Dump dependencies: drop Laravel 10 and PHP 8.1 support

.github/workflows/test-laravel.yml

@@ -1,4 +1,4 @@
-name: Test laravel projects
+name: Test Laravel app
 
 on:
   push:
@@ -19,13 +19,22 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
-    name: Test Laravel
+    name: Test Laravel app
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Test Laravel
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: 8.3
+        coverage: none
+
+    - name: Build a Laravel project and run Psalm on it
       run: |
         ./tests/Application/laravel-test.sh
+
+    - run: |
+        echo "Psalm analysis failed on a fresh Laravel project. Please consider updating baseline: tests/Application/laravel-test-baseline.xml"
+      if: ${{ failure() }}

.github/workflows/test.yml

@@ -6,15 +6,15 @@ on:
     paths:
       - '**.php'
       - '**.stubphp'
-      - '**.feature'
+      - '**.phpt'
       - '**.yml'
       - 'composer.json'
       - '.github/workflows/test.yml'
   pull_request:
     paths:
       - '**.php'
       - '**.stubphp'
-      - '**.feature'
+      - '**.phpt'
       - 'composer.json'
       - '.github/workflows/test.yml'
   schedule:
@@ -51,13 +51,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.4, 8.3, 8.2, 8.1]
-        laravel: [^11.0, ^10.0]
-        dependencies: [lowest, highest]
-        exclude:
-          - php: 8.1
-            laravel: ^11.0
-    name: Type P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
+        php: [8.4, 8.3, 8.2]
+        laravel: [^11.35]
+        dependencies: [highest]
+    name: Type test P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

composer.json

@@ -11,33 +11,33 @@
     ],
     "homepage": "https://github.com/psalm/psalm-plugin-laravel",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-simplexml": "*",
-        "barryvdh/laravel-ide-helper": "^2.13 || ^3.0",
-        "illuminate/config": "^10.48 || ^11.0",
-        "illuminate/container": "^10.48 || ^11.0",
-        "illuminate/contracts": "^10.48 || ^11.0",
-        "illuminate/database": "^10.48 || ^11.0",
-        "illuminate/events": "^10.48 || ^11.0",
-        "illuminate/http": "^10.48 || ^11.0",
-        "illuminate/routing": "^10.48 || ^11.0",
-        "illuminate/support": "^10.48 || ^11.0",
-        "illuminate/view": "^10.48 || ^11.0",
-        "nikic/php-parser": "^4.18 || ^5.0",
-        "orchestra/testbench-core": "^8.22 || ^9.0",
-        "symfony/console": "^6.0 || ^7.0",
-        "symfony/finder": "^6.0 || ^7.0",
-        "vimeo/psalm": "^5.20|^6"
+        "barryvdh/laravel-ide-helper": "~3.5.4",
+        "illuminate/config": "^11.35",
+        "illuminate/container": "^11.35",
+        "illuminate/contracts": "^11.35",
+        "illuminate/database": "^11.35",
+        "illuminate/events": "^11.35",
+        "illuminate/http": "^11.35",
+        "illuminate/routing": "^11.35",
+        "illuminate/support": "^11.35",
+        "illuminate/view": "^11.35",
+        "nikic/php-parser": "^5.0",
+        "orchestra/testbench-core": "^9.9",
+        "symfony/console": "^7.1",
+        "symfony/finder": "^7.1",
+        "vimeo/psalm": "^5.26 || ^6.0"
     },
     "require-dev": {
-        "laravel/framework": "^10.48 || ^11.0",
-        "phpunit/phpunit": "^10.5 || ^11.0",
+        "laravel/framework": "^11.35",
+        "phpunit/phpunit": "^10.5 || ^11.5",
         "phpyh/psalm-tester": "^0.1.0",
         "ramsey/collection": "^1.3",
-        "rector/rector": "^1.0",
-        "slevomat/coding-standard": "^8.8",
-        "squizlabs/php_codesniffer": "*",
-        "symfony/http-foundation": "^6.0 || ^7.0"
+        "rector/rector": "^2.0",
+        "slevomat/coding-standard": "^8.15",
+        "squizlabs/php_codesniffer": "^3.11",
+        "symfony/http-foundation": "^7.1"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -68,14 +68,16 @@
         "lint-fix": "phpcbf -n",
         "psalm": "psalm --find-dead-code --find-unused-psalm-suppress --long-progress",
         "psalm-set-baseline": "psalm --set-baseline=psalm-baseline.xml",
+        "rector": "./vendor/bin/rector",
+        "rector:dry": "./vendor/bin/rector --dry-run",
         "test": [
             "@lint",
             "@psalm",
             "@test:unit",
             "@test:type"
         ],
+        "test:app": "./tests/Application/laravel-test.sh",
         "test:type": "phpunit --testsuite=type",
-        "test:unit": "phpunit --testsuite=unit",
-        "rector": "./vendor/bin/rector --dry-run"
+        "test:unit": "phpunit --testsuite=unit"
     }
 }

phpunit.xml.dist

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-    bootstrap="vendor/autoload.php"
-    cacheDirectory=".phpunit.cache"
-    executionOrder="depends,defects"
-    beStrictAboutCoverageMetadata="true"
-    beStrictAboutOutputDuringTests="true"
-    failOnRisky="true"
-    failOnWarning="true">
-  <testsuites>
-    <testsuite name="unit">
-      <directory>tests/Unit</directory>
-    </testsuite>
-    <testsuite name="type">
-      <directory>tests/Type</directory>
-    </testsuite>
-  </testsuites>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="unit">
+            <directory>tests/Unit</directory>
+        </testsuite>
+        <testsuite name="type">
+            <directory>tests/Type</directory>
+        </testsuite>
+    </testsuites>
 
     <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
-    <include>
-      <directory>src</directory>
-    </include>
-  </source>
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
 </phpunit>

psalm-baseline.xml

@@ -1,63 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
-  <file src="src/Handlers/Application/ContainerHandler.php">
-    <MixedArgument>
-      <code>$abstract</code>
-    </MixedArgument>
-  </file>
+<files psalm-version="6.6.0@07e9a53713232e924da9acb4a6e47507461cd411">
   <file src="src/Handlers/Auth/AuthConfigAnalyzer.php">
     <MixedArgument>
       <code><![CDATA[$this->config->get('auth.guards')]]></code>
     </MixedArgument>
-    <MixedInferredReturnType>
-      <code>?string</code>
-      <code><![CDATA[class-string<\Illuminate\Contracts\Auth\Authenticatable>|null]]></code>
-    </MixedInferredReturnType>
     <MixedReturnStatement>
       <code><![CDATA[$this->config->get("auth.providers.{$provider}.model", null)]]></code>
       <code><![CDATA[$this->config->get('auth.defaults.guard')]]></code>
     </MixedReturnStatement>
   </file>
   <file src="src/Handlers/Auth/AuthHandler.php">
     <TypeDoesNotContainType>
-      <code>null</code>
+      <code><![CDATA[null]]></code>
     </TypeDoesNotContainType>
   </file>
-  <file src="src/Handlers/Auth/GuardHandler.php">
-    <DeprecatedProperty>
-      <code><![CDATA[$previous_call->name->parts]]></code>
-    </DeprecatedProperty>
-  </file>
   <file src="src/Handlers/Eloquent/ModelPropertyAccessorHandler.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$event->getFqClasslikeName()]]></code>
       <code><![CDATA[$event->getFqClasslikeName()]]></code>
       <code><![CDATA[$event->getFqClasslikeName()]]></code>
     </ArgumentTypeCoercion>
     <LessSpecificImplementedReturnType>
-      <code>array</code>
-      <code>array</code>
-      <code>array</code>
+      <code><![CDATA[array]]></code>
+      <code><![CDATA[array]]></code>
+      <code><![CDATA[array]]></code>
     </LessSpecificImplementedReturnType>
   </file>
-  <file src="src/Handlers/Eloquent/Schema/SchemaAggregator.php">
-    <DeprecatedProperty>
-      <code><![CDATA[$first_argument_of_nullable->value->name->parts]]></code>
-    </DeprecatedProperty>
-  </file>
   <file src="src/Handlers/Helpers/PathHandler.php">
     <InternalMethod>
-      <code>new TLiteralString($result)</code>
+      <code><![CDATA[new TLiteralString($result)]]></code>
     </InternalMethod>
   </file>
+  <file src="src/Plugin.php">
+    <RiskyTruthyFalsyComparison>
+      <code><![CDATA[glob(dirname(__DIR__) . '/stubs/' . $majorVersion . '/**/*.stubphp')]]></code>
+      <code><![CDATA[glob(dirname(__DIR__) . '/stubs/' . $majorVersion . '/*.stubphp')]]></code>
+      <code><![CDATA[glob(dirname(__DIR__) . '/stubs/common/TaintAnalysis/Http/*.stubphp')]]></code>
+    </RiskyTruthyFalsyComparison>
+  </file>
   <file src="src/Providers/ApplicationProvider.php">
-     <InternalMethod>
-       <code><![CDATA[createApplication]]></code>
-     </InternalMethod>
+    <InternalMethod>
+      <code><![CDATA[createApplication]]></code>
+    </InternalMethod>
+    <MixedArgument>
+      <code><![CDATA[$app['events']]]></code>
+      <code><![CDATA[$app['events']]]></code>
+    </MixedArgument>
+    <MixedMethodCall>
+      <code><![CDATA[addNamespace]]></code>
+      <code><![CDATA[bootstrap]]></code>
+    </MixedMethodCall>
   </file>
   <file src="src/Util/ContainerResolver.php">
     <InternalMethod>
-      <code>new TLiteralString($concrete)</code>
+      <code><![CDATA[new TLiteralString($concrete)]]></code>
     </InternalMethod>
   </file>
 </files>

psalm.xml

@@ -2,7 +2,7 @@
 <psalm
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config config.xsd"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorLevel="1"
     errorBaseline="psalm-baseline.xml"
     findUnusedBaselineEntry="false"
@@ -19,5 +19,6 @@
 
     <issueHandlers>
         <LessSpecificReturnType errorLevel="info" />
+        <ClassMustBeFinal errorLevel="info" />
     </issueHandlers>
 </psalm>

rector.php

@@ -2,7 +2,6 @@
 
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector;
-use Rector\CodingStyle\Rector\Closure\StaticClosureRector;
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
 use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector;
 use Rector\Config\RectorConfig;
@@ -11,24 +10,19 @@
 use Rector\Php81\Rector\Array_\FirstClassCallableRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
-use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector;
-use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
 
 return RectorConfig::configure()
     ->withPaths(['src', 'tests'])
-    ->withPhpSets(php81: true)
+    ->withPhpSets(php82: true)
     ->withPreparedSets(deadCode: true, codingStyle: true, typeDeclarations: true)
     ->withSkip([
         ReadOnlyPropertyRector::class,
         ClosureToArrowFunctionRector::class,
         FirstClassCallableRector::class,
         NullToStrictStringFuncCallArgRector::class,
-        BooleanInIfConditionRuleFixerRector::class,
-        BooleanInBooleanNotRuleFixerRector::class,
         RemoveUnusedPrivateMethodRector::class,
         SimplifyUselessVariableRector::class,
         NullableCompareToNullRector::class,
         EncapsedStringsToSprintfRector::class,
-        StaticClosureRector::class,
         SplitDoubleAssignRector::class,
     ]);

src/Exceptions/UnknownApplicationConfiguration.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Psalm\LaravelPlugin\Exceptions;
+
+final class UnknownApplicationConfiguration extends \LogicException
+{
+}

src/Fakes/FakeModelsCommand.php

@@ -21,9 +21,15 @@ class FakeModelsCommand extends ModelsCommand
     /** @var list<class-string<\Illuminate\Database\Eloquent\Model>> */
     private array $model_classes = [];
 
-    public function __construct(Filesystem $files, private SchemaAggregator $schema)
+    private SchemaAggregator $schema;
+
+    /**
+     * While the setter of a required property is an anti-pattern,
+     * this is the only way to be less independent of changes in the parent ModelsCommand constructor.
+     */
+    public function setSchemaAggregator(SchemaAggregator $schemaAggregator): void
     {
-        parent::__construct($files);
+        $this->schema = $schemaAggregator;
     }
 
     /** @return list<class-string<\Illuminate\Database\Eloquent\Model>> */
@@ -109,7 +115,6 @@ public function getPropertiesFromTable($model): void
             }
 
             if ($column->nullable) {
-                /** @psalm-suppress MixedArrayAssignment */
                 $this->nullableColumns[$column_name] = true;
             }