Add context variable to be consistent with others extractor, use it for allowing constructor extraction in write mutator

joelwurtz · joelwurtz · commit 849250ae2455 · 2019-03-27T00:21:58.000+01:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -192,7 +192,7 @@ public function isInitializable(string $class, string $property, array $context
     /**
      * {@inheritdoc}
      */
-    public function getReadAccessor(string $class, string $property): ?ReadAccessor
+    public function getReadAccessor(string $class, string $property, array $context = []): ?ReadAccessor
     {
         try {
             $reflClass = new \ReflectionClass($class);
@@ -243,14 +243,15 @@ public function getReadAccessor(string $class, string $property): ?ReadAccessor
     /**
      * {@inheritdoc}
      */
-    public function getWriteMutator(string $class, string $property, bool $allowConstruct = true): ?WriteMutator
+    public function getWriteMutator(string $class, string $property, array $context = []): ?WriteMutator
     {
         try {
             $reflClass = new \ReflectionClass($class);
         } catch (\ReflectionException $e) {
             return null;
         }
 
+        $allowConstruct = $context['enable_constructor_extraction'] ?? $this->enableConstructorExtraction;
         $hasProperty = $reflClass->hasProperty($property);
         $camelized = $this->camelize($property);
         $accessParameter = null;
diff --git a/src/Symfony/Component/PropertyInfo/ReadAccessorExtractorInterface.php b/src/Symfony/Component/PropertyInfo/ReadAccessorExtractorInterface.php
@@ -18,5 +18,5 @@
  */
 interface ReadAccessorExtractorInterface
 {
-    public function getReadAccessor(string $class, string $property): ?ReadAccessor;
+    public function getReadAccessor(string $class, string $property, array $context = []): ?ReadAccessor;
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -382,7 +382,9 @@ public function readAccessorProvider(): array
      */
     public function testGetWriteMutator($class, $property, $allowConstruct, $found, $type, $name, $addName, $removeName, $private, $static, $hasParameter)
     {
-        $writeMutator = $this->extractor->getWriteMutator($class, $property, $allowConstruct);
+        $writeMutator = $this->extractor->getWriteMutator($class, $property, [
+            'enable_constructor_extraction' => $allowConstruct
+        ]);
 
         if (!$found) {
             $this->assertNull($writeMutator);
diff --git a/src/Symfony/Component/PropertyInfo/WriteMutatorExtractorInterface.php b/src/Symfony/Component/PropertyInfo/WriteMutatorExtractorInterface.php
@@ -18,5 +18,5 @@
  */
 interface WriteMutatorExtractorInterface
 {
-    public function getWriteMutator(string $class, string $property, bool $allowConstructor = true): ?WriteMutator;
+    public function getWriteMutator(string $class, string $property, array $context = []): ?WriteMutator;
 }

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@`
`18`	`18`	`*/`
`19`	`19`	`interface ReadAccessorExtractorInterface`
`20`	`20`	`{`
`21`		`- public function getReadAccessor(string $class, string $property): ?ReadAccessor;`
	`21`	`+ public function getReadAccessor(string $class, string $property, array $context = []): ?ReadAccessor;`
`22`	`22`	`}`