Merge pull request #10 from sourceboat/feature/laravel-8-support

Laravel 8 Support

Author: pehbehbeh

.travis.yml

@@ -1,24 +1,25 @@
 language: php
 
 php:
-  - 7.2
   - 7.3
-  - 7.4snapshot
+  - 7.4
   - nightly
 
 matrix:
   include:
-  - php: 7.2
+  - php: 7.3
     env: COMPOSER_FLAGS="--prefer-lowest"
+  - php: 7.4
+    env: COMPOSER_FLAGS="--prefer-lowest"
+  - php: 7.4
   allow_failures:
-  - php: 7.4snapshot
   - php: nightly
 
 before_script:
   - travis_retry composer self-update
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
 
 script:
-  - phpunit --coverage-text --coverage-clover=coverage.clover
+  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
   - vendor/bin/phpcs -s
   - vendor/bin/phpmd config,src,tests text phpmd.xml

composer.json

@@ -19,12 +19,12 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
-        "laravel/framework": "^6.0|^7.0"
+        "php": ">=7.3",
+        "laravel/framework": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
-      "orchestra/testbench": "^5.2",
-      "phpunit/phpunit": "9.1",
+      "orchestra/testbench": "^5.0 || ^6.0",
+      "phpunit/phpunit": "^9.3",
       "phpmd/phpmd": "^2.6",
       "squizlabs/php_codesniffer": "^3.3",
       "consistence/coding-standard": "^3.8",

phpcs.xml

@@ -41,7 +41,6 @@
     <exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.PartialUse"/>
     <exclude name="SlevomatCodingStandard.Functions.TrailingCommaInCall.MissingTrailingComma"/>
     <exclude name="SlevomatCodingStandard.TypeHints.DisallowMixedTypeHint.DisallowedMixedTypeHint"/>
-    <!-- <exclude name="SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces"/> -->
     <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing" />
     <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversablePropertyTypeHintSpecification"/>
     <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
@@ -53,11 +52,17 @@
     <exclude name="SlevomatCodingStandard.ControlStructures.RequireMultiLineTernaryOperator.MultiLineTernaryOperatorNotUsed"/>
     <exclude name="SlevomatCodingStandard.ControlStructures.ControlStructureSpacing.IncorrectLinesCountAfterControlStructure"/>
     <exclude name="SlevomatCodingStandard.Operators.DisallowIncrementAndDecrementOperators.DisallowedPostIncrementOperator"/>
+    <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>
+    <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint"/>
+    <exclude name="SlevomatCodingStandard.TypeHints.DisallowMixedTypeHint"/>
+    <exclude name="SlevomatCodingStandard.Functions.RequireArrowFunction"/>
+    <exclude name="SlevomatCodingStandard.Functions.DisallowArrowFunction.DisallowedArrowFunction"/>
+    <exclude name="SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition.RequiredSingleLineCondition"/>
 	</rule>
 
   <!-- exclude directories from certain rules -->
 
-  <rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingPropertyTypeHint">
+  <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
     <exclude-pattern>*/tests/*</exclude-pattern>
   </rule>
 </ruleset>

src/Middlewares/RoleMiddleware.php

@@ -11,9 +11,9 @@ class RoleMiddleware
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string $roles
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure $next
+     * @param string $roles
      * @return mixed
      */
     public function handle(Request $request, Closure $next, string $roles)

src/Traits/HasPermissions.php

@@ -10,7 +10,7 @@ trait HasPermissions
     /**
      * Check if model has all permissions
      *
-     * @param  array|string  ...$permissions
+     * @param array|string ...$permissions
      * @return bool
      */
     public function hasPermissionTo(...$permissions): bool
@@ -35,7 +35,7 @@ public function hasPermissionTo(...$permissions): bool
     /**
      * Check if model has all permissions
      *
-     * @param  array|string  ...$permissions
+     * @param array|string ...$permissions
      * @return bool
      */
     public function hasPermission(...$permissions): bool
@@ -46,7 +46,7 @@ public function hasPermission(...$permissions): bool
     /**
      * Check if model has any permissions
      *
-     * @param  array|string  ...$permissions
+     * @param array|string ...$permissions
      * @return bool
      */
     public function hasAnyPermission(...$permissions): bool
@@ -86,8 +86,8 @@ public function getAllPermissions(): Collection
     /**
      * Match ruleset to permission
      *
-     * @param  \Illuminate\Support\Collection $rules Ruleset
-     * @param  array  $permission
+     * @param \Illuminate\Support\Collection $rules Ruleset
+     * @param array $permission
      * @return bool
      */
     public function matchPermission(Collection $rules, array $permission): bool
@@ -111,8 +111,8 @@ public function matchPermission(Collection $rules, array $permission): bool
     /**
      * Match one rule to permission
      *
-     * @param  array $rule
-     * @param  array $permission
+     * @param array $rule
+     * @param array $permission
      * @return bool
      */
     public function matchRuleToPermission(array $rule, array $permission): bool

src/Traits/HasRoles.php

@@ -10,7 +10,7 @@ trait HasRoles
     /**
      * Assign the role to the model
      *
-     * @param  string $role rolename
+     * @param string $role rolename
      * @return $this
      */
     public function assignRole(string $role)
@@ -31,7 +31,7 @@ public function assignRole(string $role)
     /**
      * Compare role with given model role
      *
-     * @param  string  $role role name
+     * @param string $role role name
      * @return bool
      */
     public function hasRole(string $role): bool

tests/BladeTest.php

@@ -7,18 +7,6 @@
 class BladeTest extends TestCase
 {
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->app['config']->set('permission.roles.admin', [
-            'users/#',
-            '!users/create',
-        ]);
-
-        $this->user = User::create(['email' => '[email protected]']);
-    }
-
     public function testPermission(): void
     {
         $this->user->assignRole('admin');
@@ -66,6 +54,18 @@ public function testUnlessRole(): void
         $this->assertEquals($this->renderView('unlessrole', ['role' => 'user']), 'Test');
     }
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->app['config']->set('permission.roles.admin', [
+            'users/#',
+            '!users/create',
+        ]);
+
+        $this->user = User::create(['email' => '[email protected]']);
+    }
+
     /**
      * from Spatie\Permission\Test;
      * return compiled blade views

tests/MatchPermissionTest.php

@@ -5,17 +5,6 @@
 class MatchPermissionTest extends TestCase
 {
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->permission = [
-            'user',
-            'edit',
-        ];
-        $this->user = User::create(['email' => '[email protected]']);
-    }
-
     public function testNoRules(): void
     {
         $rules = collect([]);
@@ -62,4 +51,15 @@ public function testOverwriteRule(): void
         $this->assertFalse($this->user->matchPermission($rules, $this->permission));
     }
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->permission = [
+            'user',
+            'edit',
+        ];
+        $this->user = User::create(['email' => '[email protected]']);
+    }
+
 }

tests/MatchRuleToPermissionTest.php

@@ -5,17 +5,6 @@
 class MatchRuleToPermissionTest extends TestCase
 {
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->permission = [
-            'user',
-            'edit',
-        ];
-        $this->user = User::create(['email' => '[email protected]']);
-    }
-
     public function testDirectRule(): void
     {
         $rule = [
@@ -97,4 +86,15 @@ public function testShortRule(): void
         $this->assertFalse($this->user->matchRuleToPermission($rule, $this->permission));
     }
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->permission = [
+            'user',
+            'edit',
+        ];
+        $this->user = User::create(['email' => '[email protected]']);
+    }
+
 }

tests/MiddlewareTest.php

@@ -11,24 +11,6 @@
 class MiddlewareTest extends TestCase
 {
 
-    /**
-     * Setup the test environment.
-     *
-     * @return void
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->roleMiddleware = new RoleMiddleware($this->app);
-
-        $this->app['config']->set('permission.roles.admin', [
-            'users/*',
-        ]);
-
-        $this->user = User::create(['email' => '[email protected]']);
-    }
-
     public function testGustCannotAccessProtectedRoute(): void
     {
         $this->assertEquals($this->runMiddleware($this->roleMiddleware, 'admin'), 403);
@@ -50,6 +32,24 @@ public function testUserCantAccessRoleIfHavenotRole(): void
         $this->assertEquals($this->runMiddleware($this->roleMiddleware, 'admin'), 403);
     }
 
+    /**
+     * Setup the test environment.
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->roleMiddleware = new RoleMiddleware($this->app);
+
+        $this->app['config']->set('permission.roles.admin', [
+            'users/*',
+        ]);
+
+        $this->user = User::create(['email' => '[email protected]']);
+    }
+
     protected function runMiddleware(RoleMiddleware $middleware, string $parameter): int
     {
         try {

tests/PermissionTest.php

@@ -2,27 +2,10 @@
 
 namespace Sourceboat\Permission\Test;
 
-/**
- * @SuppressWarnings(PHPMD.TooManyPublicMethods)
- */
+/** @SuppressWarnings(PHPMD.TooManyPublicMethods) */
 class PermissionTest extends TestCase
 {
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->permissions = [
-            'user/#',
-            '!user/create',
-            'test/+/+/test',
-        ];
-
-        $this->app['config']->set('permission.roles.user', $this->permissions);
-
-        $this->user = User::create(['email' => '[email protected]']);
-    }
-
     public function testGetPermissions(): void
     {
         $this->user->assignRole('user');
@@ -132,5 +115,20 @@ public function testHasPermissionWrongMultipleWildcards(): void
 
         $this->assertFalse($this->user->hasPermission('test/testa/test'));
     }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->permissions = [
+            'user/#',
+            '!user/create',
+            'test/+/+/test',
+        ];
+
+        $this->app['config']->set('permission.roles.user', $this->permissions);
+
+        $this->user = User::create(['email' => '[email protected]']);
+    }
 
 }

tests/RoleTest.php

@@ -5,17 +5,6 @@
 class RoleTest extends TestCase
 {
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->app['config']->set('permission.roles.admin', [
-            'users/*',
-        ]);
-
-        $this->user = User::create(['email' => '[email protected]']);
-    }
-
     public function testAssignExistentRole(): void
     {
         $this->user->assignRole('admin');
@@ -61,4 +50,15 @@ public function testGetUnsetRoleName(): void
         $this->assertEquals($this->user->getRoleName(), null);
     }
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->app['config']->set('permission.roles.admin', [
+            'users/*',
+        ]);
+
+        $this->user = User::create(['email' => '[email protected]']);
+    }
+
 }