Merge pull request #3 from agilepixels/feature/support-laravel-9

Add support for Laravel 9

.github/workflows/style.yml

@@ -15,7 +15,7 @@ jobs:
       -   name: Run PHP CS Fixer
           uses: docker://oskarstark/php-cs-fixer-ga
           with:
-            args: --config=.php_cs.dist --allow-risky=yes
+            args: --config=.php_cs.php --allow-risky=yes
 
       -   name: Commit changes
           uses: stefanzweifel/git-auto-commit-action@v4

.github/workflows/test.yml

@@ -9,16 +9,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.0]
-        laravel: [6.*, 7.*, 8.*]
-        dependency-version: [prefer-lowest, prefer-stable]
+        php: [8.2, 8.1, 8.0]
+        laravel: [9.*]
+        dependency-version: [prefer-stable]
         include:
-          -   laravel: 8.*
-              testbench: 6.*
-          -   laravel: 7.*
-              testbench: 5.*
-          -   laravel: 6.*
-              testbench: 4.*
+          -   laravel: 9.*
+              testbench: 7.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

.gitignore

@@ -1,4 +1,6 @@
 .idea
 vendor
 .phpunit.result.cache
-.php_cs.cache
+.php-cs-fixer.cache
+composer.lock
+coverage

.php_cs.dist → .php_cs.php

@@ -13,14 +13,14 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
-        '@PSR2' => true,
+        '@PSR12' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,
         'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -32,6 +32,7 @@
         'method_argument_space' => [
             'on_multiline' => 'ensure_fully_multiline',
             'keep_multiple_spaces_after_comma' => true,
-        ]
+        ],
+        'single_trait_insert_per_statement' => true,
     ])
     ->setFinder($finder);

composer.json

@@ -2,8 +2,8 @@
   "name" : "agilepixels/laravel-resource-abilities",
   "description" : "Add abilities to Laravel API resources",
   "keywords" : [
-    "agilepixels",
-    "laravel-resource-abilities"
+    "laravel",
+    "php"
   ],
   "homepage" : "https://github.com/agilepixels/laravel-resource-abilities",
   "license" : "MIT",
@@ -16,12 +16,12 @@
     }
   ],
   "require" : {
-    "php" : "^8.0",
-    "illuminate/database" : "~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/routing" : "~5.8.0|^6.0|^7.0|^8.0"
+    "php" : "^8.0|^8.1|^8.2",
+    "illuminate/database" : "^9.0",
+    "illuminate/routing" : "^9.0"
   },
   "require-dev" : {
-    "orchestra/testbench" : "~3.8.0|^4.0|^5.0|^6.0",
+    "orchestra/testbench" : "^7.0",
     "phpunit/phpunit" : "^8.0|^9.0"
   },
   "autoload" : {

src/AbilityTypes/AbilityType.php

@@ -4,7 +4,6 @@
 
 use AgilePixels\ResourceAbilities\Serializers\Serializer;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Arr;
 
 abstract class AbilityType
 {
@@ -52,7 +51,7 @@ protected function resolveSerializer(): Serializer
             ? config('resource-abilities.serializer')
             : $this->serializer;
 
-        return new $serializer;
+        return new $serializer();
     }
 
     /**

src/AbilityTypes/GateAbilityType.php

@@ -23,7 +23,7 @@ public static function make(string $ability, Model | string $model): GateAbility
 
     public function getAbilities(array $abilities, bool $withAllAbilities): array
     {
-        if (!in_array($this->ability, $abilities, true) && ! $withAllAbilities) {
+        if (! in_array($this->ability, $abilities, true) && ! $withAllAbilities) {
             return [];
         }
 

src/AbilityTypes/PolicyAbilityType.php

@@ -34,6 +34,11 @@ public function getAbilities(array $abilities, bool $withAllAbilities): array
     {
         return collect($this->abilities)
 
+            /**
+             * Filter out helper methods
+             */
+            ->reject(fn (string $ability) => in_array($ability, ['denyWithStatus', 'denyAsNotFound']))
+
             /**
              * Filter out the non-specified abilities
              */

src/Builder.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace AgilePixels\ResourceAbilities;
 
 use Illuminate\Database\Eloquent\Builder as BaseBuilder;

src/Collection.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace AgilePixels\ResourceAbilities;
 
 use Illuminate\Database\Eloquent\Collection as BaseCollection;

tests/Fakes/UserResource.php

@@ -8,7 +8,8 @@
 
 class UserResource extends JsonResource
 {
-    use ProcessesAbilities, HasRelationships;
+    use ProcessesAbilities;
+    use HasRelationships;
 
     public function toArray($request): array
     {

tests/HasRelationshipsTest.php

@@ -35,8 +35,9 @@ protected function setUp(): void
     /** @test */
     public function it_will_drop_a_to_one_relation_when_not_loaded()
     {
-        $testResource = new class(null) extends JsonResource {
-            use ProcessesAbilities, HasRelationships;
+        $testResource = new class (null) extends JsonResource {
+            use ProcessesAbilities;
+            use HasRelationships;
 
             public function toArray($request)
             {
@@ -56,8 +57,9 @@ public function toArray($request)
     /** @test */
     public function it_will_add_a_to_one_relation_when_loaded()
     {
-        $testResource = new class(null) extends JsonResource {
-            use ProcessesAbilities, HasRelationships;
+        $testResource = new class (null) extends JsonResource {
+            use ProcessesAbilities;
+            use HasRelationships;
 
             public function toArray($request)
             {
@@ -84,8 +86,9 @@ public function toArray($request)
     /** @test */
     public function it_will_drop_a_to_many_relation_when_not_loaded()
     {
-        $testResource = new class(null) extends JsonResource {
-            use ProcessesAbilities, HasRelationships;
+        $testResource = new class (null) extends JsonResource {
+            use ProcessesAbilities;
+            use HasRelationships;
 
             public function toArray($request)
             {
@@ -105,8 +108,9 @@ public function toArray($request)
     /** @test */
     public function it_will_add_a_to_many_relation_when_loaded()
     {
-        $testResource = new class(null) extends JsonResource {
-            use ProcessesAbilities, HasRelationships;
+        $testResource = new class (null) extends JsonResource {
+            use ProcessesAbilities;
+            use HasRelationships;
 
             public function toArray($request)
             {