Merge pull request #703 from FriendsOfCake/flash-check

Fix FlashComponent check
FriendsOfCake · Oct 4, 2023 · 4378ee9 · 4378ee9
2 parents 4c01324 + 408da15
commit 4378ee9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Action/BaseAction.php b/src/Action/BaseAction.php
@@ -192,7 +192,7 @@ public function setFlash(string $type, Subject $subject): void
             return;
         }
 
-        if (!isset($this->_controller()->Flash)) {
+        if (!$this->_controller()->components()->has('Flash')) {
             throw new RuntimeException('FlashComponent not loaded in controller.');
         }
 

diff --git a/tests/TestCase/Action/BaseActionTest.php b/tests/TestCase/Action/BaseActionTest.php
@@ -252,11 +252,11 @@ public function testSetFlash()
             ->with('setFlash', $Subject)
             ->will($this->returnValue(new Event('Crud.setFlash')));
 
-        $this->Controller->Flash = $this->getMockBuilder(FlashComponent::class)
+        $flash = $this->getMockBuilder(FlashComponent::class)
             ->onlyMethods(['set'])
             ->setConstructorArgs([$this->Registry])
             ->getMock();
-        $this->Controller->Flash
+        $flash
             ->expects($this->once())
             ->method('set')
             ->with(
@@ -267,6 +267,7 @@ public function testSetFlash()
                     'key' => $data['key'],
                 ]
             );
+        $this->Controller->components()->set('Flash', $flash);
 
         $this->ActionClass->setConfig('name', 'test');
         $this->ActionClass->setConfig('messages', [
-Original file line number
+Diff line change
@@ Expand Up @@
                 return;
             }
-            if (!isset($this->_controller()->Flash)) {
+            if (!$this->_controller()->components()->has('Flash')) {
                 throw new RuntimeException('FlashComponent not loaded in controller.');
             }
@@ Expand Down @@