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

romainneutron · romainneutron · commit 0f1a73074471 · 2017-12-20T15:36:51.000+01:00
diff --git a/Definition.php b/Definition.php
@@ -108,7 +108,7 @@ public function setFactoryClass($factoryClass)
     public function getFactoryClass($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryClass;
@@ -177,7 +177,7 @@ public function getDecoratedService()
     public function getFactoryMethod($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryMethod;
@@ -213,7 +213,7 @@ public function setFactoryService($factoryService, $triggerDeprecationError = tr
     public function getFactoryService($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryService;
@@ -612,7 +612,7 @@ public function isPublic()
     public function setSynchronized($boolean, $triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         $this->synchronized = (bool) $boolean;
@@ -630,7 +630,7 @@ public function setSynchronized($boolean, $triggerDeprecationError = true)
     public function isSynchronized($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->synchronized;
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -1419,7 +1419,7 @@ public function dumpParameter($name)
      */
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
 
         $this->expressionLanguageProviders[] = $provider;
     }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function setFactoryClass($factoryClass)`
`108`	`108`	`public function getFactoryClass($triggerDeprecationError = true)`
`109`	`109`	`{`
`110`	`110`	`if ($triggerDeprecationError) {`
`111`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`111`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`return $this->factoryClass;`
`@@ -177,7 +177,7 @@ public function getDecoratedService()`
`177`	`177`	`public function getFactoryMethod($triggerDeprecationError = true)`
`178`	`178`	`{`
`179`	`179`	`if ($triggerDeprecationError) {`
`180`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`180`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`return $this->factoryMethod;`
`@@ -213,7 +213,7 @@ public function setFactoryService($factoryService, $triggerDeprecationError = tr`
`213`	`213`	`public function getFactoryService($triggerDeprecationError = true)`
`214`	`214`	`{`
`215`	`215`	`if ($triggerDeprecationError) {`
`216`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`216`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`return $this->factoryService;`
`@@ -612,7 +612,7 @@ public function isPublic()`
`612`	`612`	`public function setSynchronized($boolean, $triggerDeprecationError = true)`
`613`	`613`	`{`
`614`	`614`	`if ($triggerDeprecationError) {`
`615`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`615`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`616`	`616`	`}`
`617`	`617`
`618`	`618`	`$this->synchronized = (bool) $boolean;`
`@@ -630,7 +630,7 @@ public function setSynchronized($boolean, $triggerDeprecationError = true)`
`630`	`630`	`public function isSynchronized($triggerDeprecationError = true)`
`631`	`631`	`{`
`632`	`632`	`if ($triggerDeprecationError) {`
`633`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`633`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`return $this->synchronized;`
Original file line number	Diff line number	Diff line change
`@@ -1419,7 +1419,7 @@ public function dumpParameter($name)`
`1419`	`1419`	`*/`
`1420`	`1420`	`public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)`
`1421`	`1421`	`{`
`1422`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);`
	`1422`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);`
`1423`	`1423`
`1424`	`1424`	`$this->expressionLanguageProviders[] = $provider;`
`1425`	`1425`	`}`