From 34c8dcb344a2dce3ec1e5377a63804239d9047ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tolnai=20Zolt=C3=A1n?= Date: Sat, 6 Jun 2020 10:12:19 +0200 Subject: [PATCH 01/14] Fixed config filename typo --- src/CaptchavelServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CaptchavelServiceProvider.php b/src/CaptchavelServiceProvider.php index 6f3bb60..f44df30 100644 --- 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()) { From accb81af23a73a9cc36dc5b67cd8fd8bf4973a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tolnai=20Zolt=C3=A1n?= Date: Sat, 6 Jun 2020 10:13:06 +0200 Subject: [PATCH 02/14] always use https for recaptcha endpoint --- src/Captchavel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Captchavel.php b/src/Captchavel.php index 94298bd..515c421 100644 --- 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. From 4933fa17e73daf921ac9da18123b175da8fa87fb Mon Sep 17 00:00:00 2001 From: Chrysanthos <48060191+chrysanthos@users.noreply.github.com> Date: Fri, 11 Dec 2020 00:29:05 +0200 Subject: [PATCH 03/14] Fix typo --- src/helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers.php b/src/helpers.php index 3f6c4c5..4487514 100644 --- 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."); } } From 27821fdc3173d3e44e873e3129fb4290445ee34a Mon Sep 17 00:00:00 2001 From: Chrysanthos <48060191+chrysanthos@users.noreply.github.com> Date: Fri, 11 Dec 2020 00:41:50 +0200 Subject: [PATCH 04/14] Update HelperTest.php --- tests/HelperTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/HelperTest.php b/tests/HelperTest.php index 437eec1..63481a6 100644 --- 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); } From d9d293090b4a553f0079ef26d5d4a3bf41d4e130 Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 16:22:50 -0300 Subject: [PATCH 05/14] Added Laravel 8.0 support. --- .github/workflows/php.yml | 10 +++++----- .travis.yml | 25 ------------------------- composer.json | 8 ++++---- 3 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index a6da838..d5acb93 100644 --- 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.* 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 deleted file mode 100644 index 2f33387..0000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -language: php - -php: - - 7.2 - - 7.3 - -env: - global: - - CC_TEST_REPORTER_ID=3cb0149c1ae23214062407321730aa13a558d9e10aa7011e01282b5a46e7f100 - -install: - - travis_retry composer self-update - - travis_retry composer require php-coveralls/php-coveralls:2.1.* --dev - - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source - - travis_retry curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - -before_script: - - chmod +x ./cc-test-reporter - - ./cc-test-reporter before-build - -after_script: - - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT - -after_success: - - travis_retry php vendor/bin/php-coveralls --verbose diff --git a/composer.json b/composer.json index 6f9bd17..678306a 100644 --- a/composer.json +++ b/composer.json @@ -17,13 +17,13 @@ } ], "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.0" }, "autoload": { "psr-4": { From f76b4fdbd582386e5e6c05226ed14b4e7d4f0968 Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 16:28:07 -0300 Subject: [PATCH 06/14] Changed method visibility. --- src/Facades/Captchavel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Facades/Captchavel.php b/src/Facades/Captchavel.php index 4a71a81..5a3d9e3 100644 --- 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; From 474a9db966fe6474c2fbf61ae3c3fc29a4b02777 Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 16:34:16 -0300 Subject: [PATCH 07/14] Migrated PHPUnit --- phpunit.xml.dist | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 12ba420..067cd56 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,29 +1,21 @@ - - - - tests - - - - - src/ - - - - - - - - - + + + + src/ + + + + + + + + + + tests + + + + + From 296cf65174c5646dc1a5f003187eb6cde7d2d6b9 Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 16:35:37 -0300 Subject: [PATCH 08/14] Added PHPUnit minimum version. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 678306a..44ac0c2 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ "guzzlehttp/guzzle": "^7.0" }, "require-dev": { - "orchestra/testbench": "^6.0" + "orchestra/testbench": "^6.0", + "phpunit/phpunit": "^9.5" }, "autoload": { "psr-4": { From 0a465cc411c901d8a2d2c039a5f6639ac94c36c6 Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 16:47:37 -0300 Subject: [PATCH 09/14] Fixed PHPUnit minimum version for tests. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 44ac0c2..b824024 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ }, "require-dev": { "orchestra/testbench": "^6.0", - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^9.5.2" }, "autoload": { "psr-4": { From 15d13ef40c438d44682396db98faf338126f7581 Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 16:54:58 -0300 Subject: [PATCH 10/14] Fixed Testbench minimum version for tests. --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b824024..3ea6cd3 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,7 @@ "guzzlehttp/guzzle": "^7.0" }, "require-dev": { - "orchestra/testbench": "^6.0", - "phpunit/phpunit": "^9.5.2" + "orchestra/testbench": "^6.14" }, "autoload": { "psr-4": { From ed98705b307ef432d94744350a8e1ec333112c3d Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 16:59:22 -0300 Subject: [PATCH 11/14] Fixed everything, hopefully, for test. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3ea6cd3..bbe942d 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ "guzzlehttp/guzzle": "^7.0" }, "require-dev": { - "orchestra/testbench": "^6.14" + "orchestra/testbench": "^6.14", + "phpunit/phpunit": "^9.5.2" }, "autoload": { "psr-4": { From bc4ed2c2becea093365f331de262233c95897ce0 Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 17:22:43 -0300 Subject: [PATCH 12/14] Should have fixed orchestra/testbench minimum version. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bbe942d..be173bb 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "guzzlehttp/guzzle": "^7.0" }, "require-dev": { - "orchestra/testbench": "^6.14", + "orchestra/testbench": "^6.14.0", "phpunit/phpunit": "^9.5.2" }, "autoload": { From 7519d217ce7d57929415f39d9bb8e26da55d14fa Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 17:25:33 -0300 Subject: [PATCH 13/14] Fixed testbench in actions. --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index d5acb93..daffdd5 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -16,7 +16,7 @@ jobs: dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 8.* - testbench: 6.* + testbench: ^6.14 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }} From 5bf62cb6dd8f34868f3a2d2f93edcb5ebeca6f73 Mon Sep 17 00:00:00 2001 From: DarkGhosthunter Date: Tue, 16 Mar 2021 17:54:15 -0300 Subject: [PATCH 14/14] Updated requirements section. --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f7623c7..8d8ee11 100644 --- 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