Merge pull request #35 from DarkGhostHunter/master

Laravel 8.0 support, and PHP 8.0 support
DarkGhostHunter · Mar 16, 2021 · 1984f19 · 1984f19
2 parents cb78abc + 5bf62cb
commit 1984f19
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 69 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -11,12 +11,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, 7.3, 7.2.15]
-        laravel: [7.*]
+        php: [8.0]
+        laravel: [8.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 7.*
-            testbench: 5.*
+          - laravel: 8.*
+            testbench: ^6.14
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -25,7 +25,7 @@ jobs:
       uses: actions/checkout@v1
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v1
+      uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
         extensions: mbstring, intl

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -26,7 +26,10 @@ It uses your Laravel HTTP Client and **HTTP/2**, making your app **fast**. You o
 
 ## Requirements
 
-* Laravel 7.x
+* Laravel 8.x
+* PHP 8.0
+
+> If you need support for old versions, consider sponsoring or donating.
 
 ## Installation
 

diff --git a/composer.json b/composer.json
@@ -17,13 +17,14 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^8.0",
         "ext-json": "*",
-        "illuminate/support": "^7.0",
-        "guzzlehttp/guzzle": "^6.3.1||^7.0"
+        "illuminate/support": "^8.0",
+        "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0"
+        "orchestra/testbench": "^6.14.0",
+        "phpunit/phpunit": "^9.5.2"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" />
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
 </phpunit>
diff --git a/src/Captchavel.php b/src/Captchavel.php
@@ -29,7 +29,7 @@ class Captchavel
      *
      * @var string
      */
-    public const RECAPTCHA_ENDPOINT = 'www.google.com/recaptcha/api/siteverify';
+    public const RECAPTCHA_ENDPOINT = 'https://www.google.com/recaptcha/api/siteverify';
 
     /**
      * The name of the input for a reCAPTCHA frontend response.

diff --git a/src/CaptchavelServiceProvider.php b/src/CaptchavelServiceProvider.php
@@ -34,7 +34,7 @@ public function boot(Router $router, Repository $config)
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__.'/../config/config.php' => config_path('captchavel.php'),
+                __DIR__.'/../config/captchavel.php' => config_path('captchavel.php'),
             ], 'config');
 
             if ($this->app->runningUnitTests()) {

diff --git a/src/Facades/Captchavel.php b/src/Facades/Captchavel.php
@@ -2,9 +2,9 @@
 
 namespace DarkGhostHunter\Captchavel\Facades;
 
-use Illuminate\Support\Facades\Facade;
-use DarkGhostHunter\Captchavel\CaptchavelFake;
 use DarkGhostHunter\Captchavel\Captchavel as BaseCaptchavel;
+use DarkGhostHunter\Captchavel\CaptchavelFake;
+use Illuminate\Support\Facades\Facade;
 
 /**
  * @method static \DarkGhostHunter\Captchavel\Captchavel getFacadeRoot()
@@ -26,7 +26,7 @@ protected static function getFacadeAccessor()
      *
      * @return \DarkGhostHunter\Captchavel\CaptchavelFake
      */
-    protected static function fake()
+    public static function fake()
     {
         if (static::$resolvedInstance instanceof CaptchavelFake) {
             return static::$resolvedInstance;

diff --git a/src/helpers.php b/src/helpers.php
@@ -18,6 +18,6 @@ function captchavel(string $credentials)
             return $key;
         }
 
-        throw new LogicException("The reCAPTCHA site key for [$credentials] doesn't exists.");
+        throw new LogicException("The reCAPTCHA site key for [$credentials] doesn't exist.");
     }
 }
diff --git a/tests/HelperTest.php b/tests/HelperTest.php
@@ -13,7 +13,7 @@ class HelperTest extends TestCase
     public function test_exception_when_no_v3_key_loaded()
     {
         $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The reCAPTCHA site key for [3] doesn\'t exists.');
+        $this->expectExceptionMessage('The reCAPTCHA site key for [3] doesn\'t exist.');
 
         captchavel(3);
     }