Merge branch '6.x'

Author: danog

src/Psalm/Internal/Cli/Psalm.php

@@ -323,7 +323,7 @@ public static function run(array $argv): void
 
         $show_info = self::initShowInfo($options);
 
-        $is_diff = self::initIsDiff($options);
+        $is_diff = false; // self::initIsDiff($options);
 
         $find_unused_code = self::shouldFindUnusedCode($options, $config);
 
@@ -493,12 +493,12 @@ private static function initShowInfo(array $options): bool
             : false;
     }
 
-    private static function initIsDiff(array $options): bool
+    /*private static function initIsDiff(array $options): bool
     {
         return !isset($options['no-diff'])
             && !isset($options['set-baseline'])
             && !isset($options['update-baseline']);
-    }
+    }*/
 
     /**
      * @param array<int,string> $args

src/Psalm/Internal/Codebase/ClassLikes.php

@@ -63,6 +63,7 @@
 use function preg_quote;
 use function preg_replace;
 use function strlen;
+use function strpos;
 use function strrpos;
 use function strtolower;
 use function substr;
@@ -884,9 +885,15 @@ public function consolidateAnalyzedData(Methods $methods, ?Progress $progress, b
                         && $classlike_storage->stmt_location !== null
                         && isset($project_analyzer->getIssuesToFix()['ClassMustBeFinal'])
                     ) {
-                        $idx = $classlike_storage->stmt_location->getSelectionBounds()[0];
+                        $selection = $classlike_storage->stmt_location->getSnippet();
+                        $insert_pos = strpos($selection, "class");
+        
+                        if ($insert_pos === false) {
+                            $insert_pos = $classlike_storage->stmt_location->getSelectionBounds()[0];
+                        }
+
                         FileManipulationBuffer::add($classlike_storage->stmt_location->file_path, [
-                            new FileManipulation($idx, $idx, 'final ', true),
+                            new FileManipulation($insert_pos, $insert_pos, 'final ', true),
                         ]);
                     }
                 }

src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php

@@ -1140,6 +1140,12 @@ private function createStorageForFunctionLike(
                     }
                 }
             }
+        } elseif ($stmt instanceof PhpParser\Node\PropertyHook) {
+            $function_id = $cased_function_id = strtolower($this->file_path)
+                . ':' . $stmt->getLine()
+                . ':' . (int)$stmt->getAttribute('startFilePos') . ':-:hook';
+
+            $storage = $this->storage = $this->file_storage->functions[$function_id] = new FunctionStorage();
         } else {
             throw new UnexpectedValueException("Unrecognized functionlike of type ".($stmt::class));
         }

stubs/CoreImmutableClasses.phpstub

@@ -91,7 +91,7 @@ class DateTimeImmutable implements DateTimeInterface
      * @psalm-mutation-free
      * @return static
      */
-    public function setTimestamp(int $unixtimestamp) {}
+    public function setTimestamp(int $timestamp) {}
 
     /**
      * @psalm-mutation-free

stubs/Reflection.phpstub

@@ -13,11 +13,11 @@ class ReflectionClass implements Reflector {
     public $name;
 
     /**
-     * @param T|class-string<T>|interface-string<T>|trait-string|enum-string<T> $argument
+     * @param T|class-string<T>|interface-string<T>|trait-string|enum-string<T> $objectOrClass
      * @psalm-pure
-     * @psalm-taint-sink callable $argument
+     * @psalm-taint-sink callable $objectOrClass
      */
-    public function __construct($argument) {}
+    public function __construct(object|string $objectOrClass) {}
 
     /**
      * @return class-string<T>

tests/EndToEnd/PsalmEndToEndTest.php

@@ -176,6 +176,7 @@ public function testPsalmWithPHPVersionFromConfig(): void
         );
     }
 
+    /*
     public function testPsalmDiff(): void
     {
         copy(__DIR__ . '/../fixtures/DummyProjectWithErrors/diff_composer.lock', self::$tmpDir . '/composer.lock');
@@ -203,7 +204,7 @@ public function testPsalmDiff(): void
         $this->assertSame(2, $result['CODE']);
 
         @unlink(self::$tmpDir . '/composer.lock');
-    }
+    }*/
 
     public function testTainting(): void
     {

tests/Php84Test.php

@@ -63,6 +63,27 @@ class Foo {}
                 'ignored_issues' => ['UnusedVariable'],
                 'php_version' => '8.4',
             ],
+            'propertyHook' => [
+                'code' => '<?php
+                    class Foo {
+                        public int|null $test = null{
+                            get {
+                                return $this->test;
+                            }
+                            set(int $value) {
+                                $this->test = $value;
+                            }
+                        }
+                    }
+                    $property_hook = new Foo();
+                    $property_hook->test = 5;
+                    ',
+                'assertions' => [
+                    '$property_hook->test' => 'int',
+                ],
+                'ignored_issues' => [],
+                'php_version' => '8.4',
+            ],
         ];
     }