From 762e798d22cecc9be8c973f121a0e8798f029682 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 13 Jan 2015 20:56:21 +0100 Subject: [PATCH] #385 #1181 DDC-3385 - extending `OnClassMetadataNotFoundEventArgs` from `ManagerEventArgs` instead of generic `EventArgs` --- .../OnClassMetadataNotFoundEventArgs.php | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php b/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php index f71e0336a..4fb4c8f94 100644 --- a/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php +++ b/lib/Doctrine/ORM/Event/OnClassMetadataNotFoundEventArgs.php @@ -20,7 +20,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; @@ -33,18 +35,13 @@ use Doctrine\ORM\EntityManagerInterface; * @author Marco Pivetta * @since 2.5 */ -class OnClassMetadataNotFoundEventArgs extends EventArgs +class OnClassMetadataNotFoundEventArgs extends ManagerEventArgs { /** * @var string */ private $className; - /** - * @var EntityManagerInterface - */ - private $em; - /** * @var ClassMetadata|null */ @@ -53,13 +50,14 @@ class OnClassMetadataNotFoundEventArgs extends EventArgs /** * Constructor. * - * @param string $className - * @param EntityManagerInterface $em + * @param string $className + * @param ObjectManager $objectManager */ - public function __construct($className, EntityManagerInterface $em) + public function __construct($className, ObjectManager $objectManager) { $this->className = (string) $className; - $this->em = $em; + + parent::__construct($objectManager); } /** @@ -81,21 +79,11 @@ class OnClassMetadataNotFoundEventArgs extends EventArgs /** * Retrieve associated ClassMetadata. * - * @return \Doctrine\ORM\Mapping\ClassMetadataInfo + * @return string */ public function getClassName() { return $this->className; } - - /** - * Retrieve associated EntityManager. - * - * @return \Doctrine\ORM\EntityManager - */ - public function getEntityManager() - { - return $this->em; - } }