minor #29602 [DX] rename unit test controller (frankdejonge)

nicolas-grekas · nicolas-grekas · commit 509d952cf5de · 2018-12-14T13:14:40.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [DX] rename unit test controller | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? |no | New feature? |no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Whenever I create a new controller the actually needed controller shows up second in the list of auto-completion. The first suggestion is a class defined in the test and should not ever be extended in the application. This PR renames it so that doesn't happen anymore. Example of the autocomplete issue: <img width="748" alt="screenshot 2018-12-14 at 10 33 26" src="https://user-images.githubusercontent.com/534693/49995500-a09dca80-ff8c-11e8-80b5-18890ff058b1.png"> Commits ------- d4e426c Renamed test controller from Controller to TestController so it doesn't show up in the IDE autocomplete.
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -200,7 +200,7 @@ public function testHandleWhenTheControllerIsAClosure()
     public function testHandleWhenTheControllerIsAnObjectWithInvoke()
     {
         $dispatcher = new EventDispatcher();
-        $kernel = $this->getHttpKernel($dispatcher, new Controller());
+        $kernel = $this->getHttpKernel($dispatcher, new TestController());
 
         $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
     }
@@ -216,15 +216,15 @@ public function testHandleWhenTheControllerIsAFunction()
     public function testHandleWhenTheControllerIsAnArray()
     {
         $dispatcher = new EventDispatcher();
-        $kernel = $this->getHttpKernel($dispatcher, array(new Controller(), 'controller'));
+        $kernel = $this->getHttpKernel($dispatcher, array(new TestController(), 'controller'));
 
         $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
     }
 
     public function testHandleWhenTheControllerIsAStaticArray()
     {
         $dispatcher = new EventDispatcher();
-        $kernel = $this->getHttpKernel($dispatcher, array('Symfony\Component\HttpKernel\Tests\Controller', 'staticcontroller'));
+        $kernel = $this->getHttpKernel($dispatcher, array('Symfony\Component\HttpKernel\Tests\TestController', 'staticcontroller'));
 
         $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
     }
@@ -381,7 +381,7 @@ private function assertResponseEquals(Response $expected, Response $actual)
     }
 }
 
-class Controller
+class TestController
 {
     public function __invoke()
     {

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public function testHandleWhenTheControllerIsAClosure()`
`200`	`200`	`public function testHandleWhenTheControllerIsAnObjectWithInvoke()`
`201`	`201`	`{`
`202`	`202`	`$dispatcher = new EventDispatcher();`
`203`		`- $kernel = $this->getHttpKernel($dispatcher, new Controller());`
	`203`	`+ $kernel = $this->getHttpKernel($dispatcher, new TestController());`
`204`	`204`
`205`	`205`	`$this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));`
`206`	`206`	`}`
`@@ -216,15 +216,15 @@ public function testHandleWhenTheControllerIsAFunction()`
`216`	`216`	`public function testHandleWhenTheControllerIsAnArray()`
`217`	`217`	`{`
`218`	`218`	`$dispatcher = new EventDispatcher();`
`219`		`- $kernel = $this->getHttpKernel($dispatcher, array(new Controller(), 'controller'));`
	`219`	`+ $kernel = $this->getHttpKernel($dispatcher, array(new TestController(), 'controller'));`
`220`	`220`
`221`	`221`	`$this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`public function testHandleWhenTheControllerIsAStaticArray()`
`225`	`225`	`{`
`226`	`226`	`$dispatcher = new EventDispatcher();`
`227`		`- $kernel = $this->getHttpKernel($dispatcher, array('Symfony\Component\HttpKernel\Tests\Controller', 'staticcontroller'));`
	`227`	`+ $kernel = $this->getHttpKernel($dispatcher, array('Symfony\Component\HttpKernel\Tests\TestController', 'staticcontroller'));`
`228`	`228`
`229`	`229`	`$this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));`
`230`	`230`	`}`
`@@ -381,7 +381,7 @@ private function assertResponseEquals(Response $expected, Response $actual)`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`
`384`		`-class Controller`
	`384`	`+class TestController`
`385`	`385`	`{`
`386`	`386`	`public function __invoke()`
`387`	`387`	`{`