Merge pull request ARCANEDEV#99 from ARCANEDEV/develop

Adding Laravel 8 support
tdi-tuning · Sep 9, 2020 · 537348f · 537348f
2 parents 57d7640 + e416985
commit 537348f
Show file tree

Hide file tree

Showing 35 changed files with 119 additions and 122 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4]
+        php: [7.3, 7.4]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
@@ -22,7 +22,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.composer/cache/files
-          key: dependencies-laravel-7-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+          key: dependencies-laravel-8-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 6
+        runs: 4
     php_code_sniffer:
         enabled: true
         config:

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ reCAPTCHA comes in the form of a widget that you can easily add to your blog, fo
   * Easy setup &amp; configuration.
   * Well documented &amp; IDE Friendly.
   * Well tested with maximum code quality.
-  * Laravel `4.2` to `7.x` are supported.
+  * Laravel `4.2` to `8.x` are supported.
   * PSR-7 Support (ServerRequest verification).
   * Made with :heart: &amp; :coffee:.
 

diff --git a/_docs/0-Home.md b/_docs/0-Home.md
@@ -15,7 +15,7 @@ reCAPTCHA comes in the form of a widget that you can easily add to your blog, fo
   * Easy setup &amp; configuration.
   * Well documented &amp; IDE Friendly.
   * Well tested with maximum code quality.
-  * Laravel `4.2` to `7.x` are supported.
+  * Laravel `4.2` to `8.x` are supported.
   * PSR-7 Support (ServerRequest verification).
   * Made with :heart: &amp; :coffee:.
 

diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md
@@ -18,43 +18,49 @@ For more details, check the [official documentation](https://developers.google.c
 
 ## Version Compatibility
 
-| noCaptcha                                                           | Laravel                                                                                                             |
-|:--------------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------|
-| ![noCaptcha v11.x][no_captcha_11_x]                                 | ![Laravel v7.x][laravel_7_x]                                                                                        |
-| ![noCaptcha v10.x][no_captcha_10_x]                                 | ![Laravel v6.x][laravel_6_x]                                                                                        |
-| ![noCaptcha v9.x][no_captcha_9_x]                                   | ![Laravel v5.8][laravel_5_8]                                                                                        |
-| ![noCaptcha v7.x][no_captcha_7_x] ![noCaptcha v8.x][no_captcha_8_x] | ![Laravel v5.7][laravel_5_7]                                                                                        |
-| ![noCaptcha v6.x][no_captcha_6_x]                                   | ![Laravel v5.6][laravel_5_6]                                                                                        |
-| ![noCaptcha v5.x][no_captcha_5_x]                                   | ![Laravel v5.5][laravel_5_5]                                                                                        |
-| ![noCaptcha v4.x][no_captcha_4_x]                                   | ![Laravel v5.4][laravel_5_4]                                                                                        |
-| ![noCaptcha v3.x][no_captcha_3_x]                                   | ![Laravel v5.0][laravel_5_0] ![Laravel v5.1][laravel_5_1] ![Laravel v5.2][laravel_5_2] ![Laravel v5.3][laravel_5_3] |
-| ![noCaptcha v1.x][no_captcha_1_x]                                   | ![Laravel v4.2][laravel_4_2]                                                                                        |
+| Laravel                      | noCaptcha                                                           |
+|:-----------------------------|:--------------------------------------------------------------------|
+| ![Laravel v8.x][laravel_8_x] | ![noCaptcha v12.x][no_captcha_12_x]                                 |
+| ![Laravel v7.x][laravel_7_x] | ![noCaptcha v11.x][no_captcha_11_x]                                 |
+| ![Laravel v6.x][laravel_6_x] | ![noCaptcha v10.x][no_captcha_10_x]                                 |
+| ![Laravel v5.8][laravel_5_8] | ![noCaptcha v9.x][no_captcha_9_x]                                   |
+| ![Laravel v5.7][laravel_5_7] | ![noCaptcha v7.x][no_captcha_7_x] ![noCaptcha v8.x][no_captcha_8_x] |
+| ![Laravel v5.6][laravel_5_6] | ![noCaptcha v6.x][no_captcha_6_x]                                   |
+| ![Laravel v5.5][laravel_5_5] | ![noCaptcha v5.x][no_captcha_5_x]                                   |
+| ![Laravel v5.4][laravel_5_4] | ![noCaptcha v4.x][no_captcha_4_x]                                   |
+| ![Laravel v5.3][laravel_5_3] | ![noCaptcha v3.x][no_captcha_3_x]                                   |
+| ![Laravel v5.2][laravel_5_2] | ![noCaptcha v3.x][no_captcha_3_x]                                   |
+| ![Laravel v5.1][laravel_5_1] | ![noCaptcha v3.x][no_captcha_3_x]                                   |
+| ![Laravel v5.0][laravel_5_0] | ![noCaptcha v3.x][no_captcha_3_x]                                   |
+| ![Laravel v4.2][laravel_4_2] | ![noCaptcha v1.x][no_captcha_1_x]                                   |
 
 > **Note :** This is a framework-agnostic package, so you can use any version of this package in your PHP project.
 
-[laravel_7_x]:    https://img.shields.io/badge/v7.x-supported-brightgreen.svg?style=flat-square "Laravel v7.x"
-[laravel_6_x]:    https://img.shields.io/badge/v6.x-supported-brightgreen.svg?style=flat-square "Laravel v6.x"
-[laravel_5_8]:    https://img.shields.io/badge/v5.8-supported-brightgreen.svg?style=flat-square "Laravel v5.8"
-[laravel_5_7]:    https://img.shields.io/badge/v5.7-supported-brightgreen.svg?style=flat-square "Laravel v5.7"
-[laravel_5_6]:    https://img.shields.io/badge/v5.6-supported-brightgreen.svg?style=flat-square "Laravel v5.6"
-[laravel_5_5]:    https://img.shields.io/badge/v5.5-supported-brightgreen.svg?style=flat-square "Laravel v5.5"
-[laravel_5_4]:    https://img.shields.io/badge/v5.4-supported-brightgreen.svg?style=flat-square "Laravel v5.4"
-[laravel_5_3]:    https://img.shields.io/badge/v5.3-supported-brightgreen.svg?style=flat-square "Laravel v5.3"
-[laravel_5_2]:    https://img.shields.io/badge/v5.2-supported-brightgreen.svg?style=flat-square "Laravel v5.2"
-[laravel_5_1]:    https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1"
-[laravel_5_0]:    https://img.shields.io/badge/v5.0-supported-brightgreen.svg?style=flat-square "Laravel v5.0"
-[laravel_4_2]:    https://img.shields.io/badge/v4.2-supported-brightgreen.svg?style=flat-square "Laravel v4.2"
-
+[laravel_8_x]: https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "Laravel v8.x"
+[laravel_7_x]: https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "Laravel v7.x"
+[laravel_6_x]: https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "Laravel v6.x"
+[laravel_5_8]: https://img.shields.io/badge/version-5.8-blue.svg?style=flat-square "Laravel v5.8"
+[laravel_5_7]: https://img.shields.io/badge/version-5.7-blue.svg?style=flat-square "Laravel v5.7"
+[laravel_5_6]: https://img.shields.io/badge/version-5.6-blue.svg?style=flat-square "Laravel v5.6"
+[laravel_5_5]: https://img.shields.io/badge/version-5.5-blue.svg?style=flat-square "Laravel v5.5"
+[laravel_5_4]: https://img.shields.io/badge/version-5.4-blue.svg?style=flat-square "Laravel v5.4"
+[laravel_5_3]: https://img.shields.io/badge/version-5.3-blue.svg?style=flat-square "Laravel v5.3"
+[laravel_5_2]: https://img.shields.io/badge/version-5.2-blue.svg?style=flat-square "Laravel v5.2"
+[laravel_5_1]: https://img.shields.io/badge/version-5.1-blue.svg?style=flat-square "Laravel v5.1"
+[laravel_5_0]: https://img.shields.io/badge/version-5.0-blue.svg?style=flat-square "Laravel v5.0"
+[laravel_4_2]: https://img.shields.io/badge/version-4.2-blue.svg?style=flat-square "Laravel v4.2"
+
+[no_captcha_12_x]: https://img.shields.io/badge/version-12.x-blue.svg?style=flat-square "noCaptcha v12.x"
 [no_captcha_11_x]: https://img.shields.io/badge/version-11.x-blue.svg?style=flat-square "noCaptcha v11.x"
 [no_captcha_10_x]: https://img.shields.io/badge/version-10.x-blue.svg?style=flat-square "noCaptcha v10.x"
-[no_captcha_9_x]: https://img.shields.io/badge/version-9.x-blue.svg?style=flat-square "noCaptcha v9.x"
-[no_captcha_8_x]: https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "noCaptcha v8.x"
-[no_captcha_7_x]: https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "noCaptcha v7.x"
-[no_captcha_6_x]: https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "noCaptcha v6.x"
-[no_captcha_5_x]: https://img.shields.io/badge/version-5.x-blue.svg?style=flat-square "noCaptcha v5.x"
-[no_captcha_4_x]: https://img.shields.io/badge/version-4.x-blue.svg?style=flat-square "noCaptcha v4.x"
-[no_captcha_3_x]: https://img.shields.io/badge/version-3.x-blue.svg?style=flat-square "noCaptcha v3.x"
-[no_captcha_1_x]: https://img.shields.io/badge/version-1.x-blue.svg?style=flat-square "noCaptcha v1.x"
+[no_captcha_9_x]:  https://img.shields.io/badge/version-9.x-blue.svg?style=flat-square "noCaptcha v9.x"
+[no_captcha_8_x]:  https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "noCaptcha v8.x"
+[no_captcha_7_x]:  https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "noCaptcha v7.x"
+[no_captcha_6_x]:  https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "noCaptcha v6.x"
+[no_captcha_5_x]:  https://img.shields.io/badge/version-5.x-blue.svg?style=flat-square "noCaptcha v5.x"
+[no_captcha_4_x]:  https://img.shields.io/badge/version-4.x-blue.svg?style=flat-square "noCaptcha v4.x"
+[no_captcha_3_x]:  https://img.shields.io/badge/version-3.x-blue.svg?style=flat-square "noCaptcha v3.x"
+[no_captcha_1_x]:  https://img.shields.io/badge/version-1.x-blue.svg?style=flat-square "noCaptcha v1.x"
 
 ## Composer
 

diff --git a/composer.json b/composer.json
@@ -14,16 +14,17 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":                "^7.2.5",
-        "ext-curl":           "*",
-        "ext-json":           "*",
-        "arcanedev/php-html": "^4.0",
-        "arcanedev/support":  "^7.0",
-        "psr/http-message":   "^1.0"
+        "php": "^7.3",
+        "ext-curl": "*",
+        "ext-json": "*",
+        "arcanedev/php-html": "^5.0",
+        "arcanedev/support": "^8.0",
+        "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "orchestra/testbench":    "^5.0",
-        "phpunit/phpunit":        "^8.5|^9.0"
+        "orchestra/testbench": "^6.0",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -36,13 +37,23 @@
             "Arcanedev\\NoCaptcha\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "phpunit",
+        "coverage": "phpunit --coverage-html build/coverage/html"
+    },
     "extra": {
+        "branch-alias": {
+            "dev-develop": "12.x-dev"
+        },
         "laravel": {
             "providers": [
                 "Arcanedev\\NoCaptcha\\NoCaptchaServiceProvider"
             ]
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-        >
+>
     <testsuites>
         <testsuite name="Package Test Suite">
             <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="coverage-text" target="build/logs/coverage.txt"/>
-        <log type="coverage-html" target="build/logs/coverage"/>
-    </logging>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <clover outputFile="build/coverage/clover.xml"/>
+            <html outputDirectory="build/coverage/html"/>
+            <text outputFile="build/coverage/coverage.txt" showOnlySummary="true"/>
+        </report>
+    </coverage>
 </phpunit>
diff --git a/src/AbstractNoCaptcha.php b/src/AbstractNoCaptcha.php
@@ -11,7 +11,6 @@
 /**
  * Class     AbstractNoCaptcha
  *
- * @package  Arcanedev\NoCaptcha
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 abstract class AbstractNoCaptcha implements Contracts\NoCaptcha

diff --git a/src/Contracts/NoCaptcha.php b/src/Contracts/NoCaptcha.php
@@ -9,7 +9,6 @@
 /**
  * Interface  NoCaptcha
  *
- * @package   Arcanedev\NoCaptcha\Contracts
  * @author    ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 interface NoCaptcha

diff --git a/src/Contracts/NoCaptchaManager.php b/src/Contracts/NoCaptchaManager.php
@@ -5,10 +5,9 @@
 namespace Arcanedev\NoCaptcha\Contracts;
 
 /**
- * Interface     NoCaptchaManager
+ * Interface  NoCaptchaManager
  *
- * @package  Arcanedev\NoCaptcha\Contracts
- * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
+ * @author    ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 interface NoCaptchaManager
 {

diff --git a/src/Contracts/Utilities/Request.php b/src/Contracts/Utilities/Request.php
@@ -5,9 +5,8 @@
 namespace Arcanedev\NoCaptcha\Contracts\Utilities;
 
 /**
- * Interface  RequestInterface
+ * Interface  Request
  *
- * @package   Arcanedev\NoCaptcha\Contracts\Utilities
  * @author    ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 interface Request

diff --git a/src/Contracts/Utilities/Response.php b/src/Contracts/Utilities/Response.php
@@ -4,15 +4,13 @@
 
 namespace Arcanedev\NoCaptcha\Contracts\Utilities;
 
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Contracts\Support\{Arrayable, Jsonable};
 use JsonSerializable;
 
 /**
- * Interface     Response
+ * Interface  Response
  *
- * @package  Arcanedev\NoCaptcha\Contracts\Utilities
- * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
+ * @author    ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 interface Response extends Arrayable, Jsonable, JsonSerializable
 {

diff --git a/src/Exceptions/ApiException.php b/src/Exceptions/ApiException.php
@@ -7,7 +7,6 @@
 /**
  * Class     ApiException
  *
- * @package  Arcanedev\NoCaptcha\Exceptions
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 class ApiException extends NoCaptchaException {}
diff --git a/src/Exceptions/InvalidArgumentException.php b/src/Exceptions/InvalidArgumentException.php
@@ -7,7 +7,6 @@
 /**
  * Class     InvalidArgumentException
  *
- * @package  Arcanedev\NoCaptcha\Exceptions
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 class InvalidArgumentException extends NoCaptchaException {}
diff --git a/src/Exceptions/InvalidUrlException.php b/src/Exceptions/InvalidUrlException.php
@@ -7,7 +7,6 @@
 /**
  * Class     InvalidUrlException
  *
- * @package  Arcanedev\NoCaptcha\Exceptions
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 class InvalidUrlException extends NoCaptchaException {}
diff --git a/src/Exceptions/NoCaptchaException.php b/src/Exceptions/NoCaptchaException.php
@@ -7,7 +7,6 @@
 /**
  * Class     NoCaptchaException
  *
- * @package  Arcanedev\NoCaptcha\Exceptions
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 abstract class NoCaptchaException extends \Exception {}
diff --git a/src/NoCaptchaManager.php b/src/NoCaptchaManager.php
@@ -5,15 +5,12 @@
 namespace Arcanedev\NoCaptcha;
 
 use Illuminate\Support\Manager;
-use Arcanedev\NoCaptcha\Contracts\{
-    NoCaptchaManager as NoCaptchaManagerContract,
-    NoCaptcha as NoCaptchaContract,
-};
+use Arcanedev\NoCaptcha\Contracts\NoCaptcha as NoCaptchaContract;
+use Arcanedev\NoCaptcha\Contracts\NoCaptchaManager as NoCaptchaManagerContract;
 
 /**
  * Class     NoCaptchaManager
  *
- * @package  Arcanedev\NoCaptcha
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 class NoCaptchaManager extends Manager implements NoCaptchaManagerContract

diff --git a/src/NoCaptchaServiceProvider.php b/src/NoCaptchaServiceProvider.php
@@ -13,7 +13,6 @@
 /**
  * Class     NoCaptchaServiceProvider
  *
- * @package  Arcanedev\NoCaptcha
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 class NoCaptchaServiceProvider extends ServiceProvider implements DeferrableProvider

diff --git a/src/NoCaptchaV2.php b/src/NoCaptchaV2.php
@@ -12,7 +12,6 @@
 /**
  * Class     NoCaptchaV2
  *
- * @package  Arcanedev\NoCaptcha
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 class NoCaptchaV2 extends AbstractNoCaptcha

diff --git a/src/NoCaptchaV3.php b/src/NoCaptchaV3.php
@@ -11,7 +11,6 @@
 /**
  * Class     NoCaptchaV3
  *
- * @package  Arcanedev\NoCaptcha
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 class NoCaptchaV3 extends AbstractNoCaptcha

diff --git a/src/Rules/CaptchaRule.php b/src/Rules/CaptchaRule.php
@@ -1,12 +1,15 @@
-<?php namespace Arcanedev\NoCaptcha\Rules;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Rules;
 
 use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Support\Arr;
 
 /**
  * Class     CaptchaRule
  *
- * @package  Arcanedev\NoCaptcha\Rules
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
 class CaptchaRule implements Rule