API Update validation methods

silverstripe · Oct 15, 2024 · c28b13f · c28b13f
1 parent df82059
commit c28b13f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/File.php b/src/File.php
@@ -1180,7 +1180,7 @@ public function getAbsoluteSize()
     public function validate()
     {
         $result = ValidationResult::create();
-        $this->File->validate($result, $this->Name);
+        $this->File->validateFilename($result, $this->Name);
         $this->extend('updateValidate', $result);
         return $result;
     }

diff --git a/src/Storage/DBFile.php b/src/Storage/DBFile.php
@@ -454,19 +454,18 @@ protected function isValidFilename(string $filename): bool
     protected function assertFilenameValid(string $filename): void
     {
         $result = new ValidationResult();
-        $this->validate($result, $filename);
+        $this->validateFilename($result, $filename);
         if (!$result->isValid()) {
             throw new ValidationException($result);
         }
     }
 
-
     /**
      * Hook to validate this record against a validation result
      *
      * @param null|string $filename Optional filename to validate. If omitted, the current value is validated.
      */
-    public function validate(ValidationResult $result, ?string $filename = null): bool
+    public function validateFilename(ValidationResult $result, ?string $filename = null): bool
     {
         if (empty($filename)) {
             $filename = $this->getFilename();
@@ -494,7 +493,6 @@ public function setField(string $fieldName, mixed $value, bool $markChanged = tr
         return parent::setField($fieldName, $value, $markChanged);
     }
 
-
     /**
      * Returns the size of the file type in an appropriate format.
      *