Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ARCANEDEV/noCAPTCHA
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 12.1.0
Choose a base ref
...
head repository: ARCANEDEV/noCAPTCHA
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 8 commits
  • 8 files changed
  • 2 contributors

Commits on Dec 18, 2020

  1. Copy the full SHA
    60bbf3f View commit details
  2. Merge pull request #104 from ARCANEDEV/update-php_8_support

    Adding PHP 8.0 support
    arcanedev-maroc authored Dec 18, 2020
    Copy the full SHA
    b2df8b5 View commit details

Commits on Feb 9, 2022

  1. PHP 8.1 deprecation fix

    oprypkhantc committed Feb 9, 2022
    Copy the full SHA
    908ba81 View commit details

Commits on Feb 10, 2022

  1. Merge pull request #107 from tenantcloud/master

    PHP 8.1 deprecation fix
    arcanedev-maroc authored Feb 10, 2022
    Copy the full SHA
    dc41779 View commit details
  2. Copy the full SHA
    b17622a View commit details
  3. Copy the full SHA
    8b88911 View commit details
  4. Copy the full SHA
    0e5341a View commit details
  5. Merge pull request #108 from ARCANEDEV/laravel_9_support

    Laravel 9 support
    arcanedev-maroc authored Feb 10, 2022
    Copy the full SHA
    16ff6e2 View commit details
Showing with 21 additions and 45 deletions.
  1. +8 −7 .github/workflows/run-tests.yml
  2. +1 −1 LICENSE.md
  3. +1 −1 README.md
  4. +0 −28 _docs/0-Home.md
  5. +3 −0 _docs/1-Installation-and-Setup.md
  6. +6 −6 composer.json
  7. +1 −1 src/NoCaptchaManager.php
  8. +1 −1 src/Utilities/AbstractResponse.php
15 changes: 8 additions & 7 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [7.3, 7.4]
php: [8.0, 8.1]
dependency-version: [prefer-lowest, prefer-stable]

name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
@@ -29,17 +29,18 @@ jobs:
with:
php-version: ${{ matrix.php }}
extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
coverage: xdebug
tools: composer:v2
coverage: pcov

- name: Install dependencies
run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction

- name: Execute tests
run: |
mkdir -p build/logs
vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
- name: Scrutinizer CI
run: |
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover coverage.clover
# - name: Scrutinizer CI
# run: |
# wget https://scrutinizer-ci.com/ocular.phar
# php ocular.phar code-coverage:upload --format=php-clover coverage.clover
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2020 | ARCANEDEV <arcanedev.maroc@gmail.com> - noCaptcha
Copyright (c) ARCANEDEV <arcanedev.maroc@gmail.com> - noCaptcha

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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 `8.x` are supported.
* Laravel `4.2` to `9.x` are supported.
* PSR-7 Support (ServerRequest verification).
* Made with :heart: &amp; :coffee:.

28 changes: 0 additions & 28 deletions _docs/0-Home.md

This file was deleted.

3 changes: 3 additions & 0 deletions _docs/1-Installation-and-Setup.md
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ For more details, check the [official documentation](https://developers.google.c

| Laravel | noCaptcha |
|:-----------------------------|:--------------------------------------------------------------------|
| ![Laravel v9.x][laravel_9_x] | ![noCaptcha v13.x][no_captcha_13_x] |
| ![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] |
@@ -36,6 +37,7 @@ For more details, check the [official documentation](https://developers.google.c

> **Note :** This is a framework-agnostic package, so you can use any version of this package in your PHP project.
[laravel_9_x]: https://img.shields.io/badge/version-9.x-blue.svg?style=flat-square "Laravel v9.x"
[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"
@@ -50,6 +52,7 @@ For more details, check the [official documentation](https://developers.google.c
[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_13_x]: https://img.shields.io/badge/version-13.x-blue.svg?style=flat-square "noCaptcha v13.x"
[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"
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -14,17 +14,17 @@
"type": "library",
"license": "MIT",
"require": {
"php": "^7.3",
"php": "^8.0",
"ext-curl": "*",
"ext-json": "*",
"arcanedev/php-html": "^5.0",
"arcanedev/support": "^8.0",
"arcanedev/php-html": "^6.0",
"arcanedev/support": "^9.0",
"psr/http-message": "^1.0"
},
"require-dev": {
"orchestra/testbench": "^6.0",
"orchestra/testbench": "^7.0",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.3"
"phpunit/phpunit": "^9.5.8"
},
"autoload": {
"psr-4": {
@@ -42,7 +42,7 @@
},
"extra": {
"branch-alias": {
"dev-develop": "12.x-dev"
"dev-develop": "13.x-dev"
},
"laravel": {
"providers": [
2 changes: 1 addition & 1 deletion src/NoCaptchaManager.php
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@

namespace Arcanedev\NoCaptcha;

use Illuminate\Support\Manager;
use Arcanedev\NoCaptcha\Contracts\NoCaptcha as NoCaptchaContract;
use Arcanedev\NoCaptcha\Contracts\NoCaptchaManager as NoCaptchaManagerContract;
use Illuminate\Support\Manager;

/**
* Class NoCaptchaManager
2 changes: 1 addition & 1 deletion src/Utilities/AbstractResponse.php
Original file line number Diff line number Diff line change
@@ -201,7 +201,7 @@ public function toJson($options = 0)
*
* @return array
*/
public function jsonSerialize()
public function jsonSerialize(): array
{
return $this->toArray();
}