From a47af43bc1006178c65ba41052e4aa2b2099fa50 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Wed, 27 Jul 2011 08:54:06 +0200 Subject: [PATCH 1/8] Last change from assertTrue($a instanceof $b) to assertInstanceOf --- .../ORM/Hydration/ObjectHydratorTest.php | 110 +++++++++--------- .../Tests/ORM/Mapping/ClassMetadataTest.php | 2 +- .../AbstractClassMetadataExporterTest.php | 6 +- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php index ecd50f237..f2673ac70 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php @@ -44,8 +44,8 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); $this->assertEquals(2, count($result)); - $this->assertTrue($result[0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1] instanceof \Doctrine\Tests\Models\CMS\CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]); $this->assertEquals(1, $result[0]->id); $this->assertEquals('romanb', $result[0]->name); $this->assertEquals(2, $result[1]->id); @@ -116,10 +116,10 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(4, count($result)); - $this->assertTrue($result[0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[2] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[3] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[3]); $this->assertEquals(1, $result[0]->id); $this->assertEquals('romanb', $result[0]->name); @@ -173,7 +173,7 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0] instanceof \Doctrine\Tests\Models\ECommerce\ECommerceProduct); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $result[0]); } /** @@ -231,12 +231,12 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertTrue(is_array($result[0])); $this->assertTrue(is_array($result[1])); - $this->assertTrue($result[0][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[0][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[0][0]->phonenumbers[1] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[1][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->phonenumbers); // first user => 2 phonenumbers $this->assertEquals(2, count($result[0][0]->phonenumbers)); @@ -293,8 +293,8 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, $result[0]['numPhones']); // second user => 1 phonenumber $this->assertEquals(1, $result[1]['numPhones']); - $this->assertTrue($result[0][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); } /** @@ -359,9 +359,9 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals('ROMANB', $result[0]['nameUpper']); $this->assertEquals('JWAGE', $result[1]['nameUpper']); - $this->assertTrue($result[0]['1'] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1]['2'] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[0]['1']->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]['1']); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]['2']); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0]['1']->phonenumbers); // first user => 2 phonenumbers. notice the custom indexing by user id $this->assertEquals(2, count($result[0]['1']->phonenumbers)); // second user => 1 phonenumber. notice the custom indexing by user id @@ -469,18 +469,18 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertTrue(is_array($result[0])); $this->assertTrue(is_array($result[1])); - $this->assertTrue($result[0][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[0][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[0][0]->phonenumbers[1] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[0][0]->articles instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->articles[0] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[0][0]->articles[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[1][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[1][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[1][0]->articles[0] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[1][0]->articles[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[1]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->articles); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][0]->articles[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][0]->articles[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[1][0]->phonenumbers[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]->articles[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]->articles[1]); } /** @@ -604,29 +604,29 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertTrue(is_array($result[0])); $this->assertTrue(is_array($result[1])); - $this->assertTrue($result[0][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); // phonenumbers - $this->assertTrue($result[0][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[0][0]->phonenumbers[1] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[1][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[1][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[1]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[1][0]->phonenumbers[0]); // articles - $this->assertTrue($result[0][0]->articles instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->articles[0] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[0][0]->articles[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[1][0]->articles[0] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[1][0]->articles[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->articles); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][0]->articles[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][0]->articles[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]->articles[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]->articles[1]); // article comments - $this->assertTrue($result[0][0]->articles[0]->comments instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->articles[0]->comments[0] instanceof \Doctrine\Tests\Models\CMS\CmsComment); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->articles[0]->comments); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsComment', $result[0][0]->articles[0]->comments[0]); // empty comment collections - $this->assertTrue($result[0][0]->articles[1]->comments instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->articles[1]->comments); $this->assertEquals(0, count($result[0][0]->articles[1]->comments)); - $this->assertTrue($result[1][0]->articles[0]->comments instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->articles[0]->comments); $this->assertEquals(0, count($result[1][0]->articles[0]->comments)); - $this->assertTrue($result[1][0]->articles[1]->comments instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->articles[1]->comments); $this->assertEquals(0, count($result[1][0]->articles[1]->comments)); } @@ -706,8 +706,8 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); $this->assertEquals(2, count($result)); - $this->assertTrue($result[0] instanceof \Doctrine\Tests\Models\Forum\ForumCategory); - $this->assertTrue($result[1] instanceof \Doctrine\Tests\Models\Forum\ForumCategory); + $this->assertInstanceOf('Doctrine\Tests\Models\Forum\ForumCategory', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\Forum\ForumCategory', $result[1]); $this->assertTrue($result[0] !== $result[1]); $this->assertEquals(1, $result[0]->getId()); $this->assertEquals(2, $result[1]->getId()); @@ -768,8 +768,8 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); $this->assertEquals(2, count($result)); - $this->assertTrue($result[0] instanceof CmsUser); - $this->assertTrue($result[1] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]); $this->assertEquals(0, $result[0]->articles->count()); $this->assertEquals(0, $result[1]->articles->count()); } @@ -826,19 +826,19 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(3, count($result)); - $this->assertTrue($result[0][0] instanceof CmsUser); // User object + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); // User object $this->assertEquals(1, $result[0]['id']); $this->assertEquals('The First', $result[0]['topic']); $this->assertEquals(1, $result[0]['cid']); $this->assertEquals('First Comment', $result[0]['ctopic']); - $this->assertTrue($result[1][0] instanceof CmsUser); // Same User object + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); // Same User object $this->assertEquals(1, $result[1]['id']); // duplicated $this->assertEquals('The First', $result[1]['topic']); // duplicated $this->assertEquals(2, $result[1]['cid']); $this->assertEquals('Second Comment', $result[1]['ctopic']); - $this->assertTrue($result[2][0] instanceof CmsUser); // Same User object + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2][0]); // Same User object $this->assertEquals(42, $result[2]['id']); $this->assertEquals('The Answer', $result[2]['topic']); $this->assertNull($result[2]['cid']); @@ -877,7 +877,7 @@ class ObjectHydratorTest extends HydrationTestCase $rowNum = 0; while (($row = $iterableResult->next()) !== false) { $this->assertEquals(1, count($row)); - $this->assertTrue($row[0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $row[0]); if ($rowNum == 0) { $this->assertEquals(1, $row[0]->id); $this->assertEquals('romanb', $row[0]->name); diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index 7f7d3d6cf..7868fb2fb 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -105,7 +105,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase )); $assoc = $cm->associationMappings['groups']; - //$this->assertTrue($assoc instanceof \Doctrine\ORM\Mapping\ManyToManyMapping); + //$this->assertInstanceOf('Doctrine\ORM\Mapping\ManyToManyMapping', $assoc); $this->assertEquals(array( 'name' => 'cmsuser_cmsgroup', 'joinColumns' => array(array('name' => 'cmsuser_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')), diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 11b3d113d..0dfbcc2f3 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -212,7 +212,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest public function testOneToOneAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['address'])); - //$this->assertTrue($class->associationMappings['address'] instanceof \Doctrine\ORM\Mapping\OneToOneMapping); + //$this->assertInstanceOf('Doctrine\ORM\Mapping\OneToOneMapping', $class->associationMappings['address']); $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Address', $class->associationMappings['address']['targetEntity']); $this->assertEquals('address_id', $class->associationMappings['address']['joinColumns'][0]['name']); $this->assertEquals('id', $class->associationMappings['address']['joinColumns'][0]['referencedColumnName']); @@ -234,7 +234,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest public function testOneToManyAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['phonenumbers'])); - //$this->assertTrue($class->associationMappings['phonenumbers'] instanceof \Doctrine\ORM\Mapping\OneToManyMapping); + //$this->assertInstanceOf('Doctrine\ORM\Mapping\OneToManyMapping', $class->associationMappings['phonenumbers']); $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Phonenumber', $class->associationMappings['phonenumbers']['targetEntity']); $this->assertEquals('user', $class->associationMappings['phonenumbers']['mappedBy']); $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']); @@ -255,7 +255,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest public function testManyToManyAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['groups'])); - //$this->assertTrue($class->associationMappings['groups'] instanceof \Doctrine\ORM\Mapping\ManyToManyMapping); + //$this->assertInstanceOf('Doctrine\ORM\Mapping\ManyToManyMapping', $class->associationMappings['groups']); $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Group', $class->associationMappings['groups']['targetEntity']); $this->assertEquals('cms_users_groups', $class->associationMappings['groups']['joinTable']['name']); From a04d2933fa5c489c61ec396fc72f911d0136c919 Mon Sep 17 00:00:00 2001 From: "Fabio B. Silva" Date: Sat, 13 Aug 2011 16:28:05 -0300 Subject: [PATCH 2/8] @Target annotation and support to common 2.2-DEV --- .../Mapping/Driver/DoctrineAnnotations.php | 167 ++++++++++++++---- lib/Doctrine/ORM/Tools/EntityGenerator.php | 2 +- tests/Doctrine/Tests/OrmTestCase.php | 9 +- 3 files changed, 143 insertions(+), 35 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php index 18be57714..e6a674b38 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php @@ -23,19 +23,31 @@ use Doctrine\Common\Annotations\Annotation; /* Annotations */ -/** @Annotation */ +/** + * @Annotation + * @Target("CLASS") + */ final class Entity extends Annotation { public $repositoryClass; public $readOnly = false; } -/** @Annotation */ +/** + * @Annotation + * @Target("CLASS") + */ final class MappedSuperclass extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("CLASS") + */ final class InheritanceType extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("CLASS") + */ final class DiscriminatorColumn extends Annotation { public $name; public $fieldName; // field name used in non-object hydration (array/scalar) @@ -43,21 +55,36 @@ final class DiscriminatorColumn extends Annotation { public $length; } -/** @Annotation */ +/** + * @Annotation + * @Target("CLASS") + */ final class DiscriminatorMap extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class Id extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class GeneratedValue extends Annotation { public $strategy = 'AUTO'; } -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class Version extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target({"PROPERTY","ANNOTATION"}) + */ final class JoinColumn extends Annotation { public $name; public $fieldName; // field name used in non-object hydration (array/scalar) @@ -68,10 +95,16 @@ final class JoinColumn extends Annotation { public $columnDefinition; } -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class JoinColumns extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class Column extends Annotation { public $type = 'string'; public $length; @@ -86,7 +119,10 @@ final class Column extends Annotation { public $columnDefinition; } -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class OneToOne extends Annotation { public $targetEntity; public $mappedBy; @@ -96,7 +132,10 @@ final class OneToOne extends Annotation { public $orphanRemoval = false; } -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class OneToMany extends Annotation { public $mappedBy; public $targetEntity; @@ -106,7 +145,10 @@ final class OneToMany extends Annotation { public $indexBy; } -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class ManyToOne extends Annotation { public $targetEntity; public $cascade; @@ -114,7 +156,10 @@ final class ManyToOne extends Annotation { public $inversedBy; } -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class ManyToMany extends Annotation { public $targetEntity; public $mappedBy; @@ -124,12 +169,19 @@ final class ManyToMany extends Annotation { public $indexBy; } -/** @Annotation */ +/** + * @Annotation + * @Target("ALL") + * @todo check available targets + */ final class ElementCollection extends Annotation { public $tableName; } -/** @Annotation */ +/** + * @Annotation + * @Target("CLASS") + */ final class Table extends Annotation { public $name; public $schema; @@ -137,19 +189,28 @@ final class Table extends Annotation { public $uniqueConstraints; } -/** @Annotation */ +/** + * @Annotation + * @Target("ANNOTATION") + */ final class UniqueConstraint extends Annotation { public $name; public $columns; } -/** @Annotation */ +/** + * @Annotation + * @Target("ANNOTATION") + */ final class Index extends Annotation { public $name; public $columns; } -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class JoinTable extends Annotation { public $name; public $schema; @@ -157,49 +218,89 @@ final class JoinTable extends Annotation { public $inverseJoinColumns = array(); } -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class SequenceGenerator extends Annotation { public $sequenceName; public $allocationSize = 1; public $initialValue = 1; } -/** @Annotation */ +/** + * @Annotation + * @Target("CLASS") + */ final class ChangeTrackingPolicy extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("PROPERTY") + */ final class OrderBy extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("CLASS") + */ final class NamedQueries extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("ANNOTATION") + */ final class NamedQuery extends Annotation { public $name; public $query; } /* Annotations for lifecycle callbacks */ -/** @Annotation */ + +/** + * @Annotation + * @Target("CLASS") + */ final class HasLifecycleCallbacks extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("METHOD") + */ final class PrePersist extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("METHOD") + */ final class PostPersist extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("METHOD") + */ final class PreUpdate extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("METHOD") + */ final class PostUpdate extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("METHOD") + */ final class PreRemove extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("METHOD") + */ final class PostRemove extends Annotation {} -/** @Annotation */ +/** + * @Annotation + * @Target("METHOD") + */ final class PostLoad extends Annotation {} diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 33252af77..e569ae965 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -302,7 +302,7 @@ public function () */ public function setAnnotationPrefix($prefix) { - if (version_compare(\Doctrine\Common\Version::VERSION, '3.0.0-DEV', '>=')) { + if (version_compare(\Doctrine\Common\Version::VERSION, '2.2.0-DEV', '>=')) { return; } $this->_annotationsPrefix = $prefix; diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php index ff8b7f649..678478633 100644 --- a/tests/Doctrine/Tests/OrmTestCase.php +++ b/tests/Doctrine/Tests/OrmTestCase.php @@ -24,7 +24,14 @@ abstract class OrmTestCase extends DoctrineTestCase $reader = new \Doctrine\Common\Annotations\CachedReader( new \Doctrine\Common\Annotations\AnnotationReader(), new ArrayCache() ); - } else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-BETA3-DEV', '>=')) { + } + else if (version_compare(\Doctrine\Common\Version::VERSION, '2.2.0-DEV', '>=')) { + // Register the ORM Annotations in the AnnotationRegistry + $reader = new \Doctrine\Common\Annotations\SimpleAnnotationReader(); + $reader->addNamespace('Doctrine\ORM\Mapping'); + $reader = new \Doctrine\Common\Annotations\CachedReader($reader, new ArrayCache()); + } + else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-BETA3-DEV', '>=')) { $reader = new \Doctrine\Common\Annotations\AnnotationReader(); $reader->setIgnoreNotImportedAnnotations(true); $reader->setEnableParsePhpImports(false); From f148912a28601d9c6234d59661f0e4ad1ae0c138 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Mon, 15 Aug 2011 01:53:56 -0300 Subject: [PATCH 3/8] [DDC-934][DDC-1100][DDC-1331] Implemented support to multi-values in INSTANCE OF expression. --- lib/Doctrine/ORM/AbstractQuery.php | 2 + .../ORM/Query/AST/InstanceOfExpression.php | 3 +- lib/Doctrine/ORM/Query/Parser.php | 48 +++++++++++++---- lib/Doctrine/ORM/Query/SqlWalker.php | 51 +++++++++++-------- lib/Doctrine/ORM/QueryBuilder.php | 2 + .../ORM/Query/SelectSqlGenerationTest.php | 18 +++++-- 6 files changed, 86 insertions(+), 38 deletions(-) diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php index 26eee1fb8..88bbfc2c1 100644 --- a/lib/Doctrine/ORM/AbstractQuery.php +++ b/lib/Doctrine/ORM/AbstractQuery.php @@ -195,6 +195,8 @@ abstract class AbstractQuery */ public function setParameter($key, $value, $type = null) { + $key = trim($key, ':'); + if ($type === null) { $type = Query\ParameterTypeInferer::inferType($value); } diff --git a/lib/Doctrine/ORM/Query/AST/InstanceOfExpression.php b/lib/Doctrine/ORM/Query/AST/InstanceOfExpression.php index 3aefd61d9..b586f4812 100644 --- a/lib/Doctrine/ORM/Query/AST/InstanceOfExpression.php +++ b/lib/Doctrine/ORM/Query/AST/InstanceOfExpression.php @@ -20,7 +20,8 @@ namespace Doctrine\ORM\Query\AST; /** - * InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (AbstractSchemaName | InputParameter) + * InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (InstanceOfParameter | "(" InstanceOfParameter {"," InstanceOfParameter}* ")") + * InstanceOfParameter ::= AbstractSchemaName | InputParameter * * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.doctrine-project.org diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 0f7c88538..699537456 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -2676,7 +2676,7 @@ class Parser } /** - * InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (AbstractSchemaName | InputParameter) + * InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (InstanceOfParameter | "(" InstanceOfParameter {"," InstanceOfParameter}* ")") * * @return \Doctrine\ORM\Query\AST\InstanceOfExpression */ @@ -2690,22 +2690,50 @@ class Parser } $this->match(Lexer::T_INSTANCE); + $this->match(Lexer::T_OF); + + $exprValues = array(); + + if ($this->_lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) { + $this->match(Lexer::T_OPEN_PARENTHESIS); + + $exprValues[] = $this->InstanceOfParameter(); - if ($this->_lexer->isNextToken(Lexer::T_OF)) { - $this->match(Lexer::T_OF); + while ($this->_lexer->isNextToken(Lexer::T_COMMA)) { + $this->match(Lexer::T_COMMA); + + $exprValues[] = $this->InstanceOfParameter(); + } + + $this->match(Lexer::T_CLOSE_PARENTHESIS); + + $instanceOfExpression->value = $exprValues; + + return $instanceOfExpression; } - if ($this->_lexer->isNextToken(Lexer::T_INPUT_PARAMETER)) { - $this->match(Lexer::T_INPUT_PARAMETER); - $exprValue = new AST\InputParameter($this->_lexer->token['value']); - } else { - $exprValue = $this->AliasIdentificationVariable(); - } + $exprValues[] = $this->InstanceOfParameter(); - $instanceOfExpression->value = $exprValue; + $instanceOfExpression->value = $exprValues; return $instanceOfExpression; } + + /** + * InstanceOfParameter ::= AbstractSchemaName | InputParameter + * + * @return mixed + */ + public function InstanceOfParameter() + { + if ($this->_lexer->isNextToken(Lexer::T_INPUT_PARAMETER)) { + $this->match(Lexer::T_INPUT_PARAMETER); + + return new AST\InputParameter($this->_lexer->token['value']); + } + + return $this->AliasIdentificationVariable(); + } /** * LikeExpression ::= StringExpression ["NOT"] "LIKE" (string | input_parameter) ["ESCAPE" char] diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index cc387543c..dc97d6bb5 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -1756,34 +1756,41 @@ class SqlWalker implements TreeWalker if ($this->_useSqlTableAliases) { $sql .= $this->getSQLTableAlias($discrClass->table['name'], $dqlAlias) . '.'; } + + $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN '); + + $sqlParameterList = array(); + + foreach ($instanceOfExpr->value as $parameter) { + if ($parameter instanceof AST\InputParameter) { + // We need to modify the parameter value to be its correspondent mapped value + $dqlParamKey = $parameter->name; + $paramValue = $this->_query->getParameter($dqlParamKey); - $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' <> ' : ' = '); + if ( ! ($paramValue instanceof \Doctrine\ORM\Mapping\ClassMetadata)) { + throw QueryException::invalidParameterType('ClassMetadata', get_class($paramValue)); + } - if ($instanceOfExpr->value instanceof AST\InputParameter) { - // We need to modify the parameter value to be its correspondent mapped value - $dqlParamKey = $instanceOfExpr->value->name; - $paramValue = $this->_query->getParameter($dqlParamKey); - - if ( ! ($paramValue instanceof \Doctrine\ORM\Mapping\ClassMetadata)) { - throw QueryException::invalidParameterType('ClassMetadata', get_class($paramValue)); + $entityClassName = $paramValue->name; + } else { + // Get name from ClassMetadata to resolve aliases. + $entityClassName = $this->_em->getClassMetadata($parameter)->name; } - - $entityClassName = $paramValue->name; - } else { - // Get name from ClassMetadata to resolve aliases. - $entityClassName = $this->_em->getClassMetadata($instanceOfExpr->value)->name; - } - if ($entityClassName == $class->name) { - $sql .= $this->_conn->quote($class->discriminatorValue); - } else { - $discrMap = array_flip($class->discriminatorMap); - if (!isset($discrMap[$entityClassName])) { - throw QueryException::instanceOfUnrelatedClass($entityClassName, $class->rootEntityName); + if ($entityClassName == $class->name) { + $sqlParameterList[] = $this->_conn->quote($class->discriminatorValue); + } else { + $discrMap = array_flip($class->discriminatorMap); + + if (!isset($discrMap[$entityClassName])) { + throw QueryException::instanceOfUnrelatedClass($entityClassName, $class->rootEntityName); + } + + $sqlParameterList[] = $this->_conn->quote($discrMap[$entityClassName]); } - - $sql .= $this->_conn->quote($discrMap[$entityClassName]); } + + $sql .= '(' . implode(', ', $sqlParameterList) . ')'; return $sql; } diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index 4facce77f..9b2829408 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -323,6 +323,8 @@ class QueryBuilder */ public function setParameter($key, $value, $type = null) { + $key = trim($key, ':'); + if ($type === null) { $type = Query\ParameterTypeInferer::inferType($value); } diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 503807594..4c081402d 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -380,7 +380,15 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase { $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF Doctrine\Tests\Models\Company\CompanyEmployee", - "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr = 'employee'" + "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN ('employee')" + ); + } + + public function testSupportsInstanceOfExpressionInWherePartWithMultipleValues() + { + $this->assertSqlGeneration( + "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF (Doctrine\Tests\Models\Company\CompanyEmployee, \Doctrine\Tests\Models\Company\CompanyManager)", + "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN ('employee', 'manager')" ); } @@ -391,7 +399,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase { $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF \Doctrine\Tests\Models\Company\CompanyEmployee", - "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr = 'employee'" + "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN ('employee')" ); } @@ -410,7 +418,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase { $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyEmployee u WHERE u INSTANCE OF Doctrine\Tests\Models\Company\CompanyManager", - "SELECT c0_.id AS id0, c0_.name AS name1, c1_.salary AS salary2, c1_.department AS department3, c0_.discr AS discr4 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id WHERE c0_.discr = 'manager'" + "SELECT c0_.id AS id0, c0_.name AS name1, c1_.salary AS salary2, c1_.department AS department3, c0_.discr AS discr4 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id WHERE c0_.discr IN ('manager')" ); } @@ -418,7 +426,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase { $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyManager u WHERE u INSTANCE OF Doctrine\Tests\Models\Company\CompanyManager", - "SELECT c0_.id AS id0, c0_.name AS name1, c1_.salary AS salary2, c1_.department AS department3, c2_.title AS title4, c0_.discr AS discr5 FROM company_managers c2_ INNER JOIN company_employees c1_ ON c2_.id = c1_.id INNER JOIN company_persons c0_ ON c2_.id = c0_.id WHERE c0_.discr = 'manager'" + "SELECT c0_.id AS id0, c0_.name AS name1, c1_.salary AS salary2, c1_.department AS department3, c2_.title AS title4, c0_.discr AS discr5 FROM company_managers c2_ INNER JOIN company_employees c1_ ON c2_.id = c1_.id INNER JOIN company_persons c0_ ON c2_.id = c0_.id WHERE c0_.discr IN ('manager')" ); } @@ -426,7 +434,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase { $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF ?1", - "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr = 'employee'", + "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr IN ('employee')", array(), array(1 => $this->_em->getClassMetadata('Doctrine\Tests\Models\Company\CompanyEmployee')) ); } From 6857134f36097187ab2f0d932f4f1d9ffab12854 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Mon, 15 Aug 2011 12:47:17 -0300 Subject: [PATCH 4/8] Fixed issue with duplicated commas if Entity has no fields. --- lib/Doctrine/ORM/Query/SqlWalker.php | 18 ++-- .../ORM/Functional/Ticket/DDC1225Test.php | 85 +++++++++++++++++++ 2 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index dc97d6bb5..5e92b0973 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -510,9 +510,8 @@ class SqlWalker implements TreeWalker */ public function walkSelectClause($selectClause) { - $sql = 'SELECT ' . (($selectClause->isDistinct) ? 'DISTINCT ' : '') . implode( - ', ', array_filter(array_map(array($this, 'walkSelectExpression'), $selectClause->selectExpressions)) - ); + $sql = 'SELECT ' . (($selectClause->isDistinct) ? 'DISTINCT ' : ''); + $sqlSelectExpressions = array_filter(array_map(array($this, 'walkSelectExpression'), $selectClause->selectExpressions)); $addMetaColumns = ! $this->_query->getHint(Query::HINT_FORCE_PARTIAL_LOAD) && $this->_query->getHydrationMode() == Query::HYDRATE_OBJECT @@ -538,7 +537,8 @@ class SqlWalker implements TreeWalker $tblAlias = $this->getSQLTableAlias($rootClass->table['name'], $dqlAlias); $discrColumn = $rootClass->discriminatorColumn; $columnAlias = $this->getSQLColumnAlias($discrColumn['name']); - $sql .= ", $tblAlias." . $discrColumn['name'] . ' AS ' . $columnAlias; + + $sqlSelectExpressions[] = $tblAlias . '.' . $discrColumn['name'] . ' AS ' . $columnAlias; $columnAlias = $this->_platform->getSQLResultCasing($columnAlias); $this->_rsm->setDiscriminatorColumn($dqlAlias, $columnAlias); @@ -558,7 +558,9 @@ class SqlWalker implements TreeWalker foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) { $columnAlias = $this->getSQLColumnAlias($srcColumn); - $sql .= ", $sqlTableAlias." . $srcColumn . ' AS ' . $columnAlias; + + $sqlSelectExpressions[] = $sqlTableAlias . '.' . $srcColumn . ' AS ' . $columnAlias; + $columnAlias = $this->_platform->getSQLResultCasing($columnAlias); $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSQLResultCasing($columnAlias), $srcColumn, (isset($assoc['id']) && $assoc['id'] === true)); } @@ -573,7 +575,9 @@ class SqlWalker implements TreeWalker if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) { foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) { $columnAlias = $this->getSQLColumnAlias($srcColumn); - $sql .= ', ' . $sqlTableAlias . '.' . $srcColumn . ' AS ' . $columnAlias; + + $sqlSelectExpressions[] = $sqlTableAlias . '.' . $srcColumn . ' AS ' . $columnAlias; + $columnAlias = $this->_platform->getSQLResultCasing($columnAlias); $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSQLResultCasing($columnAlias), $srcColumn, (isset($assoc['id']) && $assoc['id'] === true)); } @@ -582,6 +586,8 @@ class SqlWalker implements TreeWalker } } } + + $sql .= implode(', ', $sqlSelectExpressions); return $sql; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php new file mode 100644 index 000000000..cec258f37 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php @@ -0,0 +1,85 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity1'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1225_TestEntity2'), + )); + } catch(\PDOException $e) { + + } + } + + public function testIssue() + { + $qb = $this->_em->createQueryBuilder(); + $qb->from('Doctrine\Tests\ORM\Functional\Ticket\DDC1225_TestEntity1', 'te1') + ->select('te1') + ->where('te1.testEntity2 = ?1') + ->setParameter(1, 0); + + $this->assertEquals( + 'SELECT t0_.test_entity2_id AS test_entity2_id0 FROM te1 t0_ WHERE t0_.test_entity2_id = ?', + $qb->getQuery()->getSQL() + ); + } +} + +/** + * @Entity + * @Table(name="te1") + */ +class DDC1225_TestEntity1 +{ + /** + * @Id + * @ManyToOne(targetEntity="Doctrine\Tests\ORM\Functional\Ticket\DDC1225_TestEntity2") + * @JoinColumn(name="test_entity2_id", referencedColumnName="id", nullable=false) + */ + private $testEntity2; + + /** + * @param DDC1225_TestEntity2 $testEntity2 + */ + public function setTestEntity2(DDC1225_TestEntity2 $testEntity2) + { + $this->testEntity2 = $testEntity2; + } + + /** + * @return DDC1225_TestEntity2 + */ + public function getTestEntity2() + { + return $this->testEntity2; + } +} + +/** + * @Entity + * @Table(name="te2") + */ +class DDC1225_TestEntity2 +{ + /** + * @Id + * @GeneratedValue(strategy="AUTO") + * @Column(type="integer") + */ + private $id; +} \ No newline at end of file From 7433148f17eba4740d6453a622b3d5b8eee7aac2 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Tue, 16 Aug 2011 11:36:41 -0300 Subject: [PATCH 5/8] Fixed bug in XMLDriver where relation indexes are treathed as elements but documented as attributes. --- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 4 ++-- .../ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index ab8e3b780..20631d63c 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -322,8 +322,8 @@ class XmlDriver extends AbstractFileDriver $mapping['orderBy'] = $orderBy; } - if (isset($oneToManyElement->{'index-by'})) { - $mapping['indexBy'] = (string)$oneToManyElement->{'index-by'}; + if (isset($oneToManyElement['index-by'])) { + $mapping['indexBy'] = (string)$oneToManyElement['index-by']; } $metadata->mapOneToMany($mapping); diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml index 524b2494f..f116fb0fe 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml @@ -39,7 +39,7 @@ - + From d7fbd2cd146e68601d5aa25c95358a160bb7efd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lenar=20L=C3=B5hmus?= Date: Fri, 19 Aug 2011 04:44:24 +0300 Subject: [PATCH 6/8] short classname support for custom repository class --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 77d71dfc0..a562d28f3 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1518,6 +1518,10 @@ class ClassMetadataInfo implements ClassMetadata */ public function setCustomRepositoryClass($repositoryClassName) { + if ($repositoryClassName !== null && strpos($repositoryClassName, '\\') === false + && strlen($this->namespace) > 0) { + $repositoryClassName = $this->namespace . '\\' . $repositoryClassName; + } $this->customRepositoryClassName = $repositoryClassName; } From 8c2db89f2b578c3f888abf8aff3cf81ee8dcdb25 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 21 Aug 2011 15:01:57 +0200 Subject: [PATCH 7/8] DDC-1340 - Fix bug with merge() and optimistic lock exception --- lib/Doctrine/ORM/UnitOfWork.php | 2 +- .../ORM/Functional/DetachedEntityTest.php | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index d62eb62c7..a0d49ebff 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1406,7 +1406,7 @@ class UnitOfWork implements PropertyChangedListener $entityVersion = $class->reflFields[$class->versionField]->getValue($entity); // Throw exception if versions dont match. if ($managedCopyVersion != $entityVersion) { - throw OptimisticLockException::lockFailedVersionMissmatch($entityVersion, $managedCopyVersion); + throw OptimisticLockException::lockFailedVersionMissmatch($entity, $entityVersion, $managedCopyVersion); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php index 5d7e889ae..ee265d0ea 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php @@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\Tests\Models\CMS\CmsAddress; +use Doctrine\Tests\Models\CMS\CmsArticle; use Doctrine\ORM\UnitOfWork; require_once __DIR__ . '/../../TestInit.php'; @@ -192,5 +193,26 @@ class DetachedEntityTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertFalse($this->_em->contains($user)); $this->assertFalse($this->_em->getUnitOfWork()->isInIdentityMap($user)); } + + /** + * @group DDC-1340 + */ + public function testMergeArticleWrongVersion() + { + $article = new CmsArticle(); + $article->topic = "test"; + $article->text = "test"; + + $this->_em->persist($article); + $this->_em->flush(); + + $this->_em->detach($article); + + $sql = "UPDATE cms_articles SET version = version+1 WHERE id = " . $article->id; + $this->_em->getConnection()->executeUpdate($sql); + + $this->setExpectedException('Doctrine\ORM\OptimisticLockException', 'The optimistic lock failed, version 1 was expected, but is actually 2'); + $this->_em->merge($article); + } } From b83945d486a0709dc22a633c7e7aca765fff184b Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 21 Aug 2011 15:06:14 +0200 Subject: [PATCH 8/8] DDC-1333 - Fix bug in xsd --- doctrine-mapping.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index bb4a1cc39..627ddf460 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -92,7 +92,7 @@ - +