Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 420aef673d82 · 2021-07-15T11:09:21.000+02:00
* 4.4:
  [ErrorHandler] fix parsing `@return array&lt;foo&gt;` annotations
diff --git a/DebugClassLoader.php b/DebugClassLoader.php
@@ -611,7 +611,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
                 ;
             }
 
-            if (null !== ($returnType = self::$returnTypes[$class][$method->name] ?? self::MAGIC_METHODS[$method->name] ?? null) && !$method->hasReturnType() && !($doc && preg_match('/\n\s+\* @return +(\S+)/', $doc))) {
+            if (null !== ($returnType = self::$returnTypes[$class][$method->name] ?? self::MAGIC_METHODS[$method->name] ?? null) && !$method->hasReturnType() && !($doc && preg_match('/\n\s+\* @return +([^\s<(]+)/', $doc))) {
                 [$normalizedType, $returnType, $declaringClass, $declaringFile] = \is_string($returnType) ? [$returnType, $returnType, '', ''] : $returnType;
 
                 if ('void' === $normalizedType) {
@@ -639,7 +639,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
 
             $matches = [];
 
-            if (!$method->hasReturnType() && ((false !== strpos($doc, '@return') && preg_match('/\n\s+\* @return +(\S+)/', $doc, $matches)) || 'void' !== (self::MAGIC_METHODS[$method->name] ?? 'void'))) {
+            if (!$method->hasReturnType() && ((false !== strpos($doc, '@return') && preg_match('/\n\s+\* @return +([^\s<(]+)/', $doc, $matches)) || 'void' !== (self::MAGIC_METHODS[$method->name] ?? 'void'))) {
                 $matches = $matches ?: [1 => self::MAGIC_METHODS[$method->name]];
                 $this->setReturnType($matches[1], $method, $parent);
 

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array`
`611`	`611`	`;`
`612`	`612`	`}`
`613`	`613`
`614`		`- if (null !== ($returnType = self::$returnTypes[$class][$method->name] ?? self::MAGIC_METHODS[$method->name] ?? null) && !$method->hasReturnType() && !($doc && preg_match('/\n\s+\* @return +(\S+)/', $doc))) {`
	`614`	`+ if (null !== ($returnType = self::$returnTypes[$class][$method->name] ?? self::MAGIC_METHODS[$method->name] ?? null) && !$method->hasReturnType() && !($doc && preg_match('/\n\s+\* @return +([^\s<(]+)/', $doc))) {`
`615`	`615`	`[$normalizedType, $returnType, $declaringClass, $declaringFile] = \is_string($returnType) ? [$returnType, $returnType, '', ''] : $returnType;`
`616`	`616`
`617`	`617`	`if ('void' === $normalizedType) {`
`@@ -639,7 +639,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array`
`639`	`639`
`640`	`640`	`$matches = [];`
`641`	`641`
`642`		`- if (!$method->hasReturnType() && ((false !== strpos($doc, '@return') && preg_match('/\n\s+\* @return +(\S+)/', $doc, $matches)) \|\| 'void' !== (self::MAGIC_METHODS[$method->name] ?? 'void'))) {`
	`642`	`+ if (!$method->hasReturnType() && ((false !== strpos($doc, '@return') && preg_match('/\n\s+\* @return +([^\s<(]+)/', $doc, $matches)) \|\| 'void' !== (self::MAGIC_METHODS[$method->name] ?? 'void'))) {`
`643`	`643`	`$matches = $matches ?: [1 => self::MAGIC_METHODS[$method->name]];`
`644`	`644`	`$this->setReturnType($matches[1], $method, $parent);`
`645`	`645`