Merge pull request #8 from joelbladt/2.x

2.x

Author: joelbladt

.github/workflows/tests.yaml

@@ -28,9 +28,9 @@ jobs:
       matrix:
         php: [8.2, 8.3]
         phpunit: ['11.0', '11.4']
-        phpstan: ['1.12']
-        paratest: ['7.6']
-        larastan: ['2.5', '2.9']
+        phpstan: ['2.1']
+        paratest: ['7.6', '7.8']
+        larastan: ['v3.1']
 
     name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - with Paratest ${{ matrix.paratest }} - PHPStan ${{ matrix.phpstan }} - Larastan ${{ matrix.larastan }}
 

app/Http/Resources/BaseResourceCollection.php

@@ -7,7 +7,7 @@
 use Illuminate\Pagination\LengthAwarePaginator;
 
 /**
- * @property LengthAwarePaginator $resource
+ * @property LengthAwarePaginator<self> $resource
  */
 class BaseResourceCollection extends ResourceCollection
 {

app/Models/Book.php

@@ -35,7 +35,7 @@ class Book extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<int, string>
+     * @var list<string>
      */
     protected $fillable = [
         'title',

app/Models/Publisher.php

@@ -37,7 +37,7 @@ class Publisher extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<int, string>
+     * @var list<string>
      */
     protected $fillable = [
         'name',

app/Models/User.php

@@ -20,7 +20,7 @@ class User extends Authenticatable
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<int, string>
+     * @var list<string>
      */
     protected $fillable = [
         'name',
@@ -31,7 +31,7 @@ class User extends Authenticatable
     /**
      * The attributes that should be hidden for serialization.
      *
-     * @var array<int, string>
+     * @var list<string>
      */
     protected $hidden = [
         'password',

composer.json

@@ -7,19 +7,19 @@
     "require": {
         "php": "^8.2",
         "darkaonline/l5-swagger": "^8.6",
-        "laravel/framework": "^11.9",
+        "laravel/framework": "^12.0",
         "laravel/tinker": "^2.9"
     },
     "require-dev": {
         "brianium/paratest": "^7.6",
         "fakerphp/faker": "^1.23",
-        "larastan/larastan": "^2.9",
+        "larastan/larastan": "^v3.1",
         "laravel/pail": "^1.1",
         "laravel/pint": "^1.13",
         "laravel/sail": "^1.26",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.1",
-        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^11.4"
     },
     "autoload": {