Merge branch '2.3' into 2.4

fabpot · fabpot · commit bdd2310a4e61 · 2013-11-26T17:40:27.000+01:00
* 2.3: Fixed mistake in upgrade docu Container::camelize also takes backslashes into consideration fixed typos fixed @ExpectedException class names 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()`