Merge pull request #7503 from AndrolGenhald/bugfix/fix-const-analyzer…

…-failing-assert Fix failing case for const analyzer.
vimeo · Jan 28, 2022 · 47a2545 · 47a2545
2 parents 1a6f968 + 282518c
commit 47a2545
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,6 +79,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.0'
+          ini-values: zend.assertions=1, assert.exception=1
           tools: composer:v2
           coverage: none
           extensions: decimal

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -49,6 +49,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.0'
+          ini-values: zend.assertions=1, assert.exception=1
           tools: composer:v2
           coverage: none
 

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/ClassConstAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/ClassConstAnalyzer.php
@@ -759,7 +759,7 @@ public static function analyze(
     /**
      * Get the const storage from the parent or interface that this class is overriding.
      *
-     * @return array{ClassLikeStorage, ?ClassConstantStorage}|null
+     * @return array{ClassLikeStorage, ClassConstantStorage}|null
      */
     private static function getOverriddenConstant(
         ClassLikeStorage $class_storage,
@@ -837,6 +837,10 @@ private static function getOverriddenConstant(
             }
         }
 
+        if ($parent_const_storage === null) {
+            $parent_const_storage = $interface_const_storage;
+        }
+
         foreach ($interface_overrides as $_ => $issue) {
             IssueBuffer::maybeAdd(
                 $issue,
@@ -845,6 +849,7 @@ private static function getOverriddenConstant(
         }
 
         if ($parent_classlike_storage !== null) {
+            assert($parent_const_storage !== null);
             return [$parent_classlike_storage, $parent_const_storage];
         }
         return null;

diff --git a/tests/ConstantTest.php b/tests/ConstantTest.php
@@ -447,9 +447,9 @@ public function getA(): array {
                             return self::C;
                         }
                     }',
-                [],
-                [],
-                '8.1',
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.1',
             ],
             'resolveCalculatedConstant' => [
                 'code' => '<?php
@@ -1364,9 +1364,9 @@ class Baz implements Bar
                         public const BAR="foobar";
                     }
                 ',
-                [],
-                [],
-                '8.1',
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.1',
             ],
             'inheritedConstDoesNotOverride' => [
                 'code' => '<?php
@@ -1823,6 +1823,25 @@ interface Bar extends Foo
                 ',
                 'error_message' => 'OverriddenInterfaceConstant',
             ],
+            'overrideClassConstFromInterfaceWithExtraIrrelevantInterface' => [
+                'code' => '<?php
+                    interface Foo
+                    {
+                        /** @var non-empty-string */
+                        public const BAR="baz";
+                    }
+
+                    interface Bar {}
+
+                    class Baz implements Foo, Bar
+                    {
+                        public const BAR="";
+                    }
+                ',
+                'error_message' => "LessSpecificClassConstantType",
+                'ignored_issues' => [],
+                'php_version' => '8.1',
+            ],
         ];
     }
 }