Merge branch '2.7' into 2.8

fabpot · fabpot · commit 80c344937587 · 2017-12-31T05:16:51.000+01:00
* 2.7:
  [2.7][DX] Use constant message contextualisation for deprecations
diff --git a/OptionsResolver.php b/OptionsResolver.php
@@ -420,7 +420,7 @@ public function setNormalizer($option, \Closure $normalizer)
      */
     public function setNormalizers(array $normalizers)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use setNormalizer() instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use setNormalizer() instead.', E_USER_DEPRECATED);
 
         foreach ($normalizers as $option => $normalizer) {
             $this->setNormalizer($option, $normalizer);
@@ -1029,7 +1029,7 @@ public function count()
      */
     public function set($option, $value)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setDefaults() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the setDefaults() method instead.', E_USER_DEPRECATED);
 
         return $this->setDefault($option, $value);
     }
@@ -1041,7 +1041,7 @@ public function set($option, $value)
      */
     public function replace(array $defaults)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the clear() and setDefaults() methods instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the clear() and setDefaults() methods instead.', E_USER_DEPRECATED);
 
         $this->clear();
 
@@ -1055,7 +1055,7 @@ public function replace(array $defaults)
      */
     public function overload($option, $value)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setDefault() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the setDefault() method instead.', E_USER_DEPRECATED);
 
         return $this->setDefault($option, $value);
     }
@@ -1067,7 +1067,7 @@ public function overload($option, $value)
      */
     public function get($option)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the ArrayAccess syntax instead to get an option value.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the ArrayAccess syntax instead to get an option value.', E_USER_DEPRECATED);
 
         return $this->offsetGet($option);
     }
@@ -1079,7 +1079,7 @@ public function get($option)
      */
     public function has($option)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the ArrayAccess syntax instead to get an option value.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the ArrayAccess syntax instead to get an option value.', E_USER_DEPRECATED);
 
         return $this->offsetExists($option);
     }
@@ -1091,7 +1091,7 @@ public function has($option)
      */
     public function replaceDefaults(array $defaultValues)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the clear() and setDefaults() methods instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the clear() and setDefaults() methods instead.', E_USER_DEPRECATED);
 
         $this->clear();
 
@@ -1105,7 +1105,7 @@ public function replaceDefaults(array $defaultValues)
      */
     public function setOptional(array $optionNames)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setDefined() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the setDefined() method instead.', E_USER_DEPRECATED);
 
         return $this->setDefined($optionNames);
     }
@@ -1117,7 +1117,7 @@ public function setOptional(array $optionNames)
      */
     public function isKnown($option)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the isDefined() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the isDefined() method instead.', E_USER_DEPRECATED);
 
         return $this->isDefined($option);
     }

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ public function setNormalizer($option, \Closure $normalizer)`
`420`	`420`	`*/`
`421`	`421`	`public function setNormalizers(array $normalizers)`
`422`	`422`	`{`
`423`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use setNormalizer() instead.', E_USER_DEPRECATED);`
	`423`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use setNormalizer() instead.', E_USER_DEPRECATED);`
`424`	`424`
`425`	`425`	`foreach ($normalizers as $option => $normalizer) {`
`426`	`426`	`$this->setNormalizer($option, $normalizer);`
`@@ -1029,7 +1029,7 @@ public function count()`
`1029`	`1029`	`*/`
`1030`	`1030`	`public function set($option, $value)`
`1031`	`1031`	`{`
`1032`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setDefaults() method instead.', E_USER_DEPRECATED);`
	`1032`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the setDefaults() method instead.', E_USER_DEPRECATED);`
`1033`	`1033`
`1034`	`1034`	`return $this->setDefault($option, $value);`
`1035`	`1035`	`}`
`@@ -1041,7 +1041,7 @@ public function set($option, $value)`
`1041`	`1041`	`*/`
`1042`	`1042`	`public function replace(array $defaults)`
`1043`	`1043`	`{`
`1044`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the clear() and setDefaults() methods instead.', E_USER_DEPRECATED);`
	`1044`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the clear() and setDefaults() methods instead.', E_USER_DEPRECATED);`
`1045`	`1045`
`1046`	`1046`	`$this->clear();`
`1047`	`1047`
`@@ -1055,7 +1055,7 @@ public function replace(array $defaults)`
`1055`	`1055`	`*/`
`1056`	`1056`	`public function overload($option, $value)`
`1057`	`1057`	`{`
`1058`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setDefault() method instead.', E_USER_DEPRECATED);`
	`1058`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the setDefault() method instead.', E_USER_DEPRECATED);`
`1059`	`1059`
`1060`	`1060`	`return $this->setDefault($option, $value);`
`1061`	`1061`	`}`
`@@ -1067,7 +1067,7 @@ public function overload($option, $value)`
`1067`	`1067`	`*/`
`1068`	`1068`	`public function get($option)`
`1069`	`1069`	`{`
`1070`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the ArrayAccess syntax instead to get an option value.', E_USER_DEPRECATED);`
	`1070`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the ArrayAccess syntax instead to get an option value.', E_USER_DEPRECATED);`
`1071`	`1071`
`1072`	`1072`	`return $this->offsetGet($option);`
`1073`	`1073`	`}`
`@@ -1079,7 +1079,7 @@ public function get($option)`
`1079`	`1079`	`*/`
`1080`	`1080`	`public function has($option)`
`1081`	`1081`	`{`
`1082`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the ArrayAccess syntax instead to get an option value.', E_USER_DEPRECATED);`
	`1082`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the ArrayAccess syntax instead to get an option value.', E_USER_DEPRECATED);`
`1083`	`1083`
`1084`	`1084`	`return $this->offsetExists($option);`
`1085`	`1085`	`}`
`@@ -1091,7 +1091,7 @@ public function has($option)`
`1091`	`1091`	`*/`
`1092`	`1092`	`public function replaceDefaults(array $defaultValues)`
`1093`	`1093`	`{`
`1094`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the clear() and setDefaults() methods instead.', E_USER_DEPRECATED);`
	`1094`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the clear() and setDefaults() methods instead.', E_USER_DEPRECATED);`
`1095`	`1095`
`1096`	`1096`	`$this->clear();`
`1097`	`1097`
`@@ -1105,7 +1105,7 @@ public function replaceDefaults(array $defaultValues)`
`1105`	`1105`	`*/`
`1106`	`1106`	`public function setOptional(array $optionNames)`
`1107`	`1107`	`{`
`1108`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setDefined() method instead.', E_USER_DEPRECATED);`
	`1108`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the setDefined() method instead.', E_USER_DEPRECATED);`
`1109`	`1109`
`1110`	`1110`	`return $this->setDefined($optionNames);`
`1111`	`1111`	`}`
`@@ -1117,7 +1117,7 @@ public function setOptional(array $optionNames)`
`1117`	`1117`	`*/`
`1118`	`1118`	`public function isKnown($option)`
`1119`	`1119`	`{`
`1120`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the isDefined() method instead.', E_USER_DEPRECATED);`
	`1120`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.6 and will be removed in 3.0. Use the isDefined() method instead.', E_USER_DEPRECATED);`
`1121`	`1121`
`1122`	`1122`	`return $this->isDefined($option);`
`1123`	`1123`	`}`