minor #16151 [FrameworkBundle][VarDumper] tweak some deprecation messages (xabbuh)

fabpot · fabpot · commit 5aa1233d0b22 · 2015-10-06T18:15:19.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [FrameworkBundle][VarDumper] tweak some deprecation messages | Q | A | ------------- | --- | Fixed tickets | #16129, #16135 | License | MIT I was a bit too slow with reviewing. Commits ------- 536045f tweak some deprecation messages
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -47,7 +47,7 @@ public function __construct(ControllerNameParser $parser, $resolver, $r = null)
             $this->logger = $resolver;
             $resolver = $r;
 
-            @trigger_error('Passing a LoggerInterface instance a second argument of the '.__METHOD__.' method is deprecated since version 2.8 and will not be supported anymore in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('Passing a LoggerInterface instance as the second argument of the '.__METHOD__.' method is deprecated since version 2.8 and will not be supported anymore in 3.0.', E_USER_DEPRECATED);
         }
 
         parent::__construct($resolver);
diff --git a/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php b/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
@@ -22,7 +22,7 @@ class ThrowingCasterException extends \Exception
     public function __construct($prev, \Exception $e = null)
     {
         if (!$prev instanceof \Exception) {
-            @trigger_error('Providing $caster a 1st argument when instanciating a '.__CLASS__.' is deprecated since version 2.8 and will be removed in 3.0. Provide directly the $prev exception instead.', E_USER_DEPRECATED);
+            @trigger_error('Providing $caster as the first argument of the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Provide directly the $prev exception instead.', E_USER_DEPRECATED);
 
             $prev = $e;
         }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(ControllerNameParser $parser, $resolver, $r = null)`
`47`	`47`	`$this->logger = $resolver;`
`48`	`48`	`$resolver = $r;`
`49`	`49`
`50`		`- @trigger_error('Passing a LoggerInterface instance a second argument of the '.__METHOD__.' method is deprecated since version 2.8 and will not be supported anymore in 3.0.', E_USER_DEPRECATED);`
	`50`	`+ @trigger_error('Passing a LoggerInterface instance as the second argument of the '.__METHOD__.' method is deprecated since version 2.8 and will not be supported anymore in 3.0.', E_USER_DEPRECATED);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`parent::__construct($resolver);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ThrowingCasterException extends \Exception`
`22`	`22`	`public function __construct($prev, \Exception $e = null)`
`23`	`23`	`{`
`24`	`24`	`if (!$prev instanceof \Exception) {`
`25`		`- @trigger_error('Providing $caster a 1st argument when instanciating a '.__CLASS__.' is deprecated since version 2.8 and will be removed in 3.0. Provide directly the $prev exception instead.', E_USER_DEPRECATED);`
	`25`	`+ @trigger_error('Providing $caster as the first argument of the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Provide directly the $prev exception instead.', E_USER_DEPRECATED);`
`26`	`26`
`27`	`27`	`$prev = $e;`
`28`	`28`	`}`