Adding strict checking, and clear error handling

weaverryan · weaverryan · commit f61962d01bc0 · 2017-01-23T10:07:10.000-05:00
diff --git a/src/Symfony/Component/DependencyInjection/Annotation/Argument.php b/src/Symfony/Component/DependencyInjection/Annotation/Argument.php
@@ -89,6 +89,11 @@ public function getOnInvalid()
 
     public function setOnInvalid($onInvalid)
     {
+        $validOptions = array('exception', 'ignore', 'null');
+        if (!in_array($onInvalid, $validOptions, true)) {
+            throw new \InvalidArgumentException(sprintf('Invalid onInvalid property "%s" set on annotation "%s. Expected on of: %s', $onInvalid, get_class($this), implode(', ', $validOptions)));
+        };
+
         $this->onInvalid = $onInvalid;
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -466,9 +466,9 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)
 
             $onInvalid = $arg->getAttribute('on-invalid');
             $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
-            if ('ignore' == $onInvalid) {
+            if ('ignore' === $onInvalid) {
                 $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
-            } elseif ('null' == $onInvalid) {
+            } elseif ('null' === $onInvalid) {
                 $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,11 @@ public function getOnInvalid()`
`89`	`89`
`90`	`90`	`public function setOnInvalid($onInvalid)`
`91`	`91`	`{`
	`92`	`+ $validOptions = array('exception', 'ignore', 'null');`
	`93`	`+ if (!in_array($onInvalid, $validOptions, true)) {`
	`94`	`+ throw new \InvalidArgumentException(sprintf('Invalid onInvalid property "%s" set on annotation "%s. Expected on of: %s', $onInvalid, get_class($this), implode(', ', $validOptions)));`
	`95`	`+ };`
	`96`	`+`
`92`	`97`	`$this->onInvalid = $onInvalid;`
`93`	`98`	`}`
`94`	`99`