Merge pull request #222 from symfony-cmf/hhvm

fix test code for HHVM
symfony-cmf · Nov 21, 2014 · aa78e0d · aa78e0d
2 parents e79b9da + 7708238
commit aa78e0d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,6 @@ env:
   - SYMFONY_VERSION=2.5.*
 
 matrix:
-  allow_failures:
-    - php: hhvm
   include:
     - php: 5.5
       env: SYMFONY_VERSION=2.3.*

diff --git a/Tests/Unit/Templating/Helper/CmfBlockHelperTest.php b/Tests/Unit/Templating/Helper/CmfBlockHelperTest.php
@@ -51,7 +51,7 @@ public function testLogsIfSonataThrowsException()
             ->method('warn')
             ->with($this->matchesRegularExpression('/^Failed to render block "foo" embedded in content: /'));
 
-        $exception = $this->getMock('Sonata\BlockBundle\Exception\BlockNotFoundException');
+        $exception = $this->getMock('Sonata\BlockBundle\Exception\BlockNotFoundException', array('getMessage'));
 
         $this->getSonataBlock()->expects($this->once())
             ->method('render')