Merge branch '1' into 2

silverstripe · Jul 30, 2024 · 19b1258 · 19b1258
2 parents 8f5e067 + f380700
commit 19b1258
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/_config/extensions.yml b/_config/extensions.yml
@@ -53,6 +53,10 @@ SilverStripe\FrameworkTest\Elemental\Model\ElementalBehatTestObject:
     - DNADesign\Elemental\Extensions\ElementalAreasExtension
     - SilverStripe\FrameworkTest\Elemental\Extension\ElementalBehatTestExtension
 
+SilverStripe\FrameworkTest\Elemental\Model\MultiElementalBehatTestObject:
+  extensions:
+    - SilverStripe\FrameworkTest\Elemental\Extension\MultiElementalAreasExtension
+
 BasicElementalPage:
   extensions:
     - DNADesign\Elemental\Extensions\ElementalPageExtension
@@ -69,7 +73,6 @@ SilverStripe\FrameworkTest\Model\Company:
   extensions:
     - SilverStripe\FrameworkTest\LinkField\Extensions\CompanyExtension
 
-
 ---
 Only:
   moduleexists:

diff --git a/code/elemental/MultiElementalAreasExtension.php b/code/elemental/MultiElementalAreasExtension.php
@@ -5,6 +5,10 @@
 use DNADesign\Elemental\Extensions\ElementalAreasExtension;
 use DNADesign\Elemental\Models\ElementalArea;
 
+if (!class_exists(ElementalAreasExtension::class)) {
+    return;
+}
+
 /**
  * This is used to test multiple elemental areas on a page
  */

diff --git a/code/elemental/MutliElementalBehatTestObject.php b/code/elemental/MutliElementalBehatTestObject.php
@@ -3,7 +3,6 @@
 namespace SilverStripe\FrameworkTest\Elemental\Model;
 
 use SilverStripe\ORM\DataObject;
-use SilverStripe\FrameworkTest\Elemental\Extension\MultiElementalAreasExtension;
 
 class MultiElementalBehatTestObject extends DataObject
 {
@@ -13,26 +12,22 @@ class MultiElementalBehatTestObject extends DataObject
 
     private static $table_name = 'ElementalMultiBehatTestObject';
 
-    private static $extensions = [
-        MultiElementalAreasExtension::class,
-    ];
-
-    public function canView($member = null) 
+    public function canView($member = null)
     {
         return true;
     }
 
-    public function canEdit($member = null) 
+    public function canEdit($member = null)
     {
         return true;
     }
 
-    public function canDelete($member = null) 
+    public function canDelete($member = null)
     {
         return true;
     }
 
-    public function canCreate($member = null, $context = []) 
+    public function canCreate($member = null, $context = [])
     {
         return true;
     }