Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 55ca168ee185 · 2021-02-11T09:21:20.000+01:00
* 4.4:
  Skip checking return types on PHP &lt;= 7.2
diff --git a/phpunit b/phpunit
@@ -14,7 +14,7 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
         putenv('SYMFONY_PHPUNIT_VERSION=9.5');
     }
 }
-if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
+if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') && \PHP_VERSION_ID >= 70300) {
     putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
 }
 if (getcwd() === realpath(__DIR__.'/src/Symfony/Bridge/PhpUnit')) {
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -611,7 +611,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
                     $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                 }
 
-                if (false === strpos($doc, '@deprecated') && 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']) {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {`
`14`	`14`	`putenv('SYMFONY_PHPUNIT_VERSION=9.5');`
`15`	`15`	`}`
`16`	`16`	`}`
`17`		`-if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {`
	`17`	`+if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') && \PHP_VERSION_ID >= 70300) {`
`18`	`18`	`putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');`
`19`	`19`	`}`
`20`	`20`	`if (getcwd() === realpath(__DIR__.'/src/Symfony/Bridge/PhpUnit')) {`
Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array`
`611`	`611`	`$this->patchMethod($method, $returnType, $declaringFile, $normalizedType);`
`612`	`612`	`}`
`613`	`613`
`614`		`- if (false === strpos($doc, '@deprecated') && strncmp($ns, $declaringClass, $len)) {`
	`614`	`+ if (false === strpos($doc, '* @deprecated') && strncmp($ns, $declaringClass, $len)) {`
`615`	`615`	`if ($canAddReturnType && 'docblock' === $this->patchTypes['force'] && false === strpos($method->getFileName(), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {`
`616`	`616`	`$this->patchMethod($method, $returnType, $declaringFile, $normalizedType);`
`617`	`617`	`} elseif ('' !== $declaringClass && $this->patchTypes['deprecations']) {`