Tweaks thanks to Nicolas

weaverryan · weaverryan · commit ecd0fbbccf45 · 2017-09-23T14:50:40.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
@@ -18,6 +18,7 @@
 /**
  * Throws autowire exceptions from AutowirePass for definitions that still exist.
  *
+ * @deprecated AutowireExceptionPass is deprecated since version 3.4 and will be removed in 4.0.
  * @author Ryan Weaver <ryan@knpuniversity.com>
  */
 class AutowireExceptionPass implements CompilerPassInterface
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -44,7 +44,7 @@ public function __construct($throwOnAutowireException = true)
     }
 
     /**
-     * @deprecated
+     * @deprecated since version 3.3, to be removed in 4.0.
      *
      * @return AutowiringFailedException[]
      */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php
@@ -42,18 +42,20 @@ protected function processValue($value, $isRoot = false)
         foreach ($value->getArguments() as $k => $v) {
             if ($k !== $i++) {
                 if (!is_int($k)) {
-                    $value->addError(sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k));
+                    $msg = sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k);
+                    $value->addError($msg);
 
                     if ($this->throwExceptions) {
-                        throw new RuntimeException(sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k));
+                        throw new RuntimeException($msg);
                     }
 
                     break;
                 }
 
-                $value->addError(sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i));
+                $msg = sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i);
+                $value->addError($msg);
                 if ($this->throwExceptions) {
-                    throw new RuntimeException(sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i));
+                    throw new RuntimeException($msg);
                 }
             }
         }
@@ -63,17 +65,20 @@ protected function processValue($value, $isRoot = false)
             foreach ($methodCall[1] as $k => $v) {
                 if ($k !== $i++) {
                     if (!is_int($k)) {
-                        $value->addError(sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k));
+                        $msg = sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k);
+                        $value->addError($msg);
+
                         if ($this->throwExceptions) {
-                            throw new RuntimeException(sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k));
+                            throw new RuntimeException($msg);
                         }
 
                         break;
                     }
 
-                    $value->addError(sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i));
+                    $msg = sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i);
+                    $value->addError($msg);
                     if ($this->throwExceptions) {
-                        throw new RuntimeException(sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i));
+                        throw new RuntimeException($msg);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`/**`
`19`	`19`	`* Throws autowire exceptions from AutowirePass for definitions that still exist.`
`20`	`20`	`*`
	`21`	`+ * @deprecated AutowireExceptionPass is deprecated since version 3.4 and will be removed in 4.0.`
`21`	`22`	`* @author Ryan Weaver <ryan@knpuniversity.com>`
`22`	`23`	`*/`
`23`	`24`	`class AutowireExceptionPass implements CompilerPassInterface`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct($throwOnAutowireException = true)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * @deprecated`
	`47`	`+ * @deprecated since version 3.3, to be removed in 4.0.`
`48`	`48`	`*`
`49`	`49`	`* @return AutowiringFailedException[]`
`50`	`50`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -42,18 +42,20 @@ protected function processValue($value, $isRoot = false)`
`42`	`42`	`foreach ($value->getArguments() as $k => $v) {`
`43`	`43`	`if ($k !== $i++) {`
`44`	`44`	`if (!is_int($k)) {`
`45`		`- $value->addError(sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k));`
	`45`	`+ $msg = sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k);`
	`46`	`+ $value->addError($msg);`
`46`	`47`
`47`	`48`	`if ($this->throwExceptions) {`
`48`		`- throw new RuntimeException(sprintf('Invalid constructor argument for service "%s": integer expected but found string "%s". Check your service definition.', $this->currentId, $k));`
	`49`	`+ throw new RuntimeException($msg);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`break;`
`52`	`53`	`}`
`53`	`54`
`54`		`- $value->addError(sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i));`
	`55`	`+ $msg = sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i);`
	`56`	`+ $value->addError($msg);`
`55`	`57`	`if ($this->throwExceptions) {`
`56`		`- throw new RuntimeException(sprintf('Invalid constructor argument %d for service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $this->currentId, $i));`
	`58`	`+ throw new RuntimeException($msg);`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`	`}`
`@@ -63,17 +65,20 @@ protected function processValue($value, $isRoot = false)`
`63`	`65`	`foreach ($methodCall[1] as $k => $v) {`
`64`	`66`	`if ($k !== $i++) {`
`65`	`67`	`if (!is_int($k)) {`
`66`		`- $value->addError(sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k));`
	`68`	`+ $msg = sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k);`
	`69`	`+ $value->addError($msg);`
	`70`	`+`
`67`	`71`	`if ($this->throwExceptions) {`
`68`		`- throw new RuntimeException(sprintf('Invalid argument for method call "%s" of service "%s": integer expected but found string "%s". Check your service definition.', $methodCall[0], $this->currentId, $k));`
	`72`	`+ throw new RuntimeException($msg);`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`break;`
`72`	`76`	`}`
`73`	`77`
`74`		`- $value->addError(sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i));`
	`78`	`+ $msg = sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i);`
	`79`	`+ $value->addError($msg);`
`75`	`80`	`if ($this->throwExceptions) {`
`76`		`- throw new RuntimeException(sprintf('Invalid argument %d for method call "%s" of service "%s": argument %d must be defined before. Check your service definition.', 1 + $k, $methodCall[0], $this->currentId, $i));`
	`81`	`+ throw new RuntimeException($msg);`
`77`	`82`	`}`
`78`	`83`	`}`
`79`	`84`	`}`