Merge pull request #142 from GrahamCampbell/hhvm

Improved HHVM Support

.travis.yml

@@ -16,9 +16,4 @@ before_script:
   - composer install --no-interaction --prefer-source --dev
 
 script:
-  - phpunit
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
+  - phpunit --verbose

tests/Whoops/Handler/PrettyPageHandlerTest.php

@@ -247,6 +247,10 @@ class PrettyPageHandlerTest extends TestCase
 
     public function testEditorXdebug()
     {
+        if (!extension_loaded('xdebug')) {
+            return $this->markTestSkipped('The xdebug extension is not loaded.');
+        }
+
         $originalValue = ini_get('xdebug.file_link_format');
 
         ini_set('xdebug.file_link_format', '%f:%l');

tests/Whoops/RunTest.php

@@ -23,6 +23,10 @@ class RunTest extends TestCase
      */
     protected function getException($message = null)
     {
+        if (defined('HHVM_VERSION')) {
+            return $this->markTestSkipped('HHVM does not support mocking exceptions.');
+        }
+
         return m::mock('Exception', array($message));
     }
 
@@ -276,6 +280,10 @@ class RunTest extends TestCase
 
     public function testErrorCatching()
     {
+        if (defined('HHVM_VERSION')) {
+            return $this->markTestSkipped('Skipped due to a bug in HHVM.');
+        }
+
         $run = $this->getRunInstance();
         $run->register();