make tests work in PHP < 8.2

vimeo · Dec 19, 2023 · 9e463bb · 9e463bb
1 parent 1ff8518
commit 9e463bb
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 46 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php
@@ -2,6 +2,7 @@
 
 namespace Psalm\Internal\Analyzer\Statements\Expression\Call;
 
+use InvalidArgumentException;
 use PhpParser;
 use Psalm\CodeLocation;
 use Psalm\Codebase;
@@ -1267,10 +1268,15 @@ private static function handleByRefReadonlyArg(
         $codebase = $statements_analyzer->getCodebase();
         $declaring_property_class = (string) $codebase->properties->getDeclaringClassForProperty(
             $property_id,
-            false, # what does this do? @todo
+            true,
             $statements_analyzer,
         );
-        $declaring_class_storage = $codebase->classlike_storage_provider->get($declaring_property_class);
+
+        try {
+            $declaring_class_storage = $codebase->classlike_storage_provider->get($declaring_property_class);
+        } catch (InvalidArgumentException $_) {
+            return;
+        }
 
         if (isset($declaring_class_storage->properties[$prop_name])) {
             $property_storage = $declaring_class_storage->properties[$prop_name];
@@ -1310,7 +1316,7 @@ private static function handleByRefFunctionArg(
         if ($arg->value instanceof PhpParser\Node\Expr\PropertyFetch
             && $arg->value->name instanceof PhpParser\Node\Identifier) {
             $prop_name = $arg->value->name->name;
-            if ($statements_analyzer->getFQCLN()) {
+            if (!empty($statements_analyzer->getFQCLN())) {
                 $fq_class_name = $statements_analyzer->getFQCLN();
 
                 self::handleByRefReadonlyArg(

diff --git a/src/Psalm/Type/Atomic/TKeyedArray.php b/src/Psalm/Type/Atomic/TKeyedArray.php
@@ -112,6 +112,8 @@ public function setProperties(array $properties): self
         if ($cloned->is_list) {
             $last_k = -1;
             $had_possibly_undefined = false;
+
+            /** @psalm-suppress InaccessibleProperty */
             ksort($cloned->properties);
             foreach ($cloned->properties as $k => $v) {
                 if (is_string($k) || $last_k !== ($k-1) || ($had_possibly_undefined && !$v->possibly_undefined)) {

diff --git a/tests/ImmutableAnnotationTest.php b/tests/ImmutableAnnotationTest.php
@@ -768,63 +768,75 @@ public function getShortMutating() : string {
                 'code' => '<?php
                     namespace World;
 
-					final readonly class Foo
-					{
-						public array $values;
-
-						public function __construct(array $values)
-						{
-							$this->values = $values;
-						}
-
-						public function bar(): mixed
-						{
-							return reset($this->values);
-						}
-					}',
+                    final class Foo
+                    {
+                        /**
+                         * @readonly
+                         */
+                        public array $values;
+
+                        public function __construct(array $values)
+                        {
+                            $this->values = $values;
+                        }
+
+                        /**
+                         * @return mixed
+                         */
+                        public function bar()
+                        {
+                            return reset($this->values);
+                        }
+                    }',
                 'error_message' => 'InaccessibleProperty',
             ],
             'readonlyByRef' => [
                 'code' => '<?php
                     namespace World;
 
-					final readonly class Foo
-					{
-						public array $values;
+                    final class Foo
+                    {
+                        /**
+                         * @readonly
+                         */
+                        public array $values;
 
-						public function __construct(array $values)
-						{
-							$this->values = $values;
-						}
-					}
+                        public function __construct(array $values)
+                        {
+                            $this->values = $values;
+                        }
+                    }
 
-					$x = new Foo([]);
-					reset($x->values);',
+                    $x = new Foo([]);
+                    reset($x->values);',
                 'error_message' => 'InaccessibleProperty',
             ],
             'readonlyByRefCustomFunction' => [
                 'code' => '<?php
                     namespace World;
 
-					final readonly class Foo
-					{
-						public array $values;
-
-						public function __construct(array $values)
-						{
-							$this->values = $values;
-						}
-					}
-
-					/**
-					 * @param string $a
-					 * @param array $b
-					 * @return void
-					 */
-					function bar($a, &$b) {}
-
-					$x = new Foo([]);
-					bar("hello", $x->values);',
+                    final class Foo
+                    {
+                        /**
+                         * @readonly
+                         */
+                        public array $values;
+
+                        public function __construct(array $values)
+                        {
+                            $this->values = $values;
+                        }
+                    }
+
+                    /**
+                     * @param string $a
+                     * @param array $b
+                     * @return void
+                     */
+                    function bar($a, &$b) {}
+
+                    $x = new Foo([]);
+                    bar("hello", $x->values);',
                 'error_message' => 'InaccessibleProperty',
             ],
             'preventUnset' => [