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

Small fixes for RFC3339 and new assertion

Browse Source
This commit is contained in:
tlallement 2021-03-24 18:01:32 +01:00
parent a72588861f
commit 0e7ebe5650
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RouteDescriber/FosRestDescriber.php
View File

@ -107,10 +107,12 @@ final class FosRestDescriber implements RouteDescriberInterface
if ($requirements instanceof Constraint && !$requirements instanceof Regex) { if ($requirements instanceof Constraint && !$requirements instanceof Regex) {
if ($requirements instanceof DateTime) { if ($requirements instanceof DateTime) {
// As defined per RFC3339 // As defined per RFC3339
if ('Y-m-d\TH:i:s' === $requirements->format || 'c' === $requirements->format) { if (\DateTimeInterface::RFC3339 === $requirements->format || 'c' === $requirements->format) {
return 'date-time'; return 'date-time';
} elseif ('Y-m-d' === $requirements->format) { } elseif ('Y-m-d' === $requirements->format) {
return 'date'; return 'date';
} else {
return null;
} }
} }

3
Tests/Functional/Controller/FOSRestController.php
View File

@ -29,8 +29,9 @@ class FOSRestController
* @QueryParam(name="mapped", map=true) * @QueryParam(name="mapped", map=true)
* @RequestParam(name="Barraa", key="bar", requirements="\d+") * @RequestParam(name="Barraa", key="bar", requirements="\d+")
* @RequestParam(name="baz", requirements=@IsTrue) * @RequestParam(name="baz", requirements=@IsTrue)
* @RequestParam(name="datetime", requirements=@DateTime("Y-m-d\TH:i:s")) * @RequestParam(name="datetime", requirements=@DateTime("Y-m-d\TH:i:sP"))
* @RequestParam(name="datetimeAlt", requirements=@DateTime("c")) * @RequestParam(name="datetimeAlt", requirements=@DateTime("c"))
* @RequestParam(name="datetimeNoFormat", requirements=@DateTime())
* @RequestParam(name="date", requirements=@DateTime("Y-m-d")) * @RequestParam(name="date", requirements=@DateTime("Y-m-d"))
*/ */
public function fosrestAction() public function fosrestAction()

3
Tests/Functional/FOSRestTest.php
View File

@ -56,6 +56,9 @@ class FOSRestTest extends WebTestCase
$dateTimeAltProperty = $this->getProperty($bodySchema, 'datetimeAlt'); $dateTimeAltProperty = $this->getProperty($bodySchema, 'datetimeAlt');
$this->assertEquals('date-time', $dateTimeAltProperty->format); $this->assertEquals('date-time', $dateTimeAltProperty->format);
$dateTimeNoFormatProperty = $this->getProperty($bodySchema, 'datetimeNoFormat');
$this->assertEquals(OA\UNDEFINED, $dateTimeNoFormatProperty->format);
$dateProperty = $this->getProperty($bodySchema, 'date'); $dateProperty = $this->getProperty($bodySchema, 'date');
$this->assertEquals('date', $dateProperty->format); $this->assertEquals('date', $dateProperty->format);