Commit2f27b39

committed

Merge branch '6.0' into 6.1

* 6.0: bug#45043 [ErrorHandler] ignore ``@return`` when there is an ``@template`` (nicolas-grekas) [Finder] fix tests on Windows

2 parents42ae534 +5e4151f commit2f27b39Copy full SHA for 2f27b39

File tree

-0

lines changed

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@ public function testNotExitsBinaryFile()`
`65`	`65`
`66`	`66`	`publicfunctiontestFindWithExecutableDirectory()`
`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 {`

Comments

(0)