Skip to content
This repository has been archived by the owner on Dec 14, 2020. It is now read-only.

Commit

Permalink
Wtf
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Rey committed Sep 6, 2017
1 parent 3396f82 commit ac6e605
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/Bridge/Nelmio/ApiDoc/Parser/ApiResourceMetadataParser.php
View file
Expand Up @@ -86,7 +86,7 @@ private function resolveActualType(ResourceAttributeMetadata $attributeMetadata)
$originalTypeClass = ltrim($attributeMetadata->getOriginalType(), '\\');

if (in_array($originalTypeClass, [\DateTime::class, \DateTimeImmutable::class, \DateTimeInterface::class], true)) {
return [DataTypes::DATETIME, null];
return [DataTypes::DATETIME, DataTypes::DATETIME];
}

$type = $attributeMetadata->getType();
Expand Down
30 changes: 18 additions & 12 deletions tests/Functional/Bridge/Nelmio/ApiDoc/ApiResourceMetadataParserTest.php
View file
Expand Up @@ -77,26 +77,29 @@ public function testParse(array $toParse, $expected)

const NEWS_RESOURCE_DUMP = <<<'DUMP'
array:9 [
"createdAt" => array:5 [
"dataType" => "string"
"createdAt" => array:6 [
"dataType" => null
"actualType" => "datetime"
"required" => true
"description" => "The news creation date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"updatedAt" => array:5 [
"dataType" => "string"
"updatedAt" => array:6 [
"dataType" => null
"actualType" => "datetime"
"required" => true
"description" => "The news modification date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"deletedAt" => array:5 [
"dataType" => "string"
"deletedAt" => array:6 [
"dataType" => null
"actualType" => "datetime"
"required" => true
"description" => "The news deletion date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"image" => array:5 [
"dataType" => "file"
Expand Down Expand Up @@ -177,26 +180,29 @@ public function testParse(array $toParse, $expected)
"readonly" => null
"subType" => "Elao.Newsfeed.News"
"children" => array:9 [
"createdAt" => array:5 [
"dataType" => "string"
"createdAt" => array:6 [
"dataType" => null
"actualType" => "datetime"
"required" => true
"description" => "The news creation date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"updatedAt" => array:5 [
"dataType" => "string"
"updatedAt" => array:6 [
"dataType" => null
"actualType" => "datetime"
"required" => true
"description" => "The news modification date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"deletedAt" => array:5 [
"dataType" => "string"
"deletedAt" => array:6 [
"dataType" => null
"actualType" => "datetime"
"required" => true
"description" => "The news deletion date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"image" => array:5 [
"dataType" => "file"
Expand Down
30 changes: 18 additions & 12 deletions tests/Integration/Bridge/Nelmio/ApiDoc/Extractor/ApiDocExtractorTest.php
View file
Expand Up @@ -56,26 +56,29 @@ public function testExtractedAnnotations()
"readonly" => null
"subType" => "Elao.Newsfeed.News"
"children" => array:9 [
"createdAt" => array:5 [
"dataType" => "string"
"createdAt" => array:6 [
"dataType" => "datetime"
"actualType" => "datetime"
"required" => true
"description" => "The news creation date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"updatedAt" => array:5 [
"dataType" => "string"
"updatedAt" => array:6 [
"dataType" => "datetime"
"actualType" => "datetime"
"required" => true
"description" => "The news modification date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"deletedAt" => array:5 [
"dataType" => "string"
"deletedAt" => array:6 [
"dataType" => "datetime"
"actualType" => "datetime"
"required" => true
"description" => "The news deletion date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"image" => array:5 [
"dataType" => "file"
Expand Down Expand Up @@ -210,26 +213,29 @@ public function testExtractedAnnotations()
"readonly" => null
"subType" => "Elao.Newsfeed.News"
"children" => array:9 [
"createdAt" => array:5 [
"dataType" => "string"
"createdAt" => array:6 [
"dataType" => "datetime"
"actualType" => "datetime"
"required" => true
"description" => "The news creation date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"updatedAt" => array:5 [
"dataType" => "string"
"updatedAt" => array:6 [
"dataType" => "datetime"
"actualType" => "datetime"
"required" => true
"description" => "The news modification date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"deletedAt" => array:5 [
"dataType" => "string"
"deletedAt" => array:6 [
"dataType" => "datetime"
"actualType" => "datetime"
"required" => true
"description" => "The news deletion date formatted to ISO 8601"
"readonly" => null
"subType" => "datetime"
]
"image" => array:5 [
"dataType" => "file"
Expand Down

0 comments on commit ac6e605

Please sign in to comment.