ENH Use symfony/validation logic

src/IFramePage.php

@@ -3,12 +3,13 @@
 namespace SilverStripe\IFrame;
 
 use Page;
+use SilverStripe\Core\Validation\ConstraintValidator;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationResult;
-use SilverStripe\ORM\ValidationResult;
+use Symfony\Component\Validator\Constraints\Url;
 
 /**
  * Iframe page type embeds an iframe of URL of choice into the page.
@@ -119,21 +120,21 @@ class IFramePage extends Page
     /**
      * Ensure that the IFrameURL is a valid url and prevents XSS
      *
-     * @throws ValidationException
      * @return ValidationResult
      */
     public function validate()
     {
-        $result = parent::validate();
+        $fullResult = parent::validate();
 
-        //whitelist allowed URL schemes
+        $allowedSchemes = ['http', 'https'];
-        $allowed_schemes = array('http', 'https');
+        $message = _t(__CLASS__ . '.VALIDATION_URL', 'Please enter a valid URL');
-        if ($matches = parse_url($this->IFrameURL ?? '')) {
+        $result = ConstraintValidator::validate(
-            if (isset($matches['scheme']) && !in_array($matches['scheme'], $allowed_schemes ?? [])) {
+            $this->value,
-                $result->addError(_t(__CLASS__ . '.VALIDATION_BANNEDURLSCHEME', "This URL scheme is not allowed."));
+            new Url(message: $message, protocols: $allowedSchemes),
-            }
+            $this->getName()
-        }
+        );
+        $fullResult->combineAnd($result);
 
-        return $result;
+        return $fullResult;
     }
 }

tests/IFramePageTest.php

@@ -4,7 +4,7 @@ namespace SilverStripe\IFrame\Tests;
 
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Control\Director;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\IFrame\IFramePage;
 use SilverStripe\IFrame\IFramePageController;