Merge pull request #51 from riccardodallavia/main

UPDATE switch to laravel pint

Author: enricodelazzari

.github/workflows/php-cs-fixer.yml .github/workflows/fix-php-code-style-issues.yml

@@ -1,9 +1,12 @@
-name: Check & fix styling
+name: Fix PHP code style issues
 
-on: [push]
+on:
+  push:
+    paths:
+      - '**.php'
 
 jobs:
-  php-cs-fixer:
+  php-code-styling:
     runs-on: ubuntu-latest
 
     steps:
@@ -12,10 +15,8 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
-        with:
-          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
+      - name: Fix PHP code style issues
+        uses: aglipanci/[email protected]
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

.php-cs-fixer.dist.php

@@ -10,7 +10,7 @@
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/maize-tech/laravel-markable.svg?style=flat-square)](https://packagist.org/packages/maize-tech/laravel-markable)
 [![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/maize-tech/laravel-markable/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/maize-tech/laravel-markable/actions?query=workflow%3Arun-tests+branch%3Amain)
-[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/maize-tech/laravel-markable/php-cs-fixer.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/maize-tech/laravel-markable/actions?query=workflow%3A"Check+%26+fix+styling"+branch%3Amain)
+[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/maize-tech/laravel-markable/fix-php-code-style-issues.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/maize-tech/laravel-markable/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
 [![Total Downloads](https://img.shields.io/packagist/dt/maize-tech/laravel-markable.svg?style=flat-square)](https://packagist.org/packages/maize-tech/laravel-markable)
 
 This package allows you to easily add the markable feature to your application, as for example likes, bookmarks, favorites and so on.

README.md

@@ -30,7 +30,7 @@
         "spatie/laravel-package-tools": "^1.14.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.7",
+        "laravel/pint": "^1.0",
         "orchestra/testbench": "^7.0|^8.0",
         "phpunit/phpunit": "^9.5",
         "spatie/laravel-ray": "^1.29",
@@ -48,7 +48,7 @@
         }
     },
     "scripts": {
-        "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
+        "format": "vendor/bin/pint",
         "psalm": "vendor/bin/psalm",
         "test": "vendor/bin/phpunit --colors=always",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"

composer.json

@@ -37,7 +37,7 @@ public static function getMarkClassName(): string
             ->__toString();
     }
 
-    public static function add(Model $markable, Model $user, ?string $value = null): self
+    public static function add(Model $markable, Model $user, string $value = null): self
     {
         static::validMarkable($markable);
 
@@ -58,7 +58,7 @@ public static function add(Model $markable, Model $user, ?string $value = null):
         return static::firstOrCreate($attributes, $values);
     }
 
-    public static function remove(Model $markable, Model $user, ?string $value = null)
+    public static function remove(Model $markable, Model $user, string $value = null)
     {
         static::validMarkable($markable);
 
@@ -70,7 +70,7 @@ public static function remove(Model $markable, Model $user, ?string $value = nul
         ])->get()->each->delete();
     }
 
-    public static function count(Model $markable, ?string $value = null): int
+    public static function count(Model $markable, string $value = null): int
     {
         static::validMarkable($markable);
 
@@ -81,7 +81,7 @@ public static function count(Model $markable, ?string $value = null): int
         ])->count();
     }
 
-    public static function has(Model $markable, Model $user, ?string $value = null): bool
+    public static function has(Model $markable, Model $user, string $value = null): bool
     {
         return static::where([
             app(static::class)->getUserIdColumn() => $user->getKey(),
@@ -91,7 +91,7 @@ public static function has(Model $markable, Model $user, ?string $value = null):
         ])->exists();
     }
 
-    public static function toggle(Model $markable, Model $user, ?string $value = null)
+    public static function toggle(Model $markable, Model $user, string $value = null)
     {
         return static::has($markable, $user, $value)
             ? static::remove($markable, $user, $value)

src/Mark.php

@@ -25,7 +25,7 @@ public static function marks(): array
         return static::$marks ?? [];
     }
 
-    public function scopeWhereHasMark(Builder $builder, Mark $mark, Model $user, ?string $value = null): Builder
+    public function scopeWhereHasMark(Builder $builder, Mark $mark, Model $user, string $value = null): Builder
     {
         return $builder->whereHas(
             $mark->markableRelationName(),

src/Markable.php

@@ -27,7 +27,7 @@ protected function addWhereHasMark(Builder $builder, Mark $mark): void
     {
         $builder->macro(
             "whereHas{$mark::getMarkClassName()}",
-            fn (Builder $b, $user, ?string $value = null) => $b->whereHasMark($mark, $user, $value)
+            fn (Builder $b, $user, string $value = null) => $b->whereHasMark($mark, $user, $value)
         );
     }
 }