Merge branch '2.4'

fabpot · fabpot · commit f1d7a59d3309 · 2013-11-26T17:42:52.000+01:00
* 2.4: [HttpKernel] fixed regression introduced in 2.4 in the base DataCollector class. Added more unit tests coverage for the RequestDataCollector object. Fixed mistake in upgrade docu bumped Symfony version to 2.4.0 updated VERSION for 2.4.0-RC1 updated CHANGELOG for 2.4.0-RC1 Container::camelize also takes backslashes into consideration fixed typos fixed @ExpectedException class names Fix an issue when overriding Client::setServerParameters() and using the getContainer() method in it. fixed some typos fixed @ExpectedException class names Typo and better wording for german validator translation
diff --git a/Tests/Encoder/XmlEncoderTest.php b/Tests/Encoder/XmlEncoderTest.php
@@ -53,7 +53,7 @@ public function testSetRootNodeName()
     }
 
     /**
-     * @expectedException        UnexpectedValueException
+     * @expectedException        \Symfony\Component\Serializer\Exception\UnexpectedValueException
      * @expectedExceptionMessage Document types are not allowed.
      */
     public function testDocTypeIsNotAllowed()

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function testSetRootNodeName()`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`56`		`- * @expectedException UnexpectedValueException`
	`56`	`+ * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException`
`57`	`57`	`* @expectedExceptionMessage Document types are not allowed.`
`58`	`58`	`*/`
`59`	`59`	`public function testDocTypeIsNotAllowed()`