improve deprecation messages

xabbuh · xabbuh · commit d14c6e210ba8 · 2018-07-08T21:14:58.000+02:00
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -39,7 +39,7 @@ class DebugCommand extends Command
     public function __construct($twig = null, $projectDir = null)
     {
         if (!$twig instanceof Environment) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing a command name as the first argument of "%s()" is deprecated since Symfony 3.4 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
 
             parent::__construct($twig);
 
@@ -54,7 +54,7 @@ public function __construct($twig = null, $projectDir = null)
 
     public function setTwigEnvironment(Environment $twig)
     {
-        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
 
         $this->twig = $twig;
     }
@@ -64,7 +64,7 @@ public function setTwigEnvironment(Environment $twig)
      */
     protected function getTwigEnvironment()
     {
-        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->twig;
     }
diff --git a/Command/LintCommand.php b/Command/LintCommand.php
@@ -43,7 +43,7 @@ class LintCommand extends Command
     public function __construct($twig = null)
     {
         if (!$twig instanceof Environment) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing a command name as the first argument of "%s()" is deprecated since Symfony 3.4 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
 
             parent::__construct($twig);
 
@@ -57,7 +57,7 @@ public function __construct($twig = null)
 
     public function setTwigEnvironment(Environment $twig)
     {
-        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
 
         $this->twig = $twig;
     }
@@ -67,7 +67,7 @@ public function setTwigEnvironment(Environment $twig)
      */
     protected function getTwigEnvironment()
     {
-        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->twig;
     }
diff --git a/Tests/Command/LintCommandTest.php b/Tests/Command/LintCommandTest.php
@@ -70,7 +70,7 @@ public function testLintFileCompileTimeException()
 
     /**
      * @group legacy
-     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bridge\Twig\Command\LintCommand::__construct" is deprecated since Symfony 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.
+     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bridge\Twig\Command\LintCommand::__construct()" is deprecated since Symfony 3.4 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.
      * @expectedException \RuntimeException
      * @expectedExceptionMessage The Twig environment needs to be set.
      */

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class DebugCommand extends Command`
`39`	`39`	`public function __construct($twig = null, $projectDir = null)`
`40`	`40`	`{`
`41`	`41`	`if (!$twig instanceof Environment) {`
`42`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`42`	`+ @trigger_error(sprintf('Passing a command name as the first argument of "%s()" is deprecated since Symfony 3.4 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
`43`	`43`
`44`	`44`	`parent::__construct($twig);`
`45`	`45`
`@@ -54,7 +54,7 @@ public function __construct($twig = null, $projectDir = null)`
`54`	`54`
`55`	`55`	`public function setTwigEnvironment(Environment $twig)`
`56`	`56`	`{`
`57`		`- @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`57`	`+ @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
`58`	`58`
`59`	`59`	`$this->twig = $twig;`
`60`	`60`	`}`
`@@ -64,7 +64,7 @@ public function setTwigEnvironment(Environment $twig)`
`64`	`64`	`*/`
`65`	`65`	`protected function getTwigEnvironment()`
`66`	`66`	`{`
`67`		`- @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`67`	`+ @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
`68`	`68`
`69`	`69`	`return $this->twig;`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class LintCommand extends Command`
`43`	`43`	`public function __construct($twig = null)`
`44`	`44`	`{`
`45`	`45`	`if (!$twig instanceof Environment) {`
`46`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since Symfony 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`46`	`+ @trigger_error(sprintf('Passing a command name as the first argument of "%s()" is deprecated since Symfony 3.4 and support for it will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
`47`	`47`
`48`	`48`	`parent::__construct($twig);`
`49`	`49`
`@@ -57,7 +57,7 @@ public function __construct($twig = null)`
`57`	`57`
`58`	`58`	`public function setTwigEnvironment(Environment $twig)`
`59`	`59`	`{`
`60`		`- @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`60`	`+ @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
`61`	`61`
`62`	`62`	`$this->twig = $twig;`
`63`	`63`	`}`
`@@ -67,7 +67,7 @@ public function setTwigEnvironment(Environment $twig)`
`67`	`67`	`*/`
`68`	`68`	`protected function getTwigEnvironment()`
`69`	`69`	`{`
`70`		`- @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`70`	`+ @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
`71`	`71`
`72`	`72`	`return $this->twig;`
`73`	`73`	`}`