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 #780 from damienalexandre/fixArrayToString

Browse Source 
Fix Array to string conversion error on array requirements
This commit is contained in:
William Durand 2016-01-08 13:33:10 +01:00
commit 5d9c47bbad
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Extractor/Handler/FosRestHandler.php
View File

@ -83,6 +83,10 @@ class FosRestHandler implements HandlerInterface
return substr($class, strrpos($class, '\\')+1);
}
if (is_array($requirements) && isset($requirements['rule'])) {
return (string) $requirements['rule'];
}
return (string) $requirements;
}

14
Tests/Extractor/Handler/FosRestHandlerTest.php
View File

@ -175,4 +175,18 @@ class FosRestHandlerTest extends WebTestCase
$this->assertArrayHasKey('dataType', $parameter);
$this->assertEquals('string[]', $parameter['dataType']);
}
public function testWithRequestParamArrayRequirements()
{
$container = $this->getContainer();
$extractor = $container->get('nelmio_api_doc.extractor.api_doc_extractor');
$annotation = $extractor->get('Nelmio\ApiDocBundle\Tests\Fixtures\Controller\TestController::routeWithQueryParamArrayRequirementsAction', 'test_route_29');
$this->assertNotNull($annotation);
$filters = $annotation->getFilters();
$this->assertArrayHasKey('param1', $filters);
$this->assertArrayHasKey('requirement', $filters['param1']);
$this->assertEquals('regexp', $filters['param1']['requirement']);
}
}

8
Tests/Fixtures/Controller/TestController.php
View File

@ -398,4 +398,12 @@ class TestController
public function routeWithHostAction()
{
}
/**
* @ApiDoc()
* @QueryParam(name="param1", requirements={"rule": "regexp", "error_message": "warning"}, description="Param1 description.")
*/
public function routeWithQueryParamArrayRequirementsAction()
{
}
}

5
Tests/Fixtures/app/config/routing.yml
View File

@ -238,3 +238,8 @@ test_route_28:
requirements:
domain: "%domain_dev%|%domain_prod%"
defaults: { _controller: NelmioApiDocTestBundle:Test:routeWithHost, domain: "%domain_dev%", _format: json }
test_route_29:
path: /z-query-param-array-requirements
methods: [GET]
defaults: { _controller: NelmioApiDocTestBundle:Test:routeWithQueryParamArrayRequirementsAction }