Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 2f27b39add8c · 2022-03-18T17:23:14.000+01:00
* 6.0: bug #45043 [ErrorHandler] ignore ``@return`` when there is an ``@template`` (nicolas-grekas) [Finder] fix tests on Windows
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 {`