Merge branch '2.3' into 2.4

fabpot · fabpot · commit cd04f7b0cebf · 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/Fragment/FragmentHandlerTest.php b/Tests/Fragment/FragmentHandlerTest.php
@@ -42,7 +42,7 @@ public function testRenderWhenRendererDoesNotExist()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testRenderWithUnknownRenderer()
     {
@@ -52,7 +52,7 @@ public function testRenderWithUnknownRenderer()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      * @expectedExceptionMessage Error when rendering "http://localhost/" (Status code is 404).
      */
     public function testDeliverWithUnsuccessfulResponse()
diff --git a/Tests/HttpCache/EsiTest.php b/Tests/HttpCache/EsiTest.php
@@ -126,7 +126,7 @@ public function testProcessEscapesPhpTags()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testProcessWhenNoSrcInAnEsi()
     {
@@ -166,7 +166,7 @@ public function testHandle()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testHandleWhenResponseIsNot200()
     {
diff --git a/Tests/HttpKernelTest.php b/Tests/HttpKernelTest.php
@@ -24,7 +24,7 @@
 class HttpKernelTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()
     {
@@ -34,7 +34,7 @@ public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testHandleWhenControllerThrowsAnExceptionAndRawIsFalseAndNoListenerIsRegistered()
     {
@@ -136,7 +136,7 @@ public function testHandleWhenNoControllerIsFound()
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      */
     public function testHandleWhenTheControllerIsNotACallable()
     {
@@ -188,7 +188,7 @@ public function testHandleWhenTheControllerIsAStaticArray()
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      */
     public function testHandleWhenTheControllerDoesNotReturnAResponse()
     {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function testRenderWhenRendererDoesNotExist()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * @expectedException InvalidArgumentException`
	`45`	`+ * @expectedException \InvalidArgumentException`
`46`	`46`	`*/`
`47`	`47`	`public function testRenderWithUnknownRenderer()`
`48`	`48`	`{`
`@@ -52,7 +52,7 @@ public function testRenderWithUnknownRenderer()`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`		`- * @expectedException RuntimeException`
	`55`	`+ * @expectedException \RuntimeException`
`56`	`56`	`* @expectedExceptionMessage Error when rendering "http://localhost/" (Status code is 404).`
`57`	`57`	`*/`
`58`	`58`	`public function testDeliverWithUnsuccessfulResponse()`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function testProcessEscapesPhpTags()`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`/**`
`129`		`- * @expectedException RuntimeException`
	`129`	`+ * @expectedException \RuntimeException`
`130`	`130`	`*/`
`131`	`131`	`public function testProcessWhenNoSrcInAnEsi()`
`132`	`132`	`{`
`@@ -166,7 +166,7 @@ public function testHandle()`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`/**`
`169`		`- * @expectedException RuntimeException`
	`169`	`+ * @expectedException \RuntimeException`
`170`	`170`	`*/`
`171`	`171`	`public function testHandleWhenResponseIsNot200()`
`172`	`172`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`class HttpKernelTest extends \PHPUnit_Framework_TestCase`
`25`	`25`	`{`
`26`	`26`	`/**`
`27`		`- * @expectedException RuntimeException`
	`27`	`+ * @expectedException \RuntimeException`
`28`	`28`	`*/`
`29`	`29`	`public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()`
`30`	`30`	`{`
`@@ -34,7 +34,7 @@ public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
`37`		`- * @expectedException RuntimeException`
	`37`	`+ * @expectedException \RuntimeException`
`38`	`38`	`*/`
`39`	`39`	`public function testHandleWhenControllerThrowsAnExceptionAndRawIsFalseAndNoListenerIsRegistered()`
`40`	`40`	`{`
`@@ -136,7 +136,7 @@ public function testHandleWhenNoControllerIsFound()`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`/**`
`139`		`- * @expectedException LogicException`
	`139`	`+ * @expectedException \LogicException`
`140`	`140`	`*/`
`141`	`141`	`public function testHandleWhenTheControllerIsNotACallable()`
`142`	`142`	`{`
`@@ -188,7 +188,7 @@ public function testHandleWhenTheControllerIsAStaticArray()`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`/**`
`191`		`- * @expectedException LogicException`
	`191`	`+ * @expectedException \LogicException`
`192`	`192`	`*/`
`193`	`193`	`public function testHandleWhenTheControllerDoesNotReturnAResponse()`
`194`	`194`	`{`