Skip to content
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.

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

ENH Use symfony/validation logic #609

Merged
Merged
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/PersistedQuery/HTTPProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
use SilverStripe\Core\Config\Configurable;
use SilverStripe\Core\Injector\Injectable;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Validation\ConstraintValidator;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\Url;

/**
* Class HTTPProvider
Expand Down Expand Up @@ -108,7 +111,7 @@ public function getByID(string $queryID, string $schemaKey = 'default'): ?string
public function setSchemaMapping(array $mapping): HTTPProvider
{
foreach ($mapping as $schemaKey => $url) {
if (!filter_var($url, FILTER_VALIDATE_URL)) {
if (!ConstraintValidator::validate($url, [new Url(), new NotBlank()])->isValid()) {
throw new InvalidArgumentException(
'setSchemaMapping accepts an array of schema keys to URLs'
);
Expand Down
Loading