From 339bd23ac890f795d5cf0cb9519ef10ae2e838a5 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 16 Jan 2015 14:44:31 +0100 Subject: [PATCH] #1209 DDC-3427 - removing leftover `EntityManager` hints (using interface instead) --- .../ORM/Event/OnClassMetadataNotFoundEventArgs.php | 3 --- lib/Doctrine/ORM/Event/PreUpdateEventArgs.php | 10 +++++----- .../Collection/AbstractCollectionPersister.php | 10 +++++----- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php b/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php index 155b1baf6..a044a7e32 100644 --- a/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php +++ b/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php @@ -19,12 +19,9 @@ namespace Doctrine\ORM\Event; -use Doctrine\Common\EventArgs; use Doctrine\Common\Persistence\Event\ManagerEventArgs; use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\Common\Persistence\ObjectManager; -use Doctrine\ORM\EntityManager; -use Doctrine\ORM\EntityManagerInterface; /** * Class that holds event arguments for a `onClassMetadataNotFound` event. diff --git a/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php b/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php index 9624e94da..d9a9f9db2 100644 --- a/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php +++ b/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php @@ -19,7 +19,7 @@ namespace Doctrine\ORM\Event; -use Doctrine\ORM\EntityManager; +use Doctrine\ORM\EntityManagerInterface; /** * Class that holds event arguments for a preInsert/preUpdate event. @@ -39,11 +39,11 @@ class PreUpdateEventArgs extends LifecycleEventArgs /** * Constructor. * - * @param object $entity - * @param EntityManager $em - * @param array $changeSet + * @param object $entity + * @param EntityManagerInterface $em + * @param array $changeSet */ - public function __construct($entity, EntityManager $em, array &$changeSet) + public function __construct($entity, EntityManagerInterface $em, array &$changeSet) { parent::__construct($entity, $em); diff --git a/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php b/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php index b73744ee4..094895671 100644 --- a/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php +++ b/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php @@ -19,7 +19,7 @@ namespace Doctrine\ORM\Persisters\Collection; -use Doctrine\ORM\EntityManager; +use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\UnitOfWork; /** @@ -31,7 +31,7 @@ use Doctrine\ORM\UnitOfWork; abstract class AbstractCollectionPersister implements CollectionPersister { /** - * @var EntityManager + * @var EntityManagerInterface */ protected $em; @@ -41,7 +41,7 @@ abstract class AbstractCollectionPersister implements CollectionPersister protected $conn; /** - * @var \Doctrine\ORM\UnitOfWork + * @var UnitOfWork */ protected $uow; @@ -62,9 +62,9 @@ abstract class AbstractCollectionPersister implements CollectionPersister /** * Initializes a new instance of a class derived from AbstractCollectionPersister. * - * @param \Doctrine\ORM\EntityManager $em + * @param EntityManagerInterface $em */ - public function __construct(EntityManager $em) + public function __construct(EntityManagerInterface $em) { $this->em = $em; $this->uow = $em->getUnitOfWork();