Merge pull request #2122 from meyerbaptiste/remove_sensio_framework_e…

…xtra_bundle Remove sensio/framework-extra-bundle from the dev dependencies
api-platform · Jul 25, 2018 · 8f70ce3 · 8f70ce3
2 parents b4e5c21 + 706ec15
commit 8f70ce3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -48,7 +48,6 @@
         "psr/log": "^1.0",
         "ramsey/uuid": "^3.7",
         "ramsey/uuid-doctrine": "^1.4",
-        "sensio/framework-extra-bundle": "^3.0.11 || ^4.0 || ^5.0",
         "symfony/asset": "^3.3 || ^4.0",
         "symfony/cache": "^3.3 || ^4.0",
         "symfony/config": "^3.4 || ^4.0",

diff --git a/tests/Fixtures/TestBundle/Controller/CustomActionController.php b/tests/Fixtures/TestBundle/Controller/CustomActionController.php
@@ -31,11 +31,11 @@ class CustomActionController extends Controller
      *     defaults={"_api_resource_class"=CustomActionDummy::class, "_api_item_operation_name"="custom_normalization"}
      * )
      */
-    public function customNormalizationAction(CustomActionDummy $_data)
+    public function customNormalizationAction(CustomActionDummy $data)
     {
-        $_data->setFoo('foo');
+        $data->setFoo('foo');
 
-        return $this->json($_data);
+        return $this->json($data);
     }
 
     /**

diff --git a/tests/Fixtures/app/AppKernel.php b/tests/Fixtures/app/AppKernel.php
@@ -17,7 +17,6 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use FOS\UserBundle\FOSUserBundle;
 use Nelmio\ApiDocBundle\NelmioApiDocBundle;
-use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
@@ -51,7 +50,6 @@ public function registerBundles(): array
             new FrameworkBundle(),
             new TwigBundle(),
             new DoctrineBundle(),
-            new SensioFrameworkExtraBundle(),
             new ApiPlatformBundle(),
             new SecurityBundle(),
             new FOSUserBundle(),

diff --git a/tests/Fixtures/app/config/config_test.yml b/tests/Fixtures/app/config/config_test.yml
@@ -26,10 +26,6 @@ doctrine:
 twig:
     strict_variables: '%kernel.debug%'
 
-sensio_framework_extra:
-    router:
-        annotations: false
-
 api_platform:
     title:                             'My Dummy API'
     description:                       'This is a test API.'