Merge branch 'php-binary' of https://github.com/willemstuursma/PHP_CodeSniffer

Author: gsherwood

src/Config.php

@@ -1516,6 +1516,14 @@ public static function getExecutablePath($name)
             return $data;
         }
 
+        if ($name === "php") {
+            /*
+             * For php, we know the executable path. There's no need to look it up.
+             */
+
+            return PHP_BINARY;
+        }
+
         if (array_key_exists($name, self::$executablePaths) === true) {
             return self::$executablePaths[$name];
         }

src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php

@@ -50,14 +50,6 @@ public function process(File $phpcsFile, $stackPtr)
     {
         if ($this->phpPath === null) {
             $this->phpPath = Config::getExecutablePath('php');
-            if ($this->phpPath === null) {
-                // PHP_BINARY is available in PHP 5.4+.
-                if (defined('PHP_BINARY') === true) {
-                    $this->phpPath = PHP_BINARY;
-                } else {
-                    return;
-                }
-            }
         }
 
         $fileName = escapeshellarg($phpcsFile->getFilename());

src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php

@@ -17,27 +17,6 @@ class SyntaxUnitTest extends AbstractSniffUnitTest
 {
 
 
-    /**
-     * Should this test be skipped for some reason.
-     *
-     * @return void
-     */
-    protected function shouldSkipTest()
-    {
-        if (defined('PHP_BINARY') === true) {
-            return false;
-        }
-
-        $phpPath = Config::getExecutablePath('php');
-        if ($phpPath === null) {
-            return true;
-        }
-
-        return false;
-
-    }//end shouldSkipTest()
-
-
     /**
      * Returns the lines where errors should occur.
      *