diff --git a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php index 69fd60ca4..20c75ad30 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php @@ -90,7 +90,7 @@ class SimpleObjectHydrator extends AbstractHydrator if ($metaMappingDiscrColumnName = array_search($discrColumnName, $this->_rsm->metaMappings)) { $discrColumnName = $metaMappingDiscrColumnName; } - + if ( ! isset($sqlResult[$discrColumnName])) { throw HydrationException::missingDiscriminatorColumn($entityName, $discrColumnName, key($this->_rsm->aliasMap)); } diff --git a/lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php b/lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php index 09ea8f9cd..0137c5ba0 100644 --- a/lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php +++ b/lib/Doctrine/ORM/Internal/HydrationCompleteHandler.php @@ -55,8 +55,6 @@ class HydrationCompleteHandler * @param UnitOfWork $uow * @param \Doctrine\ORM\Event\ListenersInvoker $listenersInvoker * @param \Doctrine\ORM\EntityManager $em - * - * @since 2.5 */ public function __construct(UnitOfWork $uow, ListenersInvoker $listenersInvoker, EntityManager $em) { @@ -68,8 +66,6 @@ class HydrationCompleteHandler /** * Method schedules invoking of postLoad entity to the very end of current hydration cycle. * - * @since 2.5 - * * @param ClassMetadata $class * @param object $entity */ @@ -80,7 +76,6 @@ class HydrationCompleteHandler /** * This method should me called after any hydration cycle completed. - * @since 2.5 */ public function hydrationComplete() { @@ -89,7 +84,6 @@ class HydrationCompleteHandler /** * Method fires all deferred invocations of postLoad events - * @since 2.5 */ private function invokeAllDeferredPostLoadEvents() {