Re-add failing assert, enable assertions on CI.

vimeo · Jan 28, 2022 · 35353c6 · 35353c6
1 parent 1a6f968
commit 35353c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
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,
@@ -845,6 +845,7 @@ private static function getOverriddenConstant(
         }
 
         if ($parent_classlike_storage !== null) {
+            assert($parent_const_storage !== null);
             return [$parent_classlike_storage, $parent_const_storage];
         }
         return null;