RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-02 15:51:48 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1134 from dunglas/fix-34-40-compat

Browse Source 
[2.x] Fix compatibility with Symfony 3.4 and 4.0
This commit is contained in:
Guilhem N 2017-12-05 07:14:09 +01:00 committed by GitHub
commit f0a606b636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/config/formatters.xml
View File

@ -19,7 +19,7 @@
<service id="nelmio_api_doc.formatter.simple_formatter" class="%nelmio_api_doc.formatter.simple_formatter.class%" <service id="nelmio_api_doc.formatter.simple_formatter" class="%nelmio_api_doc.formatter.simple_formatter.class%"
parent="nelmio_api_doc.formatter.abstract_formatter" /> parent="nelmio_api_doc.formatter.abstract_formatter" />
<service id="nelmio_api_doc.formatter.html_formatter" class="%nelmio_api_doc.formatter.html_formatter.class%" <service id="nelmio_api_doc.formatter.html_formatter" class="%nelmio_api_doc.formatter.html_formatter.class%"
parent="nelmio_api_doc.formatter.abstract_formatter"> parent="nelmio_api_doc.formatter.abstract_formatter" public="true">
<call method="setTemplatingEngine"> <call method="setTemplatingEngine">
<argument type="service" id="templating" /> <argument type="service" id="templating" />
</call> </call>
@ -61,7 +61,7 @@
</call> </call>
</service> </service>
<service id="nelmio_api_doc.formatter.swagger_formatter" class="%nelmio_api_doc.formatter.swagger_formatter.class%" <service id="nelmio_api_doc.formatter.swagger_formatter" class="%nelmio_api_doc.formatter.swagger_formatter.class%"
parent="nelmio_api_doc.formatter.abstract_formatter" /> parent="nelmio_api_doc.formatter.abstract_formatter" public="true" />
</services> </services>
</container> </container>

2
Resources/config/services.xml
View File

@ -26,7 +26,7 @@
<argument type="service" id="kernel" /> <argument type="service" id="kernel" />
</service> </service>
<service id="nelmio_api_doc.extractor.api_doc_extractor" class="%nelmio_api_doc.extractor.api_doc_extractor.class%"> <service id="nelmio_api_doc.extractor.api_doc_extractor" class="%nelmio_api_doc.extractor.api_doc_extractor.class%" public="true">
<argument type="service" id="service_container" /> <argument type="service" id="service_container" />
<argument type="service" id="router" /> <argument type="service" id="router" />
<argument type="service" id="annotation_reader" /> <argument type="service" id="annotation_reader" />

24
composer.json
View File

@ -16,9 +16,9 @@
], ],
"require": { "require": {
"php": ">=5.4", "php": ">=5.4",
"symfony/twig-bundle": "~2.3|~3.0", "symfony/twig-bundle": "~2.3|~3.0|~4.0",
"symfony/framework-bundle": "~2.3|~3.0", "symfony/framework-bundle": "~2.3|~3.0|~4.0",
"symfony/console": "~2.3|~3.0", "symfony/console": "~2.3|~3.0|~4.0",
"michelf/php-markdown": "~1.4" "michelf/php-markdown": "~1.4"
}, },
"conflict": { "conflict": {
@ -28,20 +28,20 @@
"symfony/symfony": "~2.7.8" "symfony/symfony": "~2.7.8"
}, },
"require-dev": { "require-dev": {
"symfony/css-selector": "~2.3|~3.0", "symfony/css-selector": "~2.3|~3.0|~4.0",
"symfony/browser-kit": "~2.3|~3.0", "symfony/browser-kit": "~2.3|~3.0|~4.0",
"symfony/validator": "~2.3|~3.0", "symfony/validator": "~2.3|~3.0|~4.0",
"symfony/yaml": "~2.3|~3.0", "symfony/yaml": "~2.3|~3.0|~4.0",
"symfony/form": "~2.3|~3.0", "symfony/form": "~2.3|~3.0|~4.0",
"symfony/finder": "~2.3|~3.0", "symfony/finder": "~2.3|~3.0|~4.0",
"symfony/serializer": "~2.7|~3.0", "symfony/serializer": "~2.7|~3.0|~4.0",
"doctrine/orm": "~2.3", "doctrine/orm": "~2.3",
"doctrine/doctrine-bundle": "~1.5", "doctrine/doctrine-bundle": "~1.5",
"friendsofsymfony/rest-bundle": "~1.0|~2.0", "friendsofsymfony/rest-bundle": "~1.0|~2.0",
"jms/serializer-bundle": ">=0.11", "jms/serializer-bundle": ">=0.11",
"dunglas/api-bundle": "~1.0@dev", "dunglas/api-bundle": "~1.0",
"sensio/framework-extra-bundle": "~3.0", "sensio/framework-extra-bundle": "~3.0",
"symfony/phpunit-bridge": "~2.7|~3.0" "symfony/phpunit-bridge": "~2.7|~3.0|~4.0"
}, },
"suggest": { "suggest": {
"symfony/form": "For using form definitions as input.", "symfony/form": "For using form definitions as input.",