bug #37857 [PropertyInfo] Fix ReflectionExtractor + minor tweaks (ogizanagi)

fabpot · fabpot · commit 679cc4dff194 · 2020-08-19T13:09:12.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- [PropertyInfo] Fix ReflectionExtractor + minor tweaks | Q | A | ------------- | --- | Branch? | 5.1  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix N/A  | License | MIT | Doc PR | N/A Spotted while rebasing #32133 Commits ------- 7ccb5a1 [PropertyInfo] Fix ReflectionExtractor + minor tweaks
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -272,7 +272,7 @@ public function getReadInfo(string $class, string $property, array $context = []
     /**
      * {@inheritdoc}
      */
-    public function getWriteInfo(string $class, string $property, array $context = []): PropertyWriteInfo
+    public function getWriteInfo(string $class, string $property, array $context = []): ?PropertyWriteInfo
     {
         try {
             $reflClass = new \ReflectionClass($class);
@@ -308,10 +308,10 @@ public function getWriteInfo(string $class, string $property, array $context = [
             $mutator->setRemoverInfo(new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, $removerAccessName, $this->getWriteVisiblityForMethod($removerMethod), $removerMethod->isStatic()));
 
             return $mutator;
-        } else {
-            $errors = array_merge($errors, $adderAndRemoverErrors);
         }
 
+        $errors = array_merge($errors, $adderAndRemoverErrors);
+
         foreach ($this->mutatorPrefixes as $mutatorPrefix) {
             $methodName = $mutatorPrefix.$camelized;
 
@@ -330,12 +330,14 @@ public function getWriteInfo(string $class, string $property, array $context = [
 
         $getsetter = lcfirst($camelized);
 
-        [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, $getsetter, 1);
-        if ($allowGetterSetter && $accessible) {
-            $method = $reflClass->getMethod($getsetter);
+        if ($allowGetterSetter) {
+            [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, $getsetter, 1);
+            if ($accessible) {
+                $method = $reflClass->getMethod($getsetter);
+
+                return new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, $getsetter, $this->getWriteVisiblityForMethod($method), $method->isStatic());
+            }
 
-            return new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, $getsetter, $this->getWriteVisiblityForMethod($method), $method->isStatic());
-        } else {
             $errors = array_merge($errors, $methodAccessibleErrors);
         }
 
@@ -348,25 +350,27 @@ public function getWriteInfo(string $class, string $property, array $context = [
         [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, '__set', 2);
         if ($accessible) {
             return new PropertyWriteInfo(PropertyWriteInfo::TYPE_PROPERTY, $property, PropertyWriteInfo::VISIBILITY_PUBLIC, false);
-        } else {
-            $errors = array_merge($errors, $methodAccessibleErrors);
         }
 
-        [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, '__call', 2);
-        if ($allowMagicCall && $accessible) {
-            return new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, 'set'.$camelized, PropertyWriteInfo::VISIBILITY_PUBLIC, false);
-        } else {
+        $errors = array_merge($errors, $methodAccessibleErrors);
+
+        if ($allowMagicCall) {
+            [$accessible, $methodAccessibleErrors] = $this->isMethodAccessible($reflClass, '__call', 2);
+            if ($accessible) {
+                return new PropertyWriteInfo(PropertyWriteInfo::TYPE_METHOD, 'set'.$camelized, PropertyWriteInfo::VISIBILITY_PUBLIC, false);
+            }
+
             $errors = array_merge($errors, $methodAccessibleErrors);
         }
 
         if (!$allowAdderRemover && null !== $adderAccessName && null !== $removerAccessName) {
-            $errors = array_merge($errors, [sprintf(
+            $errors[] = sprintf(
                 'The property "%s" in class "%s" can be defined with the methods "%s()" but '.
                 'the new value must be an array or an instance of \Traversable',
                 $property,
                 $reflClass->getName(),
                 implode('()", "', [$adderAccessName, $removerAccessName])
-            )]);
+            );
         }
 
         $noneProperty = new PropertyWriteInfo();
@@ -626,7 +630,7 @@ private function getPropertyName(string $methodName, array $reflectionProperties
     private function findAdderAndRemover(\ReflectionClass $reflClass, array $singulars): array
     {
         if (!\is_array($this->arrayMutatorPrefixes) && 2 !== \count($this->arrayMutatorPrefixes)) {
-            return null;
+            return [null, null, []];
         }
 
         [$addPrefix, $removePrefix] = $this->arrayMutatorPrefixes;
@@ -642,7 +646,9 @@ private function findAdderAndRemover(\ReflectionClass $reflClass, array $singula
 
             if ($addMethodFound && $removeMethodFound) {
                 return [$addMethod, $removeMethod, []];
-            } elseif ($addMethodFound && !$removeMethodFound) {
+            }
+
+            if ($addMethodFound && !$removeMethodFound) {
                 $errors[] = sprintf('The add method "%s" in class "%s" was found, but the corresponding remove method "%s" was not found', $addMethod, $reflClass->getName(), $removeMethod);
             } elseif (!$addMethodFound && $removeMethodFound) {
                 $errors[] = sprintf('The remove method "%s" in class "%s" was found, but the corresponding add method "%s" was not found', $removeMethod, $reflClass->getName(), $addMethod);
