Merge branch '2.2' into 2.3

fabpot · fabpot · commit 46aa5b516dde · 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/Fragment/FragmentHandlerTest.php b/Tests/Fragment/FragmentHandlerTest.php
@@ -27,7 +27,7 @@ public function testRenderWhenRendererDoesNotExist()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testRenderWithUnknownRenderer()
     {
@@ -37,7 +37,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
@@ -133,7 +133,7 @@ public function testProcessEscapesPhpTags()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testProcessWhenNoSrcInAnEsi()
     {
@@ -173,7 +173,7 @@ public function testHandle()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testHandleWhenResponseIsNot200()
     {
diff --git a/Tests/HttpKernelTest.php b/Tests/HttpKernelTest.php
@@ -35,7 +35,7 @@ protected function setUp()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()
     {
@@ -45,7 +45,7 @@ public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testHandleWhenControllerThrowsAnExceptionAndRawIsFalseAndNoListenerIsRegistered()
     {
@@ -147,7 +147,7 @@ public function testHandleWhenNoControllerIsFound()
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      */
     public function testHandleWhenTheControllerIsNotACallable()
     {
@@ -199,7 +199,7 @@ public function testHandleWhenTheControllerIsAStaticArray()
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      */
     public function testHandleWhenTheControllerDoesNotReturnAResponse()
     {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function testRenderWhenRendererDoesNotExist()`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @expectedException InvalidArgumentException`
	`30`	`+ * @expectedException \InvalidArgumentException`
`31`	`31`	`*/`
`32`	`32`	`public function testRenderWithUnknownRenderer()`
`33`	`33`	`{`
`@@ -37,7 +37,7 @@ public function testRenderWithUnknownRenderer()`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * @expectedException RuntimeException`
	`40`	`+ * @expectedException \RuntimeException`
`41`	`41`	`* @expectedExceptionMessage Error when rendering "http://localhost/" (Status code is 404).`
`42`	`42`	`*/`
`43`	`43`	`public function testDeliverWithUnsuccessfulResponse()`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function testProcessEscapesPhpTags()`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/**`
`136`		`- * @expectedException RuntimeException`
	`136`	`+ * @expectedException \RuntimeException`
`137`	`137`	`*/`
`138`	`138`	`public function testProcessWhenNoSrcInAnEsi()`
`139`	`139`	`{`
`@@ -173,7 +173,7 @@ public function testHandle()`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`/**`
`176`		`- * @expectedException RuntimeException`
	`176`	`+ * @expectedException \RuntimeException`
`177`	`177`	`*/`
`178`	`178`	`public function testHandleWhenResponseIsNot200()`
`179`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ protected function setUp()`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
`38`		`- * @expectedException RuntimeException`
	`38`	`+ * @expectedException \RuntimeException`
`39`	`39`	`*/`
`40`	`40`	`public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()`
`41`	`41`	`{`
`@@ -45,7 +45,7 @@ public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`48`		`- * @expectedException RuntimeException`
	`48`	`+ * @expectedException \RuntimeException`
`49`	`49`	`*/`
`50`	`50`	`public function testHandleWhenControllerThrowsAnExceptionAndRawIsFalseAndNoListenerIsRegistered()`
`51`	`51`	`{`
`@@ -147,7 +147,7 @@ public function testHandleWhenNoControllerIsFound()`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`/**`
`150`		`- * @expectedException LogicException`
	`150`	`+ * @expectedException \LogicException`
`151`	`151`	`*/`
`152`	`152`	`public function testHandleWhenTheControllerIsNotACallable()`
`153`	`153`	`{`
`@@ -199,7 +199,7 @@ public function testHandleWhenTheControllerIsAStaticArray()`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`/**`
`202`		`- * @expectedException LogicException`
	`202`	`+ * @expectedException \LogicException`
`203`	`203`	`*/`
`204`	`204`	`public function testHandleWhenTheControllerDoesNotReturnAResponse()`
`205`	`205`	`{`