Adde more BC compatibility in setParameters.

doctrine · May 29, 2012 · 161ae31 · 161ae31
1 parent b3e7493
commit 161ae31
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
@@ -186,8 +186,17 @@ function ($parameter) use ($key)
      */
     public function setParameters($parameters)
     {
+        // BC compatibility with 2.3-
         if (is_array($parameters)) {
-            $parameters = new ArrayCollection($parameters);
+            $parameterCollection = new ArrayCollection();
+
+            foreach ($parameters as $key => $value) {
+                $parameter = new Query\Parameter($key, $value);
+
+                $parameterCollection->add($parameter);
+            }
+
+            $parameters = $parameterCollection;
         }
 
         $this->parameters = $parameters;

diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
@@ -165,6 +165,14 @@ public function testSetParameters()
         $users = $q->getResult();
     }
 
+    public function testSetParametersBackwardsCompatible()
+    {
+        $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1 AND u.status = ?2');
+        $q->setParameters(array(1 => 'jwage', 2 => 'active'));
+
+        $users = $q->getResult();
+    }
+
     /**
      * @group DDC-1070
      */