Skip to content

Commit 94b00b9

Browse files
committed
Merge branch '4.x' into 5.x
# Conflicts: # .symfony.bundle.yaml # README.md # composer.json # docs/index.rst
2 parents a65e1d7 + e629877 commit 94b00b9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
NelmioApiDocBundle
22
==================
33

4-
[![Build Status](https://img.shields.io/github/actions/workflow/status/nelmio/NelmioApiDocBundle/continuous-integration.yml?branch=master&style=flat-square)](https://github.com/nelmio/NelmioApiDocBundle/actions?query=workflow:CI)
5-
[![Codecov](https://img.shields.io/codecov/c/github/nelmio/NelmioApiDocBundle?branch=master&style=flat-square)](https://app.codecov.io/gh/nelmio/NelmioApiDocBundle)
4+
[![Build Status](https://img.shields.io/github/actions/workflow/status/nelmio/NelmioApiDocBundle/continuous-integration.yml?branch=4.x&style=flat-square)](https://github.com/nelmio/NelmioApiDocBundle/actions?query=workflow:CI)
5+
[![Codecov](https://img.shields.io/codecov/c/github/nelmio/NelmioApiDocBundle?branch=4.x&style=flat-square)](https://app.codecov.io/gh/nelmio/NelmioApiDocBundle)
66
[![Total Downloads](https://img.shields.io/packagist/dt/nelmio/api-doc-bundle?style=flat-square)](https://packagist.org/packages/nelmio/api-doc-bundle)
77
[![Latest Stable Version](https://img.shields.io/packagist/v/nelmio/api-doc-bundle?label=stable&style=flat-square)](https://packagist.org/packages/nelmio/api-doc-bundle)
88
[![PHP Version](https://img.shields.io/packagist/dependency-v/nelmio/api-doc-bundle/PHP?style=flat-square)](https://packagist.org/packages/nelmio/api-doc-bundle)
@@ -45,7 +45,7 @@ composer require nelmio/api-doc-bundle
4545
## Contributing
4646

4747
See
48-
[CONTRIBUTING](https://github.com/nelmio/NelmioApiDocBundle/blob/master/CONTRIBUTING.md)
48+
[CONTRIBUTING](https://github.com/nelmio/NelmioApiDocBundle/blob/4.x/CONTRIBUTING.md)
4949
file.
5050

5151
## Running the Tests

docs/customization.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Just create a file ``templates/bundles/NelmioApiDocBundle/SwaggerUi/index.html.t
6868
<script type="text/javascript" src="{{ asset('js/custom-request-signer.js') }}"></script>
6969
{% endblock javascripts %}
7070
71-
You can have a look at the `original template <https://github.com/nelmio/NelmioApiDocBundle/blob/master/templates/SwaggerUi/index.html.twig>`_, in ``/templates/SwaggerUi/index.html.twig``, to see which blocks can be overridden.
71+
You can have a look at the `original template <https://github.com/nelmio/NelmioApiDocBundle/blob/4.x/templates/SwaggerUi/index.html.twig>`_, in ``/templates/SwaggerUi/index.html.twig``, to see which blocks can be overridden.
7272

7373
Assets Loading Options
7474
-----------------------
@@ -85,7 +85,7 @@ The `html_config` settings allow you to configure how assets are loaded for the
8585
`assets_mode`
8686
~~~~~~~~~~~~~
8787

88-
The three values possible values can be found in `AssetsMode.php <https://github.com/nelmio/NelmioApiDocBundle/blob/master/src/Render/Html/AssetsMode.php>`_
88+
The three values possible values can be found in `AssetsMode.php <https://github.com/nelmio/NelmioApiDocBundle/blob/4.x/src/Render/Html/AssetsMode.php>`_
8989
- **cdn**: Loads assets from `jsDelivr <https://www.jsdelivr.com/>`_.
9090
- **bundle**: Fetches assets from the bundle in the vendor directory, including updates.
9191
- **offline**: Loads assets from the local `assets` directory, requiring the developer to update them manually.

docs/symfony_attributes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,4 +237,4 @@ Make sure to use at least php 8.1 (attribute support) to make use of this functi
237237
.. _`Symfony MapQueryParameter`: https://symfony.com/doc/current/controller.html#mapping-query-parameters-individually
238238
.. _`Symfony MapRequestPayload`: https://symfony.com/doc/current/controller.html#mapping-request-payload
239239
.. _`Symfony MapUploadedFile`: https://symfony.com/doc/current/controller.html#mapping-uploaded-files
240-
.. _`RouteArgumentDescriberInterface`: https://github.com/DjordyKoert/NelmioApiDocBundle/blob/master/src/RouteDescriber/RouteArgumentDescriber/RouteArgumentDescriberInterface.php
240+
.. _`RouteArgumentDescriberInterface`: https://github.com/DjordyKoert/NelmioApiDocBundle/blob/4.x/src/RouteDescriber/RouteArgumentDescriber/RouteArgumentDescriberInterface.php

0 commit comments

Comments
 (0)