Merge branch '2.4'

fabpot · fabpot · commit b10f4765119e · 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/Formatter/OutputFormatterStyleStackTest.php b/Tests/Formatter/OutputFormatterStyleStackTest.php
@@ -59,7 +59,7 @@ public function testPopNotLast()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testInvalidPop()
     {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function testPopNotLast()`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`62`		`- * @expectedException InvalidArgumentException`
	`62`	`+ * @expectedException \InvalidArgumentException`
`63`	`63`	`*/`
`64`	`64`	`public function testInvalidPop()`
`65`	`65`	`{`