diff --git a/.travis.yml b/.travis.yml index b1e0cb793..ebe4fb02c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,3 +38,5 @@ matrix: env: DB=pgsql # driver currently unsupported by HHVM - php: hhvm-nightly env: DB=mysqli # driver currently unsupported by HHVM + allow_failures: + - php: hhvm-nightly # hhvm-nightly currently chokes on composer installation diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index 61a15056a..e7772f189 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -160,7 +160,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $factory->setEntityManager($em); $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', - "Its not supported to define inheritance information on a mapped ". + "It is not supported to define inheritance information on a mapped ". "superclass 'Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence'."); $usingInvalidMsc = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence'); }