Merge pull request #22 from mirko-pagliai/master

updated for CakePHP 3.5+

.travis.yml

@@ -1,11 +1,10 @@
 language: php
 
-sudo: false
-
 php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:
@@ -15,20 +14,24 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 7.0
+    - php: 7.1
       env: PHPCS=1 DEFAULT=0
 
+    - php: 7.1
+      env: PREFER_LOWEST=1
+
 before_script:
-  - composer install --prefer-dist --no-interaction
+  - if [[ $PREFER_LOWEST != 1 ]]; then composer install --no-interaction; fi
+  - if [[ $PREFER_LOWEST == 1 ]]; then composer update --no-interaction --prefer-lowest --prefer-stable; fi
 
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then export CODECOVERAGE=1; vendor/bin/phpunit --coverage-clover=clover.xml; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.0 ]]; then vendor/bin/phpunit; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.1 ]]; then export CODECOVERAGE=1; vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.1 ]]; then vendor/bin/phpunit; fi
 
   - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
 after_success:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then bash <(curl -s https://codecov.io/bash); fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.1 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
 notifications:
   email: false

README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/crabstudio/Recaptcha.svg?branch=master)](https://travis-ci.org/crabstudio/Recaptcha) [![Latest Stable Version](https://poser.pugx.org/crabstudio/recaptcha/v/stable)](https://packagist.org/packages/crabstudio/recaptcha) [![Total Downloads](https://poser.pugx.org/crabstudio/recaptcha/downloads)](https://packagist.org/packages/crabstudio/recaptcha) [![Latest Unstable Version](https://poser.pugx.org/crabstudio/recaptcha/v/unstable)](https://packagist.org/packages/crabstudio/recaptcha) [![License](https://poser.pugx.org/crabstudio/recaptcha/license)](https://packagist.org/packages/crabstudio/recaptcha)
-# Integrate Google Recaptcha v2 to your CakePHP v3.2+ project
+# Integrate Google Recaptcha v2 to your CakePHP project
 
 ## Installation
 
@@ -54,18 +54,18 @@ $this->loadComponent('Recaptcha.Recaptcha', [
 
 Display recaptcha in your view:
 ```
-    <?= $this->Form->create()?>
-    <?= $this->Form->input('email')?>
-    <?= $this->Recaptcha->display()?>  // Display recaptcha box in your view, if configure enable = false, nothing to display here
-    <?= $this->Form->submit()?>
-    <?= $this->Form->end()?>
+    <?= $this->Form->create() ?>
+    <?= $this->Form->control('email') ?>
+    <?= $this->Recaptcha->display() ?>  // Display recaptcha box in your view, if configure enable = false, nothing to display here
+    <?= $this->Form->submit() ?>
+    <?= $this->Form->end() ?>
 ```
 
 Verify in your controller function
 ```
     public function forgotPassword() {
-        if($this->request->is('post')){
-            if($this->Recaptcha->verify()) { // if configure enable = false, always return true
+        if ($this->request->is('post')) {
+            if ($this->Recaptcha->verify()) { // if configure enable = false, always return true
                 //do something here
             }
             $this->Flash->error(__('Please pass Google Recaptcha first'));

composer.json

@@ -31,11 +31,11 @@
   },
   "require": {
     "php": ">=5.6",
-    "cakephp/cakephp": "~3.2"
+    "cakephp/cakephp": "^3.5"
   },
   "require-dev": {
-    "phpunit/phpunit": "*",
-    "cakephp/cakephp-codesniffer": "2.*"
+    "phpunit/phpunit": "^5.7.14|^6.0",
+    "cakephp/cakephp-codesniffer": "^3.0"
   },
   "autoload": {
     "psr-4": {

src/Controller/Component/RecaptchaComponent.php

@@ -2,8 +2,7 @@
 namespace Recaptcha\Controller\Component;
 
 use Cake\Controller\Component;
-use Cake\I18n\I18n;
-use Cake\Network\Http\Client;
+use Cake\Http\Client;
 
 /**
  * Recaptcha component
@@ -36,7 +35,7 @@ class RecaptchaComponent extends Component
      */
     public function initialize(array $config = [])
     {
-        $this->config($config);
+        $this->setConfig($config);
         $this->_registry->getController()->viewBuilder()->helpers(['Recaptcha.Recaptcha' => $this->_config]);
     }
 
@@ -51,7 +50,7 @@ public function verify()
         }
 
         $controller = $this->_registry->getController();
-        if (isset($controller->request->data['g-recaptcha-response'])) {
+        if ($controller->request->getData('g-recaptcha-response')) {
             $response = json_decode($this->apiCall());
 
             if (isset($response->success)) {
@@ -75,7 +74,7 @@ protected function apiCall()
 
         return $client->post('https://www.google.com/recaptcha/api/siteverify', [
             'secret' => $this->_config['secret'],
-            'response' => $controller->request->data['g-recaptcha-response'],
+            'response' => $controller->request->getData('g-recaptcha-response'),
             'remoteip' => $controller->request->clientIp()
         ])->getBody();
     }

src/View/Helper/RecaptchaHelper.php

@@ -16,7 +16,7 @@ class RecaptchaHelper extends Helper
      */
     public function initialize(array $config = [])
     {
-        $this->config($config);
+        $this->setConfig($config);
     }
 
     /**
@@ -25,7 +25,7 @@ public function initialize(array $config = [])
      */
     public function display()
     {
-        $recaptcha = $this->config();
+        $recaptcha = $this->getConfig();
         if (!$recaptcha['enable']) {
             return '';
         }

tests/TestCase/Controller/Component/RecaptchaComponentTest.php

@@ -3,7 +3,7 @@
 
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;
-use Cake\Network\Request;
+use Cake\Http\ServerRequest as Request;
 use Cake\TestSuite\TestCase;
 use Recaptcha\Controller\Component\RecaptchaComponent;
 
@@ -37,7 +37,7 @@ public function testVerifyFalse()
     {
         $this->assertFalse($this->Recaptcha->verify());
 
-        $this->controller->request->data['g-recaptcha-response'] = 'foo';
+        $this->controller->request = $this->controller->request->withData('g-recaptcha-response', 'foo');
 
         $this->Recaptcha->expects($this->once())
             ->method('apiCall')
@@ -48,15 +48,15 @@ public function testVerifyFalse()
 
     public function testVerifyTrue()
     {
-        $this->controller->request->data['g-recaptcha-response'] = 'foo';
+        $this->controller->request = $this->controller->request->withData('g-recaptcha-response', 'foo');
 
         $this->Recaptcha->expects($this->once())
             ->method('apiCall')
             ->will($this->returnValue('{"success":true}'));
 
         $this->assertTrue($this->Recaptcha->verify());
 
-        $this->Recaptcha->config('enable', false);
+        $this->Recaptcha->setConfig('enable', false);
         $this->assertTrue($this->Recaptcha->verify());
     }
 }

tests/TestCase/View/Helper/RecaptchaHelperTest.php

@@ -35,7 +35,7 @@ public function testDisplay()
         $this->assertTrue(is_string($result));
         $this->assertContains('class="g-recaptcha"', $result);
 
-        $this->Recaptcha->config('enable', false);
+        $this->Recaptcha->setConfig('enable', false);
         $this->assertEmpty($this->Recaptcha->display());
     }
 }