Use better exception in the register mapping pass

dantleech · dantleech · commit e1591daf4bf3 · 2016-04-27T10:32:56.000+01:00
- When no manager name parameter found, throw a more informative exception.
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass;
 
-use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -175,7 +174,7 @@ public function process(ContainerBuilder $container)
      *
      * @return string The name of the chain driver service
      *
-     * @throws ParameterNotFoundException if non of the managerParameters has a
+     * @throws InvalidArgumentException if non of the managerParameters has a
      *                                    non-empty value.
      */
     protected function getChainDriverServiceName(ContainerBuilder $container)
@@ -203,7 +202,7 @@ protected function getDriver(ContainerBuilder $container)
      *
      * @return string a service definition name
      *
-     * @throws ParameterNotFoundException if none of the managerParameters has a
+     * @throws InvalidArgumentException if none of the managerParameters has a
      *                                    non-empty value.
      */
     private function getConfigurationServiceName(ContainerBuilder $container)
@@ -221,7 +220,7 @@ private function getConfigurationServiceName(ContainerBuilder $container)
      *
      * @return string The name of the active manager.
      *
-     * @throws ParameterNotFoundException If none of the managerParameters is found in the container.
+     * @throws InvalidArgumentException If none of the managerParameters is found in the container.
      */
     private function getManagerName(ContainerBuilder $container)
     {
@@ -234,7 +233,10 @@ private function getManagerName(ContainerBuilder $container)
             }
         }
 
-        throw new ParameterNotFoundException('Could not determine the Doctrine manager. Either Doctrine is not configured or a bundle is misconfigured.');
+        throw new \InvalidArgumentException(sprintf(
+            'Could not determine the manager name from the parameters, tried: "%s"',
+            implode('", "', $this->managerParameters)
+        ));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass;`
`13`	`13`
`14`		`-use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;`
`15`	`14`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`15`	`use Symfony\Component\DependencyInjection\Definition;`
`17`	`16`	`use Symfony\Component\DependencyInjection\Reference;`
`@@ -175,7 +174,7 @@ public function process(ContainerBuilder $container)`
`175`	`174`	`*`
`176`	`175`	`* @return string The name of the chain driver service`
`177`	`176`	`*`
`178`		`- * @throws ParameterNotFoundException if non of the managerParameters has a`
	`177`	`+ * @throws InvalidArgumentException if non of the managerParameters has a`
`179`	`178`	`* non-empty value.`
`180`	`179`	`*/`
`181`	`180`	`protected function getChainDriverServiceName(ContainerBuilder $container)`
`@@ -203,7 +202,7 @@ protected function getDriver(ContainerBuilder $container)`
`203`	`202`	`*`
`204`	`203`	`* @return string a service definition name`
`205`	`204`	`*`
`206`		`- * @throws ParameterNotFoundException if none of the managerParameters has a`
	`205`	`+ * @throws InvalidArgumentException if none of the managerParameters has a`
`207`	`206`	`* non-empty value.`
`208`	`207`	`*/`
`209`	`208`	`private function getConfigurationServiceName(ContainerBuilder $container)`
`@@ -221,7 +220,7 @@ private function getConfigurationServiceName(ContainerBuilder $container)`
`221`	`220`	`*`
`222`	`221`	`* @return string The name of the active manager.`
`223`	`222`	`*`
`224`		`- * @throws ParameterNotFoundException If none of the managerParameters is found in the container.`
	`223`	`+ * @throws InvalidArgumentException If none of the managerParameters is found in the container.`
`225`	`224`	`*/`
`226`	`225`	`private function getManagerName(ContainerBuilder $container)`
`227`	`226`	`{`
`@@ -234,7 +233,10 @@ private function getManagerName(ContainerBuilder $container)`
`234`	`233`	`}`
`235`	`234`	`}`
`236`	`235`
`237`		`- throw new ParameterNotFoundException('Could not determine the Doctrine manager. Either Doctrine is not configured or a bundle is misconfigured.');`
	`236`	`+ throw new \InvalidArgumentException(sprintf(`
	`237`	`+ 'Could not determine the manager name from the parameters, tried: "%s"',`
	`238`	`+ implode('", "', $this->managerParameters)`
	`239`	`+ ));`
`238`	`240`	`}`
`239`	`241`
`240`	`242`	`/**`