ENH Use symfony/validation logic

silverstripe · Sep 24, 2024 · 188c44b · 188c44b
1 parent 203250a
commit 188c44b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/PersistedQuery/HTTPProvider.php b/src/PersistedQuery/HTTPProvider.php
@@ -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
@@ -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'
                 );

diff --git a/tests/Schema/AbstractTypeRegistryTest.php b/tests/Schema/AbstractTypeRegistryTest.php
@@ -139,7 +139,7 @@ public static function provideRebuildOnMissing(): array
 
     private function getInstance()
     {
-        $registry = new Class extends AbstractTypeRegistry
+        $registry = new class extends AbstractTypeRegistry
         {
             protected static function getSourceDirectory(): string
             {