Fix for UnitTest failure with new SessionGridFieldStateManager functionality

forsdahl · forsdahl · commit 6b69db1e3b16 · 2024-06-27T16:06:32.000+03:00
diff --git a/src/Forms/GridField/GridState_Data.php b/src/Forms/GridField/GridState_Data.php
@@ -19,11 +19,11 @@ class GridState_Data
      */
     protected $data;
 
-    protected GridState $state;
+    protected ?GridState $state;
 
     protected $defaults = [];
 
-    public function __construct($data = [], GridState $state = null)
+    public function __construct($data = [], ?GridState $state = null)
     {
         $this->data = $data;
         $this->state = $state;
@@ -88,7 +88,7 @@ public function getData($name, $default = null)
     public function storeData()
     {
         $stateManager = $this->getStateManager();
-        if (ClassInfo::hasMethod($stateManager, 'storeState')) {
+        if (ClassInfo::hasMethod($stateManager, 'storeState') && $this->state) {
             $stateManager->storeState($this->state->getGridField(), $this->state->Value());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ class GridState_Data`
`19`	`19`	`*/`
`20`	`20`	`protected $data;`
`21`	`21`
`22`		`- protected GridState $state;`
	`22`	`+ protected ?GridState $state;`
`23`	`23`
`24`	`24`	`protected $defaults = [];`
`25`	`25`
`26`		`- public function __construct($data = [], GridState $state = null)`
	`26`	`+ public function __construct($data = [], ?GridState $state = null)`
`27`	`27`	`{`
`28`	`28`	`$this->data = $data;`
`29`	`29`	`$this->state = $state;`
`@@ -88,7 +88,7 @@ public function getData($name, $default = null)`
`88`	`88`	`public function storeData()`
`89`	`89`	`{`
`90`	`90`	`$stateManager = $this->getStateManager();`
`91`		`- if (ClassInfo::hasMethod($stateManager, 'storeState')) {`
	`91`	`+ if (ClassInfo::hasMethod($stateManager, 'storeState') && $this->state) {`
`92`	`92`	`$stateManager->storeState($this->state->getGridField(), $this->state->Value());`
`93`	`93`	`}`
`94`	`94`	`}`