Merge pull request #4 from ARCANEDEV/develop

Starting Laravel 8 support
ARCANEDEV · Sep 9, 2020 · 01879ad · 01879ad
2 parents e2f6f1f + 0042c2f
commit 01879ad
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 53 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 }}

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -23,7 +23,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
@@ -19,7 +19,7 @@ This package allows to create & manage policies/abilities in a modular way.
   * Easy setup &amp; configuration.
   * Well documented &amp; IDE Friendly.
   * Well tested with maximum code quality.
-  * Laravel `6.x` to `7.x` are supported.
+  * Laravel `6.x` to `8.x` are supported.
   * Made with :heart: &amp; :coffee:.
 
 ## Table of contents
@@ -45,7 +45,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 - [ARCANEDEV][link-author]
 - [All Contributors][link-contributors]
 
-[badge_laravel]:      https://img.shields.io/badge/Laravel-6.x%20to%207.x-orange.svg?style=flat-square
+[badge_laravel]:      https://img.shields.io/badge/Laravel-6.x%20to%208.x-orange.svg?style=flat-square
 [badge_license]:      https://img.shields.io/packagist/l/arcanedev/laravel-policies.svg?style=flat-square
 [badge_build]:        https://img.shields.io/github/workflow/status/ARCANEDEV/LaravelPolicies/run-tests?style=flat-square
 [badge_coverage]:     https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelPolicies.svg?style=flat-square

diff --git a/composer.json b/composer.json
@@ -14,13 +14,13 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":               "^7.2.5",
-        "ext-json":          "*",
-        "arcanedev/support": "^7.0"
+        "php": "^7.3",
+        "ext-json": "*",
+        "arcanedev/support": "^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0",
-        "phpunit/phpunit":     "^8.5|^9.0"
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -32,13 +32,23 @@
             "Arcanedev\\LaravelPolicies\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "phpunit",
+        "coverage": "phpunit --coverage-html build/coverage/html"
+    },
     "extra": {
+        "branch-alias": {
+            "dev-develop": "3.x-dev"
+        },
         "laravel": {
             "providers": [
                 "Arcanedev\\LaravelPolicies\\PoliciesServiceProvider"
             ]
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,30 +1,25 @@
 <?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="DB_CONNECTION" value="testing"/>
     </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/Ability.php b/src/Ability.php
@@ -11,7 +11,6 @@
 /**
  * Class     Ability
  *
- * @package  Arcanedev\LaravelPolicies
  * @author   ARCANEDEV <[email protected]>
  */
 class Ability implements AbilityContract

diff --git a/src/Contracts/Ability.php b/src/Contracts/Ability.php
@@ -9,10 +9,9 @@
 use JsonSerializable;
 
 /**
- * Interface     Ability
+ * Interface  Ability
  *
- * @package  Arcanedev\LaravelPolicies\Contracts
- * @author   ARCANEDEV <[email protected]>
+ * @author    ARCANEDEV <[email protected]>
  */
 interface Ability extends Arrayable, JsonSerializable, Jsonable
 {

diff --git a/src/Contracts/Policy.php b/src/Contracts/Policy.php
@@ -5,12 +5,9 @@
 namespace Arcanedev\LaravelPolicies\Contracts;
 
 /**
- * Class     Policy
+ * Interface  Policy
  *
- * @package  Arcanedev\LaravelPolicies\Contracts
- * @author   ARCANEDEV <[email protected]>
- *
- * @method  \Arcanedev\LaravelPolicies\Ability[]|iterable  abilities()
+ * @author    ARCANEDEV <[email protected]>
  */
 interface Policy
 {

diff --git a/src/Contracts/PolicyManager.php b/src/Contracts/PolicyManager.php
@@ -7,10 +7,9 @@
 use Illuminate\Support\Collection;
 
 /**
- * Interface     PolicyManager
+ * Interface  PolicyManager
  *
- * @package  Arcanedev\LaravelPolicies\Contracts
- * @author   ARCANEDEV <[email protected]>
+ * @author    ARCANEDEV <[email protected]>
  */
 interface PolicyManager
 {

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

diff --git a/src/Policy.php b/src/Policy.php
@@ -11,7 +11,6 @@
 /**
  * Class     Policy
  *
- * @package  Arcanedev\LaravelPolicies
  * @author   ARCANEDEV <[email protected]>
  */
 abstract class Policy implements PolicyContract

diff --git a/src/PolicyManager.php b/src/PolicyManager.php
@@ -14,7 +14,6 @@
 /**
  * Class     PolicyManager
  *
- * @package  Arcanedev\LaravelPolicies
  * @author   ARCANEDEV <[email protected]>
  */
 class PolicyManager implements PolicyManagerContract

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

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

diff --git a/tests/Fixtures/Policies/Abilities/DedicatedAbility.php b/tests/Fixtures/Policies/Abilities/DedicatedAbility.php
@@ -8,9 +8,8 @@
 use Illuminate\Foundation\Auth\User;
 
 /**
- * Class     AbilityClass
+ * Class     DedicatedAbility
  *
- * @package  Arcanedev\LaravelPolicies\Tests\Fixtures\Policies\Abilities
  * @author   ARCANEDEV <[email protected]>
  */
 class DedicatedAbility

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

diff --git a/tests/Fixtures/Policies/PrefixedPolicy.php b/tests/Fixtures/Policies/PrefixedPolicy.php
@@ -11,7 +11,6 @@
 /**
  * Class     PrefixedPolicy
  *
- * @package  Arcanedev\LaravelPolicies\Tests\Fixtures\Policies
  * @author   ARCANEDEV <[email protected]>
  */
 class PrefixedPolicy extends Policy

diff --git a/tests/PoliciesServiceProviderTest.php b/tests/PoliciesServiceProviderTest.php
@@ -1,13 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Arcanedev\LaravelPolicies\Tests;
 
 use Arcanedev\LaravelPolicies\PoliciesServiceProvider;
 
 /**
  * Class     PoliciesServiceProviderTest
  *
- * @package  Arcanedev\LaravelPolicies\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class PoliciesServiceProviderTest extends TestCase

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

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

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