Preparing v2.5.9 release

Backport #6626
Backport #6625

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -142,6 +142,9 @@ abstract class AbstractHydrator
         $this->_rsm   = $resultSetMapping;
         $this->_hints = $hints;
 
+        $evm = $this->_em->getEventManager();
+        $evm->addEventListener(array(Events::onClear), $this);
+
         $this->prepare();
 
         $result = $this->hydrateAllData();

lib/Doctrine/ORM/Proxy/ProxyFactory.php

@@ -91,7 +91,9 @@ class ProxyFactory extends AbstractProxyFactory
     protected function skipClass(ClassMetadata $metadata)
     {
         /* @var $metadata \Doctrine\ORM\Mapping\ClassMetadataInfo */
-        return $metadata->isMappedSuperclass || $metadata->getReflectionClass()->isAbstract();
+        return $metadata->isMappedSuperclass
+            || $metadata->isEmbeddedClass
+            || $metadata->getReflectionClass()->isAbstract();
     }
 
     /**

lib/Doctrine/ORM/Query/SqlWalker.php

@@ -1143,7 +1143,7 @@ class SqlWalker implements TreeWalker
                 $dqlAlias   = $joinDeclaration->aliasIdentificationVariable;
                 $tableAlias = $this->getSQLTableAlias($class->table['name'], $dqlAlias);
                 $condition = '(' . $this->walkConditionalExpression($join->conditionalExpression) . ')';
-                $isUnconditionalJoin = empty($conditions);
+                $isUnconditionalJoin = empty($condition);
                 $condExprConjunction = ($class->isInheritanceTypeJoined() && $joinType != AST\Join::JOIN_TYPE_LEFT && $joinType != AST\Join::JOIN_TYPE_LEFTOUTER && $isUnconditionalJoin)
                     ? ' AND '
                     : ' ON ';

lib/Doctrine/ORM/Version.php

@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.5.5-DEV';
+    const VERSION = '2.5.9';
 
     /**
      * Compares a Doctrine version with the current one.

tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Common\EventManager;
+use Doctrine\DBAL\Driver\Statement;
+use Doctrine\ORM\Events;
+use Doctrine\ORM\Query\ResultSetMapping;
+use Doctrine\ORM\Internal\Hydration\AbstractHydrator;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @covers \Doctrine\ORM\Internal\Hydration\AbstractHydrator
+ */
+class AbstractHydratorTest extends OrmFunctionalTestCase
+{
+    /**
+     * @group DDC-3146
+     * @group #1515
+     *
+     * Verify that the number of added events to the event listener from the abstract hydrator class is equal to the
+     * number of removed events
+     */
+    public function testOnClearEventListenerIsDetachedOnCleanup()
+    {
+        $mockConnection             = $this->createMock(Connection::class);
+        $mockEntityManagerInterface = $this->createMock(EntityManagerInterface::class);
+        $mockEventManager           = $this->createMock(EventManager::class);
+        $mockStatement              = $this->createMock(Statement::class);
+        $mockResultMapping          = $this->getMockBuilder(ResultSetMapping::class);
+
+        $mockEntityManagerInterface->expects(self::any())->method('getEventManager')->willReturn($mockEventManager);
+        $mockEntityManagerInterface->expects(self::any())->method('getConnection')->willReturn($mockConnection);
+        $mockStatement->expects(self::once())->method('fetch')->willReturn(false);
+
+        /* @var $mockAbstractHydrator AbstractHydrator */
+        $mockAbstractHydrator = $this
+            ->getMockBuilder(AbstractHydrator::class)
+            ->setConstructorArgs([$mockEntityManagerInterface])
+            ->setMethods(['hydrateAllData'])
+            ->getMock();
+
+        $mockEventManager
+            ->expects(self::at(0))
+            ->method('addEventListener')
+            ->with([Events::onClear], $mockAbstractHydrator);
+
+        $mockEventManager
+            ->expects(self::at(1))
+            ->method('removeEventListener')
+            ->with([Events::onClear], $mockAbstractHydrator);
+
+        $mockEventManager
+            ->expects(self::at(2))
+            ->method('addEventListener')
+            ->with([Events::onClear], $mockAbstractHydrator);
+
+        $mockEventManager
+            ->expects(self::at(3))
+            ->method('removeEventListener')
+            ->with([Events::onClear], $mockAbstractHydrator);
+
+        iterator_to_array($mockAbstractHydrator->iterate($mockStatement, $mockResultMapping));
+        $mockAbstractHydrator->hydrateAll($mockStatement, $mockResultMapping);
+    }
+}

tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php

@@ -71,6 +71,33 @@ class ProxyFactoryTest extends \Doctrine\Tests\OrmTestCase
         $proxy->getDescription();
     }
 
+    public function testSkipMappedSuperClassesOnGeneration()
+    {
+        $cm = new ClassMetadata('stdClass');
+        $cm->isMappedSuperclass = true;
+
+        self::assertSame(
+            0,
+            $this->proxyFactory->generateProxyClasses([$cm]),
+            'No proxies generated.'
+        );
+    }
+
+    /**
+     * @group 6625
+     */
+    public function testSkipEmbeddableClassesOnGeneration()
+    {
+        $cm = new ClassMetadata('stdClass');
+        $cm->isEmbeddedClass = true;
+
+        self::assertSame(
+            0,
+            $this->proxyFactory->generateProxyClasses([$cm]),
+            'No proxies generated.'
+        );
+    }
+
     /**
      * @group DDC-1771
      */