Remove abstract class and use Interface+Trait

blanchonvincent · Tobion · commit 52c50e3b1e15 · 2015-11-04T18:03:42.000+01:00
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
	src/Symfony/Component/DependencyInjection/ContainerAware.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -35,8 +36,10 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-abstract class Controller extends ContainerAware
+abstract class Controller implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     /**
      * Generates a URL from the given parameters.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -11,7 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -23,8 +24,10 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class RedirectController extends ContainerAware
+class RedirectController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     /**
      * Redirects to another route with the given name.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -11,16 +11,19 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
  * TemplateController.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class TemplateController extends ContainerAware
+class TemplateController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     /**
      * Renders a template.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/FragmentController.php
@@ -11,12 +11,15 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\DependencyInjection\ContainerAware;
 
-class FragmentController extends ContainerAware
+class FragmentController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     public function indexAction(Request $request)
     {
         return $this->container->get('templating')->renderResponse('fragment.html.php', array('bar' => new Bar()));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php
@@ -11,11 +11,14 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\DependencyInjection\ContainerAware;
 
-class ProfilerController extends ContainerAware
+class ProfilerController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     public function indexAction()
     {
         return new Response('Hello');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
@@ -11,13 +11,16 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\DependencyInjection\ContainerAware;
 
-class SessionController extends ContainerAware
+class SessionController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     public function welcomeAction(Request $request, $name = null)
     {
         $session = $request->getSession();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
@@ -11,13 +11,16 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 
-class SubRequestController extends ContainerAware
+class SubRequestController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     public function indexAction()
     {
         $handler = $this->container->get('fragment.handler');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php
@@ -11,12 +11,15 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
-class LoginController extends ContainerAware
+class LoginController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     public function loginAction()
     {
         $form = $this->container->get('form.factory')->create('Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Form\UserLoginType');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
@@ -11,13 +11,16 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller;
 
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\DependencyInjection\ContainerAware;
 
-class LocalizedController extends ContainerAware
+class LocalizedController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     public function loginAction(Request $request)
     {
         // get the login error if there is one
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
@@ -11,14 +11,17 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller;
 
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\DependencyInjection\ContainerAware;
 
-class LoginController extends ContainerAware
+class LoginController implements ContainerAwareInterface
 {
+    use ContainerAwareTrait;
+
     public function loginAction(Request $request)
     {
         // get the login error if there is one
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -11,7 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Bundle;
 
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Console\Application;
@@ -24,8 +25,10 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-abstract class Bundle extends ContainerAware implements BundleInterface
+abstract class Bundle implements BundleInterface
 {
+    use ContainerAwareTrait;
+
     protected $name;
     protected $extension;
     protected $path;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Controller;`
`13`	`13`
`14`		`-use Symfony\Component\DependencyInjection\ContainerAware;`
	`14`	`+use Symfony\Component\DependencyInjection\ContainerAwareInterface;`
	`15`	`+use Symfony\Component\DependencyInjection\ContainerAwareTrait;`
`15`	`16`	`use Symfony\Component\HttpFoundation\RedirectResponse;`
`16`	`17`	`use Symfony\Component\HttpFoundation\Request;`
`17`	`18`	`use Symfony\Component\HttpFoundation\Response;`
`@@ -23,8 +24,10 @@`
`23`	`24`	`*`
`24`	`25`	`* @author Fabien Potencier <[email protected]>`
`25`	`26`	`*/`
`26`		`-class RedirectController extends ContainerAware`
	`27`	`+class RedirectController implements ContainerAwareInterface`
`27`	`28`	`{`
	`29`	`+ use ContainerAwareTrait;`
	`30`	`+`
`28`	`31`	`/**`
`29`	`32`	`* Redirects to another route with the given name.`
`30`	`33`	`*`
Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,19 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Controller;`
`13`	`13`
`14`		`-use Symfony\Component\DependencyInjection\ContainerAware;`
	`14`	`+use Symfony\Component\DependencyInjection\ContainerAwareInterface;`
	`15`	`+use Symfony\Component\DependencyInjection\ContainerAwareTrait;`
`15`	`16`	`use Symfony\Component\HttpFoundation\Response;`
`16`	`17`
`17`	`18`	`/**`
`18`	`19`	`* TemplateController.`
`19`	`20`	`*`
`20`	`21`	`* @author Fabien Potencier <[email protected]>`
`21`	`22`	`*/`
`22`		`-class TemplateController extends ContainerAware`
	`23`	`+class TemplateController implements ContainerAwareInterface`
`23`	`24`	`{`
	`25`	`+ use ContainerAwareTrait;`
	`26`	`+`
`24`	`27`	`/**`
`25`	`28`	`* Renders a template.`
`26`	`29`	`*`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,14 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;`
`13`	`13`
	`14`	`+use Symfony\Component\DependencyInjection\ContainerAwareInterface;`
	`15`	`+use Symfony\Component\DependencyInjection\ContainerAwareTrait;`
`14`	`16`	`use Symfony\Component\HttpFoundation\Response;`
`15`		`-use Symfony\Component\DependencyInjection\ContainerAware;`
`16`	`17`
`17`		`-class ProfilerController extends ContainerAware`
	`18`	`+class ProfilerController implements ContainerAwareInterface`
`18`	`19`	`{`
	`20`	`+ use ContainerAwareTrait;`
	`21`	`+`
`19`	`22`	`public function indexAction()`
`20`	`23`	`{`
`21`	`24`	`return new Response('Hello');`