Merge branch '2.2' into 2.3

fabpot · fabpot · commit 2d60946ed4a0 · 2013-11-25T15:49:41.000+01:00
* 2.2: fixed some typos fixed @ExpectedException class names Conflicts: src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php src/Symfony/Component/Console/Tests/Command/CommandTest.php src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
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()`