Strict properties

UPGRADING.md

@@ -34,7 +34,7 @@
 
 - [BC] The return type of `Psalm\Internal\LanguageServer\ProtocolWriter#write() changed from `Amp\Promise` to `void` due to the switch to Amp v3
 
-- [BC] All parameters and return typehints are now strictly typed.
+- [BC] All parameters, properties and return typehints are now strictly typed.
 
 - [BC] `strict_types` is now applied to all files of the Psalm codebase.
 

phpcs.xml

@@ -249,10 +249,6 @@
     </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
         <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
-        <!-- TODO: Remove in Psalm 6 -->
-        <include-pattern>bin/*</include-pattern>
-        <include-pattern>src/Psalm/Internal/*</include-pattern>
-        <include-pattern>tests/*</include-pattern>
     </rule>
     <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
     <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>

psalm-baseline.xml

@@ -251,6 +251,16 @@
       <code>$stub</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
+  <file src="src/Psalm/Internal/Codebase/Methods.php">
+    <InvalidArgument>
+      <code><![CDATA[$class_storage->methods[$declaring_method_name]->stubbed]]></code>
+    </InvalidArgument>
+  </file>
+  <file src="src/Psalm/Internal/Codebase/Populator.php">
+    <InvalidArgument>
+      <code><![CDATA[$storage->methods[$implementing_method_id->method_name]->abstract]]></code>
+    </InvalidArgument>
+  </file>
   <file src="src/Psalm/Internal/Codebase/Properties.php">
     <PossiblyUndefinedIntArrayOffset>
       <code>$property_name</code>

src/Psalm/Aliases.php

@@ -9,44 +9,40 @@ final class Aliases
     /**
      * @var array<lowercase-string, string>
      */
-    public $uses;
+    public array $uses;
 
     /**
      * @var array<lowercase-string, string>
      */
-    public $uses_flipped;
+    public array $uses_flipped;
 
     /**
      * @var array<lowercase-string, non-empty-string>
      */
-    public $functions;
+    public array $functions;
 
     /**
      * @var array<lowercase-string, string>
      */
-    public $functions_flipped;
+    public array $functions_flipped;
 
     /**
      * @var array<string, string>
      */
-    public $constants;
+    public array $constants;
 
     /**
      * @var array<string, string>
      */
-    public $constants_flipped;
+    public array $constants_flipped;
 
-    /** @var string|null */
-    public $namespace;
+    public ?string $namespace = null;
 
-    /** @var ?int */
-    public $namespace_first_stmt_start;
+    public ?int $namespace_first_stmt_start = null;
 
-    /** @var ?int */
-    public $uses_start;
+    public ?int $uses_start = null;
 
-    /** @var ?int */
-    public $uses_end;
+    public ?int $uses_end = null;
 
     /**
      * @param array<lowercase-string, string> $uses

src/Psalm/CodeLocation.php

@@ -35,34 +35,25 @@ class CodeLocation
 {
     use ImmutableNonCloneableTrait;
 
-    /** @var string */
-    public $file_path;
+    public string $file_path;
 
-    /** @var string */
-    public $file_name;
+    public string $file_name;
 
-    /** @var int */
-    public $raw_line_number;
+    public int $raw_line_number;
 
     private int $end_line_number = -1;
 
-    /** @var int */
-    public $raw_file_start;
+    public int $raw_file_start;
 
-    /** @var int */
-    public $raw_file_end;
+    public int $raw_file_end;
 
-    /** @var int */
-    protected $file_start;
+    protected int $file_start;
 
-    /** @var int */
-    protected $file_end;
+    protected int $file_end;
 
-    /** @var bool */
-    protected $single_line;
+    protected bool $single_line;
 
-    /** @var int */
-    protected $preview_start;
+    protected int $preview_start;
 
     private int $preview_end = -1;
 
@@ -78,20 +69,17 @@ class CodeLocation
 
     private ?string $text = null;
 
-    /** @var int|null */
-    public $docblock_start;
+    public ?int $docblock_start = null;
 
     private ?int $docblock_start_line_number = null;
 
-    /** @var int|null */
-    protected $docblock_line_number;
+    protected ?int $docblock_line_number = null;
 
     private ?int $regex_type = null;
 
     private bool $have_recalculated = false;
 
-    /** @var null|CodeLocation */
-    public $previous_location;
+    public ?CodeLocation $previous_location = null;
 
     public const VAR_TYPE = 0;
     public const FUNCTION_RETURN_TYPE = 1;