Fix cs/psalm errors after rebase.

vimeo · Jan 20, 2022 · 21edfcc · 21edfcc
1 parent 8f3300c
commit 21edfcc
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/docs/running_psalm/issues.md b/docs/running_psalm/issues.md
@@ -61,6 +61,7 @@
  - [InvalidCatch](issues/InvalidCatch.md)
  - [InvalidClass](issues/InvalidClass.md)
  - [InvalidClone](issues/InvalidClone.md)
+ - [InvalidConstantAssignmentValue](issues/InvalidConstantAssignmentValue.md)
  - [InvalidDocblock](issues/InvalidDocblock.md)
  - [InvalidDocblockParamName](issues/InvalidDocblockParamName.md)
  - [InvalidEnumBackingType](issues/InvalidEnumBackingType.md)
@@ -265,6 +266,7 @@
  - [UnnecessaryVarAnnotation](issues/UnnecessaryVarAnnotation.md)
  - [UnrecognizedExpression](issues/UnrecognizedExpression.md)
  - [UnrecognizedStatement](issues/UnrecognizedStatement.md)
+ - [UnresolvableConstant](issues/UnresolvableConstant.md)
  - [UnresolvableInclude](issues/UnresolvableInclude.md)
  - [UnsafeGenericInstantiation](issues/UnsafeGenericInstantiation.md)
  - [UnsafeInstantiation](issues/UnsafeInstantiation.md)

diff --git a/src/Psalm/Exception/UnresolvableConstantException.php b/src/Psalm/Exception/UnresolvableConstantException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Psalm\Exception;
 
 use Exception;

diff --git a/src/Psalm/Issue/ClassConstantIssue.php b/src/Psalm/Issue/ClassConstantIssue.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Psalm\Issue;
 
 use Psalm\CodeLocation;

diff --git a/src/Psalm/Issue/InvalidConstantAssignmentValue.php b/src/Psalm/Issue/InvalidConstantAssignmentValue.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Psalm\Issue;
 
 class InvalidConstantAssignmentValue extends ClassConstantIssue

diff --git a/src/Psalm/Issue/UnresolvableConstant.php b/src/Psalm/Issue/UnresolvableConstant.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Psalm\Issue;
 
 class UnresolvableConstant extends CodeIssue

diff --git a/src/Psalm/Storage/ClassConstantStorage.php b/src/Psalm/Storage/ClassConstantStorage.php
@@ -60,7 +60,6 @@ class ClassConstantStorage
 
     /**
      * @var list<AttributeStorage>
-     * @psalm-suppress PossiblyUnusedProperty
      */
     public $attributes = [];
 

diff --git a/tests/ConstantTest.php b/tests/ConstantTest.php
@@ -1266,7 +1266,7 @@ public static function boo(
                 ',
             ],
             'selfConstUsesInferredType' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         /** @var string */
@@ -1283,7 +1283,7 @@ public function bar(): string
                 ',
             ],
             'typedClassConst' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         /** @var string */
@@ -1297,7 +1297,7 @@ public function bar(): string
                 ',
             ],
             'classConstSuppress' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         /**
@@ -1310,7 +1310,7 @@ class Foo
                 ',
             ],
             'spreadEmptyArray' => [
-                '<?php
+                'code' => '<?php
                     class A {
                         public const ARR = [];
                     }
@@ -1602,7 +1602,7 @@ enum State {
                 'php_version' => '8.1',
             ],
             'returnValueofNonExistantConstant' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         public const BAR = ["bar"];
@@ -1619,7 +1619,7 @@ public function bar(): string
                 'error_message' => 'UnresolvableConstant',
             ],
             'returnValueofStaticConstant' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         public const BAR = ["bar"];
@@ -1636,7 +1636,7 @@ public function bar(): string
                 'error_message' => 'UnresolvableConstant',
             ],
             'takeKeyofNonExistantConstant' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         public const BAR = ["bar"];
@@ -1653,7 +1653,7 @@ public function bar(int $key): string
                 'error_message' => 'UnresolvableConstant',
             ],
             'takeKeyofStaticConstant' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         public const BAR = ["bar"];
@@ -1670,7 +1670,7 @@ public function bar(int $key): string
                 'error_message' => 'UnresolvableConstant',
             ],
             'invalidConstantAssignmentType' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         /** @var int */
@@ -1680,7 +1680,7 @@ class Foo
                 'error_message' => "InvalidConstantAssignmentValue",
             ],
             'invalidConstantAssignmentTypeResolvedLate' => [
-                '<?php
+                'code' => '<?php
                     class Foo
                     {
                         /** @var int */