From 0370f64bbd86edae7b2c714989bbf3cb024f5c51 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Mon, 29 Jul 2024 11:25:13 +1200
Subject: [PATCH 1/3] FIX Don't cause errors if elemental isn't installed
 (#194)

---
 code/elemental/MultiElementalAreasExtension.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/elemental/MultiElementalAreasExtension.php b/code/elemental/MultiElementalAreasExtension.php
index 281cf50..43adee9 100644
--- 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
  */

From 579e1602e6f8b28251f9182a474e5ce32b051df0 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Mon, 29 Jul 2024 11:45:23 +1200
Subject: [PATCH 2/3] FIX Don't require classes that don't exist (#195)

---
 code/elemental/MultiElementalBehatTestAdmin.php  |  4 ++++
 code/elemental/MutliElementalBehatTestObject.php | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/code/elemental/MultiElementalBehatTestAdmin.php b/code/elemental/MultiElementalBehatTestAdmin.php
index 663a084..29241e1 100644
--- a/code/elemental/MultiElementalBehatTestAdmin.php
+++ b/code/elemental/MultiElementalBehatTestAdmin.php
@@ -5,6 +5,10 @@
 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
index 0d3b9f0..dd593d8 100644
--- a/code/elemental/MutliElementalBehatTestObject.php
+++ b/code/elemental/MutliElementalBehatTestObject.php
@@ -5,6 +5,10 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\FrameworkTest\Elemental\Extension\MultiElementalAreasExtension;
 
+if (!class_exists(MultiElementalAreasExtension::class)) {
+    return;
+}
+
 class MultiElementalBehatTestObject extends DataObject
 {
     private static $db = [
@@ -17,22 +21,22 @@ class MultiElementalBehatTestObject extends DataObject
         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;
     }

From f380700ea67878dcb092f87a089e809d7e411011 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Mon, 29 Jul 2024 15:16:21 +1200
Subject: [PATCH 3/3] FIX Only include extension if elemental is installed
 (#196)

---
 _config/extensions.yml                           | 5 ++++-
 code/elemental/MultiElementalBehatTestAdmin.php  | 4 ----
 code/elemental/MutliElementalBehatTestObject.php | 9 ---------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/_config/extensions.yml b/_config/extensions.yml
index f681410..ee8e25f 100644
--- 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
index 29241e1..663a084 100644
--- 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
index dd593d8..66a1536 100644
--- 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;