From 820c058de79268e7280e311c7234f26c2228f470 Mon Sep 17 00:00:00 2001
From: Guilhem Niot <guilhem@gniot.fr>
Date: Tue, 22 Dec 2020 11:27:56 +0100
Subject: [PATCH 1/2] Update build status with github actions

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b6c20e0..e7957b6 100644
--- a/README.md
+++ b/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)

From e57ede23ed765c86a4440b4cd4fde46ff7d67483 Mon Sep 17 00:00:00 2001
From: Guilhem Niot <guilhem.niot@gmail.com>
Date: Tue, 29 Dec 2020 10:27:09 +0100
Subject: [PATCH 2/2] Use annotations reader without cache

---
 DependencyInjection/Compiler/ConfigurationPass.php | 2 +-
 DependencyInjection/NelmioApiDocExtension.php      | 4 ++--
 Resources/config/fos_rest.xml                      | 2 +-
 Resources/config/services.xml                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DependencyInjection/Compiler/ConfigurationPass.php b/DependencyInjection/Compiler/ConfigurationPass.php
index 8ea1aca..c88f4c7 100644
--- a/DependencyInjection/Compiler/ConfigurationPass.php
+++ b/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'))
                 ->addTag('nelmio_api_doc.model_describer', ['priority' => 100]);
         }
     }
diff --git a/DependencyInjection/NelmioApiDocExtension.php b/DependencyInjection/NelmioApiDocExtension.php
index 8633e96..01c9f4a 100644
--- a/DependencyInjection/NelmioApiDocExtension.php
+++ b/DependencyInjection/NelmioApiDocExtension.php
@@ -87,7 +87,7 @@ final class NelmioApiDocExtension extends Extension implements PrependExtensionI
                 ->setArguments([
                     new Reference(sprintf('nelmio_api_doc.routes.%s', $area)),
                     new Reference('nelmio_api_doc.controller_reflector'),
-                    new Reference('annotation_reader'),
+                    new Reference('annotations.reader'),
                     new Reference('logger'),
                 ])
                 ->addTag(sprintf('nelmio_api_doc.describer.%s', $area), ['priority' => -200]);
@@ -160,7 +160,7 @@ final class NelmioApiDocExtension extends Extension implements PrependExtensionI
                 ->setArguments([
                     new Reference('jms_serializer.metadata_factory'),
                     $jmsNamingStrategy,
-                    new Reference('annotation_reader'),
+                    new Reference('annotations.reader'),
                 ])
                 ->addTag('nelmio_api_doc.model_describer', ['priority' => 50]);
 
diff --git a/Resources/config/fos_rest.xml b/Resources/config/fos_rest.xml
index dbf8f2f..d7ed724 100644
--- a/Resources/config/fos_rest.xml
+++ b/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 -->
 
             <tag name="nelmio_api_doc.route_describer" priority="-250" />
         </service>
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 540da54..5443cdd 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -40,7 +40,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 type="service" id="serializer.name_converter.metadata_aware" on-invalid="ignore" />