Merge pull request #17 from retailcrm/sensio-support-remove

Removed support of sensio/framework-extra-bundle
retailcrm · Sep 30, 2024 · 5bad727 · 5bad727
2 parents b72dfea + 45d1ed1
commit 5bad727
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 103 deletions.
diff --git a/Extractor/Handler/SensioFrameworkExtraHandler.php b/Extractor/Handler/SensioFrameworkExtraHandler.php
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -11,7 +11,6 @@
 
         <parameter key="nelmio_api_doc.extractor.handler.fos_rest.class">Nelmio\ApiDocBundle\Extractor\Handler\FosRestHandler</parameter>
         <parameter key="nelmio_api_doc.extractor.handler.jms_security.class">Nelmio\ApiDocBundle\Extractor\Handler\JmsSecurityExtraHandler</parameter>
-        <parameter key="nelmio_api_doc.extractor.handler.sensio_framework_extra.class">Nelmio\ApiDocBundle\Extractor\Handler\SensioFrameworkExtraHandler</parameter>
         <parameter key="nelmio_api_doc.extractor.handler.phpdoc.class">Nelmio\ApiDocBundle\Extractor\Handler\PhpDocHandler</parameter>
 
         <parameter key="nelmio_api_doc.parser.collection_parser.class">Nelmio\ApiDocBundle\Parser\CollectionParser</parameter>
@@ -53,10 +52,6 @@
             <tag name="nelmio_api_doc.extractor.handler"/>
         </service>
 
-        <service id="nelmio_api_doc.extractor.handler.sensio_framework_extra" class="%nelmio_api_doc.extractor.handler.sensio_framework_extra.class%" public="false">
-            <tag name="nelmio_api_doc.extractor.handler"/>
-        </service>
-
         <service id="nelmio_api_doc.extractor.handler.phpdoc" class="%nelmio_api_doc.extractor.handler.phpdoc.class%" public="false">
             <argument type="service" id="nelmio_api_doc.doc_comment_extractor" />
             <tag name="nelmio_api_doc.extractor.handler"/>

diff --git a/Resources/doc/other-bundle-annotations.rst b/Resources/doc/other-bundle-annotations.rst
@@ -8,7 +8,6 @@ This bundle will get information from the following other annotations:
   (when strict parameter is true), ``filters`` (when strict is false)
 * ``@JMS\SecurityExtraBundle\Annotation\Secure`` - set ``authentication`` to true,
   ``authenticationRoles`` to the given roles
-* ``@Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache`` - set ``cache``
 
 PHPDoc
 ------

diff --git a/Tests/Extractor/ApiDocExtractorTest.php b/Tests/Extractor/ApiDocExtractorTest.php
@@ -224,19 +224,6 @@ public function testGetWithAuthentication()
         $this->assertCount(2, $annotation->getAuthenticationRoles());
     }
 
-    public function testGetWithCache()
-    {
-        $container  = $this->getContainer();
-        $extractor  = $container->get('nelmio_api_doc.extractor.api_doc_extractor');
-        $annotation = $extractor->get('Nelmio\ApiDocBundle\Tests\Fixtures\Controller\TestController::zCachedAction', 'test_route_23');
-
-        $this->assertNotNull($annotation);
-        $this->assertEquals(
-            60,
-            $annotation->getCache()
-        );
-    }
-
     public function testGetWithDeprecated()
     {
         $container  = $this->getContainer();

diff --git a/Tests/Extractor/Handler/SensioFrameworkExtraHandlerTest.php b/Tests/Extractor/Handler/SensioFrameworkExtraHandlerTest.php
diff --git a/Tests/Fixtures/Controller/TestController.php b/Tests/Fixtures/Controller/TestController.php
@@ -15,12 +15,8 @@
 use FOS\RestBundle\Controller\Annotations\RequestParam;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Nelmio\ApiDocBundle\Tests\Fixtures\DependencyTypePath;
-use Nelmio\ApiDocBundle\Tests\Fixtures\RequestParamHelper;
-use Nelmio\ApiDocBundle\Util\LegacyFormHelper;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Constraints as Assert;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 
 class TestController
 {
@@ -219,15 +215,13 @@ public function authenticatedAction()
 
     /**
      * @ApiDoc()
-     * @Cache(maxage=60, public=1)
      */
     public function zCachedAction()
     {
     }
 
     /**
      * @ApiDoc()
-     * @Security("has_role('ROLE_USER')")
      */
     public function zSecuredAction()
     {

diff --git a/Tests/Formatter/testFormat-result.php b/Tests/Formatter/testFormat-result.php
@@ -2605,7 +2605,6 @@
                 array (
                     'method' => 'POST',
                     'uri' => '/zcached',
-                    'cache' => 60,
                     'https' => false,
                     'authentication' => false,
                     'authenticationRoles' =>
@@ -2618,7 +2617,7 @@
                     'method' => 'POST',
                     'uri' => '/zsecured',
                     'https' => false,
-                    'authentication' => true,
+                    'authentication' => false,
                     'authenticationRoles' =>
                         array (
                         ),

diff --git a/Tests/Formatter/testFormat-result_1.php b/Tests/Formatter/testFormat-result_1.php
@@ -2448,7 +2448,6 @@
     array (
       'method' => 'POST',
       'uri' => '/zcached',
-      'cache' => 60,
       'https' => false,
       'authentication' => false,
       'authenticationRoles' => 
@@ -2461,7 +2460,7 @@
       'method' => 'POST',
       'uri' => '/zsecured',
       'https' => false,
-      'authentication' => true,
+      'authentication' => false,
       'authenticationRoles' => 
       array (
       ),

diff --git a/composer.json b/composer.json
@@ -23,11 +23,11 @@
         "michelf/php-markdown": "~1.4"
     },
     "require-dev": {
+        "doctrine/annotations": "^1.0",
         "friendsofsymfony/rest-bundle": "^3.7",
-        "jms/serializer": "~3.15.0",
-        "jms/serializer-bundle": "4.1.0",
+        "jms/serializer": "^3.15",
+        "jms/serializer-bundle": "^4.1|^5.4",
         "phpunit/phpunit": "~9.5",
-        "sensio/framework-extra-bundle": "^6.2",
         "symfony/asset": "^5.0|^6.0",
         "symfony/browser-kit": "^5.0|^6.0",
         "symfony/translation": "^5.0|^6.0",