Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 5e4151fd8826 · 2022-03-18T17:21:55.000+01:00
* 5.4: bug #45043 [ErrorHandler] ignore ``@return`` when there is an ``@template`` (nicolas-grekas) [Finder] fix tests on Windows
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -371,9 +371,12 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
 
         $parent = get_parent_class($class) ?: null;
         self::$returnTypes[$class] = [];
+        $classIsTemplate = false;
 
         // Detect annotations on the class
         if ($doc = $this->parsePhpDoc($refl)) {
+            $classIsTemplate = isset($doc['template']);
+
             foreach (['final', 'deprecated', 'internal'] as $annotation) {
                 if (null !== $description = $doc[$annotation][0] ?? null) {
                     self::${$annotation}[$class] = '' !== $description ? ' '.$description.(preg_match('/[.!]$/', $description) ? '' : '.') : '.';
@@ -517,6 +520,10 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
             // To read method annotations
             $doc = $this->parsePhpDoc($method);
 
+            if (($classIsTemplate || isset($doc['template'])) && $method->hasReturnType()) {
+                unset($doc['return']);
+            }
+
             if (isset(self::$annotatedParameters[$class][$method->name])) {
                 $definedParameters = [];
                 foreach ($method->getParameters() as $parameter) {
diff --git a/src/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
@@ -65,6 +65,10 @@ public function testNotExitsBinaryFile()
 
     public function testFindWithExecutableDirectory()
     {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Directories are not executable on Windows');
+        }
+
         $originalPhpBinary = getenv('PHP_BINARY');
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@ public function testNotExitsBinaryFile()`
`65`	`65`
`66`	`66`	`public function testFindWithExecutableDirectory()`
`67`	`67`	`{`
	`68`	`+ if ('\\' === \DIRECTORY_SEPARATOR) {`
	`69`	`+ $this->markTestSkipped('Directories are not executable on Windows');`
	`70`	`+ }`
	`71`	`+`
`68`	`72`	`$originalPhpBinary = getenv('PHP_BINARY');`
`69`	`73`
`70`	`74`	`try {`