Fix deprecated method usage in Helpers.

cakephp · Nov 16, 2017 · 7f4245e · 7f4245e
1 parent 6dcf7cd
commit 7f4245e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/View/Helper/FlashHelper.php b/src/View/Helper/FlashHelper.php
@@ -74,7 +74,7 @@ public function render($key = 'flash', array $options = [])
             return null;
         }
 
-        $flash = $this->request->session()->read("Flash.$key");
+        $flash = $this->request->getSession()->read("Flash.$key");
         if (!is_array($flash)) {
             throw new UnexpectedValueException(sprintf(
                 'Value for flash setting key "%s" must be an array.',

diff --git a/tests/TestCase/View/Helper/FlashHelperTest.php b/tests/TestCase/View/Helper/FlashHelperTest.php
@@ -143,7 +143,7 @@ public function testFlash()
     public function testFlashThrowsException()
     {
         $this->expectException(\UnexpectedValueException::class);
-        $this->View->request->session()->write('Flash.foo', 'bar');
+        $this->View->request->getSession()->write('Flash.foo', 'bar');
         $this->Flash->render('foo');
     }
 
@@ -217,7 +217,7 @@ public function testFlashWithStack()
             ['div' => ['id' => 'classy-message']], 'Recorded', '/div'
         ];
         $this->assertHtml($expected, $result);
-        $this->assertNull($this->View->request->session()->read('Flash.stack'));
+        $this->assertNull($this->View->request->getSession()->read('Flash.stack'));
     }
 
     /**

diff --git a/tests/TestCase/View/Helper/PaginatorHelperTest.php b/tests/TestCase/View/Helper/PaginatorHelperTest.php
@@ -446,7 +446,7 @@ public function testSortLinksMultiplePagination()
         ]);
 
         $this->Paginator->options(['model' => 'Articles']);
-        $this->Paginator->request['paging'] = [
+        $this->Paginator->request = $this->Paginator->request->withParam('paging', [
             'Articles' => [
                 'current' => 9,
                 'count' => 62,
@@ -469,7 +469,7 @@ public function testSortLinksMultiplePagination()
                 'page' => 1,
                 'scope' => 'tags',
             ]
-        ];
+        ]);
 
         $result = $this->Paginator->sort('title', 'Title', ['model' => 'Articles']);
         $expected = [