Merge branch 'feature/generic-executablefile-skip-tests-on-windows' of https://github.com/jrfnl/PHP_CodeSniffer

gsherwood · gsherwood · commit 65e88a32fce5 · 2020-01-06T07:50:54.000+11:00
diff --git a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
@@ -24,7 +24,8 @@ protected function shouldSkipTest()
     {
         // PEAR doesn't preserve the executable flag, so skip
         // tests when running in a PEAR install.
-        return $GLOBALS['PHP_CODESNIFFER_PEAR'];
+        // Also skip on Windows which doesn't have the concept of executable files.
+        return ($GLOBALS['PHP_CODESNIFFER_PEAR'] || (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'));
 
     }//end shouldSkipTest()
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ protected function shouldSkipTest()`
`24`	`24`	`{`
`25`	`25`	`// PEAR doesn't preserve the executable flag, so skip`
`26`	`26`	`// tests when running in a PEAR install.`
`27`		`- return $GLOBALS['PHP_CODESNIFFER_PEAR'];`
	`27`	`+ // Also skip on Windows which doesn't have the concept of executable files.`
	`28`	`+ return ($GLOBALS['PHP_CODESNIFFER_PEAR'] \|\| (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'));`
`28`	`29`
`29`	`30`	`}//end shouldSkipTest()`
`30`	`31`