Removed custom interface for SessionGridFieldStateManager, the extra …

…methods will be incorporated into GridFieldStateManagerInterface in the future.
silverstripe · Jun 20, 2024 · 898ef9b · 898ef9b
1 parent e9cd597
commit 898ef9b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
@@ -454,7 +454,7 @@ protected function getFormActions()
 
             $gridState = $this->gridField->getState(false);
             $actions->push(HiddenField::create($manager->getStateKey($this->gridField), null, $gridState));
-            if ($manager instanceof GridFieldStateStoreInterface) {
+            if (ClassInfo::hasMethod($manager, 'getStateRequestVar')) {
                 $stateRequestVar = $manager->getStateRequestVar();
                 $stateValue = $this->getRequest()->requestVar($stateRequestVar);
                 if ($stateValue) {

diff --git a/src/Forms/GridField/GridFieldStateStoreInterface.php b/src/Forms/GridField/GridFieldStateStoreInterface.php
diff --git a/src/Forms/GridField/GridState_Data.php b/src/Forms/GridField/GridState_Data.php
@@ -2,6 +2,8 @@
 
 namespace SilverStripe\Forms\GridField;
 
+use SilverStripe\Core\ClassInfo;
+
 /**
  * Simple set of data, similar to stdClass, but without the notice-level
  * errors.
@@ -86,7 +88,7 @@ public function getData($name, $default = null)
     public function storeData()
     {
         $stateManager = $this->getStateManager();
-        if ($stateManager instanceof GridFieldStateStoreInterface) {
+        if (ClassInfo::hasMethod($stateManager, 'storeState')) {
             $stateManager->storeState($this->state->getGridField(), $this->state->Value());
         }
     }

diff --git a/src/Forms/GridField/SessionGridFieldStateManager.php b/src/Forms/GridField/SessionGridFieldStateManager.php
@@ -11,7 +11,7 @@
  * (i.e. the state is changed from the default).
  * If a session state key is present in the request, it will always be used instead of generating a new one.
  */
-class SessionGridFieldStateManager implements GridFieldStateManagerInterface, GridFieldStateStoreInterface
+class SessionGridFieldStateManager implements GridFieldStateManagerInterface
 {
     protected static $state_ids = [];