L13 upgrade

Author: pdphilip

.github/workflows/phpstan.yml

@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -17,19 +17,16 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.4, 8.3, 8.2 ]
-        laravel: [ 12.*, 11.*, 10.* ]
+        php: [ 8.3, 8.4 ]
+        laravel: [ 13.*, 12.*, 11.* ]
         stability: [ prefer-stable ]
         include:
+          - laravel: 13.*
+            testbench: 11.*
           - laravel: 12.*
             testbench: 10.*
           - laravel: 11.*
             testbench: 9.*
-          - laravel: 10.*
-            testbench: 8.*
-        exclude:
-          - php: 8.4
-            laravel: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 

composer.json

@@ -16,24 +16,24 @@
     }
   ],
   "require": {
-    "php": "^8.2",
-    "illuminate/contracts": "^10.0||^11.0||^12.0",
-    "pdphilip/elasticsearch": "^5",
-    "pdphilip/omniterm": "^2",
-    "pdphilip/cf-request": "^3",
+    "php": "^8.3",
+    "illuminate/contracts": "^11.0||^12.0||^13.0",
+    "pdphilip/elasticsearch": "^5.6",
+    "pdphilip/omniterm": "^3.0",
+    "pdphilip/cf-request": "^3.1",
     "spatie/laravel-package-tools": "^1.16"
   },
   "require-dev": {
     "laravel/pint": "^1.14",
-    "larastan/larastan": "^2||^3",
-    "nunomaduro/collision": "^7.10.0||^8.1.1",
-    "orchestra/testbench": "^8.0||^9.0||^10.0",
-    "pestphp/pest": "^2||^3",
-    "pestphp/pest-plugin-arch": "^2||^3",
-    "pestphp/pest-plugin-laravel": "^2||^3",
-    "phpstan/extension-installer": "^1.3",
-    "phpstan/phpstan-deprecation-rules": "^1||^2",
-    "phpstan/phpstan-phpunit": "^1||^2"
+    "larastan/larastan": "^3",
+    "nunomaduro/collision": "^8.1.1",
+    "orchestra/testbench": "^9.0||^10.0||^11.0",
+    "pestphp/pest": "^3||^4",
+    "pestphp/pest-plugin-arch": "^3||^4",
+    "pestphp/pest-plugin-laravel": "^3||^4",
+    "phpstan/extension-installer": "^1.4||^2.0",
+    "phpstan/phpstan-deprecation-rules": "^2",
+    "phpstan/phpstan-phpunit": "^2"
   },
   "autoload": {
     "psr-4": {
@@ -70,6 +70,24 @@
       "@test:lint",
       "@test:types",
       "@test:unit"
+    ],
+    "test:l11": [
+      "@composer update --with laravel/framework:^11.0 --prefer-stable --no-interaction --quiet",
+      "@test:unit"
+    ],
+    "test:l12": [
+      "@composer update --with laravel/framework:^12.0 --prefer-stable --no-interaction --quiet",
+      "@test:unit"
+    ],
+    "test:l13": [
+      "@composer update --with laravel/framework:^13.0 --prefer-stable --no-interaction --quiet",
+      "@test:unit"
+    ],
+    "test:all": [
+      "Composer\\Config::disableProcessTimeout",
+      "@test:l11",
+      "@test:l12",
+      "@test:l13"
     ]
   },
   "config": {
@@ -89,4 +107,4 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true
-}
+}

phpstan-baseline.neon

@@ -0,0 +1,13 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Parameter \#1 \$view of function view expects view\-string\|null, string given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Commands/OmniEventMakeCommand.php
+
+		-
+			message: '#^Trait PDPhilip\\OmniEvent\\Eventable is used zero times and is not analysed\.$#'
+			identifier: trait.unused
+			count: 1
+			path: src/Eventable.php

phpstan.neon.dist

@@ -5,7 +5,6 @@ parameters:
     level: 5
     paths:
         - src
-        - config
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true

src/Eventable.php

@@ -17,7 +17,7 @@ trait Eventable
 
     public static function bootEventable(): void
     {
-        $eventModel = OmniEvent::fetchEventModel(new static);
+        $eventModel = OmniEvent::fetchEventModelFromClass(static::class);
         $validated = $eventModel::validateSchema();
 
         static::$eventModel = $eventModel;

src/OmniEvent.php

@@ -16,6 +16,13 @@ public static function fetchEventModelClass(object $baseModel): string
         return config('omnievent.namespaces.events').'\\'.class_basename($baseModel).'Event';
     }
 
+    public static function fetchEventModelFromClass(string $class): EventModel
+    {
+        $eventClass = config('omnievent.namespaces.events').'\\'.class_basename($class).'Event';
+
+        return new $eventClass;
+    }
+
     public static function fetchEventModel(object $baseModel): EventModel
     {
         $class = self::fetchEventModelClass($baseModel);