Return empty flash array if flash data is not set into the session

ishanvyas22 · Oct 25, 2020 · a75f9ef · a75f9ef
1 parent c21beb8
commit a75f9ef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/Controller/InertiaResponseTrait.php b/src/Controller/InertiaResponseTrait.php
@@ -85,6 +85,10 @@ protected function setFlashData()
         $session = $this->getRequest()->getSession();
 
         $this->set('flash', function () use ($session) {
+            if (! $session->check('Flash.flash.0')) {
+                return [];
+            }
+
             $flash = $session->read('Flash.flash.0');
 
             $flash['element'] = strtolower(str_replace('/', '-', $flash['element']));

diff --git a/tests/TestCase/Controller/UsersControllerTest.php b/tests/TestCase/Controller/UsersControllerTest.php
@@ -135,12 +135,10 @@ public function testItSetsSuccessFlashDataIntoProps()
         $this->assertResponseOk();
         $this->assertArrayHasKey('flash', $responseArray['props']);
         $this->assertEquals([
-            [
-                'message' => 'User saved successfully.',
-                'key' => 'flash',
-                'element' => 'Flash/success',
-                'params' => [],
-            ],
+            'message' => 'User saved successfully.',
+            'key' => 'flash',
+            'element' => 'flash-success',
+            'params' => [],
         ], $responseArray['props']['flash']);
     }
 
@@ -156,12 +154,10 @@ public function testItSetsErrorFlashDataIntoProps()
         $this->assertResponseOk();
         $this->assertArrayHasKey('flash', $responseArray['props']);
         $this->assertEquals([
-            [
-                'message' => 'Something went wrong!',
-                'key' => 'flash',
-                'element' => 'Flash/error',
-                'params' => [],
-            ],
+            'message' => 'Something went wrong!',
+            'key' => 'flash',
+            'element' => 'flash-error',
+            'params' => [],
         ], $responseArray['props']['flash']);
     }
 }