bug #9665 [Bridge/Doctrine] ORMQueryBuilderLoader - handled the scenario when no entity manager is passed with closure query builder (jakzal)

fabpot · fabpot · commit 62d9cc803147 · 2013-11-30T19:14:55.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Bridge/Doctrine] ORMQueryBuilderLoader - handled the scenario when no entity manager is passed with closure query builder | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- a534b55 Handled the scenario when no entity manager is passed with closure query builder.
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -49,6 +49,10 @@ public function __construct($queryBuilder, $manager = null, $class = null)
         }
 
         if ($queryBuilder instanceof \Closure) {
+            if (!$manager instanceof EntityManager) {
+                throw new UnexpectedTypeException($manager, 'Doctrine\ORM\EntityManager');
+            }
+
             $queryBuilder = $queryBuilder($manager->getRepository($class));
 
             if (!$queryBuilder instanceof QueryBuilder) {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Form\ChoiceList;
+
+use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
+
+class ORMQueryBuilderLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testItOnlyWorksWithQueryBuilderOrClosure()
+    {
+        new ORMQueryBuilderLoader(new \stdClass());
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testClosureRequiresTheEntityManager()
+    {
+        $closure = function () {};
+
+        new ORMQueryBuilderLoader($closure);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,10 @@ public function __construct($queryBuilder, $manager = null, $class = null)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if ($queryBuilder instanceof \Closure) {`
	`52`	`+ if (!$manager instanceof EntityManager) {`
	`53`	`+ throw new UnexpectedTypeException($manager, 'Doctrine\ORM\EntityManager');`
	`54`	`+ }`
	`55`	`+`
`52`	`56`	`$queryBuilder = $queryBuilder($manager->getRepository($class));`
`53`	`57`
`54`	`58`	`if (!$queryBuilder instanceof QueryBuilder) {`