Permalink
Browse files

[DDC-193] Fixed.

  • Loading branch information...
1 parent 5381e3d commit 7cc56c45d334f6e9d2c21de3c8e90d8734d26285 @romanb romanb committed Apr 9, 2010
Showing with 159 additions and 211 deletions.
  1. +1 −1 UPGRADE_TO_2_0
  2. +6 −3 doctrine-mapping.xsd
  3. +1 −1 lib/Doctrine/Common/EventArgs.php
  4. +3 −4 lib/Doctrine/Common/EventSubscriber.php
  5. +5 −4 lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
  6. +0 −1 lib/Doctrine/ORM/Mapping/ClassMetadata.php
  7. +3 −55 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
  8. +6 −6 lib/Doctrine/ORM/Mapping/Driver/AbstractFileDriver.php
  9. +2 −2 lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
  10. +2 −2 lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
  11. +0 −2 lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
  12. +3 −3 lib/Doctrine/ORM/Mapping/Driver/DriverChain.php
  13. +0 −1 lib/Doctrine/ORM/Mapping/Driver/PhpDriver.php
  14. +20 −9 lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
  15. +13 −1 lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
  16. +6 −6 lib/Doctrine/ORM/Mapping/ManyToManyMapping.php
  17. +5 −9 lib/Doctrine/ORM/Mapping/OneToOneMapping.php
  18. +3 −14 lib/Doctrine/ORM/PersistentCollection.php
  19. +1 −1 lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php
  20. +2 −2 lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
  21. +4 −4 lib/Doctrine/ORM/UnitOfWork.php
  22. +5 −7 tests/Doctrine/Tests/Models/CMS/CmsAddress.php
  23. +1 −1 tests/Doctrine/Tests/Models/CMS/CmsArticle.php
  24. +1 −1 tests/Doctrine/Tests/Models/CMS/CmsComment.php
  25. +2 −2 tests/Doctrine/Tests/Models/CMS/CmsEmployee.php
  26. +2 −2 tests/Doctrine/Tests/Models/CMS/CmsGroup.php
  27. +2 −2 tests/Doctrine/Tests/Models/CMS/CmsPhonenumber.php
  28. +1 −1 tests/Doctrine/Tests/Models/CMS/CmsUser.php
  29. +2 −2 tests/Doctrine/Tests/Models/Company/CompanyEvent.php
  30. +2 −2 tests/Doctrine/Tests/Models/Company/CompanyPerson.php
  31. +1 −1 tests/Doctrine/Tests/Models/Company/CompanyRaffle.php
  32. +3 −3 tests/Doctrine/Tests/Models/ECommerce/ECommerceCart.php
  33. +1 −1 tests/Doctrine/Tests/Models/ECommerce/ECommerceCategory.php
  34. +3 −3 tests/Doctrine/Tests/Models/ECommerce/ECommerceFeature.php
  35. +5 −5 tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php
  36. +1 −1 tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php
  37. +1 −1 tests/Doctrine/Tests/Models/Forum/ForumBoard.php
  38. +1 −2 tests/Doctrine/Tests/Models/Forum/ForumUser.php
  39. +1 −1 tests/Doctrine/Tests/Models/Generic/DateTimeModel.php
  40. +3 −4 tests/Doctrine/Tests/Models/Routing/RoutingLeg.php
  41. +1 −2 tests/Doctrine/Tests/Models/Routing/RoutingLocation.php
  42. +1 −1 tests/Doctrine/Tests/Models/Routing/RoutingRoute.php
  43. +2 −2 tests/Doctrine/Tests/Models/Routing/RoutingRouteBooking.php
  44. +4 −4 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php
  45. +4 −4 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php
  46. +1 −1 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php
  47. +3 −3 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php
  48. +3 −5 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php
  49. +2 −2 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php
  50. +2 −2 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php
  51. +1 −2 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php
  52. +1 −1 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php
  53. +1 −1 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php
  54. +2 −2 tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php
  55. +2 −3 tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
  56. +2 −2 tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
  57. +1 −0 tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php
  58. +1 −1 tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
  59. +1 −0 tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml
View
@@ -46,7 +46,7 @@ Prefer PHP default values, if possible.
## Partial Objects
-xxx
+[TBD: New syntax, results, etc.]
## XML Mapping Driver
@@ -217,7 +217,7 @@
</xs:complexType>
<xs:complexType name="order-by-field">
- <xs:attribute name="field" type="XS:NMTOKEN" use="required" />
+ <xs:attribute name="name" type="xs:NMTOKEN" use="required" />
<xs:attribute name="direction" type="orm:order-by-direction" default="ASC" />
</xs:complexType>
@@ -237,6 +237,7 @@
<xs:attribute name="target-entity" type="xs:NMTOKEN" use="required" />
<xs:attribute name="field" type="xs:NMTOKEN" use="required" />
<xs:attribute name="mapped-by" type="xs:NMTOKEN" />
+ <xs:attribute name="inversed-by" type="xs:NMTOKEN" />
<xs:attribute name="fetch" type="orm:fetch-type" default="LAZY" />
</xs:complexType>
@@ -246,7 +247,7 @@
<xs:element name="order-by" type="orm:order-by" minOccurs="0" />
</xs:sequence>
<xs:attribute name="target-entity" type="xs:NMTOKEN" use="required" />
- <xs:attribute name="mapped-by" type="xs:NMTOKEN" />
+ <xs:attribute name="mapped-by" type="xs:NMTOKEN" use="required" />
<xs:attribute name="field" type="xs:NMTOKEN" use="required" />
<xs:attribute name="orphan-removal" type="xs:boolean" default="false" />
<xs:attribute name="fetch" type="orm:fetch-type" default="LAZY" />
@@ -264,6 +265,7 @@
<xs:attribute name="field" type="xs:NMTOKEN" use="required" />
<xs:attribute name="orphan-removal" type="xs:boolean" default="false" />
<xs:attribute name="fetch" type="orm:fetch-type" default="LAZY" />
+ <xs:attribute name="inversed-by" type="xs:NMTOKEN" />
</xs:complexType>
<xs:complexType name="one-to-one">
@@ -274,9 +276,10 @@
<xs:element name="join-columns" type="orm:join-columns"/>
</xs:choice>
</xs:sequence>
+ <xs:attribute name="field" type="xs:NMTOKEN" use="required" />
<xs:attribute name="target-entity" type="xs:NMTOKEN" use="required" />
<xs:attribute name="mapped-by" type="xs:NMTOKEN" />
- <xs:attribute name="field" type="xs:NMTOKEN" use="required" />
+ <xs:attribute name="inversed-by" type="xs:NMTOKEN" />
<xs:attribute name="orphan-removal" type="xs:boolean" default="false" />
<xs:attribute name="fetch" type="orm:fetch-type" default="LAZY" />
</xs:complexType>
@@ -26,7 +26,7 @@
*
* This class contains no event data. It is used by events that do not pass state
* information to an event handler when an event is raised. The single empty EventArgs
- * instance can be obtained through {@link getEmptyInstance()}.
+ * instance can be obtained through {@link getEmptyInstance}.
*
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
@@ -16,29 +16,28 @@
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
+ * <http://www.doctrine-project.org>.
*/
namespace Doctrine\Common;
/**
* An EventSubscriber knows himself what events he is interested in.
* If an EventSubscriber is added to an EventManager, the manager invokes
- * getSubscribedEvents() and registers the subscriber as a listener for all
+ * {@link getSubscribedEvents} and registers the subscriber as a listener for all
* returned events.
*
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision: 3938 $
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*/
interface EventSubscriber
{
/**
- * Returns an array of events that this subscriber listens
+ * Returns an array of events this subscriber wants to listen to.
*
* @return array
*/
@@ -87,8 +87,8 @@ protected function _prepare()
if ($assoc->mappedBy) {
$this->_hints['fetched'][$className][$assoc->mappedBy] = true;
} else {
- if (isset($class->inverseMappings[$sourceClassName][$assoc->sourceFieldName])) {
- $inverseAssoc = $class->inverseMappings[$sourceClassName][$assoc->sourceFieldName];
+ if ($assoc->inversedBy) {
+ $inverseAssoc = $class->associationMappings[$assoc->inversedBy];
if ($inverseAssoc->isOneToOne()) {
$this->_hints['fetched'][$className][$inverseAssoc->sourceFieldName] = true;
if ($class->subClasses) {
@@ -346,9 +346,10 @@ protected function _hydrateRow(array $data, array &$cache, array &$result)
$this->_uow->setOriginalEntityProperty($oid, $relationField, $element);
$targetClass = $this->_ce[$relation->targetEntityName];
if ($relation->isOwningSide) {
+ //TODO: Just check hints['fetched'] here?
// If there is an inverse mapping on the target class its bidirectional
- if (isset($targetClass->inverseMappings[$relation->sourceEntityName][$relationField])) {
- $inverseAssoc = $targetClass->inverseMappings[$relation->sourceEntityName][$relationField];
+ if ($relation->inversedBy) {
+ $inverseAssoc = $targetClass->associationMappings[$relation->inversedBy];
if ($inverseAssoc->isOneToOne()) {
$targetClass->reflFields[$inverseAssoc->sourceFieldName]->setValue($element, $parentObject);
$this->_uow->setOriginalEntityProperty(spl_object_hash($element), $inverseAssoc->sourceFieldName, $parentObject);
@@ -315,7 +315,6 @@ public function __sleep()
'idGenerator', //TODO: Does not really need to be serialized. Could be moved to runtime.
'inheritanceType',
'inheritedAssociationFields',
- 'inverseMappings', //TODO: Remove! DDC-193
'isIdentifierComposite',
'isMappedSuperclass',
'isVersioned',
@@ -127,9 +127,9 @@ class ClassMetadataInfo
public $namespace;
/**
- * READ-ONLY: The name of the entity class that is at the root of the entity inheritance
- * hierarchy. If the entity is not part of an inheritance hierarchy this is the same
- * as $_entityName.
+ * READ-ONLY: The name of the entity class that is at the root of the mapped entity inheritance
+ * hierarchy. If the entity is not part of a mapped inheritance hierarchy this is the same
+ * as {@link $entityName}.
*
* @var string
*/
@@ -313,14 +313,6 @@ class ClassMetadataInfo
public $associationMappings = array();
/**
- * READ-ONLY: List of inverse association mappings, indexed by mappedBy field name.
- *
- * @var array
- * @todo Remove! See http://www.doctrine-project.org/jira/browse/DDC-193
- */
- public $inverseMappings = array();
-
- /**
* READ-ONLY: Flag indicating whether the identifier/primary key of the class is composite.
*
* @var boolean
@@ -532,34 +524,6 @@ public function getAssociationMapping($fieldName)
}
/**
- * Gets the inverse association mapping for the given target class name and
- * owning fieldname.
- *
- * @param string $mappedByFieldName The field on the
- * @return Doctrine\ORM\Mapping\AssociationMapping The mapping or NULL if there is no such
- * inverse association mapping.
- */
- public function getInverseAssociationMapping($targetClassName, $mappedByFieldName)
- {
- return isset($this->inverseMappings[$targetClassName][$mappedByFieldName]) ?
- $this->inverseMappings[$targetClassName][$mappedByFieldName] : null;
- }
-
- /**
- * Checks whether the class has an inverse association mapping that points to the
- * specified class and ha the specified mappedBy field.
- *
- * @param string $targetClassName The name of the target class.
- * @param string $mappedByFieldName The name of the mappedBy field that points to the field on
- * the target class that owns the association.
- * @return boolean
- */
- public function hasInverseAssociationMapping($targetClassName, $mappedByFieldName)
- {
- return isset($this->inverseMappings[$targetClassName][$mappedByFieldName]);
- }
-
- /**
* Gets all association mappings of the class.
*
* @return array
@@ -1063,7 +1027,6 @@ public function addAssociationMapping(AssociationMapping $mapping, $owningClassN
if ($owningClassName !== null) {
$this->inheritedAssociationFields[$sourceFieldName] = $owningClassName;
}
- $this->_registerMappingIfInverse($mapping);
}
/**
@@ -1094,20 +1057,6 @@ public function mapOneToOne(array $mapping)
}
/**
- * Registers the mapping as an inverse mapping, if it is a mapping on the
- * inverse side of an association mapping.
- *
- * @param AssociationMapping The mapping to register as inverse if it is a mapping
- * for the inverse side of an association.
- */
- private function _registerMappingIfInverse(AssociationMapping $assoc)
- {
- if ( ! $assoc->isOwningSide) {
- $this->inverseMappings[$assoc->targetEntityName][$assoc->mappedBy] = $assoc;
- }
- }
-
- /**
* Adds a one-to-many mapping.
*
* @param array $mapping The mapping.
@@ -1154,7 +1103,6 @@ protected function _storeAssociationMapping(AssociationMapping $assocMapping)
throw MappingException::duplicateFieldMapping($this->name, $sourceFieldName);
}
$this->associationMappings[$sourceFieldName] = $assocMapping;
- $this->_registerMappingIfInverse($assocMapping);
}
/**
@@ -55,7 +55,7 @@
* @var string
*/
protected $_fileExtension;
-
+
/**
* Initializes a new FileDriver that looks in the given path(s) for mapping
* documents and operates in the specified operating mode.
@@ -76,7 +76,7 @@ public function addPaths(array $paths)
{
$this->_paths = array_unique(array_merge($this->_paths, $paths));
}
-
+
/**
* Retrieve the defined metadata lookup paths.
*
@@ -107,7 +107,7 @@ public function setFileExtension($fileExtension)
{
$this->_fileExtension = $fileExtension;
}
-
+
/**
* Get the element of schema meta data for the class from the mapping file.
* This will lazily load the mapping file if it is not loaded yet
@@ -132,7 +132,7 @@ public function getElement($className)
public function isTransient($className)
{
$fileName = str_replace('\\', '.', $className) . $this->_fileExtension;
-
+
// Check whether file exists
foreach ((array) $this->_paths as $path) {
if (file_exists($path . DIRECTORY_SEPARATOR . $fileName)) {
@@ -142,7 +142,7 @@ public function isTransient($className)
return true;
}
-
+
/**
* Gets the names of all mapped classes known to this driver.
*
@@ -151,7 +151,7 @@ public function isTransient($className)
public function getAllClassNames()
{
$classes = array();
-
+
if ($this->_paths) {
foreach ((array) $this->_paths as $path) {
if ( ! is_dir($path)) {
@@ -173,7 +173,7 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
// Evaluate InheritanceType annotation
if (isset($classAnnotations['Doctrine\ORM\Mapping\InheritanceType'])) {
$inheritanceTypeAnnot = $classAnnotations['Doctrine\ORM\Mapping\InheritanceType'];
- $metadata->setInheritanceType(constant('\Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value));
+ $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value));
}
// Evaluate DiscriminatorColumn annotation
@@ -195,7 +195,7 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
// Evaluate DoctrineChangeTrackingPolicy annotation
if (isset($classAnnotations['Doctrine\ORM\Mapping\ChangeTrackingPolicy'])) {
$changeTrackingAnnot = $classAnnotations['Doctrine\ORM\Mapping\ChangeTrackingPolicy'];
- $metadata->setChangeTrackingPolicy(constant('\Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value));
+ $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value));
}
// Evaluate annotations on properties/fields
@@ -29,7 +29,7 @@
Doctrine\Common\Util\Inflector;
/**
- * The DatabaseDriver reverse engineers the mapping metadata from a database
+ * The DatabaseDriver reverse engineers the mapping metadata from a database.
*
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
@@ -67,7 +67,7 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
$columns = $this->_sm->listTableColumns($tableName);
- if($this->_sm->getDatabasePlatform()->supportsForeignKeyConstraints()) {
+ if ($this->_sm->getDatabasePlatform()->supportsForeignKeyConstraints()) {
$foreignKeys = $this->_sm->listTableForeignKeys($tableName);
} else {
$foreignKeys = array();
@@ -37,7 +37,6 @@
public $length;
}
final class DiscriminatorMap extends Annotation {}
-/*final class SubClasses extends Annotation {}*/
final class Id extends Annotation {}
final class GeneratedValue extends Annotation {
public $strategy = 'AUTO';
@@ -124,7 +123,6 @@
public $initialValue = 1;
}
final class ChangeTrackingPolicy extends Annotation {}
-
final class OrderBy extends Annotation {}
/* Annotations for lifecycle callbacks */
@@ -46,7 +46,7 @@ class DriverChain implements Driver
private $_drivers = array();
/**
- * Add a nested driver
+ * Add a nested driver.
*
* @param Driver $nestedDriver
* @param string $namespace
@@ -57,7 +57,7 @@ public function addDriver(Driver $nestedDriver, $namespace)
}
/**
- * Get the array of nested drivers
+ * Get the array of nested drivers.
*
* @return array $drivers
*/
@@ -74,7 +74,7 @@ public function getDrivers()
*/
public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
{
- foreach ($this->_drivers AS $namespace => $driver) {
+ foreach ($this->_drivers as $namespace => $driver) {
if (strpos($className, $namespace) === 0) {
$driver->loadMetadataForClass($className, $metadata);
return;
@@ -49,7 +49,6 @@ class PhpDriver extends AbstractFileDriver
* {@inheritdoc}
*/
protected $_fileExtension = '.php';
-
protected $_metadata;
/**
Oops, something went wrong.

0 comments on commit 7cc56c4

Please sign in to comment.