From 379584fb26fafeb2e13c11fd2fcbb7a8edc48ee5 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 28 Jun 2011 21:10:43 +0000 Subject: [PATCH 1/6] Bump dependencies of Common and DBAL to 2.1.0RC2 --- lib/vendor/doctrine-common | 2 +- lib/vendor/doctrine-dbal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index 565674b9b..6a74bf90f 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit 565674b9b376edbc5e31070e91fd85ea6dbd5d60 +Subproject commit 6a74bf90f5fcf6b404f49aee6c11b78fbd568c6c diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index 2cb22496a..be3790059 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit 2cb22496a732029373d98ff9e4d54a7187ee9bb8 +Subproject commit be3790059cc43b674a55548eb42d5d25846ea6a9 From 01935e66611c5ffa5bc71168f7a93889faf841e6 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 28 Jun 2011 21:11:02 +0000 Subject: [PATCH 2/6] Release 2.1.0RC2 --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index 7041ecf03..058dd5985 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0RC2-DEV'; + const VERSION = '2.1.0RC2'; /** * Compares a Doctrine version with the current one. From 6d035be3e3e4a9805abf0ef6a7895555cb6b9bbf Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 28 Jun 2011 21:11:14 +0000 Subject: [PATCH 3/6] Bump Dev Version to 2.1.0-DEV --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index 058dd5985..e459dceb6 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0RC2'; + const VERSION = '2.1.0-DEV'; /** * Compares a Doctrine version with the current one. From 9395eeed3d0a94506b7d3240f570fabe8a151873 Mon Sep 17 00:00:00 2001 From: Peter Kruithof Date: Wed, 29 Jun 2011 03:15:05 -0700 Subject: [PATCH 4/6] Changed order of elements --- .../Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml b/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml index 11bb6ac95..de638b236 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml +++ b/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml @@ -26,12 +26,12 @@ - - - + + + From 570103606892d2d57ca350a974cb0d856d055dc1 Mon Sep 17 00:00:00 2001 From: Johannes Schmitt Date: Thu, 30 Jun 2011 11:03:32 +0200 Subject: [PATCH 5/6] added @Annotation to annotations --- .../Mapping/Driver/DoctrineAnnotations.php | 76 +++++++++++++++++-- 1 file changed, 69 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php index 84d2cd1c8..532ee1c77 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php @@ -23,24 +23,41 @@ use Doctrine\Common\Annotations\Annotation; /* Annotations */ +/** @Annotation */ final class Entity extends Annotation { public $repositoryClass; public $readOnly = false; } + +/** @Annotation */ final class MappedSuperclass extends Annotation {} + +/** @Annotation */ final class InheritanceType extends Annotation {} + +/** @Annotation */ final class DiscriminatorColumn extends Annotation { public $name; public $fieldName; // field name used in non-object hydration (array/scalar) public $type; public $length; } + +/** @Annotation */ final class DiscriminatorMap extends Annotation {} + +/** @Annotation */ final class Id extends Annotation {} + +/** @Annotation */ final class GeneratedValue extends Annotation { public $strategy = 'AUTO'; } + +/** @Annotation */ final class Version extends Annotation {} + +/** @Annotation */ final class JoinColumn extends Annotation { public $name; public $fieldName; // field name used in non-object hydration (array/scalar) @@ -51,7 +68,11 @@ final class JoinColumn extends Annotation { public $onUpdate; public $columnDefinition; } + +/** @Annotation */ final class JoinColumns extends Annotation {} + +/** @Annotation */ final class Column extends Annotation { public $type = 'string'; public $length; @@ -65,6 +86,8 @@ final class Column extends Annotation { public $options = array(); public $columnDefinition; } + +/** @Annotation */ final class OneToOne extends Annotation { public $targetEntity; public $mappedBy; @@ -73,6 +96,8 @@ final class OneToOne extends Annotation { public $fetch = 'LAZY'; public $orphanRemoval = false; } + +/** @Annotation */ final class OneToMany extends Annotation { public $mappedBy; public $targetEntity; @@ -81,12 +106,16 @@ final class OneToMany extends Annotation { public $orphanRemoval = false; public $indexBy; } + +/** @Annotation */ final class ManyToOne extends Annotation { public $targetEntity; public $cascade; public $fetch = 'LAZY'; public $inversedBy; } + +/** @Annotation */ final class ManyToMany extends Annotation { public $targetEntity; public $mappedBy; @@ -95,50 +124,83 @@ final class ManyToMany extends Annotation { public $fetch = 'LAZY'; public $indexBy; } + +/** @Annotation */ final class ElementCollection extends Annotation { public $tableName; } + +/** @Annotation */ final class Table extends Annotation { public $name; public $schema; public $indexes; public $uniqueConstraints; } + +/** @Annotation */ final class UniqueConstraint extends Annotation { public $name; public $columns; } + +/** @Annotation */ final class Index extends Annotation { public $name; public $columns; } + +/** @Annotation */ final class JoinTable extends Annotation { public $name; public $schema; public $joinColumns = array(); public $inverseJoinColumns = array(); } + +/** @Annotation */ final class SequenceGenerator extends Annotation { public $sequenceName; public $allocationSize = 1; public $initialValue = 1; } + +/** @Annotation */ final class ChangeTrackingPolicy extends Annotation {} + +/** @Annotation */ final class OrderBy extends Annotation {} +/** @Annotation */ final class NamedQueries extends Annotation {} + +/** @Annotation */ final class NamedQuery extends Annotation { public $name; public $query; } /* Annotations for lifecycle callbacks */ +/** @Annotation */ final class HasLifecycleCallbacks extends Annotation {} -final class PrePersist extends Annotation {} -final class PostPersist extends Annotation {} -final class PreUpdate extends Annotation {} -final class PostUpdate extends Annotation {} -final class PreRemove extends Annotation {} -final class PostRemove extends Annotation {} -final class PostLoad extends Annotation {} +/** @Annotation */ +final class PrePersist extends Annotation {} + +/** @Annotation */ +final class PostPersist extends Annotation {} + +/** @Annotation */ +final class PreUpdate extends Annotation {} + +/** @Annotation */ +final class PostUpdate extends Annotation {} + +/** @Annotation */ +final class PreRemove extends Annotation {} + +/** @Annotation */ +final class PostRemove extends Annotation {} + +/** @Annotation */ +final class PostLoad extends Annotation {} From 4603e94fe990e1063f4a2d6ccc87247e3bc3935b Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Thu, 30 Jun 2011 15:04:57 -0300 Subject: [PATCH 6/6] Fixed ClassMetadataFactory which was throwing an exception if parent class on inheritance hierarchy is an abstract class and also extends from a mapped superclass (so it contains an inheritance already), but is not in the discriminatorMap. --- lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 3f65da3c5..8bfda6450 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -327,7 +327,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface if (!$class->discriminatorColumn) { throw MappingException::missingDiscriminatorColumn($class->name); } - } else if ($parent && !in_array($class->name, array_values($class->discriminatorMap))) { + } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) { // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur. throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName); }