RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-10 11:07:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/build-fix'

Browse Source
This commit is contained in:
Marco Pivetta 2014-06-07 15:12:09 +02:00
commit 5c447cfb71
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -38,3 +38,5 @@ matrix:
env: DB=pgsql # driver currently unsupported by HHVM env: DB=pgsql # driver currently unsupported by HHVM
- php: hhvm-nightly - php: hhvm-nightly
env: DB=mysqli # driver currently unsupported by HHVM env: DB=mysqli # driver currently unsupported by HHVM
allow_failures:
- php: hhvm-nightly # hhvm-nightly currently chokes on composer installation

2
tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
View File

@ -160,7 +160,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
$factory->setEntityManager($em); $factory->setEntityManager($em);
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException', $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'."); "superclass 'Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence'.");
$usingInvalidMsc = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence'); $usingInvalidMsc = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence');
} }