Merge branch 'master' into fixes

zoonru · Jan 17, 2024 · 2011145 · 2011145
2 parents e7c9bcc + 823c918
commit 2011145
Show file tree

Hide file tree

Showing 75 changed files with 140 additions and 6 deletions.
diff --git a/src/Psalm/Aliases.php b/src/Psalm/Aliases.php
@@ -10,6 +10,8 @@ final class Aliases
 {
     use UnserializeMemoryUsageSuppressionTrait;
 
+    public ?int $namespace_first_stmt_start = null;
+
     public ?int $uses_start = null;
 
     public ?int $uses_end = null;

diff --git a/src/Psalm/Internal/Analyzer/ClosureAnalyzer.php b/src/Psalm/Internal/Analyzer/ClosureAnalyzer.php
@@ -14,6 +14,7 @@
 use Psalm\Issue\PossiblyUndefinedVariable;
 use Psalm\Issue\UndefinedVariable;
 use Psalm\IssueBuffer;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 use Psalm\Type;
 use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Union;
@@ -30,6 +31,7 @@
  */
 final class ClosureAnalyzer extends FunctionLikeAnalyzer
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     /**
      * @param PhpParser\Node\Expr\Closure|PhpParser\Node\Expr\ArrowFunction $function
      */

diff --git a/src/Psalm/Internal/Analyzer/FunctionAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionAnalyzer.php
@@ -7,6 +7,7 @@
 use PhpParser;
 use Psalm\Config;
 use Psalm\Context;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 use UnexpectedValueException;
 
 use function is_string;
@@ -18,6 +19,7 @@
  */
 final class FunctionAnalyzer extends FunctionLikeAnalyzer
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function __construct(PhpParser\Node\Stmt\Function_ $function, SourceAnalyzer $source)
     {
         $codebase = $source->getCodebase();

diff --git a/src/Psalm/Internal/Analyzer/MethodAnalyzer.php b/src/Psalm/Internal/Analyzer/MethodAnalyzer.php
@@ -20,6 +20,7 @@
 use Psalm\StatementsSource;
 use Psalm\Storage\ClassLikeStorage;
 use Psalm\Storage\MethodStorage;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 use UnexpectedValueException;
 
 use function in_array;
@@ -31,6 +32,7 @@
  */
 final class MethodAnalyzer extends FunctionLikeAnalyzer
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     // https://github.com/php/php-src/blob/a83923044c48982c80804ae1b45e761c271966d3/Zend/zend_enum.c#L77-L95
     private const FORBIDDEN_ENUM_METHODS = [
         '__construct',

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallReturnTypeFetcher.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallReturnTypeFetcher.php
@@ -48,7 +48,6 @@
 use function explode;
 use function in_array;
 use function str_contains;
-use function str_ends_with;
 use function strlen;
 use function strtolower;
 use function substr;

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php
@@ -55,8 +55,8 @@
 use function in_array;
 use function is_numeric;
 use function is_string;
-use function str_starts_with;
 use function preg_match;
+use function str_starts_with;
 use function strpos;
 use function strtolower;
 

diff --git a/src/Psalm/Internal/MethodIdentifier.php b/src/Psalm/Internal/MethodIdentifier.php
@@ -6,8 +6,8 @@
 
 use InvalidArgumentException;
 use Psalm\Storage\ImmutableNonCloneableTrait;
-use Stringable;
 use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
+use Stringable;
 
 use function explode;
 use function is_string;

diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php
@@ -29,9 +29,7 @@
 use function dirname;
 use function explode;
 use function in_array;
-use function preg_match;
 use function str_contains;
-use function strpos;
 use function strtolower;
 use function substr;
 

diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -89,7 +89,6 @@
 use function end;
 use function explode;
 use function filter_var;
-use function get_class;
 use function in_array;
 use function is_int;
 use function is_numeric;

diff --git a/src/Psalm/Storage/Assertion/Any.php b/src/Psalm/Storage/Assertion/Any.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class Any extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function getNegation(): Assertion
     {
         return $this;

diff --git a/src/Psalm/Storage/Assertion/ArrayKeyDoesNotExist.php b/src/Psalm/Storage/Assertion/ArrayKeyDoesNotExist.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class ArrayKeyDoesNotExist extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function getNegation(): Assertion
     {
         return new ArrayKeyExists();

diff --git a/src/Psalm/Storage/Assertion/ArrayKeyExists.php b/src/Psalm/Storage/Assertion/ArrayKeyExists.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class ArrayKeyExists extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function getNegation(): Assertion
     {
         return new ArrayKeyDoesNotExist();

diff --git a/src/Psalm/Storage/Assertion/DoesNotHaveAtLeastCount.php b/src/Psalm/Storage/Assertion/DoesNotHaveAtLeastCount.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class DoesNotHaveAtLeastCount extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     /** @param positive-int $count */
     public function __construct(public readonly int $count)
     {

diff --git a/src/Psalm/Storage/Assertion/DoesNotHaveExactCount.php b/src/Psalm/Storage/Assertion/DoesNotHaveExactCount.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class DoesNotHaveExactCount extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     /** @param positive-int $count */
     public function __construct(public readonly int $count)
     {

diff --git a/src/Psalm/Storage/Assertion/DoesNotHaveMethod.php b/src/Psalm/Storage/Assertion/DoesNotHaveMethod.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class DoesNotHaveMethod extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function __construct(public readonly string $method)
     {
     }

diff --git a/src/Psalm/Storage/Assertion/Empty_.php b/src/Psalm/Storage/Assertion/Empty_.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class Empty_ extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function getNegation(): Assertion
     {
         return new NonEmpty();

diff --git a/src/Psalm/Storage/Assertion/Falsy.php b/src/Psalm/Storage/Assertion/Falsy.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class Falsy extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function getNegation(): Assertion
     {
         return new Truthy();

diff --git a/src/Psalm/Storage/Assertion/HasArrayKey.php b/src/Psalm/Storage/Assertion/HasArrayKey.php
@@ -5,13 +5,15 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 use UnexpectedValueException;
 
 /**
  * @psalm-immutable
  */
 final class HasArrayKey extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function __construct(public readonly string $key)
     {
     }

diff --git a/src/Psalm/Storage/Assertion/HasAtLeastCount.php b/src/Psalm/Storage/Assertion/HasAtLeastCount.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class HasAtLeastCount extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     /** @param positive-int $count */
     public function __construct(public readonly int $count)
     {

diff --git a/src/Psalm/Storage/Assertion/HasExactCount.php b/src/Psalm/Storage/Assertion/HasExactCount.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class HasExactCount extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     /** @param positive-int $count */
     public function __construct(public readonly int $count)
     {

diff --git a/src/Psalm/Storage/Assertion/HasIntOrStringArrayAccess.php b/src/Psalm/Storage/Assertion/HasIntOrStringArrayAccess.php
@@ -5,13 +5,15 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 use UnexpectedValueException;
 
 /**
  * @psalm-immutable
  */
 final class HasIntOrStringArrayAccess extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function getNegation(): Assertion
     {
         throw new UnexpectedValueException('This should never be called');

diff --git a/src/Psalm/Storage/Assertion/HasMethod.php b/src/Psalm/Storage/Assertion/HasMethod.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class HasMethod extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function __construct(public readonly string $method)
     {
     }

diff --git a/src/Psalm/Storage/Assertion/HasStringArrayAccess.php b/src/Psalm/Storage/Assertion/HasStringArrayAccess.php
@@ -5,13 +5,15 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 use UnexpectedValueException;
 
 /**
  * @psalm-immutable
  */
 final class HasStringArrayAccess extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function getNegation(): Assertion
     {
         throw new UnexpectedValueException('This should never be called');

diff --git a/src/Psalm/Storage/Assertion/InArray.php b/src/Psalm/Storage/Assertion/InArray.php
@@ -5,13 +5,15 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 use Psalm\Type\Union;
 
 /**
  * @psalm-immutable
  */
 final class InArray extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function __construct(public readonly Union $type)
     {
     }

diff --git a/src/Psalm/Storage/Assertion/IsAClass.php b/src/Psalm/Storage/Assertion/IsAClass.php
@@ -5,13 +5,15 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 use Psalm\Type\Atomic;
 
 /**
  * @psalm-immutable
  */
 final class IsAClass extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     /** @param Atomic\TTemplateParamClass|Atomic\TNamedObject $type */
     public function __construct(public readonly Atomic $type, public readonly bool $allow_string)
     {

diff --git a/src/Psalm/Storage/Assertion/IsClassEqual.php b/src/Psalm/Storage/Assertion/IsClassEqual.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class IsClassEqual extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function __construct(public readonly string $type)
     {
     }

diff --git a/src/Psalm/Storage/Assertion/IsClassNotEqual.php b/src/Psalm/Storage/Assertion/IsClassNotEqual.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class IsClassNotEqual extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function __construct(public readonly string $type)
     {
     }

diff --git a/src/Psalm/Storage/Assertion/IsCountable.php b/src/Psalm/Storage/Assertion/IsCountable.php
@@ -5,12 +5,14 @@
 namespace Psalm\Storage\Assertion;
 
 use Psalm\Storage\Assertion;
+use Psalm\Storage\UnserializeMemoryUsageSuppressionTrait;
 
 /**
  * @psalm-immutable
  */
 final class IsCountable extends Assertion
 {
+    use UnserializeMemoryUsageSuppressionTrait;
     public function getNegation(): Assertion
     {
         return new IsNotCountable(true);