Merge branch '2.3'

fabpot · fabpot · commit 6b7329fca43d · 2013-10-17T13:48:11.000+02:00
* 2.3: Improve documentation of X-Forwarded-For header handling [DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays Removed unused use statements. Make usleep longer and simplify assertions Added japanese translation resource for security component. Replaced the @inheritdoc with an actual list of params since the original method has a different signature. fix typo : StdClass should be stdClass with little "s" Remove unnecessary continue from Request [Yaml] Fixed the escaping of strings starting with a dash when dumping Fix in ChainLoader.php fixed wrong started states
diff --git a/Encoder/JsonDecode.php b/Encoder/JsonDecode.php
@@ -70,7 +70,7 @@ public function getLastError()
      *
      * json_decode_associative: boolean
      *      If true, returns the object as associative array.
-     *      If false, returns the object as nested StdClass
+     *      If false, returns the object as nested stdClass
      *      If not specified, this method will use the default set in JsonDecode::__construct
      *
      * json_decode_recursion_depth: integer

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function getLastError()`
`70`	`70`	`*`
`71`	`71`	`* json_decode_associative: boolean`
`72`	`72`	`* If true, returns the object as associative array.`
`73`		`- * If false, returns the object as nested StdClass`
	`73`	`+ * If false, returns the object as nested stdClass`
`74`	`74`	`* If not specified, this method will use the default set in JsonDecode::__construct`
`75`	`75`	`*`
`76`	`76`	`* json_decode_recursion_depth: integer`