RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-28 10:53:49 +03:00
Code Issues Projects Releases Wiki Activity

Removing conditionals checking for PHP 5.4 support

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-14 20:14:39 +01:00
parent 541e7bdf72
commit 9024c04c72
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,15 +213,11 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
$this->setExpectedException('Doctrine\Common\Annotations\AnnotationException', $this->setExpectedException('Doctrine\Common\Annotations\AnnotationException',
'[Enum Error] Attribute "fetch" of @Doctrine\ORM\Mapping\OneToMany declared on property Doctrine\Tests\ORM\Mapping\InvalidFetchOption::$collection accept only [LAZY, EAGER, EXTRA_LAZY], but got eager.'); '[Enum Error] Attribute "fetch" of @Doctrine\ORM\Mapping\OneToMany declared on property Doctrine\Tests\ORM\Mapping\InvalidFetchOption::$collection accept only [LAZY, EAGER, EXTRA_LAZY], but got eager.');
$cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\InvalidFetchOption'); $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\InvalidFetchOption');
} }
public function testAttributeOverridesMappingWithTrait() public function testAttributeOverridesMappingWithTrait()
{ {
if (!version_compare(PHP_VERSION, '5.4.0', '>=')) {
$this->markTestSkipped('This test is only for 5.4+.');
}
$factory = $this->createClassMetadataFactory(); $factory = $this->createClassMetadataFactory();
$metadataWithoutOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithoutOverride'); $metadataWithoutOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithoutOverride');

8
tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
View File

@ -704,10 +704,6 @@ class EntityGeneratorTest extends OrmTestCase
*/ */
public function testTraitPropertiesAndMethodsAreNotDuplicated() public function testTraitPropertiesAndMethodsAreNotDuplicated()
{ {
if (PHP_VERSION_ID < 50400) {
$this->markTestSkipped('Traits are not available before php 5.4.');
}
$cmf = new ClassMetadataFactory(); $cmf = new ClassMetadataFactory();
$em = $this->_getTestEntityManager(); $em = $this->_getTestEntityManager();
$cmf->setEntityManager($em); $cmf->setEntityManager($em);
@ -734,10 +730,6 @@ class EntityGeneratorTest extends OrmTestCase
*/ */
public function testTraitPropertiesAndMethodsAreNotDuplicatedInChildClasses() public function testTraitPropertiesAndMethodsAreNotDuplicatedInChildClasses()
{ {
if (PHP_VERSION_ID < 50400) {
$this->markTestSkipped('Traits are not available before php 5.4.');
}
$cmf = new ClassMetadataFactory(); $cmf = new ClassMetadataFactory();
$em = $this->_getTestEntityManager(); $em = $this->_getTestEntityManager();
$cmf->setEntityManager($em); $cmf->setEntityManager($em);