[2.x] New version

Laragear · Mar 6, 2024 · e1e0d9c · e1e0d9c
1 parent 99c7df1
commit e1e0d9c
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 359 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -9,119 +9,119 @@ on:
 jobs:
 
   byte_level:
-    name: "0️⃣ Byte-level"
-    runs-on: "ubuntu-latest"
+    name: 0️⃣ Byte-level
+    runs-on: ubuntu-latest
     steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v3"
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: "Check file permissions"
+      - name: Check file permissions
         run: |
-          test "$(find . -type f -not -path './.git/*' -executable)" == ""
-      - name: "Find non-printable ASCII characters"
+          test $(find . -type f -not -path './.git/*' -executable) ==
+      - name: Find non-printable ASCII characters
         run: |
-          ! LC_ALL=C.UTF-8 find ./src -type f -name "*.php" -print0 | xargs -0 -- grep -PHn "[^ -~]"
+          ! LC_ALL=C.UTF-8 find ./src -type f -name *.php -print0 | xargs -0 -- grep -PHn [^ -~]
 
   syntax_errors:
-    name: "1️⃣ Syntax errors"
-    runs-on: "ubuntu-latest"
+    name: 1️⃣ Syntax errors
+    runs-on: ubuntu-latest
     steps:
-      - name: "Set up PHP"
-        uses: "shivammathur/setup-php@v2"
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: "latest"
-          tools: "parallel-lint"
+          php-version: latest
+          tools: parallel-lint
 
-      - name: "Checkout code"
-        uses: "actions/checkout@v3"
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: "Validate Composer configuration"
-        run: "composer validate --strict"
+      - name: Validate Composer configuration
+        run: composer validate --strict
 
-      - name: "Check source code for syntax errors"
-        run: "composer exec -- parallel-lint src/"
+      - name: Check source code for syntax errors
+        run: composer exec -- parallel-lint src/
 
   unit_tests:
-    name: "2️⃣ Unit and Feature tests"
+    name: 2️⃣ Unit and Feature tests
     needs:
-      - "byte_level"
-      - "syntax_errors"
-    runs-on: "ubuntu-latest"
+      - byte_level
+      - syntax_errors
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php-version:
-          - "8.0"
-          - "8.1"
-          - "8.2"
+          - 8.1
+          - 8.2
+          - 8.3
         laravel-constraint:
-          - "9.*"
-          - "10.*"
+          - 10.*
+          - 11.*
         dependencies:
-          - "lowest"
-          - "highest"
+          - lowest
+          - highest
         exclude:
-          - laravel-constraint: "10.*"
-            php-version: "8.0"
+          - laravel-constraint: 11.*
+            php-version: 8.1
     steps:
-      - name: "Set up PHP"
-        uses: "shivammathur/setup-php@v2"
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: "${{ matrix.php-version }}"
-          extensions: "mbstring, intl"
-          coverage: "xdebug"
+          php-version: ${{ matrix.php-version }}
+          extensions: mbstring, intl
+          coverage: xdebug
 
-      - name: "Checkout code"
-        uses: "actions/checkout@v3"
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: "Install dependencies"
-        uses: "ramsey/composer-install@v2"
+      - name: Install dependencies
+        uses: ramsey/composer-install@v3
         with:
-          dependency-versions: "${{ matrix.dependencies }}"
-          composer-options: "--with=laravel/framework:${{ matrix.laravel-constraint }}"
+          dependency-versions: ${{ matrix.dependencies }}
+          composer-options: --with=laravel/framework:${{ matrix.laravel-constraint }}
 
-      - name: "Execute unit tests"
-        run: "composer run-script test"
+      - name: Execute unit tests
+        run: composer run-script test
 
-      - name: "Upload coverage to Codecov"
-        uses: "codecov/codecov-action@v3"
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
 
   static_analysis:
-    name: "3️⃣ Static Analysis"
+    name: 3️⃣ Static Analysis
     needs:
-      - "byte_level"
-      - "syntax_errors"
-    runs-on: "ubuntu-latest"
+      - byte_level
+      - syntax_errors
+    runs-on: ubuntu-latest
     steps:
-      - name: "Set up PHP"
-        uses: "shivammathur/setup-php@v2"
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
         with:
-          tools: "phpstan"
-          php-version: "latest"
-          coverage: "none"
+          tools: phpstan
+          php-version: latest
+          coverage: none
 
-      - name: "Checkout code"
-        uses: "actions/checkout@v3"
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: "Install dependencies"
-        uses: "ramsey/composer-install@v2"
+      - name: Install dependencies
+        uses: ramsey/composer-install@v3
 
-      - name: "Execute static analysis"
-        run: "composer exec -- phpstan analyze -l 5 src/"
+      - name: Execute static analysis
+        run: composer exec -- phpstan analyze -l 5 src/
 
   exported_files:
-    name: "4️⃣ Exported files"
+    name: 4️⃣ Exported files
     needs:
-      - "byte_level"
-      - "syntax_errors"
-    runs-on: "ubuntu-latest"
+      - byte_level
+      - syntax_errors
+    runs-on: ubuntu-latest
     steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v3"
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - name: "Check exported files"
+      - name: Check exported files
         run: |
-          EXPECTED=".phpstorm.meta.php,LICENSE.md,README.md,composer.json"
-          CURRENT="$(git archive HEAD | tar --list --exclude="src" --exclude="src/*" --exclude=".stubs" --exclude=".stubs/*"  --exclude="routes" --exclude="routes/*" --exclude="stubs" --exclude="stubs/*" --exclude="lang" --exclude="lang/*" --exclude="config" --exclude="config/*" --exclude="database" --exclude="database/*" --exclude="resources" --exclude="resources/*" | paste -s -d ",")"
-          echo "CURRENT =${CURRENT}"
-          echo "EXPECTED=${EXPECTED}"
-          test "${CURRENT}" == "${EXPECTED}"
+          EXPECTED=.phpstorm.meta.php,LICENSE.md,README.md,composer.json
+          CURRENT=$(git archive HEAD | tar --list --exclude=src --exclude=src/* --exclude=.stubs --exclude=.stubs/*  --exclude=routes --exclude=routes/* --exclude=stubs --exclude=stubs/* --exclude=lang --exclude=lang/* --exclude=config --exclude=config/* --exclude=database --exclude=database/* --exclude=resources --exclude=resources/* | paste -s -d ,)
+          echo CURRENT =${CURRENT}
+          echo EXPECTED=${EXPECTED}
+          test ${CURRENT} == ${EXPECTED}
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Codecov coverage](https://codecov.io/gh/Laragear/ReCaptcha/branch/1.x/graph/badge.svg?token=5U6BJUEA4T)](https://codecov.io/gh/Laragear/ReCaptcha)
 [![Maintainability](https://api.codeclimate.com/v1/badges/b889decbc6af6a1cfd3a/maintainability)](https://codeclimate.com/github/Laragear/ReCaptcha/maintainability)
 [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=Laragear_ReCaptcha&metric=alert_status)](https://sonarcloud.io/dashboard?id=Laragear_ReCaptcha)
-[![Laravel Octane Compatibility](https://img.shields.io/badge/Laravel%20Octane-Compatible-success?style=flat&logo=laravel)](https://laravel.com/docs/9.x/octane#introduction)
+[![Laravel Octane Compatibility](https://img.shields.io/badge/Laravel%20Octane-Compatible-success?style=flat&logo=laravel)](https://laravel.com/docs/11.x/octane#introduction)
 
 Integrate reCAPTCHA using **async HTTP/2**, making your app **fast** with a few lines.
 
@@ -25,8 +25,7 @@ Your support allows me to keep this package free, up-to-date and maintainable. A
 
 ## Requirements
 
-* PHP 8.0 or later
-* Laravel 9, 10 or later
+* Laravel 10 or later
 
 ## Installation
 
@@ -553,4 +552,4 @@ If you discover any security related issues, please email darkghosthunter@gmail.
 
 This specific package version is licensed under the terms of the [MIT License](LICENSE.md), at time of publishing.
 
-[Laravel](https://laravel.com) is a Trademark of [Taylor Otwell](https://github.com/TaylorOtwell/). Copyright © 2011-2023 Laravel LLC.
+[Laravel](https://laravel.com) is a Trademark of [Taylor Otwell](https://github.com/TaylorOtwell/). Copyright © 2011-2024 Laravel LLC.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Integrate reCAPTCHA using async HTTP/2, making your app fast with a few lines.",
     "type": "library",
     "license": "MIT",
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "keywords": [
         "laragear",
@@ -23,17 +23,16 @@
         "issues": "https://github.com/Laragear/ReCaptcha/issues"
     },
     "require": {
-        "php": "8.*",
+        "php": "^8.1",
         "ext-json": "*",
-        "illuminate/support": "9.*|10.*",
-        "illuminate/http": "9.*|10.*",
-        "illuminate/routing": "9.*|10.*",
-        "illuminate/container": "9.*|10.*",
-        "illuminate/events": "9.*|10.*",
-        "guzzlehttp/guzzle": "^7.5"
+        "illuminate/support": "10.*|11.*",
+        "illuminate/http": "10.*|11.*",
+        "illuminate/routing": "10.*|11.*",
+        "illuminate/container": "10.*|11.*",
+        "illuminate/events": "10.*|11.*"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.22|8.*"
+        "orchestra/testbench": "8.*|9.*"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Blade/Directives/Robot.php b/src/Blade/Directives/Robot.php
@@ -10,8 +10,6 @@ class Robot
 {
     /**
      * Check if the ReCaptcha challenge was remembered and not expired.
-     *
-     * @return bool
      */
     public static function directive(): bool
     {

diff --git a/src/Facades/ReCaptcha.php b/src/Facades/ReCaptcha.php
@@ -15,8 +15,6 @@ class ReCaptcha extends Facade
 {
     /**
      * Get the registered name of the component.
-     *
-     * @return string
      */
     protected static function getFacadeAccessor(): string
     {
@@ -25,8 +23,6 @@ protected static function getFacadeAccessor(): string
 
     /**
      * Returns a new ReCaptcha service to fake responses.
-     *
-     * @return \Laragear\ReCaptcha\ReCaptchaFake
      */
     public static function fake(): ReCaptchaFake
     {
@@ -43,9 +39,6 @@ public static function fake(): ReCaptchaFake
 
     /**
      * Makes the fake ReCaptcha response with a fake score.
-     *
-     * @param  float  $score
-     * @return void
      */
     public static function fakeScore(float $score): void
     {
@@ -54,8 +47,6 @@ public static function fakeScore(float $score): void
 
     /**
      * Makes a fake ReCaptcha response made by a robot with "0" score.
-     *
-     * @return void
      */
     public static function fakeRobot(): void
     {
@@ -64,8 +55,6 @@ public static function fakeRobot(): void
 
     /**
      * Makes a fake ReCaptcha response made by a human with "1.0" score.
-     *
-     * @return void
      */
     public static function fakeHuman(): void
     {

diff --git a/src/Http/CheckScore.php b/src/Http/CheckScore.php
@@ -6,16 +6,11 @@ trait CheckScore
 {
     /**
      * The threshold to compare score-driven responses.
-     *
-     * @var float
      */
     protected float $threshold = 1.0;
 
     /**
      * Sets the threshold to compare score-driven responses.
-     *
-     * @param  float  $threshold
-     * @return $this
      */
     public function setThreshold(float $threshold): static
     {

diff --git a/src/Http/Controllers/ConfirmationController.php b/src/Http/Controllers/ConfirmationController.php
@@ -6,15 +6,12 @@
 use Illuminate\Http\Response;
 use Illuminate\Routing\Controller;
 use Laragear\ReCaptcha\Http\Middleware\Builders\ReCaptcha;
-
 use function redirect;
 
 class ConfirmationController extends Controller
 {
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -23,8 +20,6 @@ public function __construct()
 
     /**
      * Show the confirmation view.
-     *
-     * @return \Illuminate\Http\Response
      */
     public function show(): Response
     {
@@ -33,8 +28,6 @@ public function show(): Response
 
     /**
      * Redirects the user after confirming the reCAPTCHA challenge.
-     *
-     * @return \Illuminate\Http\RedirectResponse
      */
     public function confirm(): RedirectResponse
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,6 @@ class Robot @@
     {
         /**
          * Check if the ReCaptcha challenge was remembered and not expired.
-         *
-         * @return bool
          */
         public static function directive(): bool
         {
@@ Expand Down @@