Merge branch '2.8'

Tobion · Tobion · commit 695168ade4ba · 2015-10-29T13:12:54.000+01:00
Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.7.md
	composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/Form/Tests/FormRegistryTest.php
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Ldap/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/composer.json
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
	src/Symfony/Component/VarDumper/composer.json
diff --git a/Encoder/JsonDecode.php b/Encoder/JsonDecode.php
@@ -88,7 +88,7 @@ public function decode($data, $format, array $context = array())
         $decodedData = json_decode($data, $associative, $recursionDepth, $options);
 
         if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
+            throw new UnexpectedValueException(json_last_error_message());
         }
 
         return $decodedData;
diff --git a/Encoder/JsonEncode.php b/Encoder/JsonEncode.php
@@ -40,7 +40,7 @@ public function encode($data, $format, array $context = array())
         $encodedJson = json_encode($data, $context['json_encode_options']);
 
         if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
+            throw new UnexpectedValueException(json_last_error_message());
         }
 
         return $encodedJson;
diff --git a/Encoder/JsonEncoder.php b/Encoder/JsonEncoder.php
@@ -72,9 +72,13 @@ public function supportsDecoding($format)
      * Resolves json_last_error message.
      *
      * @return string
+     *
+     * @deprecated since 2.8, to be removed in 3.0. Use json_last_error_msg() instead.
      */
     public static function getLastErrorMessage()
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use json_last_error_msg() instead.', E_USER_DEPRECATED);
+
         return json_last_error_msg();
     }
 }
diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9"
+        "php": ">=5.5.9",
+        "symfony/polyfill-php54": "~1.0"
     },
     "require-dev": {
         "symfony/yaml": "~2.8|~3.0",

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function decode($data, $format, array $context = array())`
`88`	`88`	`$decodedData = json_decode($data, $associative, $recursionDepth, $options);`
`89`	`89`
`90`	`90`	`if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {`
`91`		`- throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());`
	`91`	`+ throw new UnexpectedValueException(json_last_error_message());`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`return $decodedData;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function encode($data, $format, array $context = array())`
`40`	`40`	`$encodedJson = json_encode($data, $context['json_encode_options']);`
`41`	`41`
`42`	`42`	`if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {`
`43`		`- throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());`
	`43`	`+ throw new UnexpectedValueException(json_last_error_message());`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`return $encodedJson;`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,13 @@ public function supportsDecoding($format)`
`72`	`72`	`* Resolves json_last_error message.`
`73`	`73`	`*`
`74`	`74`	`* @return string`
	`75`	`+ *`
	`76`	`+ * @deprecated since 2.8, to be removed in 3.0. Use json_last_error_msg() instead.`
`75`	`77`	`*/`
`76`	`78`	`public static function getLastErrorMessage()`
`77`	`79`	`{`
	`80`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use json_last_error_msg() instead.', E_USER_DEPRECATED);`
	`81`	`+`
`78`	`82`	`return json_last_error_msg();`
`79`	`83`	`}`
`80`	`84`	`}`