Merge pull request #95 from ARCANEDEV/update-github_actions

Using GitHub Actions for testing
ARCANEDEV · Jan 31, 2020 · a2e3d6f · a2e3d6f
2 parents 007d706 + 27b1864
commit a2e3d6f
Show file tree

Hide file tree

Showing 33 changed files with 407 additions and 293 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,6 +8,5 @@
 .gitattributes    export-ignore
 .gitignore        export-ignore
 .scrutinizer.yml  export-ignore
-.travis.yml       export-ignore
 phpunit.xml.dist  export-ignore
 CONTRIBUTING.md   export-ignore
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -0,0 +1,46 @@
+name: run-tests
+
+on: [push]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.2, 7.3, 7.4]
+        laravel: [6.*]
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v1
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
+          coverage: xdebug
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+
+      - 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
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 2
+        runs: 6
     php_code_sniffer:
         enabled: true
         config:

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # noCAPTCHA (new reCAPTCHA) [![Packagist License][badge_license]](LICENSE.md) [![For PHP][badge_php]][link-github-repo]
 
-[![Travis Status][badge_build]][link-travis]
+[![Github Workflow Status][badge_build]][link-github-status]
 [![Coverage Status][badge_coverage]][link-scrutinizer]
 [![Scrutinizer Code Quality][badge_quality]][link-scrutinizer]
 [![SensioLabs Insight][badge_insight]][link-insight]
@@ -55,7 +55,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 
 [badge_php]:          https://img.shields.io/badge/PHP-Framework%20agnostic-4F5B93.svg?style=flat-square
 [badge_license]:      https://img.shields.io/packagist/l/arcanedev/no-captcha.svg?style=flat-square
-[badge_build]:        https://img.shields.io/travis/ARCANEDEV/noCAPTCHA.svg?style=flat-square
+[badge_build]:       https://img.shields.io/github/workflow/status/ARCANEDEV/noCAPTCHA/run-tests?style=flat-square
 [badge_coverage]:     https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/noCAPTCHA.svg?style=flat-square
 [badge_quality]:      https://img.shields.io/scrutinizer/g/ARCANEDEV/noCAPTCHA.svg?style=flat-square
 [badge_insight]:      https://img.shields.io/sensiolabs/i/ae37b4c0-5478-4afb-9a71-1fe5534d8ef5.svg?style=flat-square
@@ -65,10 +65,10 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 [badge_downloads]:    https://img.shields.io/packagist/dt/arcanedev/no-captcha.svg?style=flat-square
 
 [link-author]:        https://github.com/arcanedev-maroc
+[link-github-status]: https://github.com/ARCANEDEV/noCAPTCHA/actions
 [link-github-repo]:   https://github.com/ARCANEDEV/noCAPTCHA
 [link-github-issues]: https://github.com/ARCANEDEV/noCAPTCHA/issues
 [link-contributors]:  https://github.com/ARCANEDEV/noCAPTCHA/graphs/contributors
 [link-packagist]:     https://packagist.org/packages/arcanedev/no-captcha
-[link-travis]:        https://travis-ci.org/ARCANEDEV/noCAPTCHA
 [link-scrutinizer]:   https://scrutinizer-ci.com/g/ARCANEDEV/noCAPTCHA/?branch=master
 [link-insight]:       https://insight.sensiolabs.com/projects/ae37b4c0-5478-4afb-9a71-1fe5534d8ef5
diff --git a/composer.json b/composer.json
@@ -18,11 +18,11 @@
         "ext-curl":           "*",
         "ext-json":           "*",
         "arcanedev/php-html": "^3.0",
-        "arcanedev/support":  "^5.0",
+        "arcanedev/support":  "^5.1",
         "psr/http-message":   "^1.0"
     },
     "require-dev": {
-        "orchestra/testbench":    "^4.0",
+        "orchestra/testbench":    "^4.5",
         "phpunit/phpunit":        "^8.0",
         "phpunit/phpcov":         "^6.0"
     },

diff --git a/src/AbstractNoCaptcha.php b/src/AbstractNoCaptcha.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha;
 
 use Arcanedev\NoCaptcha\Utilities\Request;
 use Illuminate\Support\HtmlString;
@@ -243,7 +247,7 @@ public function verifyRequest(ServerRequestInterface $request)
      *
      * @param  array  $query
      *
-     * @return \Arcanedev\NoCaptcha\Utilities\ResponseV3
+     * @return \Arcanedev\NoCaptcha\Contracts\Utilities\Response
      */
     protected function sendVerifyRequest(array $query = [])
     {
@@ -260,7 +264,7 @@ protected function sendVerifyRequest(array $query = [])
      *
      * @param  string  $json
      *
-     * @return \Arcanedev\NoCaptcha\Utilities\AbstractResponse|mixed
+     * @return \Arcanedev\NoCaptcha\Contracts\Utilities\Response|mixed
      */
     abstract protected function parseResponse($json);
 
@@ -285,7 +289,7 @@ protected function hasLang()
      * @param  string  $name
      * @param  string  $value
      */
-    private static function checkKey($name, &$value)
+    private static function checkKey($name, &$value): void
     {
         self::checkIsString($name, $value);
 
@@ -302,7 +306,7 @@ private static function checkKey($name, &$value)
      *
      * @throws \Arcanedev\NoCaptcha\Exceptions\ApiException
      */
-    private static function checkIsString($name, $value)
+    private static function checkIsString($name, $value): void
     {
         if ( ! is_string($value)) {
             throw new Exceptions\ApiException(
@@ -319,7 +323,7 @@ private static function checkIsString($name, $value)
      *
      * @throws \Arcanedev\NoCaptcha\Exceptions\ApiException
      */
-    private static function checkIsNotEmpty($name, $value)
+    private static function checkIsNotEmpty($name, $value): void
     {
         if (empty($value)) {
             throw new Exceptions\ApiException("The {$name} must not be empty");

diff --git a/src/Contracts/NoCaptcha.php b/src/Contracts/NoCaptcha.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Contracts;
 
 use Arcanedev\NoCaptcha\Contracts\Utilities\Request;
 

diff --git a/src/Contracts/NoCaptchaManager.php b/src/Contracts/NoCaptchaManager.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Contracts;
 
 /**
  * Interface     NoCaptchaManager

diff --git a/src/Contracts/Utilities/Request.php b/src/Contracts/Utilities/Request.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha\Contracts\Utilities;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Contracts\Utilities;
 
 /**
  * Interface  RequestInterface

diff --git a/src/Contracts/Utilities/Response.php b/src/Contracts/Utilities/Response.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha\Contracts\Utilities;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Contracts\Utilities;
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;

diff --git a/src/Exceptions/ApiException.php b/src/Exceptions/ApiException.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha\Exceptions;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Exceptions;
 
 /**
  * Class     ApiException

diff --git a/src/Exceptions/InvalidArgumentException.php b/src/Exceptions/InvalidArgumentException.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha\Exceptions;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Exceptions;
 
 /**
  * Class     InvalidArgumentException

diff --git a/src/Exceptions/InvalidUrlException.php b/src/Exceptions/InvalidUrlException.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha\Exceptions;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Exceptions;
 
 /**
  * Class     InvalidUrlException

diff --git a/src/Exceptions/NoCaptchaException.php b/src/Exceptions/NoCaptchaException.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha\Exceptions;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Exceptions;
 
 /**
  * Class     NoCaptchaException

diff --git a/src/NoCaptchaManager.php b/src/NoCaptchaManager.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha;
 
 use Illuminate\Support\Manager;
 use Arcanedev\NoCaptcha\Contracts\{
@@ -96,6 +100,6 @@ protected function buildDriver(string $driver): NoCaptchaContract
      */
     protected function config(string $key = '')
     {
-        return $this->container['config']->get("no-captcha.{$key}");
+        return $this->config->get("no-captcha.{$key}");
     }
 }
diff --git a/src/NoCaptchaServiceProvider.php b/src/NoCaptchaServiceProvider.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha;
 
 use Arcanedev\Support\Providers\PackageServiceProvider as ServiceProvider;
 use Illuminate\Contracts\Foundation\Application;

diff --git a/src/NoCaptchaV2.php b/src/NoCaptchaV2.php
@@ -1,7 +1,10 @@
-<?php namespace Arcanedev\NoCaptcha;
+<?php
 
-use Arcanedev\Html\Elements\Button;
-use Arcanedev\Html\Elements\Div;
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha;
+
+use Arcanedev\Html\Elements\{Button, Div};
 use Arcanedev\NoCaptcha\Exceptions\InvalidArgumentException;
 use Arcanedev\NoCaptcha\Utilities\ResponseV2;
 use Illuminate\Support\Arr;
@@ -154,7 +157,7 @@ public function getApiScript()
                     captchas: [],
                     reset: function(name) {
                         var captcha = window.noCaptcha.get(name);
-        
+
                         if (captcha)
                             window.noCaptcha.resetById(captcha.id);
                     },
@@ -179,9 +182,9 @@ public function getApiScript()
                             id: grecaptcha.render(name, {'sitekey' : sitekey}),
                             name: name
                         };
-                        
+
                         window.noCaptcha.captchas.push(captcha);
-                        
+
                         return captcha;
                     }
                 }
@@ -223,7 +226,7 @@ public function scriptWithCallback(array $captchas, $callbackName = 'captchaRend
      *
      * @return string
      */
-    private function renderCaptchas(array $captchas)
+    private function renderCaptchas(array $captchas): string
     {
         return implode(PHP_EOL, array_map(function($captcha) {
             return "if (document.getElementById('{$captcha}')) { window.noCaptcha.render('{$captcha}', '{$this->siteKey}'); }";
@@ -242,7 +245,7 @@ private function renderCaptchas(array $captchas)
      *
      * @return bool
      */
-    private function hasCallbackName($callbackName)
+    private function hasCallbackName($callbackName): bool
     {
         return ! (is_null($callbackName) || trim($callbackName) === '');
     }
@@ -271,7 +274,7 @@ protected function parseResponse($json)
      *
      * @return array
      */
-    private function prepareAttributes(array $attributes)
+    private function prepareAttributes(array $attributes): array
     {
         $attributes = array_merge(
             ['class' => 'g-recaptcha', 'data-sitekey' => $this->siteKey],
@@ -294,7 +297,7 @@ private function prepareAttributes(array $attributes)
      * @param  array   $supported
      * @param  string  $default
      */
-    private static function checkDataAttribute(array &$attributes, $name, array $supported, $default)
+    private static function checkDataAttribute(array &$attributes, $name, array $supported, $default): void
     {
         $attribute = $attributes[$name] ?? null;
 

diff --git a/src/NoCaptchaV3.php b/src/NoCaptchaV3.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\NoCaptcha;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha;
 
 use Arcanedev\Html\Elements\Input;
 use Arcanedev\NoCaptcha\Utilities\ResponseV3;

diff --git a/src/Utilities/AbstractResponse.php b/src/Utilities/AbstractResponse.php
@@ -1,7 +1,10 @@
-<?php namespace Arcanedev\NoCaptcha\Utilities;
+<?php
 
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Contracts\Support\Jsonable;
+declare(strict_types=1);
+
+namespace Arcanedev\NoCaptcha\Utilities;
+
+use Illuminate\Contracts\Support\{Arrayable, Jsonable};
 use JsonSerializable;
 
 /**