Merge branch '3.x'

DependencyInjection/Compiler/ConfigurationPass.php

@@ -29,7 +29,7 @@ final class ConfigurationPass implements CompilerPassInterface
             $container->register('nelmio_api_doc.model_describers.form', FormModelDescriber::class)
                 ->setPublic(false)
                 ->addArgument(new Reference('form.factory'))
-                ->addArgument(new Reference('annotation_reader'))
+                ->addArgument(new Reference('annotations.reader'))
                 ->addArgument($container->getParameter('nelmio_api_doc.media_types'))
                 ->addTag('nelmio_api_doc.model_describer', ['priority' => 100]);
         }

README.md

@@ -1,8 +1,7 @@
 NelmioApiDocBundle
 ==================
 
-[![Build
-Status](https://travis-ci.org/nelmio/NelmioApiDocBundle.svg?branch=master)](http://travis-ci.org/nelmio/NelmioApiDocBundle)
+[![Build Status](https://img.shields.io/github/workflow/status/nelmio/NelmioApiDocBundle/CI?style=flat-square)](https://github.com/nelmio/NelmioApiDocBundle/actions?query=workflow:CI) 
 [![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)

Resources/config/fos_rest.xml

@@ -5,7 +5,7 @@
 
     <services>
         <service id="nelmio_api_doc.route_describers.fos_rest" class="Nelmio\ApiDocBundle\RouteDescriber\FosRestDescriber" public="false">
-            <argument type="service" id="annotation_reader" />
+            <argument type="service" id="annotation_reader" /> <!-- we don't deal with @OA annotations in this describer so we can use the cached reader -->
             <argument />
 
             <tag name="nelmio_api_doc.route_describer" priority="-250" />

Resources/config/services.xml

@@ -46,7 +46,7 @@
         <!-- Model Describers -->
         <service id="nelmio_api_doc.model_describers.object" class="Nelmio\ApiDocBundle\ModelDescriber\ObjectModelDescriber" public="false">
             <argument type="service" id="property_info" />
-            <argument type="service" id="annotation_reader" />
+            <argument type="service" id="annotations.reader" />
             <argument type="tagged" tag="nelmio_api_doc.object_model.property_describer" />
             <argument />
             <argument type="service" id="serializer.name_converter.metadata_aware" on-invalid="ignore" />