From 9024c04c72689ce9c7953802b2beac2f74759ffc Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 14 Jan 2015 20:14:39 +0100 Subject: [PATCH] Removing conditionals checking for PHP 5.4 support --- tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php | 6 +----- tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index 27dda1981..927755f99 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -213,15 +213,11 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $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.'); - $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\InvalidFetchOption'); + $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\InvalidFetchOption'); } public function testAttributeOverridesMappingWithTrait() { - if (!version_compare(PHP_VERSION, '5.4.0', '>=')) { - $this->markTestSkipped('This test is only for 5.4+.'); - } - $factory = $this->createClassMetadataFactory(); $metadataWithoutOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithoutOverride'); diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index d23d543ca..79e583d4d 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -704,10 +704,6 @@ class EntityGeneratorTest extends OrmTestCase */ public function testTraitPropertiesAndMethodsAreNotDuplicated() { - if (PHP_VERSION_ID < 50400) { - $this->markTestSkipped('Traits are not available before php 5.4.'); - } - $cmf = new ClassMetadataFactory(); $em = $this->_getTestEntityManager(); $cmf->setEntityManager($em); @@ -734,10 +730,6 @@ class EntityGeneratorTest extends OrmTestCase */ public function testTraitPropertiesAndMethodsAreNotDuplicatedInChildClasses() { - if (PHP_VERSION_ID < 50400) { - $this->markTestSkipped('Traits are not available before php 5.4.'); - } - $cmf = new ClassMetadataFactory(); $em = $this->_getTestEntityManager(); $cmf->setEntityManager($em);