Merge pull request #11 from ARCANEDEV/update-github_actions

Using GitHub Actions for testing
ARCANEDEV · Feb 1, 2020 · ac707a6 · ac707a6
2 parents 5fed5a6 + abf360a
commit ac707a6
Show file tree

Hide file tree

Showing 28 changed files with 166 additions and 57 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,6 +7,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 @@
 # LaravelImpersonator [![Packagist License][badge_license]](LICENSE.md) [![For Laravel][badge_laravel]][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]
@@ -45,7 +45,7 @@ Any ideas are welcome. Feel free to submit any issues or pull requests, please c
 
 [badge_license]:   https://img.shields.io/packagist/l/arcanedev/laravel-impersonator.svg?style=flat-square
 [badge_laravel]:   https://img.shields.io/badge/Laravel-5.4%20to%206.x-orange.svg?style=flat-square
-[badge_build]:     https://img.shields.io/travis/ARCANEDEV/LaravelImpersonator.svg?style=flat-square
+[badge_build]:     https://img.shields.io/github/workflow/status/ARCANEDEV/LaravelImpersonator/run-tests?style=flat-square
 [badge_coverage]:  https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelImpersonator.svg?style=flat-square
 [badge_quality]:   https://img.shields.io/scrutinizer/g/ARCANEDEV/LaravelImpersonator.svg?style=flat-square
 [badge_insight]:   https://img.shields.io/sensiolabs/i/a9bfffe8-8d21-434c-a1cc-07bbbee97cb7.svg?style=flat-square
@@ -56,9 +56,9 @@ Any ideas are welcome. Feel free to submit any issues or pull requests, please c
 
 [link-author]:        https://github.com/arcanedev-maroc
 [link-github-repo]:   https://github.com/ARCANEDEV/LaravelImpersonator
+[link-github-status]: https://github.com/ARCANEDEV/LaravelImpersonator/actions
 [link-github-issues]: https://github.com/ARCANEDEV/LaravelImpersonator/issues
 [link-contributors]:  https://github.com/ARCANEDEV/LaravelImpersonator/graphs/contributors
 [link-packagist]:     https://packagist.org/packages/arcanedev/laravel-impersonator
-[link-travis]:        https://travis-ci.org/ARCANEDEV/LaravelImpersonator
 [link-scrutinizer]:   https://scrutinizer-ci.com/g/ARCANEDEV/LaravelImpersonator/?branch=master
 [link-insight]:       https://insight.sensiolabs.com/projects/a9bfffe8-8d21-434c-a1cc-07bbbee97cb7
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "license": "MIT",
     "require": {
         "php":                  ">=7.2.0",
-        "arcanedev/support":    "^5.0"
+        "arcanedev/support":    "^5.1"
     },
     "require-dev": {
         "orchestra/testbench": "^4.0",

diff --git a/src/Contracts/Impersonatable.php b/src/Contracts/Impersonatable.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Contracts;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Contracts;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 

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

diff --git a/src/Events/AbstractImpersonationEvent.php b/src/Events/AbstractImpersonationEvent.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Events;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Events;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonatable;
 use Illuminate\Broadcasting\InteractsWithSockets;

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

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

diff --git a/src/Exceptions/ImpersonationException.php b/src/Exceptions/ImpersonationException.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Exceptions;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Exceptions;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonatable;
 
@@ -61,7 +65,7 @@ public static function cannotImpersonate(Impersonatable $impersonater): self
      *
      * @return static
      */
-    public static function cannotBeImpersonated(Impersonatable $impersonated)
+    public static function cannotBeImpersonated(Impersonatable $impersonated): self
     {
         return static::make(
             __('The impersonated with `:impersonated_name`=[:impersonated_id] cannot be impersonated.', [
@@ -76,7 +80,7 @@ public static function cannotBeImpersonated(Impersonatable $impersonated)
      *
      * @return static
      */
-    public static function impersonaterAndImpersonatedAreSame()
+    public static function impersonaterAndImpersonatedAreSame(): self
     {
         return static::make(
             __('The impersonater & impersonated with must be different.')

diff --git a/src/Guard/SessionGuard.php b/src/Guard/SessionGuard.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Guard;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Guard;
 
 use Illuminate\Auth\SessionGuard as BaseSessionGuard;
 use Illuminate\Contracts\Auth\Authenticatable;

diff --git a/src/Http/Middleware/ImpersonationNotAllowed.php b/src/Http/Middleware/ImpersonationNotAllowed.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Http\Middleware;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Http\Middleware;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonator;
 use Closure;

diff --git a/src/Impersonator.php b/src/Impersonator.php
@@ -1,6 +1,11 @@
-<?php namespace Arcanedev\LaravelImpersonator;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonatable;
+use Arcanedev\LaravelImpersonator\Contracts\Impersonator as ImpersonatorContract;
 use Arcanedev\LaravelImpersonator\Exceptions\ImpersonationException;
 use Exception;
 use Illuminate\Contracts\Foundation\Application;
@@ -11,7 +16,7 @@
  * @package  Arcanedev\LaravelImpersonator
  * @author   ARCANEDEV <[email protected]>
  */
-class Impersonator implements Contracts\Impersonator
+class Impersonator implements ImpersonatorContract
 {
     /* -----------------------------------------------------------------
      |  Properties
@@ -183,7 +188,7 @@ public function findUserById($id)
     }
 
     /* -----------------------------------------------------------------
-     |  Check Functions
+     |  Check Methods
      | -----------------------------------------------------------------
      */
 
@@ -276,7 +281,6 @@ private function checkImpersonater(Impersonatable $impersonater): void
      */
     private function checkImpersonated(Impersonatable $impersonated): void
     {
-
         if ( ! $impersonated->canBeImpersonated())
             throw ImpersonationException::cannotBeImpersonated($impersonated);
     }

diff --git a/src/ImpersonatorServiceProvider.php b/src/ImpersonatorServiceProvider.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator;
 
 use Arcanedev\Support\Providers\PackageServiceProvider;
 use Illuminate\Auth\SessionGuard as IlluminateSessionGuard;

diff --git a/src/Policies/ImpersonationPolicy.php b/src/Policies/ImpersonationPolicy.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Policies;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Policies;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonatable;
 use Arcanedev\Support\Bases\Policy;

diff --git a/src/Providers/AuthorizationServiceProvider.php b/src/Providers/AuthorizationServiceProvider.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Providers;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Providers;
 
 use Arcanedev\LaravelImpersonator\Policies\ImpersonationPolicy;
 use Arcanedev\Support\Providers\AuthorizationServiceProvider as ServiceProvider;

diff --git a/src/Traits/CanImpersonate.php b/src/Traits/CanImpersonate.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Traits;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Traits;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonatable;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/EventsTest.php b/tests/EventsTest.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests;
 
 use Arcanedev\LaravelImpersonator\Events\ImpersonationStopped;
 use Arcanedev\LaravelImpersonator\Events\ImpersonationStarted;

diff --git a/tests/ImpersonationPoliciesTest.php b/tests/ImpersonationPoliciesTest.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests;
 
 use Symfony\Component\HttpFoundation\Response;
 

diff --git a/tests/ImpersonationTraitTest.php b/tests/ImpersonationTraitTest.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests;
 
 /**
  * Class     ImpersonationTraitTest

diff --git a/tests/ImpersonatorServiceProviderTest.php b/tests/ImpersonatorServiceProviderTest.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests;
 
 use Arcanedev\LaravelImpersonator\ImpersonatorServiceProvider;
 

diff --git a/tests/ImpersonatorTest.php b/tests/ImpersonatorTest.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests;
 
 use Arcanedev\LaravelImpersonator\Tests\Stubs\Models\User;
 use Arcanedev\LaravelImpersonator\Contracts\Impersonator as ImpersonatorContract;

diff --git a/tests/MiddlewareTest.php b/tests/MiddlewareTest.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests;
 
 /**
  * Class     MiddlewareTest

diff --git a/tests/Stubs/Controllers/ImpersonatorController.php b/tests/Stubs/Controllers/ImpersonatorController.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests\Stubs\Controllers;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests\Stubs\Controllers;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonator;
 use Arcanedev\LaravelImpersonator\Policies\ImpersonationPolicy;

diff --git a/tests/Stubs/Models/User.php b/tests/Stubs/Models/User.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests\Stubs\Models;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests\Stubs\Models;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonatable;
 use Arcanedev\LaravelImpersonator\Traits\CanImpersonate;

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,4 +1,8 @@
-<?php namespace Arcanedev\LaravelImpersonator\Tests;
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\LaravelImpersonator\Tests;
 
 use Orchestra\Testbench\TestCase as BaseTestCase;