RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

fix docblock and remove white spaces

Browse Source
This commit is contained in:
Fabio B. Silva 2012-02-02 21:11:15 -02:00
parent 9e010cbd34
commit 3085c52f95
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Mapping/AssociationOverride.php
View File

@ -23,10 +23,10 @@ namespace Doctrine\ORM\Mapping;
* This annotation is used to override association mapping of property for an entity relationship. * This annotation is used to override association mapping of property for an entity relationship.
* *
* @author Fabio B. Silva <fabio.bat.silva@gmail.com> * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
* @since 2.2 * @since 2.3
* *
* @Annotation * @Annotation
* @Target({"PROPERTY","ANNOTATION"}) * @Target("ANNOTATION")
*/ */
final class AssociationOverride implements Annotation final class AssociationOverride implements Annotation
{ {

2
lib/Doctrine/ORM/Mapping/AssociationOverrides.php
View File

@ -23,7 +23,7 @@ namespace Doctrine\ORM\Mapping;
* This annotation is used to override association mappings of relationship properties. * This annotation is used to override association mappings of relationship properties.
* *
* @author Fabio B. Silva <fabio.bat.silva@gmail.com> * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
* @since 2.2 * @since 2.3
* *
* @Annotation * @Annotation
* @Target("CLASS") * @Target("CLASS")

12
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -477,11 +477,6 @@ class ClassMetadataInfo implements ClassMetadata
*/ */
public $associationMappings = array(); public $associationMappings = array();
/**
* @var array
*/
public $overrideAssociationMappings = array();
/** /**
* READ-ONLY: Flag indicating whether the identifier/primary key of the class is composite. * READ-ONLY: Flag indicating whether the identifier/primary key of the class is composite.
* *
@ -576,7 +571,7 @@ class ClassMetadataInfo implements ClassMetadata
/** /**
* NamingStrategy determining the default column and table names * NamingStrategy determining the default column and table names
* *
* @var \Doctrine\ORM\NamingStrategy * @var Doctrine\ORM\Mapping\NamingStrategy
*/ */
protected $namingStrategy; protected $namingStrategy;
@ -1808,9 +1803,12 @@ class ClassMetadataInfo implements ClassMetadata
} }
/** /**
* Sets the association to override association mapping of property for an entity relationship.
*
* @param string $fieldName * @param string $fieldName
* @param array $overrideMapping
*/ */
public function setAssociationOverride($fieldName, $overrideMapping) public function setAssociationOverride($fieldName, array $overrideMapping)
{ {
if (!isset($this->associationMappings[$fieldName])) { if (!isset($this->associationMappings[$fieldName])) {
throw MappingException::invalidOverrideFieldName($this->name, $fieldName); throw MappingException::invalidOverrideFieldName($this->name, $fieldName);

6
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View File

@ -527,13 +527,13 @@ class YamlDriver extends AbstractFileDriver
} }
} }
// Evaluate association-overrides // Evaluate associationOverride
if (isset($element['associationOverride'])) { if (isset($element['associationOverride'])) {
foreach ($element['associationOverride'] as $fieldName => $associationOverride) { foreach ($element['associationOverride'] as $fieldName => $associationOverride) {
$override = array(); $override = array();
// Check for join-columns // Check for joinColumn
if (isset($associationOverride['joinColumn'])) { if (isset($associationOverride['joinColumn'])) {
$joinColumns = array(); $joinColumns = array();
foreach ($associationOverride['joinColumn'] as $name => $joinColumnElement) { foreach ($associationOverride['joinColumn'] as $name => $joinColumnElement) {
@ -545,7 +545,7 @@ class YamlDriver extends AbstractFileDriver
$override['joinColumns'] = $joinColumns; $override['joinColumns'] = $joinColumns;
} }
// Check for join-table // Check for joinTable
if (isset($associationOverride['joinTable'])) { if (isset($associationOverride['joinTable'])) {
$joinTableElement = $associationOverride['joinTable']; $joinTableElement = $associationOverride['joinTable'];