fixed some deprecation messages

fabpot · fabpot · commit b3431c9214e3 · 2017-12-31T07:59:27.000+01: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 version 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 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 version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('Method "%s" 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 version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->twig;
     }
@@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (__CLASS__ !== get_class($this)) {
             $r = new \ReflectionMethod($this, 'getTwigEnvironment');
             if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                @trigger_error(sprintf('Usage of method "%s" is deprecated since version 3.4 and will no longer be supported in 4.0. Construct the command with its required arguments instead.', get_class($this).'::getTwigEnvironment'), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Usage of method "%s" is deprecated since Symfony 3.4 and will no longer be supported in 4.0. Construct the command with its required arguments instead.', get_class($this).'::getTwigEnvironment'), E_USER_DEPRECATED);
 
                 $this->twig = $this->getTwigEnvironment();
             }
diff --git a/Command/LintCommand.php b/Command/LintCommand.php
@@ -41,7 +41,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 version 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 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);
 
@@ -55,7 +55,7 @@ public function __construct($twig = null)
 
     public function setTwigEnvironment(Environment $twig)
     {
-        @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
 
         $this->twig = $twig;
     }
@@ -65,7 +65,7 @@ public function setTwigEnvironment(Environment $twig)
      */
     protected function getTwigEnvironment()
     {
-        @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->twig;
     }
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (__CLASS__ !== get_class($this)) {
             $r = new \ReflectionMethod($this, 'getTwigEnvironment');
             if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                @trigger_error(sprintf('Usage of method "%s" is deprecated since version 3.4 and will no longer be supported in 4.0. Construct the command with its required arguments instead.', get_class($this).'::getTwigEnvironment'), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Usage of method "%s" is deprecated since Symfony 3.4 and will no longer be supported in 4.0. Construct the command with its required arguments instead.', get_class($this).'::getTwigEnvironment'), E_USER_DEPRECATED);
 
                 $this->twig = $this->getTwigEnvironment();
             }
diff --git a/Form/TwigRenderer.php b/Form/TwigRenderer.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Environment;
 
-@trigger_error(sprintf('The %s class is deprecated since version 3.4 and will be removed in 4.0. Use %s instead.', TwigRenderer::class, FormRenderer::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('The %s class is deprecated since Symfony 3.4 and will be removed in 4.0. Use %s instead.', TwigRenderer::class, FormRenderer::class), E_USER_DEPRECATED);
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
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 version 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 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 version 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 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 version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`57`	`+ @trigger_error(sprintf('Method "%s" 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 version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`67`	`+ @trigger_error(sprintf('Method "%s" 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`	`}`
`@@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`105`	`105`	`if (__CLASS__ !== get_class($this)) {`
`106`	`106`	`$r = new \ReflectionMethod($this, 'getTwigEnvironment');`
`107`	`107`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`108`		`- @trigger_error(sprintf('Usage of method "%s" is deprecated since version 3.4 and will no longer be supported in 4.0. Construct the command with its required arguments instead.', get_class($this).'::getTwigEnvironment'), E_USER_DEPRECATED);`
	`108`	`+ @trigger_error(sprintf('Usage of method "%s" is deprecated since Symfony 3.4 and will no longer be supported in 4.0. Construct the command with its required arguments instead.', get_class($this).'::getTwigEnvironment'), E_USER_DEPRECATED);`
`109`	`109`
`110`	`110`	`$this->twig = $this->getTwigEnvironment();`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class LintCommand extends Command`
`41`	`41`	`public function __construct($twig = null)`
`42`	`42`	`{`
`43`	`43`	`if (!$twig instanceof Environment) {`
`44`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 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);`
	`44`	`+ @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);`
`45`	`45`
`46`	`46`	`parent::__construct($twig);`
`47`	`47`
`@@ -55,7 +55,7 @@ public function __construct($twig = null)`
`55`	`55`
`56`	`56`	`public function setTwigEnvironment(Environment $twig)`
`57`	`57`	`{`
`58`		`- @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`58`	`+ @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
`59`	`59`
`60`	`60`	`$this->twig = $twig;`
`61`	`61`	`}`
`@@ -65,7 +65,7 @@ public function setTwigEnvironment(Environment $twig)`
`65`	`65`	`*/`
`66`	`66`	`protected function getTwigEnvironment()`
`67`	`67`	`{`
`68`		`- @trigger_error(sprintf('Method "%s" is deprecated since version 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`68`	`+ @trigger_error(sprintf('Method "%s" is deprecated since Symfony 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);`
`69`	`69`
`70`	`70`	`return $this->twig;`
`71`	`71`	`}`
`@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`106`	`106`	`if (__CLASS__ !== get_class($this)) {`
`107`	`107`	`$r = new \ReflectionMethod($this, 'getTwigEnvironment');`
`108`	`108`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`109`		`- @trigger_error(sprintf('Usage of method "%s" is deprecated since version 3.4 and will no longer be supported in 4.0. Construct the command with its required arguments instead.', get_class($this).'::getTwigEnvironment'), E_USER_DEPRECATED);`
	`109`	`+ @trigger_error(sprintf('Usage of method "%s" is deprecated since Symfony 3.4 and will no longer be supported in 4.0. Construct the command with its required arguments instead.', get_class($this).'::getTwigEnvironment'), E_USER_DEPRECATED);`
`110`	`110`
`111`	`111`	`$this->twig = $this->getTwigEnvironment();`
`112`	`112`	`}`