Merge pull request #12 from Ocramius/hotfix/hhvm-build-fix

HHVM does not have a `PDORow` class - breaks test suite
Ocramius · Aug 11, 2014 · 8aa99ef · 8aa99ef
2 parents 11aa050 + 741a75c
commit 8aa99ef
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/tests/InstantiatorTest/InstantiatorTest.php b/tests/InstantiatorTest/InstantiatorTest.php
@@ -71,16 +71,23 @@ public function testInstantiatesSeparateInstances($className)
 
     public function testExceptionOnUnSerializationException()
     {
-        $className = 'InstantiatorTestAsset\\UnserializeExceptionArrayObjectAsset';
-
-        if (\PHP_VERSION_ID === 50429 || \PHP_VERSION_ID === 50513) {
-            $className = 'InstantiatorTestAsset\\SerializableArrayObjectAsset';
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped(
+                'As of facebook/hhvm#3432, HHVM has no PDORow, and therefore '
+                . ' no internal final classes that cannot be instantiated'
+            );
         }
 
+        $className = 'InstantiatorTestAsset\\UnserializeExceptionArrayObjectAsset';
+
         if (\PHP_VERSION_ID >= 50600) {
             $className = 'PDORow';
         }
 
+        if (\PHP_VERSION_ID === 50429 || \PHP_VERSION_ID === 50513) {
+            $className = 'InstantiatorTestAsset\\SerializableArrayObjectAsset';
+        }
+
         $this->setExpectedException('Instantiator\\Exception\\UnexpectedValueException');
 
         $this->instantiator->instantiate($className);