Skip to content

Polish #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 20, 2019
Merged

Polish #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88cd1b5
Polish
yoanm Apr 20, 2019
4cde4ee
Fix scrutinizer issue
yoanm Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions src/App/Helper/TypeGuesser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,12 @@ private function isAbstractType(TypeDoc $doc) : bool
private function guessPrimaryTypeFromConstraint(Constraint $constraint) : ?TypeDoc
{
// Try to guess primary types
if (null !== $this->getMatchingClassNameIn($constraint, self::STRING_CONSTRAINT_CLASS_LIST)) {
return new StringDoc();
} elseif (null !== $this->getMatchingClassNameIn($constraint, self::BOOLEAN_CONSTRAINT_CLASS_LIST)) {
return new BooleanDoc();
if (null !== ($type = $this->guessSimplePrimaryTypeFromConstraint($constraint))) {
return $type;
} elseif ($constraint instanceof Assert\DateTime) {
return $this->guessDateTimeType($constraint);
} elseif ($constraint instanceof Assert\Collection) {
return $this->guestCollectionType($constraint);
} elseif ($constraint instanceof Assert\Regex) {
return new ScalarDoc();
} elseif ($this->isArrayConstraint($constraint)) {
return new ArrayDoc();
}

return null;
Expand Down Expand Up @@ -175,4 +169,24 @@ private function isArrayConstraint(Constraint $constraint): bool
&& true === $constraint->multiple // << expect an array multiple choices
);
}

/**
* @param Constraint $constraint
*
* @return TypeDoc|null
*/
private function guessSimplePrimaryTypeFromConstraint(Constraint $constraint) : ?TypeDoc
{
if (null !== $this->getMatchingClassNameIn($constraint, self::STRING_CONSTRAINT_CLASS_LIST)) {
return new StringDoc();
} elseif (null !== $this->getMatchingClassNameIn($constraint, self::BOOLEAN_CONSTRAINT_CLASS_LIST)) {
return new BooleanDoc();
} elseif ($constraint instanceof Assert\Regex) {
return new ScalarDoc();
} elseif ($this->isArrayConstraint($constraint)) {
return new ArrayDoc();
}

return null;
}
}