From 8742377c3ba0047a99dbf5cdaaa07a74436810dc Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Sun, 29 Jul 2012 00:03:25 -0500 Subject: [PATCH 1/3] [DDC-1872] add tests to evaluate annotations overrides with traits --- .../ORM/Mapping/AnnotationDriverTest.php | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index 4d7715ebb..df335c56c 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -215,6 +215,19 @@ class AnnotationDriverTest extends AbstractMappingDriverTest "Entity 'Doctrine\Tests\ORM\Mapping\InvalidFetchOption' has a mapping with invalid fetch mode 'eager"); $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\InvalidFetchOption'); } + + public function testAttributeOverridesMappingWithTrait() + { + $factory = $this->createClassMetadataFactory(); + + $metadataWithoutOverride = $factory->getMetadataFor(get_class(new ExampleEntityWithoutOverride())); + $metadataWithOverride = $factory->getMetadataFor(get_class(new ExampleEntityWithOverride())); + + $this->assertEquals('trait_foo', $metadataWithoutOverride->fieldMappings['foo']['columnName']); + $this->assertEquals('foo_overridden', $metadataWithOverride->fieldMappings['foo']['columnName']); + $this->assertArrayHasKey('example_trait_bar_id', $metadataWithoutOverride->associationMappings['bar']['joinColumnFieldNames']); + $this->assertArrayHasKey('example_entity_overridden_bar_id', $metadataWithOverride->associationMappings['bar']['joinColumnFieldNames']); + } } /** @@ -338,3 +351,68 @@ class InvalidFetchOption */ private $collection; } + +/** + * @Entity + * + * @AttributeOverrides({ + * @AttributeOverride(name="foo", + * column=@Column( + * name = "foo_overridden", + * type = "integer", + * length = 140, + * nullable = false, + * unique = false + * ) + * ) + * }) + * + * @AssociationOverrides({ + * @AssociationOverride(name="bar", + * joinColumns=@JoinColumn( + * name="example_entity_overridden_bar_id", referencedColumnName="id" + * ) + * ) + * }) + */ +class ExampleEntityWithOverride +{ + use ExampleTrait; +} + +/** + * @Entity + */ +class ExampleEntityWithoutOverride +{ + use ExampleTrait; +} + +/** + * Trait class + */ +trait ExampleTrait +{ + /** @Id @Column(type="string") */ + private $id; + + /** + * @Column(name="trait_foo", type="integer", length=100, nullable=true, unique=true) + */ + protected $foo; + + /** + * @OneToOne(targetEntity="Bar", cascade={"persist", "merge"}) + * @JoinColumn(name="example_trait_bar_id", referencedColumnName="id") + */ + protected $bar; +} + +/** + * @Entity + */ +class Bar +{ + /** @Id @Column(type="string") */ + private $id; +} \ No newline at end of file From 5d0082471fa7bc39c47cefe1b8994e0ab9f12ff7 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Sun, 29 Jul 2012 22:55:26 -0500 Subject: [PATCH 2/3] [DDC-1872] skip 5.4 versions for php 5.3 uncompatible tests --- .../Tests/Models/DDC1872/DDC1872Bar.php | 12 +++ .../DDC1872ExampleEntityWithOverride.php | 31 ++++++++ .../DDC1872ExampleEntityWithoutOverride.php | 11 +++ .../Models/DDC1872/DDC1872ExampleTrait.php | 23 ++++++ .../ORM/Mapping/AnnotationDriverTest.php | 73 ++----------------- 5 files changed, 83 insertions(+), 67 deletions(-) create mode 100644 tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php create mode 100644 tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithOverride.php create mode 100644 tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithoutOverride.php create mode 100644 tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php diff --git a/tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php b/tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php new file mode 100644 index 000000000..ea170aeff --- /dev/null +++ b/tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php @@ -0,0 +1,12 @@ +=')) { + $this->markTestSkipped('Invalid PHP version, unable to run this test.'); + } + $factory = $this->createClassMetadataFactory(); - $metadataWithoutOverride = $factory->getMetadataFor(get_class(new ExampleEntityWithoutOverride())); - $metadataWithOverride = $factory->getMetadataFor(get_class(new ExampleEntityWithOverride())); + $metadataWithoutOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithoutOverride'); + $metadataWithOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithOverride'); $this->assertEquals('trait_foo', $metadataWithoutOverride->fieldMappings['foo']['columnName']); $this->assertEquals('foo_overridden', $metadataWithOverride->fieldMappings['foo']['columnName']); @@ -350,69 +354,4 @@ class InvalidFetchOption * @OneToMany(targetEntity="Doctrine\Tests\Models\CMS\CmsUser", fetch="eager") */ private $collection; -} - -/** - * @Entity - * - * @AttributeOverrides({ - * @AttributeOverride(name="foo", - * column=@Column( - * name = "foo_overridden", - * type = "integer", - * length = 140, - * nullable = false, - * unique = false - * ) - * ) - * }) - * - * @AssociationOverrides({ - * @AssociationOverride(name="bar", - * joinColumns=@JoinColumn( - * name="example_entity_overridden_bar_id", referencedColumnName="id" - * ) - * ) - * }) - */ -class ExampleEntityWithOverride -{ - use ExampleTrait; -} - -/** - * @Entity - */ -class ExampleEntityWithoutOverride -{ - use ExampleTrait; -} - -/** - * Trait class - */ -trait ExampleTrait -{ - /** @Id @Column(type="string") */ - private $id; - - /** - * @Column(name="trait_foo", type="integer", length=100, nullable=true, unique=true) - */ - protected $foo; - - /** - * @OneToOne(targetEntity="Bar", cascade={"persist", "merge"}) - * @JoinColumn(name="example_trait_bar_id", referencedColumnName="id") - */ - protected $bar; -} - -/** - * @Entity - */ -class Bar -{ - /** @Id @Column(type="string") */ - private $id; } \ No newline at end of file From 221ab3b69522c8dc1dbcd5410adc811c563ba0f1 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 1 Aug 2012 02:27:23 -0500 Subject: [PATCH 3/3] [DDC-1872] adjust as per @stof comments on test skipped message --- 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 4042f690c..96933ac9d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -219,7 +219,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest public function testAttributeOverridesMappingWithTrait() { if (!version_compare(PHP_VERSION, '5.4.0', '>=')) { - $this->markTestSkipped('Invalid PHP version, unable to run this test.'); + $this->markTestSkipped('This test is only for 5.4+.'); } $factory = $this->createClassMetadataFactory();