From 32b24ba15586040a67988526896d91af555c69aa Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 7 Jun 2014 14:55:59 +0200 Subject: [PATCH 1/2] Fixed mismatch in expected exception message, see doctrine/doctrine2#1048 --- tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'); } From 50d7975fd602e3b97eb76ff8cdb42ff04f095b7d Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 7 Jun 2014 15:11:51 +0200 Subject: [PATCH 2/2] Allowing failures on hhvm-nightly, as the build chokes on composer installation for now (unrecognized console flags) --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) 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