Merge branch 'strict_types' into fixes

zoonru · Oct 19, 2023 · a243252 · a243252
2 parents c24feaa + 2d43c16
commit a243252
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 17 deletions.
diff --git a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
@@ -94,7 +94,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
     /**
      * @var TFunction
      */
-    protected $function;
+    protected Closure|Function_|ClassMethod|ArrowFunction $function;
 
     protected Codebase $codebase;
 

diff --git a/src/Psalm/Report/ReportOptions.php b/src/Psalm/Report/ReportOptions.php
@@ -17,7 +17,7 @@ final class ReportOptions
     /**
      * @var Report::TYPE_*
      */
-    public $format = Report::TYPE_CONSOLE;
+    public string $format = Report::TYPE_CONSOLE;
 
     public bool $pretty = false;
 

diff --git a/src/Psalm/Storage/Assertion/HasArrayKey.php b/src/Psalm/Storage/Assertion/HasArrayKey.php
@@ -12,11 +12,8 @@
  */
 final class HasArrayKey extends Assertion
 {
-    public $key;
-
-    public function __construct(string $key)
+    public function __construct(public readonly string $key)
     {
-        $this->key = $key;
     }
 
     public function getNegation(): Assertion

diff --git a/src/Psalm/Storage/Assertion/IsNotCountable.php b/src/Psalm/Storage/Assertion/IsNotCountable.php
@@ -11,11 +11,8 @@
  */
 final class IsNotCountable extends Assertion
 {
-    public $is_negatable;
-
-    public function __construct(bool $is_negatable)
+    public function __construct(public readonly bool $is_negatable)
     {
-        $this->is_negatable = $is_negatable;
     }
 
     public function isNegation(): bool

diff --git a/src/Psalm/Storage/Assertion/NonEmptyCountable.php b/src/Psalm/Storage/Assertion/NonEmptyCountable.php
@@ -11,11 +11,8 @@
  */
 final class NonEmptyCountable extends Assertion
 {
-    public $is_negatable;
-
-    public function __construct(bool $is_negatable)
+    public function __construct(public readonly bool $is_negatable)
     {
-        $this->is_negatable = $is_negatable;
     }
 
     public function getNegation(): Assertion

diff --git a/src/Psalm/Storage/PropertyStorage.php b/src/Psalm/Storage/PropertyStorage.php
@@ -17,7 +17,7 @@ final class PropertyStorage implements HasAttributesInterface
     /**
      * @var ClassLikeAnalyzer::VISIBILITY_*
      */
-    public $visibility = ClassLikeAnalyzer::VISIBILITY_PUBLIC;
+    public int $visibility = ClassLikeAnalyzer::VISIBILITY_PUBLIC;
 
     public ?CodeLocation $location = null;
 

diff --git a/src/Psalm/Type/Atomic/TPropertiesOf.php b/src/Psalm/Type/Atomic/TPropertiesOf.php
@@ -26,7 +26,7 @@ final class TPropertiesOf extends Atomic
     /**
      * @var self::VISIBILITY_*|null
      */
-    public $visibility_filter;
+    public ?int $visibility_filter;
 
     /**
      * @return list<TokenName>

diff --git a/src/Psalm/Type/Atomic/TTemplatePropertiesOf.php b/src/Psalm/Type/Atomic/TTemplatePropertiesOf.php
@@ -23,7 +23,7 @@ final class TTemplatePropertiesOf extends Atomic
     /**
      * @var TPropertiesOf::VISIBILITY_*|null
      */
-    public $visibility_filter;
+    public ?int $visibility_filter;
 
     /**
      * @param TPropertiesOf::VISIBILITY_*|null $visibility_filter