Merge branch '2.7' into 2.8

fabpot · fabpot · commit 168a5d86abba · 2017-12-31T05:16:51.000+01:00
* 2.7:
  [2.7][DX] Use constant message contextualisation for deprecations
diff --git a/Definition.php b/Definition.php
@@ -115,7 +115,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;
@@ -185,7 +185,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;
@@ -221,7 +221,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;
@@ -660,7 +660,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;
@@ -678,7 +678,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
@@ -1432,7 +1432,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
`@@ -115,7 +115,7 @@ public function setFactoryClass($factoryClass)`
`115`	`115`	`public function getFactoryClass($triggerDeprecationError = true)`
`116`	`116`	`{`
`117`	`117`	`if ($triggerDeprecationError) {`
`118`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`118`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`return $this->factoryClass;`
`@@ -185,7 +185,7 @@ public function getDecoratedService()`
`185`	`185`	`public function getFactoryMethod($triggerDeprecationError = true)`
`186`	`186`	`{`
`187`	`187`	`if ($triggerDeprecationError) {`
`188`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`188`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`return $this->factoryMethod;`
`@@ -221,7 +221,7 @@ public function setFactoryService($factoryService, $triggerDeprecationError = tr`
`221`	`221`	`public function getFactoryService($triggerDeprecationError = true)`
`222`	`222`	`{`
`223`	`223`	`if ($triggerDeprecationError) {`
`224`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`224`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`return $this->factoryService;`
`@@ -660,7 +660,7 @@ public function isPublic()`
`660`	`660`	`public function setSynchronized($boolean, $triggerDeprecationError = true)`
`661`	`661`	`{`
`662`	`662`	`if ($triggerDeprecationError) {`
`663`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`663`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`$this->synchronized = (bool) $boolean;`
`@@ -678,7 +678,7 @@ public function setSynchronized($boolean, $triggerDeprecationError = true)`
`678`	`678`	`public function isSynchronized($triggerDeprecationError = true)`
`679`	`679`	`{`
`680`	`680`	`if ($triggerDeprecationError) {`
`681`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`681`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`682`	`682`	`}`
`683`	`683`
`684`	`684`	`return $this->synchronized;`
Original file line number	Diff line number	Diff line change
`@@ -1432,7 +1432,7 @@ public function dumpParameter($name)`
`1432`	`1432`	`*/`
`1433`	`1433`	`public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)`
`1434`	`1434`	`{`
`1435`		`- @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);`
	`1435`	`+ @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);`
`1436`	`1436`
`1437`	`1437`	`$this->expressionLanguageProviders[] = $provider;`
`1438`	`1438`	`}`