Merge pull request #43 from ddeboer/hhvm-webserver

Support HHVM built-in web server in listener

Author: dbu

.travis.yml

@@ -11,7 +11,6 @@ before_script:
   - sudo apt-get update -qq
   - sudo apt-get install -qq varnish
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' ]; then ./tests/install-apache.sh; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = 'hhvm' ]; then ./tests/run-hhvm.sh; fi"
   # Install deps
   - composer update --dev --prefer-source
 

tests/Functional/WebServerListener.php

@@ -3,7 +3,8 @@
 namespace FOS\HttpCache\Tests\Functional;
 
 /**
- * A PHPUnit test listener that starts and stops the PHP built-in web server
+ * A PHPUnit test listener that starts and stops the PHP/HHVM built-in web
+ * server
  *
  * This listener is configured with a couple of constants from the phpunit.xml
  * file. To define constants in the phpunit file, use this syntax:
@@ -34,15 +35,13 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
             return;
         }
 
-        $command = sprintf(
-            'php -S %s:%d -t %s >/dev/null 2>&1 & echo $!',
-            $this->getHostName(),
-            $this->getPort(),
-            $this->getDocRoot()
-        );
+        if (defined('HHVM_VERSION')) {
+            $pid = $this->startHhvmWebServer();
+        } else {
+            $pid = $this->startPhpWebServer();
+        }
 
-        exec($command, $output);
-        $this->pid = $pid = $output[0];
+        $this->pid = $pid;
 
         register_shutdown_function(function () use ($pid) {
             exec('kill ' . $pid);
@@ -107,4 +106,41 @@ protected function getDocRoot()
 
         return WEB_SERVER_DOCROOT;
     }
+
+    /**
+     * Start HHVM built-in web server
+     *
+     * @return int PID
+     */
+    protected function startHhvmWebServer()
+    {
+        $cur = getcwd();
+        chdir($this->getDocRoot());
+        $command = sprintf(
+            'hhvm -m server -p %d >/dev/null 2>&1 & echo $!',
+            $this->getPort()
+        );
+        exec($command, $output);
+        chdir($cur);
+
+        return $output[0];
+    }
+
+    /**
+     * Start PHP built-in web server
+     *
+     * @return int PID
+     */
+    protected function startPhpWebServer()
+    {
+        $command = sprintf(
+            'php -S %s:%d -t %s >/dev/null 2>&1 & echo $!',
+            $this->getHostName(),
+            $this->getPort(),
+            $this->getDocRoot()
+        );
+        exec($command, $output);
+
+        return $output[0];
+    }
 }