Add binary location as option

barryvdh · barryvdh · commit a613d23fd6ee · 2014-11-25T22:25:31.000+01:00
See barryvdh#25 Default is php, null = autodetect.
diff --git a/readme.md b/readme.md
@@ -34,6 +34,7 @@ You should now be able to use the async driver in config/queue.php
         ...
         'async' => array(
             'driver' => 'async',
+            'binary' => 'php',  // Optional: path to php binary, defaults to 'php'. Set to null to autodetect.
         ),
         ...
     }
diff --git a/src/AsyncQueue.php b/src/AsyncQueue.php
@@ -7,11 +7,14 @@
 
 class AsyncQueue extends SyncQueue
 {
-    /** @var PhpExecutableFinder  */
-    protected $phpfinder;
+    protected $binary;
 
-    public function __construct(){
-        $this->phpfinder = new PhpExecutableFinder();
+    public function __construct(array $config)
+    {
+        $this->binary = array_key_exists('binary', $config) ? $config['binary'] : 'phpauto';
+        if (!$this->binary) {
+            $this->binary = $this->getPhpBinary();
+        }
     }
 
     /**
@@ -80,16 +83,16 @@ protected function getCommand($jobId)
         $cmd = '%s artisan queue:async %d --env=%s';
         $cmd = $this->getBackgroundCommand($cmd);
 
-        $php = $this->getPhpBinary();
         $environment = $this->container->environment();
 
-        return sprintf($cmd, $php, $jobId, $environment);
+        return sprintf($cmd, $this->binary, $jobId, $environment);
     }
 
     protected function getPhpBinary()
     {
-        $path = escapeshellarg($this->phpfinder->find(false));
-        $args = implode(' ', $this->phpfinder->findArguments());
+        $phpfinder = new PhpExecutableFinder();
+        $path = escapeshellarg($phpfinder->find(false));
+        $args = implode(' ', $phpfinder->findArguments());
         return trim($path.' '.$args);
     }
 
diff --git a/src/Connectors/AsyncConnector.php b/src/Connectors/AsyncConnector.php
@@ -16,6 +16,6 @@ class AsyncConnector implements ConnectorInterface
      */
     public function connect(array $config)
     {
-        return new AsyncQueue();
+        return new AsyncQueue($config);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ You should now be able to use the async driver in config/queue.php`
`34`	`34`	`...`
`35`	`35`	`'async' => array(`
`36`	`36`	`'driver' => 'async',`
	`37`	`+ 'binary' => 'php', // Optional: path to php binary, defaults to 'php'. Set to null to autodetect.`
`37`	`38`	`),`
`38`	`39`	`...`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ class AsyncConnector implements ConnectorInterface`
`16`	`16`	`*/`
`17`	`17`	`public function connect(array $config)`
`18`	`18`	`{`
`19`		`- return new AsyncQueue();`
	`19`	`+ return new AsyncQueue($config);`
`20`	`20`	`}`
`21`	`21`	`}`