Merge pull request #21 from retailcrm/fos-rest-remove

Remove the support of FosRestBundle, DunglasApiBundle and JmsSecurityExtra
retailcrm · Oct 1, 2024 · 49f4161 · 49f4161
2 parents 73f9b9e + 3ef60f2
commit 49f4161
Show file tree

Hide file tree

Showing 28 changed files with 50 additions and 4,537 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/DependencyInjection/LoadExtractorParsersPass.php b/DependencyInjection/LoadExtractorParsersPass.php
@@ -32,10 +32,5 @@ public function process(ContainerBuilder $container): void
         if ($container->hasDefinition('jms_serializer.serializer')) {
             $loader->load('services.jms.xml');
         }
-
-        // DunglasJsonLdApiBundle may or may not be installed, if it is, load that config as well
-        if ($container->hasDefinition('api.resource_collection')) {
-            $loader->load('services.dunglas_api.xml');
-        }
     }
 }
diff --git a/Extractor/Handler/FosRestHandler.php b/Extractor/Handler/FosRestHandler.php
diff --git a/Extractor/Handler/JmsSecurityExtraHandler.php b/Extractor/Handler/JmsSecurityExtraHandler.php
diff --git a/README.md b/README.md
@@ -1,12 +1,6 @@
 NelmioApiDocBundle
 ==================
 
-[![Build
-Status](https://secure.travis-ci.org/nelmio/NelmioApiDocBundle.png?branch=master)](http://travis-ci.org/nelmio/NelmioApiDocBundle)
-[![Total Downloads](https://poser.pugx.org/nelmio/api-doc-bundle/downloads)](https://packagist.org/packages/nelmio/api-doc-bundle)
-[![Latest Stable
-Version](https://poser.pugx.org/nelmio/api-doc-bundle/v/stable)](https://packagist.org/packages/nelmio/api-doc-bundle)
-
 The **NelmioApiDocBundle** bundle allows you to generate a decent documentation
 for your APIs.
 

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -9,8 +9,6 @@
         <parameter key="nelmio_api_doc.twig.extension.extra_markdown.class">Nelmio\ApiDocBundle\Twig\Extension\MarkdownExtension</parameter>
         <parameter key="nelmio_api_doc.doc_comment_extractor.class">Nelmio\ApiDocBundle\Util\DocCommentExtractor</parameter>
 
-        <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.phpdoc.class">Nelmio\ApiDocBundle\Extractor\Handler\PhpDocHandler</parameter>
 
         <parameter key="nelmio_api_doc.parser.collection_parser.class">Nelmio\ApiDocBundle\Parser\CollectionParser</parameter>
@@ -43,14 +41,6 @@
 
         <!-- Extractor Annotation Handlers -->
 
-        <service id="nelmio_api_doc.extractor.handler.fos_rest" class="%nelmio_api_doc.extractor.handler.fos_rest.class%" public="false">
-            <tag name="nelmio_api_doc.extractor.handler"/>
-        </service>
-
-        <service id="nelmio_api_doc.extractor.handler.jms_security" class="%nelmio_api_doc.extractor.handler.jms_security.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/dunglasapibundle.rst b/Resources/doc/dunglasapibundle.rst
diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
@@ -94,7 +94,6 @@ setup your API documentation:
     multiple-api-doc
     other-bundle-annotations
     swagger-support
-    dunglasapibundle
     sandbox
     commands
     configuration-in-depth

diff --git a/Resources/doc/other-bundle-annotations.rst b/Resources/doc/other-bundle-annotations.rst
@@ -1,14 +1,6 @@
 Other Bundle Annotations
 ========================
 
-This bundle will get information from the following other annotations:
-
-* ``@FOS\RestBundle\Controller\Annotations\RequestParam`` - use as ``parameters``
-* ``@FOS\RestBundle\Controller\Annotations\QueryParam`` - use as ``requirements``
-  (when strict parameter is true), ``filters`` (when strict is false)
-* ``@JMS\SecurityExtraBundle\Annotation\Secure`` - set ``authentication`` to true,
-  ``authenticationRoles`` to the given roles
-
 PHPDoc
 ------
 

diff --git a/Tests/Extractor/AnnotationsProvider/DunglasApiProviderTest.php b/Tests/Extractor/AnnotationsProvider/DunglasApiProviderTest.php