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

DDC-1939 - Removing references to non-existing AssociationMapping class

Browse Source
This commit is contained in:
Marco Pivetta 2012-07-24 11:37:57 +02:00
parent 619d29adb2
commit aa0cb0b6d7
6 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/PersistentCollection.php
View File

@ -294,7 +294,7 @@ final class PersistentCollection implements Collection, Selectable
/** /**
* INTERNAL: Gets the association mapping of the collection. * INTERNAL: Gets the association mapping of the collection.
* *
* @return \Doctrine\ORM\Mapping\AssociationMapping * @return array
*/ */
public function getMapping() public function getMapping()
{ {

2
lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
View File

@ -198,7 +198,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
} }
// Composite identifier // Composite identifier
$sourceClass = $this->_em->getClassMetadata(get_class($mapping->getOwner())); $sourceClass = $this->_em->getClassMetadata(get_class($coll->getOwner()));
foreach ($mapping['relationToSourceKeyColumns'] as $srcColumn) { foreach ($mapping['relationToSourceKeyColumns'] as $srcColumn) {
$params[] = $identifier[$sourceClass->fieldNames[$srcColumn]]; $params[] = $identifier[$sourceClass->fieldNames[$srcColumn]];

1
lib/Doctrine/ORM/Proxy/ProxyFactory.php
View File

@ -21,7 +21,6 @@ namespace Doctrine\ORM\Proxy;
use Doctrine\ORM\EntityManager, use Doctrine\ORM\EntityManager,
Doctrine\ORM\Mapping\ClassMetadata, Doctrine\ORM\Mapping\ClassMetadata,
Doctrine\ORM\Mapping\AssociationMapping,
Doctrine\Common\Util\ClassUtils; Doctrine\Common\Util\ClassUtils;
/** /**

2
lib/Doctrine/ORM/Query/QueryException.php
View File

@ -96,7 +96,7 @@ class QueryException extends \Doctrine\ORM\ORMException
} }
/** /**
* @param \Doctrine\ORM\Mapping\AssociationMapping $assoc * @param array $assoc
*/ */
public static function iterateWithFetchJoinCollectionNotAllowed($assoc) public static function iterateWithFetchJoinCollectionNotAllowed($assoc)
{ {

1
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -20,7 +20,6 @@
namespace Doctrine\ORM\Tools; namespace Doctrine\ORM\Tools;
use Doctrine\ORM\Mapping\ClassMetadataInfo, use Doctrine\ORM\Mapping\ClassMetadataInfo,
Doctrine\ORM\Mapping\AssociationMapping,
Doctrine\Common\Util\Inflector, Doctrine\Common\Util\Inflector,
Doctrine\DBAL\Types\Type; Doctrine\DBAL\Types\Type;

1
lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php
View File

@ -20,7 +20,6 @@
namespace Doctrine\ORM\Tools\Export\Driver; namespace Doctrine\ORM\Tools\Export\Driver;
use Doctrine\ORM\Mapping\ClassMetadataInfo, use Doctrine\ORM\Mapping\ClassMetadataInfo,
Doctrine\ORM\Mapping\AssociationMapping,
Doctrine\ORM\Tools\EntityGenerator; Doctrine\ORM\Tools\EntityGenerator;
/** /**