Merge pull request #2108 from jenaye/route/deprecationNotice

[Route] Update framework-extra-bundle annotation

Author: teohhanhui

composer.json

@@ -48,7 +48,7 @@
         "psr/log": "^1.0",
         "ramsey/uuid": "^3.7",
         "ramsey/uuid-doctrine": "^1.4",
-        "sensio/framework-extra-bundle": "^3.0.11 || ^4.0",
+        "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",

tests/Fixtures/TestBundle/Controller/CustomActionController.php

@@ -14,10 +14,9 @@
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Controller;
 
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CustomActionDummy;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @author Kévin Dunglas <[email protected]>
@@ -26,11 +25,11 @@ class CustomActionController extends Controller
 {
     /**
      * @Route(
+     *     methods={"GET"},
      *     name="custom_normalization",
      *     path="/custom/{id}/normalization",
      *     defaults={"_api_resource_class"=CustomActionDummy::class, "_api_item_operation_name"="custom_normalization"}
      * )
-     * @Method("GET")
      */
     public function customNormalizationAction(CustomActionDummy $_data)
     {
@@ -41,6 +40,7 @@ public function customNormalizationAction(CustomActionDummy $_data)
 
     /**
      * @Route(
+     *     methods={"POST"},
      *     name="custom_denormalization",
      *     path="/custom/denormalization",
      *     defaults={
@@ -49,7 +49,6 @@ public function customNormalizationAction(CustomActionDummy $_data)
      *         "_api_receive"=false
      *     }
      * )
-     * @Method("POST")
      */
     public function customDenormalizationAction(Request $request)
     {
@@ -65,11 +64,11 @@ public function customDenormalizationAction(Request $request)
 
     /**
      * @Route(
+     *     methods={"GET"},
      *     name="short_custom_normalization",
      *     path="/short_custom/{id}/normalization",
      *     defaults={"_api_resource_class"=CustomActionDummy::class, "_api_item_operation_name"="custom_normalization"}
      * )
-     * @Method("GET")
      */
     public function shortCustomNormalizationAction(CustomActionDummy $data)
     {
@@ -80,6 +79,7 @@ public function shortCustomNormalizationAction(CustomActionDummy $data)
 
     /**
      * @Route(
+     *     methods={"POST"},
      *     name="short_custom_denormalization",
      *     path="/short_custom/denormalization",
      *     defaults={
@@ -88,7 +88,6 @@ public function shortCustomNormalizationAction(CustomActionDummy $data)
      *         "_api_receive"=false
      *     }
      * )
-     * @Method("POST")
      */
     public function shortCustomDenormalizationAction(Request $request)
     {

tests/Fixtures/TestBundle/Controller/DummyValidationController.php

@@ -14,18 +14,17 @@
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Controller;
 
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyValidation;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\Routing\Annotation\Route;
 
 class DummyValidationController
 {
     /**
      * @Route(
+     *     methods={"POST"},
      *     name="post_validation_groups",
      *     path="/dummy_validation/validation_groups",
      *     defaults={"_api_resource_class"=DummyValidation::class, "_api_collection_operation_name"="post_validation_groups"}
      * )
-     * @Method("POST")
      */
     public function postValidationGroups($data)
     {
@@ -34,11 +33,11 @@ public function postValidationGroups($data)
 
     /**
      * @Route(
+     *     methods={"POST"},
      *     name="post_validation_sequence",
      *     path="/dummy_validation/validation_sequence",
      *     defaults={"_api_resource_class"=DummyValidation::class, "_api_collection_operation_name"="post_validation_sequence"}
      * )
-     * @Method("POST")
      */
     public function postValidationSequence($data)
     {

tests/Fixtures/app/config/config_test.yml

@@ -26,6 +26,10 @@ doctrine:
 twig:
     strict_variables: '%kernel.debug%'
 
+sensio_framework_extra:
+    router:
+        annotations: false
+
 api_platform:
     title:                             'My Dummy API'
     description:                       'This is a test API.'