[ErrorHandler] fix parsing return types in DebugClassLoader

nicolas-grekas · nicolas-grekas · commit 58e32b3c2a33 · 2021-02-02T17:49:07.000+01:00
diff --git a/phpunit b/phpunit
@@ -16,9 +16,6 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
         putenv('SYMFONY_PHPUNIT_VERSION=9.5');
     }
 }
-if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
-    putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
-}
 if (getcwd() === realpath(__DIR__.'/src/Symfony/Bridge/PhpUnit')) {
     putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
 }
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -535,7 +535,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
             if (null !== (self::INTERNAL_TYPES[$use] ?? null)) {
                 foreach (self::INTERNAL_TYPES[$use] as $method => $returnType) {
                     if ('void' !== $returnType) {
-                        self::$returnTypes[$class] += [$method => [$returnType, $returnType, $class, '']];
+                        self::$returnTypes[$class] += [$method => [$returnType, $returnType, $use, '']];
                     }
                 }
             }
@@ -612,7 +612,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
                     $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                 }
 
-                if (strncmp($ns, $declaringClass, $len)) {
+                if (false === strpos($doc, '@deprecated') && strncmp($ns, $declaringClass, $len)) {
                     if ($canAddReturnType && 'docblock' === $this->patchTypes['force'] && false === strpos($method->getFileName(), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {
                         $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                     } elseif ('' !== $declaringClass && $this->patchTypes['deprecations']) {
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
@@ -320,12 +320,12 @@ public function getSalt()
         return null;
     }
 
-    public function serialize()
+    public function serialize(): string
     {
         return serialize($this->name);
     }
 
-    public function unserialize($serialized)
+    public function unserialize($serialized): void
     {
         $this->name = unserialize($serialized);
     }

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {`
`16`	`16`	`putenv('SYMFONY_PHPUNIT_VERSION=9.5');`
`17`	`17`	`}`
`18`	`18`	`}`
`19`		`-if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {`
`20`		`- putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');`
`21`		`-}`
`22`	`19`	`if (getcwd() === realpath(__DIR__.'/src/Symfony/Bridge/PhpUnit')) {`
`23`	`20`	`putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');`
`24`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array`
`535`	`535`	`if (null !== (self::INTERNAL_TYPES[$use] ?? null)) {`
`536`	`536`	`foreach (self::INTERNAL_TYPES[$use] as $method => $returnType) {`
`537`	`537`	`if ('void' !== $returnType) {`
`538`		`- self::$returnTypes[$class] += [$method => [$returnType, $returnType, $class, '']];`
	`538`	`+ self::$returnTypes[$class] += [$method => [$returnType, $returnType, $use, '']];`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`	`}`
`@@ -612,7 +612,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array`
`612`	`612`	`$this->patchMethod($method, $returnType, $declaringFile, $normalizedType);`
`613`	`613`	`}`
`614`	`614`
`615`		`- if (strncmp($ns, $declaringClass, $len)) {`
	`615`	`+ if (false === strpos($doc, '@deprecated') && strncmp($ns, $declaringClass, $len)) {`
`616`	`616`	`if ($canAddReturnType && 'docblock' === $this->patchTypes['force'] && false === strpos($method->getFileName(), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {`
`617`	`617`	`$this->patchMethod($method, $returnType, $declaringFile, $normalizedType);`
`618`	`618`	`} elseif ('' !== $declaringClass && $this->patchTypes['deprecations']) {`
Original file line number	Diff line number	Diff line change
`@@ -320,12 +320,12 @@ public function getSalt()`
`320`	`320`	`return null;`
`321`	`321`	`}`
`322`	`322`
`323`		`- public function serialize()`
	`323`	`+ public function serialize(): string`
`324`	`324`	`{`
`325`	`325`	`return serialize($this->name);`
`326`	`326`	`}`
`327`	`327`
`328`		`- public function unserialize($serialized)`
	`328`	`+ public function unserialize($serialized): void`
`329`	`329`	`{`
`330`	`330`	`$this->name = unserialize($serialized);`
`331`	`331`	`}`