feat: update to PHPStan 2 and PHP 8.4

Author: calebdw

.github/workflows/tests.yml

@@ -1,3 +1,4 @@
+---
 name: Tests
 
 on:
@@ -18,16 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1, 8.2, 8.3]
-        laravel: ['^10.0', '^11.0']
-        include:
-          - laravel: ^10.0
-            testbench: ^8.0
-          - laravel: ^11.0
-            testbench: ^9.0
-        exclude:
-          - php: 8.1
-            laravel: '^11.0'
+        php: [8.4]
+        laravel: ['^11.0']
     name: PHP${{ matrix.php }} - Laravel${{ matrix.laravel }}
     runs-on: ubuntu-latest
     steps:
@@ -57,7 +50,7 @@ jobs:
           restore-keys: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-
 
       - name: Install dependencies from composer.json
-        run: composer update --with='laravel/framework:${{ matrix.laravel }}' --with='orchestra/testbench:${{ matrix.testbench }}' --no-interaction --no-progress
+        run: composer update --with='laravel/framework:${{ matrix.laravel }}' --no-interaction --no-progress
 
       - name: Check PSR-4 mapping
         run: composer dump-autoload --optimize --strict-psr

composer.json

@@ -40,18 +40,17 @@
     }
   },
   "require": {
-    "php": "^8.1",
+    "php": "^8.4",
     "godruoyi/php-snowflake": "^3.0",
-    "illuminate/contracts": "^10.0|^11.0",
-    "illuminate/database": "^10.0|^11.0",
-    "illuminate/support": "^10.0|^11.0",
-    "illuminate/validation": "^10.0|^11.0",
-    "phpstan/phpstan": "^1.11"
+    "illuminate/contracts": "^11.0",
+    "illuminate/database": "^11.0",
+    "illuminate/support": "^11.0",
+    "illuminate/validation": "^11.0"
   },
   "require-dev": {
-    "larastan/larastan": "^2.9",
+    "larastan/larastan": "^3.0",
     "laravel/pint": "^1.16.2",
-    "orchestra/testbench": "^8.0|^9.0",
+    "orchestra/testbench": "^9.0",
     "pestphp/pest": "^2.34"
   },
   "extra": {

phpstan.neon.dist

@@ -4,3 +4,4 @@ parameters:
   level: max
   paths:
     - src
+    - workbench/app

src/Concerns/HasSnowflakes.php

@@ -40,10 +40,14 @@ public function newUniqueId(): string
     /** @inheritDoc */
     public function resolveRouteBindingQuery($query, $value, $field = null)
     {
+        if (! is_numeric($value)) {
+            return parent::resolveRouteBindingQuery($query, $value, $field);
+        }
+
         $field ??= $this->getRouteKeyName();
 
         if (in_array($field, $this->uniqueIds(), true) && ! Str::isSnowflake($value)) {
-            throw (new ModelNotFoundException())->setModel($this::class, $value);
+            throw new ModelNotFoundException()->setModel($this::class, (string) $value);
         }
 
         return parent::resolveRouteBindingQuery($query, $value, $field);

src/Macros/BlueprintMacros.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CalebDW\Laraflake\Macros;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\ColumnDefinition;
+
+class BlueprintMacros
+{
+    public static function boot(): void
+    {
+        Blueprint::macro('snowflake', function (string $column = 'id'): ColumnDefinition {
+            return $this->unsignedBigInteger($column);
+        });
+
+        Blueprint::macro('foreignSnowflake', function (string $column): ColumnDefinition {
+            return $this->foreignId($column);
+        });
+
+        Blueprint::macro('foreignSnowflakeFor', function (string $model, ?string $column = null): ColumnDefinition {
+            /** @var class-string<Model> $model */
+            return $this->foreignSnowflake($column ?? (new $model())->getForeignKey());
+        });
+    }
+}

src/Macros/RuleMacros.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CalebDW\Laraflake\Macros;
+
+use CalebDW\Laraflake\Rules\Snowflake as SnowflakeRule;
+use Illuminate\Validation\Rule;
+
+class RuleMacros
+{
+    public static function boot(): void
+    {
+        Rule::macro('snowflake', fn () => new SnowflakeRule());
+    }
+}

src/Mixins/StrMixin.php src/Macros/StrMacros.php

@@ -2,38 +2,33 @@
 
 declare(strict_types=1);
 
-namespace CalebDW\Laraflake\Mixins;
+namespace CalebDW\Laraflake\Macros;
 
 use CalebDW\Laraflake\Facades\Snowflake;
-use Closure;
 use Illuminate\Support\Str;
 
-/** @mixin \Illuminate\Support\Str */
-class StrMixin
+class StrMacros
 {
-    /** @return Closure(): string */
-    public function snowflake(): Closure
+    public static function boot(): void
     {
-        return fn (): string => Snowflake::id();
-    }
+        Str::macro('snowflake', fn (): string => Snowflake::id());
 
-    /** @return Closure(mixed): bool */
-    public function isSnowflake(): Closure
-    {
-        return function (mixed $value): bool {
+        Str::macro('isSnowflake', function (mixed $value): bool {
             if (! is_numeric($value)) {
                 return false;
             }
 
             $value = Str::of((string) $value)
                 ->rtrim('.0')
                 ->rtrim('.')
-                ->toString();
+                ->value();
 
             if (Str::contains($value, '.')) {
                 return false;
             }
 
+            assert(is_numeric($value));
+
             $maxSnowflakeValue = '9223372036854775807';
 
             if (bccomp($value, '0') < 0 || bccomp($value, $maxSnowflakeValue, 1) > 0) {
@@ -43,6 +38,6 @@ public function isSnowflake(): Closure
             $parsed = Snowflake::parseId($value);
 
             return count(array_filter($parsed)) === count($parsed);
-        };
+        });
     }
 }

src/Mixins/BlueprintMixin.php

@@ -4,9 +4,9 @@
 
 namespace CalebDW\Laraflake;
 
-use CalebDW\Laraflake\Mixins\BlueprintMixin;
-use CalebDW\Laraflake\Mixins\RuleMixin;
-use CalebDW\Laraflake\Mixins\StrMixin;
+use CalebDW\Laraflake\Macros\BlueprintMacros;
+use CalebDW\Laraflake\Macros\RuleMacros;
+use CalebDW\Laraflake\Macros\StrMacros;
 use Composer\InstalledVersions;
 use Godruoyi\Snowflake\FileLockResolver;
 use Godruoyi\Snowflake\LaravelSequenceResolver;
@@ -18,11 +18,9 @@
 use Godruoyi\Snowflake\Sonyflake;
 use Godruoyi\Snowflake\SwooleSequenceResolver;
 use Illuminate\Contracts\Cache\Repository;
-use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Foundation\Console\AboutCommand;
 use Illuminate\Support\ServiceProvider as IlluminateServiceProvider;
-use Illuminate\Support\Str;
-use Illuminate\Validation\Rule;
 use InvalidArgumentException;
 
 /**
@@ -50,7 +48,7 @@ public function boot(): void
     {
         $this->publishes([__DIR__ . '/../config/laraflake.php' => config_path('laraflake.php')]);
 
-        $this->registerMixins();
+        $this->registerMacros();
 
         AboutCommand::add('Laraflake', function () {
             /** @var LaraflakeConfig $config */
@@ -76,17 +74,17 @@ public function boot(): void
     }
 
     /** Register custom mixins. */
-    protected function registerMixins(): void
+    protected function registerMacros(): void
     {
-        Blueprint::mixin(new BlueprintMixin());
-        Str::mixin(new StrMixin());
-        Rule::mixin(new RuleMixin());
+        BlueprintMacros::boot();
+        RuleMacros::boot();
+        StrMacros::boot();
     }
 
     /** Register the Snowflake singleton. */
     protected function registerSnowflake(): void
     {
-        $this->app->singleton(Snowflake::class, function ($app) {
+        $this->app->singleton(Snowflake::class, function (Application $app) {
             /** @var LaraflakeConfig $config */
             $config = config('laraflake');
 
@@ -103,7 +101,7 @@ protected function registerSnowflake(): void
     /** Bind the Snowflake sequence resolver. */
     protected function registerSequenceResolver(): void
     {
-        $this->app->bind(SequenceResolver::class, function ($app) {
+        $this->app->bind(SequenceResolver::class, function (Application $app) {
             if (! $app->has('cache.store')) {
                 return new RandomSequenceResolver();
             }

src/Mixins/RuleMixin.php

@@ -52,11 +52,14 @@
         ->assertSee(test()->post->title);
 });
 
-it('throws exception for invalid snowflake', function () {
+it('throws exception for invalid snowflake', function ($value) {
     test()->withoutExceptionHandling();
 
-    test()->get('/users-id/invalid');
-})->throws(ModelNotFoundException::class);
+    test()->get("/users-id/{$value}");
+})->with([
+    'non-numeric',
+    '9999999999999999999',
+])->throws(ModelNotFoundException::class);
 
 it('throws exception for non-unique field', function () {
     test()->withoutExceptionHandling();

src/ServiceProvider.php

@@ -25,6 +25,7 @@ public function uniqueIds(): array
         return ['slug'];
     }
 
+    /** @return BelongsTo<User, $this> */
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);

tests/Feature/HasSnowflakesTest.php

@@ -14,6 +14,7 @@ class User extends Model
 
     protected $guarded = [];
 
+    /** @return HasMany<Post, $this> */
     public function posts(): HasMany
     {
         return $this->hasMany(Post::class);