Merge remote-tracking branch 'origin/MAGETWO-51983-php-executable-in-command' into develop

dsikkema-magento · dsikkema-magento · commit ef3a088d7f73 · 2016-05-12T16:50:48.000-05:00
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -116,7 +116,8 @@ public function __construct(
         $this->driverFile = $driverFile;
         $this->storeView = $storeView;
         $this->shell = $shell;
-        $this->functionCallPath = 'php -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';
+        $this->functionCallPath =
+            PHP_BINARY . ' -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';
     }
 
     /**
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
@@ -121,7 +121,7 @@ protected function setUp()
         $userCollection->setAccessible(true);
         $userCollection->setValue($this->filesystem, $this->userCollectionMock);
 
-        $this->cmdPrefix = 'php -f '. BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';
+        $this->cmdPrefix = PHP_BINARY . ' -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';
     }
 
     public function testRegenerateStatic()

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,8 @@ public function __construct(`
`116`	`116`	`$this->driverFile = $driverFile;`
`117`	`117`	`$this->storeView = $storeView;`
`118`	`118`	`$this->shell = $shell;`
`119`		`- $this->functionCallPath = 'php -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';`
	`119`	`+ $this->functionCallPath =`
	`120`	`+ PHP_BINARY . ' -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ protected function setUp()`
`121`	`121`	`$userCollection->setAccessible(true);`
`122`	`122`	`$userCollection->setValue($this->filesystem, $this->userCollectionMock);`
`123`	`123`
`124`		`- $this->cmdPrefix = 'php -f '. BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';`
	`124`	`+ $this->cmdPrefix = PHP_BINARY . ' -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`public function testRegenerateStatic()`