Merge pull request #14 from ARCANEDEV/develop

Starting Laravel 8 support
ARCANEDEV · Sep 10, 2020 · eab40c4 · eab40c4
2 parents 96f85e9 + 9ac7a88
commit eab40c4
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 66 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4]
+        php: [7.3, 7.4]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
@@ -22,7 +22,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.composer/cache/files
-          key: dependencies-laravel-7-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+          key: dependencies-laravel-8-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 6
+        runs: 4
     php_code_sniffer:
         enabled: true
         config:

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelImpers
 
 ### Features
 
-  * Laravel `5.4` to `7.x` are supported.
+  * Laravel `5.4` to `8.x` are supported.
   * Easy setup &amp; configuration.
   * Well documented &amp; IDE Friendly.
   * Well tested with maximum code quality.
@@ -44,7 +44,7 @@ Any ideas are welcome. Feel free to submit any issues or pull requests, please c
 - [All Contributors][link-contributors]
 
 [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%207.x-orange.svg?style=flat-square
+[badge_laravel]:   https://img.shields.io/badge/Laravel-5.4%20to%208.x-orange.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

diff --git a/composer.json b/composer.json
@@ -16,13 +16,13 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":               "^7.2.5",
-        "arcanedev/support": "^7.0"
+        "php": "^7.3",
+        "arcanedev/support": "^8.0"
     },
     "require-dev": {
-        "arcanedev/laravel-policies": "^2.0",
-        "orchestra/testbench":        "^5.0",
-        "phpunit/phpunit":            "^8.5"
+        "arcanedev/laravel-policies": "^3.0",
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -35,13 +35,23 @@
             "Arcanedev\\LaravelImpersonator\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "phpunit",
+        "coverage": "phpunit --coverage-html build/coverage/html"
+    },
     "extra": {
+        "branch-alias": {
+            "dev-develop": "4.x-dev"
+        },
         "laravel": {
             "providers": [
                 "Arcanedev\\LaravelImpersonator\\ImpersonatorServiceProvider"
             ]
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,33 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-        >
+>
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix=".php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <clover outputFile="build/coverage/clover.xml"/>
+            <html outputDirectory="build/coverage/html"/>
+            <text outputFile="build/coverage/coverage.txt" showOnlySummary="true"/>
+        </report>
+    </coverage>
     <php>
-        <env name="APP_ENV" value="testing"/>
         <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
         <env name="DB_CONNECTION" value="testing"/>
         <env name="SESSION_DRIVER" value="array"/>
     </php>
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="coverage-text" target="build/logs/coverage.txt"/>
-        <log type="coverage-html" target="build/logs/coverage"/>
-    </logging>
 </phpunit>
diff --git a/src/Contracts/Impersonatable.php b/src/Contracts/Impersonatable.php
@@ -7,10 +7,9 @@
 use Illuminate\Contracts\Auth\Authenticatable;
 
 /**
- * Interface     Impersonatable
+ * Interface  Impersonatable
  *
- * @package  Arcanedev\LaravelImpersonator\Contracts
- * @author   ARCANEDEV <[email protected]>
+ * @author    ARCANEDEV <[email protected]>
  */
 interface Impersonatable extends Authenticatable
 {

diff --git a/src/Contracts/Impersonator.php b/src/Contracts/Impersonator.php
@@ -5,10 +5,9 @@
 namespace Arcanedev\LaravelImpersonator\Contracts;
 
 /**
- * Interface     Impersonator
+ * Interface  Impersonator
  *
- * @package  Arcanedev\LaravelImpersonator\Contracts
- * @author   ARCANEDEV <[email protected]>
+ * @author    ARCANEDEV <[email protected]>
  */
 interface Impersonator
 {

diff --git a/src/Events/AbstractImpersonationEvent.php b/src/Events/AbstractImpersonationEvent.php
@@ -12,7 +12,6 @@
 /**
  * Class     AbstractImpersonationEvent
  *
- * @package  Arcanedev\LaravelImpersonator\Events
  * @author   ARCANEDEV <[email protected]>
  */
 abstract class AbstractImpersonationEvent

diff --git a/src/Events/ImpersonationStarted.php b/src/Events/ImpersonationStarted.php
@@ -7,7 +7,6 @@
 /**
  * Class     ImpersonationStarted
  *
- * @package  Arcanedev\LaravelImpersonator\Events
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonationStarted extends AbstractImpersonationEvent {}
diff --git a/src/Events/ImpersonationStopped.php b/src/Events/ImpersonationStopped.php
@@ -5,9 +5,8 @@
 namespace Arcanedev\LaravelImpersonator\Events;
 
 /**
- * Class     ImpersonationEnded
+ * Class     ImpersonationStopped
  *
- * @package  Arcanedev\LaravelImpersonator\Events
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonationStopped extends AbstractImpersonationEvent {}
diff --git a/src/Exceptions/ImpersonationException.php b/src/Exceptions/ImpersonationException.php
@@ -10,7 +10,6 @@
 /**
  * Class     ImpersonationException
  *
- * @package  Arcanedev\LaravelImpersonator\Exceptions
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonationException extends Exception

diff --git a/src/Guard/SessionGuard.php b/src/Guard/SessionGuard.php
@@ -10,7 +10,6 @@
 /**
  * Class     SessionGuard
  *
- * @package  Arcanedev\LaravelImpersonator\Guard
  * @author   ARCANEDEV <[email protected]>
  */
 class SessionGuard extends BaseSessionGuard

diff --git a/src/Http/Middleware/ImpersonationNotAllowed.php b/src/Http/Middleware/ImpersonationNotAllowed.php
@@ -10,7 +10,6 @@
 /**
  * Class     ImpersonationNotAllowed
  *
- * @package  Arcanedev\LaravelImpersonator\Http\Middleware
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonationNotAllowed

diff --git a/src/Impersonator.php b/src/Impersonator.php
@@ -13,7 +13,6 @@
 /**
  * Class     Impersonator
  *
- * @package  Arcanedev\LaravelImpersonator
  * @author   ARCANEDEV <[email protected]>
  */
 class Impersonator implements ImpersonatorContract

diff --git a/src/ImpersonatorServiceProvider.php b/src/ImpersonatorServiceProvider.php
@@ -13,7 +13,6 @@
 /**
  * Class     ImpersonatorServiceProvider
  *
- * @package  Arcanedev\LaravelImpersonator
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonatorServiceProvider extends PackageServiceProvider implements DeferrableProvider

diff --git a/src/Policies/ImpersonationPolicy.php b/src/Policies/ImpersonationPolicy.php
@@ -11,7 +11,6 @@
 /**
  * Class     ImpersonationPolicy
  *
- * @package  Arcanedev\LaravelImpersonator\Policies
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonationPolicy extends Policy

diff --git a/src/Traits/CanImpersonate.php b/src/Traits/CanImpersonate.php
@@ -8,9 +8,8 @@
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Trait     HasImpersonation
+ * Trait     CanImpersonate
  *
- * @package  Arcanedev\LaravelImpersonator\Traits
  * @author   ARCANEDEV <[email protected]>
  */
 trait CanImpersonate

diff --git a/tests/EventsTest.php b/tests/EventsTest.php
@@ -11,7 +11,6 @@
 /**
  * Class     EventsTest
  *
- * @package  Arcanedev\LaravelImpersonator\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class EventsTest extends TestCase

diff --git a/tests/ImpersonationPoliciesTest.php b/tests/ImpersonationPoliciesTest.php
@@ -9,7 +9,6 @@
 /**
  * Class     ImpersonationPoliciesTest
  *
- * @package  Arcanedev\LaravelImpersonator\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonationPoliciesTest extends TestCase

diff --git a/tests/ImpersonationTraitTest.php b/tests/ImpersonationTraitTest.php
@@ -9,7 +9,6 @@
 /**
  * Class     ImpersonationTraitTest
  *
- * @package  Arcanedev\LaravelImpersonator\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonationTraitTest extends TestCase

diff --git a/tests/ImpersonatorServiceProviderTest.php b/tests/ImpersonatorServiceProviderTest.php
@@ -14,7 +14,6 @@
 /**
  * Class     ImpersonatorServiceProviderTest
  *
- * @package  Arcanedev\LaravelImpersonator\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonatorServiceProviderTest extends TestCase

diff --git a/tests/ImpersonatorTest.php b/tests/ImpersonatorTest.php
@@ -11,7 +11,6 @@
 /**
  * Class     ImpersonatorTest
  *
- * @package  Arcanedev\LaravelImpersonator\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonatorTest extends TestCase

diff --git a/tests/MiddlewareTest.php b/tests/MiddlewareTest.php
@@ -7,7 +7,6 @@
 /**
  * Class     MiddlewareTest
  *
- * @package  Arcanedev\LaravelImpersonator\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class MiddlewareTest extends TestCase

diff --git a/tests/Policies/ImpersonationPolicyTest.php b/tests/Policies/ImpersonationPolicyTest.php
@@ -10,7 +10,6 @@
 /**
  * Class     ImpersonationPolicyTest
  *
- * @package  Arcanedev\LaravelImpersonator\Tests\Policies
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonationPolicyTest extends TestCase

diff --git a/tests/Stubs/Controllers/ImpersonatorController.php b/tests/Stubs/Controllers/ImpersonatorController.php
@@ -13,7 +13,6 @@
 /**
  * Class     ImpersonatorController
  *
- * @package  Arcanedev\LaravelImpersonator\Tests\Stubs\Controllers
  * @author   ARCANEDEV <[email protected]>
  */
 class ImpersonatorController extends Controller

diff --git a/tests/Stubs/Models/User.php b/tests/Stubs/Models/User.php
@@ -12,16 +12,15 @@
 /**
  * Class     User
  *
- * @package  Arcanedev\LaravelImpersonator\Tests\Stubs\Models
  * @author   ARCANEDEV <[email protected]>
  *
- * @property  int             id
- * @property  string          name
- * @property  string          email
- * @property  string          password
- * @property  string          remember_token
- * @property  string          created_at
- * @property  \Carbon\Carbon  updated_at
+ * @property  int                         id
+ * @property  string                      name
+ * @property  string                      email
+ * @property  string                      password
+ * @property  string                      remember_token
+ * @property  \Illuminate\Support\Carbon  created_at
+ * @property  \Illuminate\Support\Carbon  updated_at
  */
 class User extends Authenticatable implements Impersonatable
 {

diff --git a/tests/Stubs/Providers/AuthorizationServiceProvider.php b/tests/Stubs/Providers/AuthorizationServiceProvider.php
@@ -11,7 +11,6 @@
 /**
  * Class     AuthorizationServiceProvider
  *
- * @package  Arcanedev\LaravelImpersonator\Tests\Stubs\Providers
  * @author   ARCANEDEV <[email protected]>
  */
 class AuthorizationServiceProvider extends ServiceProvider

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -16,7 +16,6 @@
 /**
  * Class     TestCase
  *
- * @package  Arcanedev\LaravelImpersonator\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 abstract class TestCase extends BaseTestCase