[2.7][DX] Use constant message contextualisation for deprecations

romainneutron · romainneutron · commit 34522acfb08d · 2017-12-20T15:36:51.000+01:00
diff --git a/ButtonBuilder.php b/ButtonBuilder.php
@@ -588,7 +588,7 @@ public function getByReference()
      */
     public function getVirtual()
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\FormConfigBuilder::getInheritData method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\FormConfigBuilder::getInheritData method instead.', E_USER_DEPRECATED);
 
         return false;
     }
diff --git a/Extension/Core/ChoiceList/ChoiceList.php b/Extension/Core/ChoiceList/ChoiceList.php
@@ -200,7 +200,7 @@ public function getValuesForChoices(array $choices)
      */
     public function getIndicesForChoices(array $choices)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $choices = $this->fixChoices($choices);
         $indices = array();
@@ -228,7 +228,7 @@ public function getIndicesForChoices(array $choices)
      */
     public function getIndicesForValues(array $values)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $values = $this->fixValues($values);
         $indices = array();
diff --git a/Extension/Core/ChoiceList/LazyChoiceList.php b/Extension/Core/ChoiceList/LazyChoiceList.php
@@ -115,7 +115,7 @@ public function getValuesForChoices(array $choices)
      */
     public function getIndicesForChoices(array $choices)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if (!$this->choiceList) {
             $this->load();
@@ -131,7 +131,7 @@ public function getIndicesForChoices(array $choices)
      */
     public function getIndicesForValues(array $values)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if (!$this->choiceList) {
             $this->load();
diff --git a/Extension/Core/ChoiceList/ObjectChoiceList.php b/Extension/Core/ChoiceList/ObjectChoiceList.php
@@ -196,7 +196,7 @@ public function getValuesForChoices(array $choices)
      */
     public function getIndicesForChoices(array $choices)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if (!$this->valuePath) {
             return parent::getIndicesForChoices($choices);
diff --git a/Extension/Core/EventListener/FixCheckboxInputListener.php b/Extension/Core/EventListener/FixCheckboxInputListener.php
@@ -89,7 +89,7 @@ public function preSubmit(FormEvent $event)
      */
     public function preBind(FormEvent $event)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
 
         $this->preSubmit($event);
     }
diff --git a/Extension/Core/EventListener/FixRadioInputListener.php b/Extension/Core/EventListener/FixRadioInputListener.php
@@ -71,7 +71,7 @@ public function preSubmit(FormEvent $event)
      */
     public function preBind(FormEvent $event)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
 
         $this->preSubmit($event);
     }
diff --git a/Extension/Core/EventListener/FixUrlProtocolListener.php b/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -49,7 +49,7 @@ public function onSubmit(FormEvent $event)
      */
     public function onBind(FormEvent $event)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);
 
         $this->onSubmit($event);
     }
diff --git a/Extension/Core/EventListener/MergeCollectionListener.php b/Extension/Core/EventListener/MergeCollectionListener.php
@@ -119,7 +119,7 @@ public function onSubmit(FormEvent $event)
      */
     public function onBind(FormEvent $event)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);
 
         $this->onSubmit($event);
     }
diff --git a/Extension/Core/EventListener/ResizeFormListener.php b/Extension/Core/EventListener/ResizeFormListener.php
@@ -172,7 +172,7 @@ public function onSubmit(FormEvent $event)
      */
     public function preBind(FormEvent $event)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
 
         $this->preSubmit($event);
     }
@@ -185,7 +185,7 @@ public function preBind(FormEvent $event)
      */
     public function onBind(FormEvent $event)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);
 
         $this->onSubmit($event);
     }
diff --git a/Extension/Core/EventListener/TrimListener.php b/Extension/Core/EventListener/TrimListener.php
@@ -45,7 +45,7 @@ public function preSubmit(FormEvent $event)
      */
     public function preBind(FormEvent $event)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
 
         $this->preSubmit($event);
     }
diff --git a/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php b/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php
@@ -33,7 +33,7 @@ public function __construct(CsrfTokenManagerInterface $tokenManager)
     public function getTokenManager($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
         }
 
         return $this->tokenManager;
@@ -44,7 +44,7 @@ public function getTokenManager($triggerDeprecationError = true)
      */
     public function generateCsrfToken($intention)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
 
         return $this->tokenManager->getToken($intention)->getValue();
     }
@@ -54,7 +54,7 @@ public function generateCsrfToken($intention)
      */
     public function isCsrfTokenValid($intention, $token)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
 
         return $this->tokenManager->isTokenValid(new CsrfToken($intention, $token));
     }
diff --git a/Extension/Csrf/EventListener/CsrfValidationListener.php b/Extension/Csrf/EventListener/CsrfValidationListener.php
@@ -104,7 +104,7 @@ public function preSubmit(FormEvent $event)
      */
     public function preBind(FormEvent $event)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);
 
         $this->preSubmit($event);
     }
diff --git a/Form.php b/Form.php
@@ -684,7 +684,7 @@ public function bind($submittedData)
         // This method is deprecated for Request too, but the error is
         // triggered in Form::submit() method.
         if (!$submittedData instanceof Request) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the '.__CLASS__.'::submit method instead.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the '.__CLASS__.'::submit method instead.', E_USER_DEPRECATED);
         }
 
         return $this->submit($submittedData);
@@ -724,7 +724,7 @@ public function isSubmitted()
      */
     public function isBound()
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the '.__CLASS__.'::isSubmitted method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the '.__CLASS__.'::isSubmitted method instead.', E_USER_DEPRECATED);
 
         return $this->submitted;
     }
@@ -844,7 +844,7 @@ public function getErrors($deep = false, $flatten = true)
      */
     public function getErrorsAsString($level = 0)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use (string) Form::getErrors(true, false) instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.5 and will be removed in 3.0. Use (string) Form::getErrors(true, false) instead.', E_USER_DEPRECATED);
 
         return self::indent((string) $this->getErrors(true, false), $level);
     }
diff --git a/FormConfigBuilder.php b/FormConfigBuilder.php
@@ -356,7 +356,7 @@ public function getInheritData()
      */
     public function getVirtual()
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the FormConfigBuilder::getInheritData() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the FormConfigBuilder::getInheritData() method instead.', E_USER_DEPRECATED);
 
         return $this->getInheritData();
     }
@@ -720,7 +720,7 @@ public function setInheritData($inheritData)
      */
     public function setVirtual($inheritData)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the FormConfigBuilder::setInheritData() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the FormConfigBuilder::setInheritData() method instead.', E_USER_DEPRECATED);
 
         $this->setInheritData($inheritData);
     }
diff --git a/ResolvedFormType.php b/ResolvedFormType.php
@@ -208,7 +208,7 @@ public function getOptionsResolver()
                 $isNewOverwritten = 'Symfony\Component\Form\AbstractType' !== $reflector->getDeclaringClass()->getName();
 
                 if ($isOldOverwritten && !$isNewOverwritten) {
-                    @trigger_error(get_class($this->innerType).': The FormTypeInterface::setDefaultOptions() method is deprecated since version 2.7 and will be removed in 3.0. Use configureOptions() instead. This method will be added to the FormTypeInterface with Symfony 3.0.', E_USER_DEPRECATED);
+                    @trigger_error(get_class($this->innerType).': The FormTypeInterface::setDefaultOptions() method is deprecated since Symfony 2.7 and will be removed in 3.0. Use configureOptions() instead. This method will be added to the FormTypeInterface with Symfony 3.0.', E_USER_DEPRECATED);
                 }
             } else {
                 @trigger_error(get_class($this->innerType).': The FormTypeInterface::configureOptions() method will be added in Symfony 3.0. You should extend AbstractType or implement it in your classes.', E_USER_DEPRECATED);
@@ -225,7 +225,7 @@ public function getOptionsResolver()
                     $isNewOverwritten = 'Symfony\Component\Form\AbstractTypeExtension' !== $reflector->getDeclaringClass()->getName();
 
                     if ($isOldOverwritten && !$isNewOverwritten) {
-                        @trigger_error(get_class($extension).': The FormTypeExtensionInterface::setDefaultOptions() method is deprecated since version 2.7 and will be removed in 3.0. Use configureOptions() instead. This method will be added to the FormTypeExtensionInterface with Symfony 3.0.', E_USER_DEPRECATED);
+                        @trigger_error(get_class($extension).': The FormTypeExtensionInterface::setDefaultOptions() method is deprecated since Symfony 2.7 and will be removed in 3.0. Use configureOptions() instead. This method will be added to the FormTypeExtensionInterface with Symfony 3.0.', E_USER_DEPRECATED);
                     }
                 } else {
                     @trigger_error(get_class($this->innerType).': The FormTypeExtensionInterface::configureOptions() method will be added in Symfony 3.0. You should extend AbstractTypeExtension or implement it in your classes.', E_USER_DEPRECATED);

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ public function getByReference()`
`588`	`588`	`*/`
`589`	`589`	`public function getVirtual()`
`590`	`590`	`{`
`591`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\FormConfigBuilder::getInheritData method instead.', E_USER_DEPRECATED);`
	`591`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\FormConfigBuilder::getInheritData method instead.', E_USER_DEPRECATED);`
`592`	`592`
`593`	`593`	`return false;`
`594`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function getValuesForChoices(array $choices)`
`196`	`196`	`*/`
`197`	`197`	`public function getIndicesForChoices(array $choices)`
`198`	`198`	`{`
`199`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`199`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);`
`200`	`200`
`201`	`201`	`if (!$this->valuePath) {`
`202`	`202`	`return parent::getIndicesForChoices($choices);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function preSubmit(FormEvent $event)`
`89`	`89`	`*/`
`90`	`90`	`public function preBind(FormEvent $event)`
`91`	`91`	`{`
`92`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);`
	`92`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);`
`93`	`93`
`94`	`94`	`$this->preSubmit($event);`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function preSubmit(FormEvent $event)`
`71`	`71`	`*/`
`72`	`72`	`public function preBind(FormEvent $event)`
`73`	`73`	`{`
`74`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);`
	`74`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);`
`75`	`75`
`76`	`76`	`$this->preSubmit($event);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function onSubmit(FormEvent $event)`
`49`	`49`	`*/`
`50`	`50`	`public function onBind(FormEvent $event)`
`51`	`51`	`{`
`52`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);`
	`52`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);`
`53`	`53`
`54`	`54`	`$this->onSubmit($event);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function onSubmit(FormEvent $event)`
`119`	`119`	`*/`
`120`	`120`	`public function onBind(FormEvent $event)`
`121`	`121`	`{`
`122`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);`
	`122`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);`
`123`	`123`
`124`	`124`	`$this->onSubmit($event);`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public function onSubmit(FormEvent $event)`
`172`	`172`	`*/`
`173`	`173`	`public function preBind(FormEvent $event)`
`174`	`174`	`{`
`175`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);`
	`175`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);`
`176`	`176`
`177`	`177`	`$this->preSubmit($event);`
`178`	`178`	`}`
`@@ -185,7 +185,7 @@ public function preBind(FormEvent $event)`
`185`	`185`	`*/`
`186`	`186`	`public function onBind(FormEvent $event)`
`187`	`187`	`{`
`188`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);`
	`188`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);`
`189`	`189`
`190`	`190`	`$this->onSubmit($event);`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function preSubmit(FormEvent $event)`
`45`	`45`	`*/`
`46`	`46`	`public function preBind(FormEvent $event)`
`47`	`47`	`{`
`48`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);`
	`48`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the preSubmit() method instead.', E_USER_DEPRECATED);`
`49`	`49`
`50`	`50`	`$this->preSubmit($event);`
`51`	`51`	`}`