FIX Only include extension if elemental is installed (#196)

silverstripe · Jul 29, 2024 · f380700 · f380700
1 parent 579e160
commit f380700
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 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/MultiElementalBehatTestAdmin.php b/code/elemental/MultiElementalBehatTestAdmin.php
@@ -5,10 +5,6 @@
 use SilverStripe\Admin\ModelAdmin;
 use SilverStripe\FrameworkTest\Elemental\Model\MultiElementalBehatTestObject;
 
-if (!class_exists(MultiElementalBehatTestObject::class)) {
-    return;
-}
-
 class MutliElementalBehatTestAdmin extends ModelAdmin
 {
     private static $url_segment = 'multi-elemental-behat-test-admin';

diff --git a/code/elemental/MutliElementalBehatTestObject.php b/code/elemental/MutliElementalBehatTestObject.php
@@ -3,11 +3,6 @@
 namespace SilverStripe\FrameworkTest\Elemental\Model;
 
 use SilverStripe\ORM\DataObject;
-use SilverStripe\FrameworkTest\Elemental\Extension\MultiElementalAreasExtension;
-
-if (!class_exists(MultiElementalAreasExtension::class)) {
-    return;
-}
 
 class MultiElementalBehatTestObject extends DataObject
 {
@@ -17,10 +12,6 @@ class MultiElementalBehatTestObject extends DataObject
 
     private static $table_name = 'ElementalMultiBehatTestObject';
 
-    private static $extensions = [
-        MultiElementalAreasExtension::class,
-    ];
-
     public function canView($member = null)
     {
         return true;