fix cookie expire value from CsrfComponent not used

CsrfComponent uses key 'expiry' while Network\Response uses 'expire'
cakephp · Jun 25, 2015 · 22dae85 · 22dae85
1 parent 25d6753
commit 22dae85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Controller/Component/CsrfComponent.php b/src/Controller/Component/CsrfComponent.php
@@ -125,7 +125,7 @@ protected function _setCookie(Request $request, Response $response)
         $response->cookie([
             'name' => $this->_config['cookieName'],
             'value' => $value,
-            'expiry' => $this->_config['expiry'],
+            'expire' => $this->_config['expiry'],
             'path' => $request->webroot,
             'secure' => $this->_config['secure'],
         ]);

diff --git a/tests/TestCase/Controller/Component/CsrfComponentTest.php b/tests/TestCase/Controller/Component/CsrfComponentTest.php
@@ -72,7 +72,7 @@ public function testSettingCookie()
         $cookie = $controller->response->cookie('csrfToken');
         $this->assertNotEmpty($cookie, 'Should set a token.');
         $this->assertRegExp('/^[a-f0-9]+$/', $cookie['value'], 'Should look like a hash.');
-        $this->assertEquals(0, $cookie['expiry'], 'session duration.');
+        $this->assertEquals(0, $cookie['expire'], 'session duration.');
         $this->assertEquals('/dir/', $cookie['path'], 'session path.');
 
         $this->assertEquals($cookie['value'], $controller->request->params['_csrfToken']);
@@ -273,7 +273,7 @@ public function testConfigurationCookieCreate()
         $cookie = $controller->response->cookie('token');
         $this->assertNotEmpty($cookie, 'Should set a token.');
         $this->assertRegExp('/^[a-f0-9]+$/', $cookie['value'], 'Should look like a hash.');
-        $this->assertEquals(90, $cookie['expiry'], 'session duration.');
+        $this->assertEquals(90, $cookie['expire'], 'session duration.');
         $this->assertEquals('/dir/', $cookie['path'], 'session path.');
         $this->assertTrue($cookie['secure'], 'cookie security flag missing');
     }