ENH More standardisation (#223)

* ENH Refactoring, new tests, and other standardisation * MNT Reorder methods to match our coding conventions
silverstripe · Feb 15, 2024 · c75615f · c75615f
1 parent 58bd7a7
commit c75615f
Show file tree

Hide file tree

Showing 10 changed files with 197 additions and 259 deletions.
diff --git a/src/Form/AbstractLinkField.php b/src/Form/AbstractLinkField.php
@@ -80,7 +80,7 @@ public function getTypesProp(): string
             $typesList[$key] = [
                 'key' => $key,
                 'title' => $type->getMenuTitle(),
-                'handlerName' => $type->LinkTypeHandlerName(),
+                'handlerName' => $type->getLinkTypeHandlerName(),
                 'priority' => $class::config()->get('menu_priority'),
                 'icon' => $class::config()->get('icon'),
                 'allowed' => $allowed,

diff --git a/src/Models/EmailLink.php b/src/Models/EmailLink.php
@@ -36,6 +36,13 @@ public function getCMSFields(): FieldList
         return parent::getCMSFields();
     }
 
+    public function getCMSCompositeValidator(): CompositeValidator
+    {
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(RequiredFields::create(['Email']));
+        return $validator;
+    }
+
     public function getDescription(): string
     {
         return $this->Email ?: '';
@@ -54,11 +61,4 @@ public function getMenuTitle(): string
     {
         return _t(__CLASS__ . '.LINKLABEL', 'Link to email address');
     }
-
-    public function getCMSCompositeValidator(): CompositeValidator
-    {
-        $validator = parent::getCMSCompositeValidator();
-        $validator->addValidator(RequiredFields::create(['Email']));
-        return $validator;
-    }
 }
diff --git a/src/Models/ExternalLink.php b/src/Models/ExternalLink.php
@@ -37,6 +37,13 @@ public function getCMSFields(): FieldList
         return parent::getCMSFields();
     }
 
+    public function getCMSCompositeValidator(): CompositeValidator
+    {
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(RequiredFields::create(['ExternalUrl']));
+        return $validator;
+    }
+
     public function getDescription(): string
     {
         return $this->ExternalUrl ?: '';
@@ -55,11 +62,4 @@ public function getMenuTitle(): string
     {
         return _t(__CLASS__ . '.LINKLABEL', 'Link to external URL');
     }
-
-    public function getCMSCompositeValidator(): CompositeValidator
-    {
-        $validator = parent::getCMSCompositeValidator();
-        $validator->addValidator(RequiredFields::create(['ExternalUrl']));
-        return $validator;
-    }
 }
diff --git a/src/Models/FileLink.php b/src/Models/FileLink.php
@@ -34,6 +34,13 @@ public function getCMSFields(): FieldList
         return parent::getCMSFields();
     }
 
+    public function getCMSCompositeValidator(): CompositeValidator
+    {
+        $validator = parent::getCMSCompositeValidator();
+        $validator->addValidator(RequiredFields::create(['File']));
+        return $validator;
+    }
+
     public function getDescription(): string
     {
         $file = $this->File();
@@ -52,16 +59,6 @@ public function getURL(): string
         return $file->exists() ? (string) $file->getURL() : '';
     }
 
-    public function getDefaultTitle(): string
-    {
-        $file = $this->File();
-        if (!$file->exists()) {
-            return _t(__CLASS__ . '.MISSING_DEFAULT_TITLE', '(File missing)');
-        }
-
-        return (string) $this->getDescription();
-    }
-
     /**
      * The title that will be displayed in the dropdown
      * for selecting the link type to create.
@@ -71,10 +68,13 @@ public function getMenuTitle(): string
         return _t(__CLASS__ . '.LINKLABEL', 'Link to a file');
     }
 
-    public function getCMSCompositeValidator(): CompositeValidator
+    protected function getDefaultTitle(): string
     {
-        $validator = parent::getCMSCompositeValidator();
-        $validator->addValidator(RequiredFields::create(['File']));
-        return $validator;
+        $file = $this->File();
+        if (!$file?->exists()) {
+            return _t(__CLASS__ . '.MISSING_DEFAULT_TITLE', '(File missing)');
+        }
+
+        return (string) $this->getDescription();
     }
 }