Fix

danog · danog · commit 9ddc39dc73d3 · 2023-10-19T20:13:28.000+02:00
diff --git a/examples/TemplateScanner.php b/examples/TemplateScanner.php
@@ -14,7 +14,7 @@
 use function preg_match;
 use function trim;
 
-final class TemplateScanner extends Psalm\Internal\Scanner\FileScanner
+class TemplateScanner extends Psalm\Internal\Scanner\FileScanner
 {
     final public const VIEW_CLASS = 'Your\\View\\Class';
 
diff --git a/src/Psalm/Internal/Analyzer/FileAnalyzer.php b/src/Psalm/Internal/Analyzer/FileAnalyzer.php
@@ -41,7 +41,7 @@
  * @internal
  * @psalm-consistent-constructor
  */
-final class FileAnalyzer extends SourceAnalyzer
+class FileAnalyzer extends SourceAnalyzer
 {
     use CanAlias;
 
diff --git a/src/Psalm/Internal/Analyzer/NamespaceAnalyzer.php b/src/Psalm/Internal/Analyzer/NamespaceAnalyzer.php
@@ -38,7 +38,7 @@ final class NamespaceAnalyzer extends SourceAnalyzer
     private static array $public_namespace_constants = [];
 
     public function __construct(
-        private readonly Namespace_ $namespace, 
+        private readonly Namespace_ $namespace,
         /**
          * @var FileAnalyzer
          * @psalm-suppress NonInvariantDocblockPropertyType
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/IfElse/ElseIfAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/IfElse/ElseIfAnalyzer.php
@@ -241,7 +241,7 @@ public static function analyze(
 
                 foreach ($newly_reconciled_var_ids as $changed_var_id => $_) {
                     foreach ($elseif_context->vars_in_scope as $var_id => $_) {
-                        if (preg_match('/' . preg_quote((string) $changed_var_id, '/') . '[\]\[\-]/', $var_id)
+                        if (preg_match('/' . preg_quote($changed_var_id, '/') . '[\]\[\-]/', $var_id)
                             && !array_key_exists($var_id, $newly_reconciled_var_ids)
                             && !array_key_exists($var_id, $cond_referenced_var_ids)
                         ) {
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ArithmeticOpAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ArithmeticOpAnalyzer.php
@@ -4,7 +4,6 @@
 
 namespace Psalm\Internal\Analyzer\Statements\Expression\BinaryOp;
 
-use Decimal\Decimal;
 use PhpParser;
 use Psalm\CodeLocation;
 use Psalm\Codebase;
diff --git a/src/Psalm/Internal/Diff/FileDiffer.php b/src/Psalm/Internal/Diff/FileDiffer.php
@@ -250,7 +250,7 @@ public static function getDiff(string $a_code, string $b_code): array
                 $b_offset += $new_text_length;
             } else {
                 /** @psalm-suppress MixedArgument */
-                $same_text_length = strlen((string) $diff_elem->new) + 1;
+                $same_text_length = strlen($diff_elem->new) + 1;
 
                 $a_offset += $same_text_length;
                 $b_offset += $same_text_length;
diff --git a/src/Psalm/Internal/LanguageServer/LanguageClient.php b/src/Psalm/Internal/LanguageServer/LanguageClient.php
@@ -153,7 +153,7 @@ private function configurationRefreshed(array $config): void
         }
 
         /** @var array */
-        $array = json_decode((string) json_encode($config, JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);
+        $array = json_decode(json_encode($config, JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);
 
         if (isset($array['hideWarnings'])) {
             $this->clientConfiguration->hideWarnings = (bool) $array['hideWarnings'];
diff --git a/src/Psalm/Internal/PhpVisitor/PartialParserVisitor.php b/src/Psalm/Internal/PhpVisitor/PartialParserVisitor.php
@@ -35,7 +35,7 @@ final class PartialParserVisitor extends PhpParser\NodeVisitorAbstract
 {
     private bool $must_rescan = false;
 
-    private readonly int $non_method_changes;
+    private int $non_method_changes;
 
     private readonly int $a_file_contents_length;
 
diff --git a/src/Psalm/Internal/Type/TypeExpander.php b/src/Psalm/Internal/Type/TypeExpander.php
@@ -319,28 +319,6 @@ public static function expandAtomic(
                 ];
             }
 
-            /** @psalm-suppress DeprecatedProperty For backwards compatibility, we have to keep this here. */
-            foreach ($return_type->extra_types ?? [] as $alias) {
-                $more_recursively_fleshed_out_types = self::expandAtomic(
-                    $codebase,
-                    $alias,
-                    $self_class,
-                    $static_class_type,
-                    $parent_class,
-                    $evaluate_class_constants,
-                    $evaluate_conditional_types,
-                    $final,
-                    $expand_generic,
-                    $expand_templates,
-                    $throw_on_unresolvable_constant,
-                );
-
-                $recursively_fleshed_out_types = [
-                    ...$more_recursively_fleshed_out_types,
-                    ...$recursively_fleshed_out_types,
-                ];
-            }
-
             return $recursively_fleshed_out_types;
         }
 
diff --git a/src/Psalm/IssueBuffer.php b/src/Psalm/IssueBuffer.php
@@ -881,7 +881,6 @@ public static function getOutput(
             Report::TYPE_SARIF => new SarifReport($normalized_data, self::$fixable_issue_counts, $report_options),
             Report::TYPE_CODECLIMATE => new CodeClimateReport($normalized_data, self::$fixable_issue_counts, $report_options),
             Report::TYPE_COUNT => new CountReport($normalized_data, self::$fixable_issue_counts, $report_options),
-            default => throw new RuntimeException('Unexpected report format: ' . $report_options->format),
         };
 
         return $output->create();
diff --git a/src/Psalm/Progress/DefaultProgress.php b/src/Psalm/Progress/DefaultProgress.php
@@ -9,7 +9,7 @@
 use function str_repeat;
 use function strlen;
 
-final class DefaultProgress extends LongProgress
+class DefaultProgress extends LongProgress
 {
     private const TOO_MANY_FILES = 1_500;
 
diff --git a/src/Psalm/Storage/AttributeArg.php b/src/Psalm/Storage/AttributeArg.php
@@ -10,20 +10,15 @@
 
 /**
  * @psalm-immutable
+ * @api
  */
 final class AttributeArg
 {
     use ImmutableNonCloneableTrait;
 
     public function __construct(
-        /**
-         * @psalm-suppress PossiblyUnusedProperty It's part of the public API for now
-         */
         public ?string $name,
         public Union|UnresolvedConstantComponent $type,
-        /**
-         * @psalm-suppress PossiblyUnusedProperty It's part of the public API for now
-         */
         public CodeLocation $location,
     ) {
     }
diff --git a/src/Psalm/Storage/AttributeStorage.php b/src/Psalm/Storage/AttributeStorage.php
@@ -8,6 +8,7 @@
 
 /**
  * @psalm-immutable
+ * @api
  */
 final class AttributeStorage
 {
@@ -19,13 +20,7 @@ final class AttributeStorage
     public function __construct(
         public string $fq_class_name,
         public array $args,
-        /**
-         * @psalm-suppress PossiblyUnusedProperty part of public API
-         */
         public CodeLocation $location,
-        /**
-         * @psalm-suppress PossiblyUnusedProperty part of public API
-         */
         public CodeLocation $name_location,
     ) {
     }
diff --git a/src/Psalm/Type/Atomic/TTypeAlias.php b/src/Psalm/Type/Atomic/TTypeAlias.php
@@ -6,46 +6,17 @@
 
 use Psalm\Type\Atomic;
 
-use function array_map;
-use function implode;
-
 /**
  * @psalm-immutable
  */
 final class TTypeAlias extends Atomic
 {
-    /**
-     * @param array<string, TTypeAlias>|null $extra_types
-     */
     public function __construct(
         public string $declaring_fq_classlike_name,
-        public string $alias_name, /**
-         * @deprecated type aliases are resolved within {@see TypeParser::resolveTypeAliases()} and therefore the
-         *             referencing type(s) are part of other intersection types. The intersection types are not set anymore
-         *             and with v6 this property along with its related methods will get removed.
-         */
-        public ?array $extra_types = null,
+        public string $alias_name,
     ) {
         parent::__construct(true);
     }
-    /**
-     * @param array<string, TTypeAlias>|null $extra_types
-     * @deprecated type aliases are resolved within {@see TypeParser::resolveTypeAliases()} and therefore the
-     *             referencing type(s) are part of other intersection types. This method will get removed with v6.
-     * @psalm-suppress PossiblyUnusedMethod For backwards compatibility, we have to keep this here.
-     */
-    public function setIntersectionTypes(?array $extra_types): self
-    {
-        /** @psalm-suppress DeprecatedProperty For backwards compatibility, we have to keep this here. */
-        if ($extra_types === $this->extra_types) {
-            return $this;
-        }
-        return new self(
-            $this->declaring_fq_classlike_name,
-            $this->alias_name,
-            $extra_types,
-        );
-    }
 
     public function getKey(bool $include_extra = true): string
     {
@@ -54,17 +25,6 @@ public function getKey(bool $include_extra = true): string
 
     public function getId(bool $exact = true, bool $nested = false): string
     {
-        /** @psalm-suppress DeprecatedProperty For backwards compatibility, we have to keep this here. */
-        if ($this->extra_types) {
-            return $this->getKey() . '&' . implode(
-                '&',
-                array_map(
-                    static fn(Atomic $type): string => $type->getId($exact, true),
-                    $this->extra_types,
-                ),
-            );
-        }
-
         return $this->getKey();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use function preg_match;`
`15`	`15`	`use function trim;`
`16`	`16`
`17`		`-final class TemplateScanner extends Psalm\Internal\Scanner\FileScanner`
	`17`	`+class TemplateScanner extends Psalm\Internal\Scanner\FileScanner`
`18`	`18`	`{`
`19`	`19`	`final public const VIEW_CLASS = 'Your\\View\\Class';`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`* @internal`
`42`	`42`	`* @psalm-consistent-constructor`
`43`	`43`	`*/`
`44`		`-final class FileAnalyzer extends SourceAnalyzer`
	`44`	`+class FileAnalyzer extends SourceAnalyzer`
`45`	`45`	`{`
`46`	`46`	`use CanAlias;`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ private function configurationRefreshed(array $config): void`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`/** @var array */`
`156`		`- $array = json_decode((string) json_encode($config, JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);`
	`156`	`+ $array = json_decode(json_encode($config, JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);`
`157`	`157`
`158`	`158`	`if (isset($array['hideWarnings'])) {`
`159`	`159`	`$this->clientConfiguration->hideWarnings = (bool) $array['hideWarnings'];`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ final class PartialParserVisitor extends PhpParser\NodeVisitorAbstract`
`35`	`35`	`{`
`36`	`36`	`private bool $must_rescan = false;`
`37`	`37`
`38`		`- private readonly int $non_method_changes;`
	`38`	`+ private int $non_method_changes;`
`39`	`39`
`40`	`40`	`private readonly int $a_file_contents_length;`
`41`	`41`