Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Jul 29, 2012
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/PersistentCollection.php
View file
Open in desktop
Expand Up @@ -294,7 +294,7 @@ function($a, $b) { return $a === $b ? 0 : 1; }
/**
* INTERNAL: Gets the association mapping of the collection.
*
* @return \Doctrine\ORM\Mapping\AssociationMapping
* @return array
*/
public function getMapping()
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
View file
Open in desktop
Expand Up @@ -198,7 +198,7 @@ protected function _getDeleteSQLParameters(PersistentCollection $coll)
}

// Composite identifier
$sourceClass = $this->_em->getClassMetadata(get_class($mapping->getOwner()));
$sourceClass = $this->_em->getClassMetadata(get_class($coll->getOwner()));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intersting, this code is never executed if you can just change it this way.


foreach ($mapping['relationToSourceKeyColumns'] as $srcColumn) {
$params[] = $identifier[$sourceClass->fieldNames[$srcColumn]];
Expand Down
1 change: 0 additions & 1 deletion lib/Doctrine/ORM/Proxy/ProxyFactory.php
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@

use Doctrine\ORM\EntityManager,
Doctrine\ORM\Mapping\ClassMetadata,
Doctrine\ORM\Mapping\AssociationMapping,
Doctrine\Common\Util\ClassUtils;

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Query/QueryException.php
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@ public static function invalidLiteral($literal) {
}

/**
* @param \Doctrine\ORM\Mapping\AssociationMapping $assoc
* @param array $assoc
*/
public static function iterateWithFetchJoinCollectionNotAllowed($assoc)
{
Expand Down
1 change: 0 additions & 1 deletion lib/Doctrine/ORM/Tools/EntityGenerator.php
View file
Open in desktop
Expand Up @@ -20,7 +20,6 @@
namespace Doctrine\ORM\Tools;

use Doctrine\ORM\Mapping\ClassMetadataInfo,
Doctrine\ORM\Mapping\AssociationMapping,
Doctrine\Common\Util\Inflector,
Doctrine\DBAL\Types\Type;

Expand Down
1 change: 0 additions & 1 deletion lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php
View file
Open in desktop
Expand Up @@ -20,7 +20,6 @@
namespace Doctrine\ORM\Tools\Export\Driver;

use Doctrine\ORM\Mapping\ClassMetadataInfo,
Doctrine\ORM\Mapping\AssociationMapping,
Doctrine\ORM\Tools\EntityGenerator;

/**
Expand Down