fix conflicts

Author: taylorotwell

.github/workflows/lint.yml

@@ -43,7 +43,3 @@ jobs:
         with:
           commit_message: fix code style
           commit_options: '--no-verify'
-
-      # We need to run PHPStan after commiting changes as it does not auto-fix errors...
-      - name: PHPStan
-        run: ./vendor/bin/phpstan

composer.json

@@ -17,20 +17,19 @@
     "require": {
         "php": "^8.2",
         "inertiajs/inertia-laravel": "^2.0",
-        "laravel/framework": "^11.31",
-        "laravel/tinker": "^2.9",
+        "laravel/framework": "^12.0",
+        "laravel/tinker": "^2.10.1",
         "laravel/workos": "*",
         "tightenco/ziggy": "^2.4"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",
-        "larastan/larastan": "^3.0",
-        "laravel/pail": "^1.1",
+        "laravel/pail": "^1.2.2",
         "laravel/pint": "^1.18",
-        "laravel/sail": "^1.26",
+        "laravel/sail": "^1.41",
         "mockery/mockery": "^1.6",
-        "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^11.5"
+        "nunomaduro/collision": "^8.6",
+        "phpunit/phpunit": "^11.5.3"
     },
     "autoload": {
         "psr-4": {