Merge pull request doctrine#1009 from doctrine/feature/hhvm-tests

HHVM compatibility

.travis.yml

@@ -27,8 +27,6 @@ after_script:
   - php vendor/bin/coveralls -v
 
 matrix:
-  allow_failures:
-    - php: hhvm
   exclude:
     - php: hhvm
       env: DB=pgsql  # driver currently unsupported by HHVM

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2862Test.php

@@ -2,6 +2,8 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
+use Doctrine\ORM\Tools\ToolsException;
+
 /**
  * @group DDC-2862
  * @group DDC-2183
@@ -18,8 +20,7 @@ public function setUp()
                 $this->_em->getClassMetadata(DDC2862User::CLASSNAME),
                 $this->_em->getClassMetadata(DDC2862Driver::CLASSNAME),
             ));
-        } catch (\Doctrine\ORM\Tools\ToolsException $exc) {
-            $this->assertInstanceOf('Doctrine\DBAL\Exception\TableExistsException', $exc->getPrevious());
+        } catch (ToolsException $exc) {
         }
     }
 

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php

@@ -2,42 +2,34 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
+use Doctrine\Common\Cache\FilesystemCache;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
  * @group non-cacheable
  */
 class DDC742Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
-    private $userCm;
-    private $commentCm;
-
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         parent::setUp();
 
-        if (\extension_loaded('memcache') && @fsockopen('localhost', 11211)) {
-            $memcache = new \Memcache();
-            $memcache->addServer('localhost');
-            $memcache->flush();
+        $testDir = sys_get_temp_dir() . '/DDC742Test' . uniqid();
 
-            $cacheDriver = new \Doctrine\Common\Cache\MemcacheCache();
-            $cacheDriver->setMemcache($memcache);
+        mkdir($testDir);
 
-            $this->_em->getMetadataFactory()->setCacheDriver($cacheDriver);
-        } else if (\extension_loaded('apc')) {
-            $this->_em->getMetadataFactory()->setCacheDriver(new \Doctrine\Common\Cache\ApcCache());
-        } else {
-            $this->markTestSkipped('Test only works with a cache enabled.');
-        }
+        // using a Filesystemcache to ensure that the cached data is serialized
+        $this->_em->getMetadataFactory()->setCacheDriver(new FilesystemCache($testDir));
 
         try {
             $this->_schemaTool->createSchema(array(
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC742User'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC742Comment')
             ));
         } catch(\Exception $e) {
-
         }
 
         // make sure classes will be deserialized from caches