Merge pull request #3 from php-static-analysis/psalm-6.12

Updates for PSalm 6.12

Author: carlos-granados

composer.json

@@ -29,7 +29,7 @@
         "ext-simplexml": "*",
         "php-static-analysis/attributes": "^0.4.1 || dev-main",
         "php-static-analysis/node-visitor": "^0.4.1 || dev-main",
-        "vimeo/psalm": "^6",
+        "vimeo/psalm": "^6.12",
         "webmozart/assert": "^1.11"
     },
     "require-dev": {

patches/vimeo-psalm-src-psalm-internal-codebase-analizer-php.patch

@@ -0,0 +1,16 @@
+diff --git a/src/Psalm/Internal/Codebase/Analyzer.php b/src/Psalm/Internal/Codebase/Analyzer.php
+index f9127a517..41f94a174 100644
+--- a/src/Psalm/Internal/Codebase/Analyzer.php
++++ b/src/Psalm/Internal/Codebase/Analyzer.php
+@@ -812,7 +812,10 @@ final class Analyzer
+         );
+     }
+ 
+-    public function shiftFileOffsets(StatementsProvider $statements_provider): void
++    /**
++     * @param StatementsProvider $statements_provider
++     */
++    public function shiftFileOffsets($statements_provider): void
+     {
+         $diff_map = $statements_provider->getDiffMap();
+         $deletion_ranges = $statements_provider->getDeletionRanges();

patches/vimeo-psalm-src-psalm-internal-provider-parsercacheprovider-php.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Psalm/Internal/Provider/ParserCacheProvider.php b/src/Psalm/Internal/Provider/ParserCacheProvider.php
+index f352519f2..c2351841e 100644
+--- a/src/Psalm/Internal/Provider/ParserCacheProvider.php
++++ b/src/Psalm/Internal/Provider/ParserCacheProvider.php
+@@ -13,7 +13,7 @@ use function filemtime;
+ use const DIRECTORY_SEPARATOR;
+ 
+ /** @internal */
+-final class ParserCacheProvider
++class ParserCacheProvider
+ {
+     private const PARSER_CACHE_DIRECTORY = 'php-parser';
+ 

patches/vimeo-psalm-tests-testconfig-php.patch

@@ -0,0 +1,13 @@
+diff --git a/tests/TestConfig.php b/tests/TestConfig.php
+index b5bac8fcc..970ac2b40 100644
+--- a/tests/TestConfig.php
++++ b/tests/TestConfig.php
+@@ -12,7 +12,7 @@ use SimpleXMLElement;
+ 
+ use function getcwd;
+ 
+-final class TestConfig extends Config
++class TestConfig extends Config
+ {
+     private static ?ProjectFileFilter $cached_project_files = null;
+ 

psalm.xml

@@ -7,6 +7,7 @@
         errorLevel="1"
         findUnusedBaselineEntry="true"
         findUnusedCode="false"
+        ensureOverrideAttribute="false"
 >
     <projectFiles>
         <directory name="src" />

src/Composer/Plugin.php

@@ -9,7 +9,7 @@
 use Composer\Script\Event;
 use PhpStaticAnalysis\Attributes\Returns;
 
-class Plugin implements PluginInterface, EventSubscriberInterface
+final class Plugin implements PluginInterface, EventSubscriberInterface
 {
     public function activate(Composer $composer, IOInterface $io)
     {
@@ -50,12 +50,25 @@ private static function applyPatches(Event $event): void
         $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
 
         $dependencyPath = $vendorDir . '/vimeo/psalm';
-        $patchFile = __DIR__ . '/../../patches/vimeo-psalm-src-psalm-config-php.patch';
+        $patchesDir = __DIR__ . '/../../patches/';
+        $patchFiles = glob($patchesDir . '*.patch');
 
-        exec("patch -p1 -d $dependencyPath --forward < $patchFile");
+        if ($patchFiles === false) {
+            echo "No patches to apply\n";
+            return;
+        }
+        foreach ($patchFiles as $patchFile) {
+            $escapedPatchFile = escapeshellarg($patchFile);
+            $escapedDependencyPath = escapeshellarg($dependencyPath);
 
-        $patchFile = __DIR__ . '/../../patches/vimeo-psalm-src-psalm-codebase-php.patch';
+            $cmd = "patch -p1 -d $escapedDependencyPath --forward < $escapedPatchFile";
+            exec($cmd, $output, $returnVar);
 
-        exec("patch -p1 -d $dependencyPath --forward < $patchFile");
+            if ($returnVar !== 0) {
+                echo "Failed to apply patch: $patchFile\n";
+            } else {
+                echo "Applied patch: $patchFile\n";
+            }
+        }
     }
 }

src/Plugin.php

@@ -10,7 +10,7 @@
 use Psalm\Plugin\RegistrationInterface;
 use SimpleXMLElement;
 
-class Plugin implements PluginEntryPointInterface
+final class Plugin implements PluginEntryPointInterface
 {
     public function __invoke(RegistrationInterface $registration, ?SimpleXMLElement $config = null): void
     {

src/Provider/AttributeStatementProvider.php

@@ -14,7 +14,7 @@
 use Psalm\Progress\Progress;
 use Webmozart\Assert\Assert;
 
-class AttributeStatementProvider
+final class AttributeStatementProvider
 {
     private StatementsProvider $statementsProvider;
 
@@ -27,12 +27,14 @@ public function __construct(StatementsProvider $statementsProvider)
     public function getStatementsForFile(
         string $file_path,
         int $analysis_php_version_id,
+        bool $do_diff,
         ?Progress $progress = null
     ): array {
         /** @psalm-suppress InternalMethod */
         $ast = $this->statementsProvider->getStatementsForFile(
             $file_path,
             $analysis_php_version_id,
+            $do_diff,
             $progress
         );
         return $this->traverseAst($ast);

tests/AssertAttributeTest.php

@@ -4,7 +4,7 @@
 
 namespace test\PhpStaticAnalysis\PsalmPlugin;
 
-class AssertAttributeTest extends BaseAttributeTestCase
+final class AssertAttributeTest extends BaseAttributeTestCase
 {
     public function testFunctionAssertAttribute(): void
     {

tests/AssertIfFalseAttributeTest.php

@@ -4,7 +4,7 @@
 
 namespace test\PhpStaticAnalysis\PsalmPlugin;
 
-class AssertIfFalseAttributeTest extends BaseAttributeTestCase
+final class AssertIfFalseAttributeTest extends BaseAttributeTestCase
 {
     public function testFunctionAssertIfFalseAttribute(): void
     {