diff --git a/Describer/DefaultDescriber.php b/Describer/DefaultDescriber.php index 2c803aa..0b7c8ff 100644 --- a/Describer/DefaultDescriber.php +++ b/Describer/DefaultDescriber.php @@ -38,7 +38,7 @@ final class DefaultDescriber implements DescriberInterface $operation = $path->getOperation($method); // Default Response - if (0 === count($operation->getResponses())) { + if (0 === iterator_count($operation->getResponses())) { $defaultResponse = $operation->getResponses()->get('default'); $defaultResponse->setDescription(''); } diff --git a/Resources/config/services.xml b/Resources/config/services.xml index dee835c..5606cd4 100644 --- a/Resources/config/services.xml +++ b/Resources/config/services.xml @@ -5,17 +5,17 @@ - + - + - + diff --git a/RouteDescriber/RouteMetadataDescriber.php b/RouteDescriber/RouteMetadataDescriber.php index 68fe1e6..ed67dd2 100644 --- a/RouteDescriber/RouteMetadataDescriber.php +++ b/RouteDescriber/RouteMetadataDescriber.php @@ -40,7 +40,7 @@ final class RouteMetadataDescriber implements RouteDescriberInterface } if (isset($requirements[$pathVariable])) { - $parameter->setFormat($requirements[$pathVariable]); + $parameter->setPattern($requirements[$pathVariable]); } } } diff --git a/Tests/Functional/FunctionalTest.php b/Tests/Functional/FunctionalTest.php index 5d0380e..f72b5fe 100644 --- a/Tests/Functional/FunctionalTest.php +++ b/Tests/Functional/FunctionalTest.php @@ -113,7 +113,8 @@ class FunctionalTest extends WebTestCase $parameter = $parameters->get('user', 'path'); $this->assertTrue($parameter->getRequired()); $this->assertEquals('string', $parameter->getType()); - $this->assertEquals('/foo/', $parameter->getFormat()); + $this->assertEquals('/foo/', $parameter->getPattern()); + $this->assertEmpty($parameter->getFormat()); } public function testFOSRestAction() diff --git a/composer.json b/composer.json index 64c6e01..6d10ec7 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "7.0.*|7.1.*", + "php": "^7.0", "symfony/framework-bundle": "^3.2.5|^4.0", "symfony/property-info": "^3.1|^4.0", "exsyst/swagger": "~0.3", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 18979b1..fb133f5 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,6 +9,7 @@ > +