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

Merge branch 'master' of github.com:nelmio/NelmioApiDocBundle

Browse Source
This commit is contained in:
kopaygorodsky 2017-11-11 13:23:05 +02:00
commit d0a6dffa11
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Describer/DefaultDescriber.php
View File

@ -38,7 +38,7 @@ final class DefaultDescriber implements DescriberInterface
$operation = $path->getOperation($method); $operation = $path->getOperation($method);
// Default Response // Default Response
if (0 === count($operation->getResponses())) { if (0 === iterator_count($operation->getResponses())) {
$defaultResponse = $operation->getResponses()->get('default'); $defaultResponse = $operation->getResponses()->get('default');
$defaultResponse->setDescription(''); $defaultResponse->setDescription('');
} }

6
Resources/config/services.xml
View File

@ -5,17 +5,17 @@
<services> <services>
<!-- Controllers --> <!-- Controllers -->
<service id="nelmio_api_doc.controller.swagger_ui" class="Nelmio\ApiDocBundle\Controller\SwaggerUiController"> <service id="nelmio_api_doc.controller.swagger_ui" class="Nelmio\ApiDocBundle\Controller\SwaggerUiController" public="true">
<argument type="service" id="nelmio_api_doc.generator" /> <argument type="service" id="nelmio_api_doc.generator" />
<argument type="service" id="twig" /> <argument type="service" id="twig" />
</service> </service>
<service id="nelmio_api_doc.controller.swagger" class="Nelmio\ApiDocBundle\Controller\DocumentationController"> <service id="nelmio_api_doc.controller.swagger" class="Nelmio\ApiDocBundle\Controller\DocumentationController" public="true">
<argument type="service" id="nelmio_api_doc.generator" /> <argument type="service" id="nelmio_api_doc.generator" />
</service> </service>
<!-- Swagger Spec Generator --> <!-- Swagger Spec Generator -->
<service id="nelmio_api_doc.generator" class="Nelmio\ApiDocBundle\ApiDocGenerator"> <service id="nelmio_api_doc.generator" class="Nelmio\ApiDocBundle\ApiDocGenerator" public="true">
<argument type="collection" /> <!-- Describers --> <argument type="collection" /> <!-- Describers -->
<argument type="collection" /> <!-- Model Describers --> <argument type="collection" /> <!-- Model Describers -->
</service> </service>

2
RouteDescriber/RouteMetadataDescriber.php
View File

@ -40,7 +40,7 @@ final class RouteMetadataDescriber implements RouteDescriberInterface
} }
if (isset($requirements[$pathVariable])) { if (isset($requirements[$pathVariable])) {
$parameter->setFormat($requirements[$pathVariable]); $parameter->setPattern($requirements[$pathVariable]);
} }
} }
} }

3
Tests/Functional/FunctionalTest.php
View File

@ -113,7 +113,8 @@ class FunctionalTest extends WebTestCase
$parameter = $parameters->get('user', 'path'); $parameter = $parameters->get('user', 'path');
$this->assertTrue($parameter->getRequired()); $this->assertTrue($parameter->getRequired());
$this->assertEquals('string', $parameter->getType()); $this->assertEquals('string', $parameter->getType());
$this->assertEquals('/foo/', $parameter->getFormat()); $this->assertEquals('/foo/', $parameter->getPattern());
$this->assertEmpty($parameter->getFormat());
} }
public function testFOSRestAction() public function testFOSRestAction()

2
composer.json
View File

@ -15,7 +15,7 @@
} }
], ],
"require": { "require": {
"php": "7.0.*|7.1.*", "php": "^7.0",
"symfony/framework-bundle": "^3.2.5|^4.0", "symfony/framework-bundle": "^3.2.5|^4.0",
"symfony/property-info": "^3.1|^4.0", "symfony/property-info": "^3.1|^4.0",
"exsyst/swagger": "~0.3", "exsyst/swagger": "~0.3",

1
phpunit.xml.dist
View File

@ -9,6 +9,7 @@
> >
<php> <php>
<ini name="error_reporting" value="-1" /> <ini name="error_reporting" value="-1" />
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak_vendors" />
</php> </php>
<testsuites> <testsuites>