address reviews

rlerdorf · rlerdorf · commit 59d0981dae4e · 2026-05-04T18:28:54.000-04:00
diff --git a/src/Phan/Analysis/ClassConstantTypesAnalyzer.php b/src/Phan/Analysis/ClassConstantTypesAnalyzer.php
@@ -292,8 +292,8 @@ private static function checkConstantInheritance(CodeBase $code_base, Clazz $cla
                     continue;
                 }
 
-                // PHP enforces covariance for typed constants: child type must be a subtype of parent type
-                if (!$constant_real_type->canCastToUnionType($inherited_real_type, $code_base)) {
+                // PHP enforces covariance for typed constants: every type in the child must be a subtype of the parent
+                if (!$constant_real_type->canStrictCastToUnionType($code_base, $inherited_real_type)) {
                     Issue::maybeEmit(
                         $code_base,
                         $constant->getContext(),
diff --git a/tests/php83_files/expected/002_typed_class_constants.php.expected b/tests/php83_files/expected/002_typed_class_constants.php.expected
@@ -7,4 +7,5 @@
 %s:60 PhanTypeMismatchDeclaredConstant Constant \ComplexExpressions::WRONG_CALC is declared with type int but has value ('prefix' . self::BASE) of type 'prefix10'
 %s:67 PhanTypeMismatchDeclaredConstant Constant \UnionTypes::WRONG is declared with type int|string but has value 3.14 of type 3.14
 %s:74 PhanTypeMismatchDeclaredConstant Constant \NullableTypes::WRONG_NULL is declared with type ?int but has value 'not null' of type 'not null'
-%s:94 PhanConstantTypeMismatchInheritance Class constant \NonCovariantChild::STR is declared with type ?string which is not covariant with type string inherited from \NonCovariantParent (constant types must be invariant or covariant)
+%s:95 PhanConstantTypeMismatchInheritance Class constant \NonCovariantChild::STR is declared with type ?string which is not covariant with type string inherited from \NonCovariantParent (constant types must be invariant or covariant)
+%s:96 PhanConstantTypeMismatchInheritance Class constant \NonCovariantChild::NUM is declared with type int|string which is not covariant with type int inherited from \NonCovariantParent (constant types must be invariant or covariant)
diff --git a/tests/php83_files/src/002_typed_class_constants.php b/tests/php83_files/src/002_typed_class_constants.php
@@ -88,8 +88,10 @@ class CovariantChild extends CovariantParent {
 // Test non-covariant inheritance: widening is not allowed
 class NonCovariantParent {
     const string STR = 'test';
+    const int NUM = 1;
 }
 
 class NonCovariantChild extends NonCovariantParent {
-    const ?string STR = null; // ERROR: ?string widens string (not covariant)
+    const ?string STR = null;    // ERROR: ?string widens string (not covariant)
+    const int|string NUM = 1;    // ERROR: int|string widens int (not covariant)
 }

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,10 @@ class CovariantChild extends CovariantParent {`
`88`	`88`	`// Test non-covariant inheritance: widening is not allowed`
`89`	`89`	`class NonCovariantParent {`
`90`	`90`	`const string STR = 'test';`
	`91`	`+ const int NUM = 1;`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`class NonCovariantChild extends NonCovariantParent {`
`94`		`- const ?string STR = null; // ERROR: ?string widens string (not covariant)`
	`95`	`+ const ?string STR = null; // ERROR: ?string widens string (not covariant)`
	`96`	`+ const int\|string NUM = 1; // ERROR: int\|string widens int (not covariant)`
`95`	`97`	`}`