Allow defining custom path to php-cgi

Author: igorw

CHANGELOG.md

@@ -1,5 +1,6 @@
-### 1.0.1 (2013-03
+### 1.0.1 (2013-03-xx)
 
+  * Feature: Allow defining custom path to php-cgi
   * Bugfix: Allow double CRLF in response body
 
 ### 1.0.0 (2013-03-11)

phpunit.xml.dist

@@ -4,6 +4,10 @@
          colors="true"
          bootstrap="vendor/autoload.php"
 >
+    <php>
+        <env name="CGI_HTTP_KERNEL_BIN" value="php-cgi"/>
+    </php>
+
     <testsuites>
         <testsuite name="CgiHttpKernel Test Suite">
             <directory>./tests/</directory>

src/Igorw/CgiHttpKernel/CgiHttpKernel.php

@@ -15,11 +15,13 @@ class CgiHttpKernel implements HttpKernelInterface
 {
     private $rootDir;
     private $frontController;
+    private $phpCgiBin;
 
-    public function __construct($rootDir, $frontController = null)
+    public function __construct($rootDir, $frontController = null, $phpCgiBin = 'php-cgi')
     {
         $this->rootDir = $rootDir;
         $this->frontController = $frontController;
+        $this->phpCgiBin = $phpCgiBin;
     }
 
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
@@ -39,7 +41,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
         }
 
         $builder = ProcessBuilder::create()
-            ->add('php-cgi')
+            ->add($this->phpCgiBin)
             ->add('-d expose_php=Off')
             ->add('-d cgi.force_redirect=Off')
             ->add($filename)

tests/functional/CgiHttpKernelTest.php

@@ -6,11 +6,13 @@
 
 class CgiHttpKernelTest extends \PHPUnit_Framework_TestCase
 {
+    private $phpCgiBin;
     private $kernel;
 
     public function __construct()
     {
-        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures');
+        $this->phpCgiBin = getenv('CGI_HTTP_KERNEL_BIN');
+        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', null, $this->phpCgiBin);
     }
 
     /** @test */
@@ -55,7 +57,7 @@ public function customErrorStatusCodeShouldBeSent()
     /** @test */
     public function frontControllerShouldLoadPathInfo()
     {
-        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php');
+        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php', $this->phpCgiBin);
 
         $request = Request::create('/foo');
         $response = $this->kernel->handle($request);
@@ -66,7 +68,7 @@ public function frontControllerShouldLoadPathInfo()
     /** @test */
     public function frontControllerShouldConvertRequestMethod()
     {
-        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php');
+        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php', $this->phpCgiBin);
 
         $request = Request::create('/baz', 'POST');
         $response = $this->kernel->handle($request);
@@ -77,7 +79,7 @@ public function frontControllerShouldConvertRequestMethod()
     /** @test */
     public function frontControllerShouldSupportPut()
     {
-        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php');
+        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php', $this->phpCgiBin);
 
         $request = Request::create('/put-target', 'PUT');
         $response = $this->kernel->handle($request);
@@ -88,7 +90,7 @@ public function frontControllerShouldSupportPut()
     /** @test */
     public function frontControllerShouldSupportDelete()
     {
-        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php');
+        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php', $this->phpCgiBin);
 
         $request = Request::create('/delete-target', 'DELETE');
         $response = $this->kernel->handle($request);
@@ -204,7 +206,7 @@ public function scriptNameShouldBeFrontController()
     /** @test */
     public function scriptNameShouldBeFrontControllerWithCustomFrontController()
     {
-        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php');
+        $this->kernel = new CgiHttpKernel(__DIR__.'/Fixtures', 'silex.php', $this->phpCgiBin);
 
         $request = Request::create('/script-name');
         $response = $this->kernel->handle($request);