replace Controller with AbstractController

xabbuh · xabbuh · commit 8e009b760a3a · 2019-01-01T17:42:46.000+01:00
diff --git a/Tests/Fixtures/Controller/AnnotatedConditionalUsersController.php b/Tests/Fixtures/Controller/AnnotatedConditionalUsersController.php
@@ -22,10 +22,10 @@
 use FOS\RestBundle\Controller\Annotations\Put;
 use FOS\RestBundle\Controller\Annotations\Route;
 use FOS\RestBundle\Controller\Annotations\Unlink;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use FOS\RestBundle\Tests\Fixtures\User;
 
-class AnnotatedConditionalUsersController extends Controller
+class AnnotatedConditionalUsersController extends AbstractController
 {
     /**
      * [OPTIONS]     /users.
diff --git a/Tests/Fixtures/Controller/AnnotatedNonPluralizedArticleController.php b/Tests/Fixtures/Controller/AnnotatedNonPluralizedArticleController.php
@@ -11,13 +11,13 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
+use FOS\RestBundle\Controller\AbstractFOSRestController;
 use FOS\RestBundle\Controller\Annotations as Rest;
-use FOS\RestBundle\Controller\FOSRestController;
 
 /**
  *  @Rest\RouteResource("Article", pluralize=false)
  */
-class AnnotatedNonPluralizedArticleController extends FOSRestController
+class AnnotatedNonPluralizedArticleController extends AbstractFOSRestController
 {
     /**
      * [GET] /article.
diff --git a/Tests/Fixtures/Controller/AnnotatedPrefixedController.php b/Tests/Fixtures/Controller/AnnotatedPrefixedController.php
@@ -12,14 +12,14 @@
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
 use FOS\RestBundle\Controller\Annotations\Prefix;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @author Donald Tyler <chekote69@gmail.com>
  * @Prefix("aprefix")
  */
-class AnnotatedPrefixedController extends Controller
+class AnnotatedPrefixedController extends AbstractController
 {
     /**
      * [GET]     /aprefix/something.{_format}.
diff --git a/Tests/Fixtures/Controller/AnnotatedUsersController.php b/Tests/Fixtures/Controller/AnnotatedUsersController.php
@@ -29,9 +29,9 @@
 use FOS\RestBundle\Controller\Annotations\Route;
 use FOS\RestBundle\Controller\Annotations\Unlink;
 use FOS\RestBundle\Controller\Annotations\Unlock;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class AnnotatedUsersController extends Controller
+class AnnotatedUsersController extends AbstractController
 {
     /**
      * @Options
diff --git a/Tests/Fixtures/Controller/AnnotatedVersionUserController.php b/Tests/Fixtures/Controller/AnnotatedVersionUserController.php
@@ -13,12 +13,12 @@
 
 use FOS\RestBundle\Controller\Annotations\Version;
 use FOS\RestBundle\Controller\Annotations\Get;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
  * @Version({"v1", "v3"})
  */
-class AnnotatedVersionUserController extends Controller
+class AnnotatedVersionUserController extends AbstractController
 {
     /**
      * [GET, HEAD]     /users/{slug}/v2.
diff --git a/Tests/Fixtures/Controller/ArticleController.php b/Tests/Fixtures/Controller/ArticleController.php
@@ -13,11 +13,11 @@
 
 use FOS\RestBundle\Controller\ControllerTrait;
 use FOS\RestBundle\Routing\ClassResourceInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Validator\ConstraintViolationList;
 
-class ArticleController extends Controller implements ClassResourceInterface
+class ArticleController extends AbstractController implements ClassResourceInterface
 {
     use ControllerTrait;
 
diff --git a/Tests/Fixtures/Controller/Directory/UserTopicCommentsController.php b/Tests/Fixtures/Controller/Directory/UserTopicCommentsController.php
@@ -11,9 +11,9 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller\Directory;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class UserTopicCommentsController extends Controller
+class UserTopicCommentsController extends AbstractController
 {
     public function getCommentsAction($slug, $title)
     {
diff --git a/Tests/Fixtures/Controller/Directory/UserTopicsController.php b/Tests/Fixtures/Controller/Directory/UserTopicsController.php
@@ -11,9 +11,9 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller\Directory;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class UserTopicsController extends Controller
+class UserTopicsController extends AbstractController
 {
     public function getTopicsAction($slug)
     {
diff --git a/Tests/Fixtures/Controller/Directory/UsersController.php b/Tests/Fixtures/Controller/Directory/UsersController.php
@@ -11,9 +11,9 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller\Directory;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class UsersController extends Controller
+class UsersController extends AbstractController
 {
     public function getUsersAction()
     {
diff --git a/Tests/Fixtures/Controller/InformationController.php b/Tests/Fixtures/Controller/InformationController.php
@@ -13,9 +13,9 @@
 
 use FOS\RestBundle\Controller\ControllerTrait;
 use FOS\RestBundle\Routing\ClassResourceInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class InformationController extends Controller implements ClassResourceInterface
+class InformationController extends AbstractController implements ClassResourceInterface
 {
     use ControllerTrait;
 
diff --git a/Tests/Fixtures/Controller/MediaController.php b/Tests/Fixtures/Controller/MediaController.php
@@ -13,9 +13,9 @@
 
 use FOS\RestBundle\Controller\ControllerTrait;
 use FOS\RestBundle\Routing\ClassResourceInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class MediaController extends Controller implements ClassResourceInterface
+class MediaController extends AbstractController implements ClassResourceInterface
 {
     use ControllerTrait;
 
diff --git a/Tests/Fixtures/Controller/OrdersController.php b/Tests/Fixtures/Controller/OrdersController.php
@@ -11,9 +11,9 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class OrdersController extends Controller
+class OrdersController extends AbstractController
 {
     /**
      * [GET] /foos.
diff --git a/Tests/Fixtures/Controller/ReportController.php b/Tests/Fixtures/Controller/ReportController.php
@@ -13,12 +13,12 @@
 
 use FOS\RestBundle\Controller\Annotations as Rest;
 use FOS\RestBundle\Controller\ControllerTrait;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
  * Class ReportController.
  */
-class ReportController extends Controller
+class ReportController extends AbstractController
 {
     use ControllerTrait;
 
diff --git a/Tests/Fixtures/Controller/UserTopicCommentsController.php b/Tests/Fixtures/Controller/UserTopicCommentsController.php
@@ -11,9 +11,9 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class UserTopicCommentsController extends Controller
+class UserTopicCommentsController extends AbstractController
 {
     /**
      * [GET] /users/{slug}/topics/{title}/comments.
diff --git a/Tests/Fixtures/Controller/UserTopicsController.php b/Tests/Fixtures/Controller/UserTopicsController.php
@@ -11,9 +11,9 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class UserTopicsController extends Controller
+class UserTopicsController extends AbstractController
 {
     /**
      * [GET] /users/{slug}/topics.
diff --git a/Tests/Fixtures/Controller/UsersController.php b/Tests/Fixtures/Controller/UsersController.php
@@ -11,10 +11,10 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 
-class UsersController extends Controller
+class UsersController extends AbstractController
 {
     public function copyUserAction($id)
     {
diff --git a/Tests/Functional/Bundle/TestBundle/Controller/ArticleController.php b/Tests/Functional/Bundle/TestBundle/Controller/ArticleController.php
@@ -11,15 +11,15 @@
 
 namespace FOS\RestBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use FOS\RestBundle\Controller\AbstractFOSRestController;
 use Symfony\Component\HttpFoundation\Request;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
 use FOS\RestBundle\Controller\Annotations\View;
-use FOS\RestBundle\Controller\FOSRestController;
 
 /**
  * @RouteResource("Article")
  */
-class ArticleController extends FOSRestController
+class ArticleController extends AbstractFOSRestController
 {
     /**
      * Create a new resource.
diff --git a/Tests/Functional/Bundle/TestBundle/Controller/ParamFetcherController.php b/Tests/Functional/Bundle/TestBundle/Controller/ParamFetcherController.php
@@ -11,8 +11,8 @@
 
 namespace FOS\RestBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use FOS\RestBundle\Controller\AbstractFOSRestController;
 use FOS\RestBundle\Controller\Annotations\FileParam;
-use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Controller\Annotations\QueryParam;
 use FOS\RestBundle\Controller\Annotations\RequestParam;
 use FOS\RestBundle\Request\ParamFetcherInterface;
@@ -22,7 +22,7 @@
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Validator\Constraints\IdenticalTo;
 
-class ParamFetcherController extends FOSRestController
+class ParamFetcherController extends AbstractFOSRestController
 {
     /**
      * @RequestParam(name="raw", requirements=@IdenticalTo({"foo"="raw", "bar"="foo"}), default="invalid", strict=false)
diff --git a/Tests/Functional/Bundle/TestBundle/Controller/RequestBodyParamConverterController.php b/Tests/Functional/Bundle/TestBundle/Controller/RequestBodyParamConverterController.php
@@ -12,10 +12,10 @@
 namespace FOS\RestBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 
-class RequestBodyParamConverterController extends Controller
+class RequestBodyParamConverterController extends AbstractController
 {
     /**
      * @ParamConverter("post", converter="fos_rest.request_body")
diff --git a/Tests/Functional/Bundle/TestBundle/Controller/SerializerErrorController.php b/Tests/Functional/Bundle/TestBundle/Controller/SerializerErrorController.php
@@ -12,15 +12,15 @@
 namespace FOS\RestBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
 use FOS\RestBundle\Controller\Annotations\View;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
  * Controller to test serialization of various errors and exceptions.
  *
  * @author Florian Voutzinos <florian@voutzinos.com>
  */
-class SerializerErrorController extends Controller
+class SerializerErrorController extends AbstractController
 {
     /**
      * @View
diff --git a/Tests/Functional/Bundle/TestBundle/Controller/Version2Controller.php b/Tests/Functional/Bundle/TestBundle/Controller/Version2Controller.php
@@ -11,18 +11,18 @@
 
 namespace FOS\RestBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use FOS\RestBundle\Controller\AbstractFOSRestController;
 use FOS\RestBundle\Controller\Annotations\Get;
 use FOS\RestBundle\Controller\Annotations\Version;
 use FOS\RestBundle\Controller\Annotations\View;
-use FOS\RestBundle\Controller\FOSRestController;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @author Ener-Getick <egetick@gmail.com>
  *
  * @Version({"1.2"})
  */
-class Version2Controller extends FOSRestController
+class Version2Controller extends AbstractFOSRestController
 {
     /**
      * @View("TestBundle:Version:version.html.twig")
diff --git a/Tests/Functional/Bundle/TestBundle/Controller/VersionController.php b/Tests/Functional/Bundle/TestBundle/Controller/VersionController.php
@@ -11,14 +11,14 @@
 
 namespace FOS\RestBundle\Tests\Functional\Bundle\TestBundle\Controller;
 
+use FOS\RestBundle\Controller\AbstractFOSRestController;
 use FOS\RestBundle\Controller\Annotations\View;
-use FOS\RestBundle\Controller\FOSRestController;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @author Ener-Getick <egetick@gmail.com>
  */
-class VersionController extends FOSRestController
+class VersionController extends AbstractFOSRestController
 {
     /**
      * @View("TestBundle:Version:version.html.twig")
diff --git a/Tests/Functional/app/config/default.yml b/Tests/Functional/app/config/default.yml
@@ -1,2 +1,3 @@
 imports:
     - { resource: framework.yml }
+    - { resource: services.yaml }
diff --git a/Tests/Functional/app/config/services.yaml b/Tests/Functional/app/config/services.yaml
@@ -0,0 +1,6 @@
+services:
+    FOS\RestBundle\Tests\Functional\Bundle\TestBundle\Controller\:
+        resource: '../../Bundle/TestBundle/Controller/*'
+        public: true
+        autoconfigure: true
+        autowire: true

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace FOS\RestBundle\Tests\Fixtures\Controller\Directory;`
`13`	`13`
`14`		`-use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
	`14`	`+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;`
`15`	`15`
`16`		`-class UserTopicCommentsController extends Controller`
	`16`	`+class UserTopicCommentsController extends AbstractController`
`17`	`17`	`{`
`18`	`18`	`public function getCommentsAction($slug, $title)`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`
`14`	`14`	`use FOS\RestBundle\Controller\ControllerTrait;`
`15`	`15`	`use FOS\RestBundle\Routing\ClassResourceInterface;`
`16`		`-use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
	`16`	`+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;`
`17`	`17`
`18`		`-class InformationController extends Controller implements ClassResourceInterface`
	`18`	`+class InformationController extends AbstractController implements ClassResourceInterface`
`19`	`19`	`{`
`20`	`20`	`use ControllerTrait;`
`21`	`21`