Merge pull request #10 from nojimage/develop

Add CakePHP 3.7 Support & Drop PHP 7.0 support

.travis.yml

@@ -3,7 +3,6 @@ language: php
 
 php:
   - 5.6
-  - 7.0
   - 7.1
   - 7.2
 
@@ -14,6 +13,7 @@ env:
     - CAKE_VERSION='3.4.*' DB=mysql db_dsn='mysql://root@0.0.0.0/cakephp_test'
     - CAKE_VERSION='3.5.*' DB=mysql db_dsn='mysql://root@0.0.0.0/cakephp_test'
     - CAKE_VERSION='3.6.*' DB=mysql db_dsn='mysql://root@0.0.0.0/cakephp_test'
+    - CAKE_VERSION='3.7.*' DB=mysql db_dsn='mysql://root@0.0.0.0/cakephp_test'
   global:
     - DEFAULT=1
 

README.md

@@ -29,7 +29,13 @@ The recommended way to install composer packages is:
 composer require nojimage/cakephp-remember-me
 ```
 
-You will need to add the following line to your application's bootstrap.php file:
+(CakePHP >= 3.6.0) Load the plugin by adding the following statement in your project's `src/Application.php`:
+
+```
+$this->addPlugin('RememberMe');
+```
+
+(CakePHP <= 3.5.x) Load the plugin by adding the following statement in your project's `config/bootstrap.php` file:
 
 ```
 Plugin::load('RememberMe');

src/Auth/CookieAuthenticate.php

@@ -7,6 +7,7 @@
 use Cake\Controller\Component\AuthComponent;
 use Cake\Datasource\EntityInterface;
 use Cake\Event\Event;
+use Cake\Http\Cookie\Cookie;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\I18n\FrozenTime;
@@ -142,6 +143,20 @@ protected function setCookie(Response $response, $cookie)
     {
         $config = $this->getConfig('cookie');
         $expires = new FrozenTime($config['expires']);
+        if (class_exists(Cookie::class)) {
+            $cookieObj = new Cookie(
+                $this->getConfig('cookie.name'),
+                $cookie,
+                $expires,
+                $this->getConfig('cookie.path', '/'),
+                $this->getConfig('cookie.domain', ''),
+                $this->getConfig('cookie.secure', true),
+                $this->getConfig('cookie.httpOnly', true)
+            );
+
+            return $response->withCookie($cookieObj);
+        }
+
         $config['value'] = $cookie;
         $config['expire'] = $expires->format('U');
 

tests/TestCase/Auth/CookieAuthenticateTest.php

@@ -413,7 +413,9 @@ public function testOnLogout()
         ];
 
         // set login cookie
+        error_reporting(E_ALL ^ E_USER_DEPRECATED);
         $response = (new Response())->withCookie('rememberMe', 'dummy');
+        error_reporting(E_ALL);
 
         // test logout
         $subject = $this->getMockBuilder(AuthComponent::class)
@@ -451,7 +453,9 @@ public function testWorkWithEncryptedCookieMiddleware()
 
         $encoded = $this->auth->encryptToken('foo', 'series_foo_1', '123456');
 
+        error_reporting(E_ALL ^ E_USER_DEPRECATED);
         $response = $response->withCookie('rememberMe', ['value' => $encoded]);
+        error_reporting(E_ALL);
         $response = $middleware($request, $response, function ($request, $response) {
             return $response;
         });

tests/bootstrap.php

@@ -1,5 +1,6 @@
 <?php
 
+use Cake\Core\Configure;
 use Cake\Core\Plugin;
 
 /**
@@ -28,5 +29,13 @@
     require $root . '/config/bootstrap.php';
 } else {
     require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
+
+    // Disable deprecations for now when using 3.6
+    if (version_compare(Configure::version(), '3.6.0', '>=')) {
+        error_reporting(E_ALL ^ E_USER_DEPRECATED);
+    }
+
     Plugin::load('RememberMe', ['path' => dirname(dirname(__FILE__)) . DS]);
+
+    error_reporting(E_ALL);
 }