Release 2.3.0-RC2

This reverts commit 131d3003a0, reversing
changes made to 9d909cd583.

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": ">=5.3.2",
         "ext-pdo": "*",
-        "doctrine/dbal": ">=2.3-dev,<2.5-dev",
+        "doctrine/dbal": "2.3.*",
         "symfony/console": "2.*"
     },
     "suggest": {
@@ -26,7 +26,7 @@
     "bin": ["bin/doctrine", "bin/doctrine.php"],
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4.x-dev"
+            "dev-master": "2.3.x-dev"
         }
     }
 }

lib/Doctrine/ORM/EntityRepository.php

@@ -25,6 +25,7 @@ use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\ExpressionBuilder;
 
 /**
  * An EntityRepository serves as a repository for entities with generic as well as

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -1188,7 +1188,7 @@ class ClassMetadataInfo implements ClassMetadata
 
         // Complete fieldName and columnName mapping
         if ( ! isset($mapping['columnName'])) {
-            $mapping['columnName'] = $this->namingStrategy->propertyToColumnName($mapping['fieldName'], $this->name);
+            $mapping['columnName'] = $this->namingStrategy->propertyToColumnName($mapping['fieldName']);
         }
 
         if ($mapping['columnName'][0] === '`') {
@@ -1465,7 +1465,6 @@ class ClassMetadataInfo implements ClassMetadata
             if ( ! isset($mapping['joinTable']['name'])) {
                 $mapping['joinTable']['name'] = $this->namingStrategy->joinTableName($mapping['sourceEntity'], $mapping['targetEntity'], $mapping['fieldName']);
             }
-
             if ( ! isset($mapping['joinTable']['joinColumns'])) {
                 $mapping['joinTable']['joinColumns'] = array(array(
                         'name' => $this->namingStrategy->joinKeyColumnName($mapping['sourceEntity']),

lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php

@@ -45,7 +45,7 @@ class DefaultNamingStrategy implements NamingStrategy
     /**
      * {@inheritdoc}
      */
-    public function propertyToColumnName($propertyName, $className = null)
+    public function propertyToColumnName($propertyName)
     {
         return $propertyName;
     }

lib/Doctrine/ORM/Mapping/NamingStrategy.php

@@ -42,10 +42,9 @@ interface NamingStrategy
      * Return a column name for a property
      *
      * @param string $propertyName A property
-     * @param string $className The fully-qualified class name
      * @return string A column name
      */
-    function propertyToColumnName($propertyName, $className = null);
+    function propertyToColumnName($propertyName);
 
     /**
      * Return the default reference column name

lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php

@@ -80,7 +80,7 @@ class UnderscoreNamingStrategy implements NamingStrategy
     /**
      * {@inheritdoc}
      */
-    public function propertyToColumnName($propertyName, $className = null)
+    public function propertyToColumnName($propertyName)
     {
         return $this->underscore($propertyName);
     }

lib/Doctrine/ORM/ORMInvalidArgumentException.php

@@ -43,7 +43,7 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
 
     static public function entityWithoutIdentity($className, $entity)
     {
-        throw new self(
+        return new self(
             "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " . 
             "id values set. It cannot be added to the identity map."
         );
@@ -70,30 +70,30 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
 
     static public function detachedEntityFoundThroughRelationship(array $assoc, $entry)
     {
-        throw new self("A detached entity of type " . $assoc['targetEntity'] . " (" . self::objToStr($entry) . ") "
+        return new self("A detached entity of type " . $assoc['targetEntity'] . " (" . self::objToStr($entry) . ") "
                         . " was found through the relationship '" . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' "
                         . "during cascading a persist operation.");
     }
 
     static public function entityNotManaged($entity)
     {
-        throw new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
+        return new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
                 "from the database or registered as new through EntityManager#persist");
     }
 
     static public function entityHasNoIdentity($entity, $operation)
     {
-        throw new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
     }
 
     static public function entityIsRemoved($entity, $operation)
     {
-        throw new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
     }
 
     static public function detachedEntityCannot($entity, $operation)
     {
-        throw new self("A detached entity was found during " . $operation . " " . self::objToStr($entity));
+        return new self("A detached entity was found during " . $operation . " " . self::objToStr($entity));
     }
 
     public static function invalidObject($context, $given, $parameterIndex = 1)

lib/Doctrine/ORM/Tools/Pagination/Paginator.php

@@ -174,16 +174,18 @@ class Paginator implements \Countable, \IteratorAggregate
 
             $whereInQuery = $this->cloneQuery($this->query);
             // don't do this for an empty id array
-            if (count($ids) > 0) {
-                $namespace = WhereInWalker::PAGINATOR_ID_ALIAS;
+            if (count($ids) == 0) {
+                return new \ArrayIterator(array());
+            }
 
-                $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
-                $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, count($ids));
-                $whereInQuery->setFirstResult(null)->setMaxResults(null);
-                foreach ($ids as $i => $id) {
-                    $i++;
-                    $whereInQuery->setParameter("{$namespace}_{$i}", $id);
-                }
+            $namespace = WhereInWalker::PAGINATOR_ID_ALIAS;
+
+            $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, array('Doctrine\ORM\Tools\Pagination\WhereInWalker'));
+            $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, count($ids));
+            $whereInQuery->setFirstResult(null)->setMaxResults(null);
+            foreach ($ids as $i => $id) {
+                $i++;
+                $whereInQuery->setParameter("{$namespace}_{$i}", $id);
             }
 
             $result = $whereInQuery->getResult($this->query->getHydrationMode());

lib/Doctrine/ORM/Version.php

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

tests/Doctrine/Tests/Mocks/StatementMock.php

@@ -10,7 +10,7 @@ namespace Doctrine\Tests\Mocks;
 class StatementMock implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
 {
     public function bindValue($param, $value, $type = null){}
-    public function bindParam($column, &$variable, $type = null){}
+    public function bindParam($column, &$variable, $type = null, $length = null){}
     public function errorCode(){}
     public function errorInfo(){}
     public function execute($params = null){}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php

@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Tests\Models\Quote\Group;
 use Doctrine\Tests\Models\Quote\User;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1845
  * @group DDC-1885
@@ -170,4 +168,4 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $user->getGroups()->get(0));
         $this->assertInstanceOf('Doctrine\Tests\Models\Quote\Group', $user->getGroups()->get(1));
     }
-}
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsGroup;
+use Doctrine\ORM\Tools\Pagination\Paginator;
+
+/**
+ * @group DDC-1918
+ */
+class DDC1918Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+    public function testLastPageCorrect()
+    {
+        $groups = array();
+        for ($i = 0; $i < 3; $i++) {
+            $group = new CmsGroup();
+            $group->name = "test";
+            $this->_em->persist($group);
+
+            $groups[] = $group;
+        }
+
+        for ($i = 0; $i < 10; $i++) {
+            $user = new CmsUser();
+            $user->username = "user$i";
+            $user->name = "user$i";
+            $user->status = "active";
+            $user->groups = $groups;
+
+            $this->_em->persist($user);
+        }
+
+        $this->_em->flush();
+
+        $query = $this->_em->createQuery('SELECT u, g FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.groups g');
+        $query->setFirstResult(6);
+        $query->setMaxResults(3);
+
+        $paginator = new Paginator($query, true);
+        $this->assertEquals(3, count(iterator_to_array($paginator)));
+
+        $query->setFirstResult(8);
+        $query->setMaxResults(3);
+
+        $paginator = new Paginator($query, true);
+        $this->assertEquals(2, count(iterator_to_array($paginator)));
+
+        $query->setFirstResult(10);
+        $query->setMaxResults(3);
+
+        $paginator = new Paginator($query, true);
+        $this->assertEquals(0, count(iterator_to_array($paginator)));
+    }
+}

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php

@@ -1,182 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Functional\Ticket;
-
-use Doctrine\Common\Collections\ArrayCollection;
-
-require_once __DIR__ . '/../../../TestInit.php';
-
-/**
- * @group DDC-1925
- * @group DDC-1210
- */
-class DDC1925Test extends \Doctrine\Tests\OrmFunctionalTestCase
-{
-    public function testIssue()
-    {
-        $this->_schemaTool->createSchema(array(
-            $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1925User'),
-            $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1925Product'),
-        ));
-
-        $user = new DDC1925User();
-        $user->setTitle("Test User");
-        $this->_em->persist($user);
-
-        $product = new DDC1925Product();
-        $product->setTitle("Test product");
-        $this->_em->persist($product);
-        $this->_em->flush();
-
-        $product->addBuyer($user);
-
-        $this->_em->getUnitOfWork()->computeChangeSets();
-
-        $this->_em->persist($product);
-        $this->_em->flush();
-    }
-}
-
-/**
- * @Table
- * @Entity
- */
-class DDC1925Product
-{
-    /**
-     * @var integer $id
-     *
-     * @Column(name="id", type="integer")
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @var string $title
-     *
-     * @Column(name="title", type="string", length=255)
-     */
-    private $title;
-
-    /**
-     * @ManyToMany(targetEntity="DDC1925User")
-     * @JoinTable(
-     *   name="user_purchases",
-     *   joinColumns={@JoinColumn(name="product_id", referencedColumnName="id")},
-     *   inverseJoinColumns={@JoinColumn(name="user_id", referencedColumnName="id")}
-     * )
-     */
-    private $buyers;
-
-    /**
-     * Default constructor
-     */
-    public function __construct()
-    {
-        $this->buyers = new ArrayCollection();
-    }
-
-    /**
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param string $title
-     */
-    public function setTitle($title)
-    {
-        $this->title = $title;
-    }
-
-    /**
-     * Get title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-     * @param string $buyers
-     */
-    public function setBuyers($buyers)
-    {
-        $this->buyers = $buyers;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBuyers()
-    {
-        return $this->buyers;
-    }
-
-    /**
-     * @param DDC1925User $buyer
-     */
-    public function addBuyer(DDC1925User $buyer)
-    {
-        $this->buyers[] = $buyer;
-    }
-}
-
-/**
- * @Table
- * @Entity
- */
-class DDC1925User
-{
-    /**
-     * @var integer
-     *
-     * @Column(name="id", type="integer")
-     * @Id
-     * @GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @Column(name="title", type="string", length=255)
-     */
-    private $title;
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set title
-     *
-     * @param string $title
-     */
-    public function setTitle($title)
-    {
-        $this->title = $title;
-    }
-
-    /**
-     * Get title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-}

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php

@@ -922,26 +922,6 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('doctrineglobal_article_cms_cmsuser', $articleMetadata->associationMappings['author']['joinTable']['name']);
     }
 
-    /**
-     * @group DDC-984
-     * @group DDC-559
-     */
-    public function testFullyQualifiedClassNameShouldBeGivenToNamingStrategyPropertyToColumnName()
-    {
-        $namingStrategy = new MyPrefixNamingStrategy();
-        $metadata       = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);
-
-        $metadata->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
-
-        $metadata->mapField(array('fieldName'=>'country'));
-        $metadata->mapField(array('fieldName'=>'city'));
-
-        $this->assertEquals($metadata->fieldNames, array(
-            'cmsaddress_country'   => 'country',
-            'cmsaddress_city'      => 'city'
-        ));
-    }
-
     /**
      * @group DDC-1746
      */
@@ -1013,14 +993,3 @@ class MyNamespacedNamingStrategy extends \Doctrine\ORM\Mapping\DefaultNamingStra
         return strtolower($className);
     }
 }
-
-class MyPrefixNamingStrategy extends \Doctrine\ORM\Mapping\DefaultNamingStrategy
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function propertyToColumnName($propertyName, $className = null)
-    {
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName;
-    }
-}