Rename

VincentLanglet · VincentLanglet · commit 49a6bef30078 · 2025-10-09T18:34:53.000+02:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -76,7 +76,7 @@ parameters:
 	reportStaticMethodSignatures: false
 	reportWrongPhpDocTypeInVarTag: false
 	reportAnyTypeWideningInVarTag: false
-	reportArrayKeyCast: false
+	allowFloatBoolNullAsArrayKey: true
 	reportPossiblyNonexistentGeneralArrayOffset: false
 	reportPossiblyNonexistentConstantArrayOffset: false
 	checkMissingOverrideMethodAttribute: false
diff --git a/conf/parametersSchema.neon b/conf/parametersSchema.neon
@@ -85,7 +85,7 @@ parametersSchema:
 	reportStaticMethodSignatures: bool()
 	reportWrongPhpDocTypeInVarTag: bool()
 	reportAnyTypeWideningInVarTag: bool()
-	reportArrayKeyCast: bool()
+	allowFloatBoolNullAsArrayKey: bool()
 	reportPossiblyNonexistentGeneralArrayOffset: bool()
 	reportPossiblyNonexistentConstantArrayOffset: bool()
 	checkMissingOverrideMethodAttribute: bool()
diff --git a/src/Rules/Arrays/AllowedArrayKeysTypes.php b/src/Rules/Arrays/AllowedArrayKeysTypes.php
@@ -22,14 +22,14 @@
 final class AllowedArrayKeysTypes
 {
 
-	public static function getType(?PhpVersion $phpVersion = null, bool $strict = false): Type
+	public static function getType(?PhpVersion $phpVersion = null, bool $allowFloatBoolNull = true): Type
 	{
 		$types = [
 			new IntegerType(),
 			new StringType(),
 		];
 
-		if (!$strict) {
+		if (!$allowFloatBoolNull) {
 			$types[] = new BooleanType();
 
 			if ($phpVersion === null || !$phpVersion->deprecatesImplicitlyFloatConversionToInt()) {
diff --git a/src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php b/src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php
@@ -28,7 +28,7 @@ public function __construct(
 		#[AutowiredParameter]
 		private bool $reportMaybes,
 		#[AutowiredParameter]
-		private bool $reportArrayKeyCast,
+		private bool $allowFloatBoolNullAsArrayKey,
 	)
 	{
 	}
@@ -61,18 +61,18 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$phpVersion = $this->phpVersion;
-		$reportArrayKeyCast = $this->reportArrayKeyCast;
+		$allowFloatBoolNullAsArrayKey = $this->allowFloatBoolNullAsArrayKey;
 		$dimensionType = $this->ruleLevelHelper->findTypeToCheck(
 			$scope,
 			$node->dim,
 			'',
-			static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion, $reportArrayKeyCast)->isSuperTypeOf($dimType)->yes(),
+			static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion, $allowFloatBoolNullAsArrayKey)->isSuperTypeOf($dimType)->yes(),
 		)->getType();
 		if ($dimensionType instanceof ErrorType) {
 			return [];
 		}
 
-		$isSuperType = AllowedArrayKeysTypes::getType($phpVersion, $reportArrayKeyCast)->isSuperTypeOf($dimensionType);
+		$isSuperType = AllowedArrayKeysTypes::getType($phpVersion, $allowFloatBoolNullAsArrayKey)->isSuperTypeOf($dimensionType);
 		if ($isSuperType->yes() || ($isSuperType->maybe() && !$this->reportMaybes)) {
 			return [];
 		}
diff --git a/src/Rules/Arrays/InvalidKeyInArrayItemRule.php b/src/Rules/Arrays/InvalidKeyInArrayItemRule.php
@@ -26,7 +26,7 @@ public function __construct(
 		private RuleLevelHelper $ruleLevelHelper,
 		private PhpVersion $phpVersion,
 		#[AutowiredParameter]
-		private bool $reportArrayKeyCast,
+		private bool $allowFloatBoolNullAsArrayKey,
 	)
 	{
 	}
@@ -43,18 +43,18 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$phpVersion = $this->phpVersion;
-		$reportArrayKeyCast = $this->reportArrayKeyCast;
+		$allowFloatBoolNullAsArrayKey = $this->allowFloatBoolNullAsArrayKey;
 		$dimensionType = $this->ruleLevelHelper->findTypeToCheck(
 			$scope,
 			$node->key,
 			'',
-			static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion, $reportArrayKeyCast)->isSuperTypeOf($dimType)->yes(),
+			static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion, $allowFloatBoolNullAsArrayKey)->isSuperTypeOf($dimType)->yes(),
 		)->getType();
 		if ($dimensionType instanceof ErrorType) {
 			return [];
 		}
 
-		$isSuperType = AllowedArrayKeysTypes::getType($phpVersion, $reportArrayKeyCast)->isSuperTypeOf($dimensionType);
+		$isSuperType = AllowedArrayKeysTypes::getType($phpVersion, $allowFloatBoolNullAsArrayKey)->isSuperTypeOf($dimensionType);
 		if ($isSuperType->yes()) {
 			return [];
 		}
diff --git a/tests/PHPStan/Rules/Arrays/InvalidKeyInArrayDimFetchRuleTest.php b/tests/PHPStan/Rules/Arrays/InvalidKeyInArrayDimFetchRuleTest.php
@@ -15,7 +15,7 @@
 class InvalidKeyInArrayDimFetchRuleTest extends RuleTestCase
 {
 
-	private bool $reportCastedArrayKey = false;
+	private bool $allowFloatBoolNullAsArrayKey = true;
 
 	protected function getRule(): Rule
 	{
@@ -24,7 +24,7 @@ protected function getRule(): Rule
 			$ruleLevelHelper,
 			self::getContainer()->getByType(PhpVersion::class),
 			true,
-			$this->reportCastedArrayKey,
+			$this->allowFloatBoolNullAsArrayKey,
 		);
 	}
 
@@ -168,7 +168,7 @@ public function testBug12981(): void
 
 	public function testUnsetFalseKey(): void
 	{
-		$this->reportCastedArrayKey = true;
+		$this->allowFloatBoolNullAsArrayKey = false;
 
 		$this->analyse([__DIR__ . '/data/unset-false-key.php'], [
 			[
diff --git a/tests/PHPStan/Rules/Arrays/InvalidKeyInArrayItemRuleTest.php b/tests/PHPStan/Rules/Arrays/InvalidKeyInArrayItemRuleTest.php
@@ -15,7 +15,7 @@
 class InvalidKeyInArrayItemRuleTest extends RuleTestCase
 {
 
-	private bool $reportCastedArrayKey = false;
+	private bool $allowFloatBoolNullAsArrayKey = true;
 
 	private bool $checkExplicitMixed = false;
 
@@ -28,7 +28,7 @@ protected function getRule(): Rule
 		return new InvalidKeyInArrayItemRule(
 			$ruleLevelHelper,
 			self::getContainer()->getByType(PhpVersion::class),
-			$this->reportCastedArrayKey,
+			$this->allowFloatBoolNullAsArrayKey,
 		);
 	}
 
@@ -107,7 +107,7 @@ public function testInvalidMixedKey(): void
 
 	public function testInvalidKeyReportingCastedArrayKey(): void
 	{
-		$this->reportCastedArrayKey = true;
+		$this->allowFloatBoolNullAsArrayKey = false;
 
 		$this->analyse([__DIR__ . '/data/invalid-key-array-item.php'], [
 			[

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@`
`22`	`22`	`final class AllowedArrayKeysTypes`
`23`	`23`	`{`
`24`	`24`
`25`		`- public static function getType(?PhpVersion $phpVersion = null, bool $strict = false): Type`
	`25`	`+ public static function getType(?PhpVersion $phpVersion = null, bool $allowFloatBoolNull = true): Type`
`26`	`26`	`{`
`27`	`27`	`$types = [`
`28`	`28`	`new IntegerType(),`
`29`	`29`	`new StringType(),`
`30`	`30`	`];`
`31`	`31`
`32`		`- if (!$strict) {`
	`32`	`+ if (!$allowFloatBoolNull) {`
`33`	`33`	`$types[] = new BooleanType();`
`34`	`34`
`35`	`35`	`if ($phpVersion === null \|\| !$phpVersion->deprecatesImplicitlyFloatConversionToInt()) {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(`
`28`	`28`	`#[AutowiredParameter]`
`29`	`29`	`private bool $reportMaybes,`
`30`	`30`	`#[AutowiredParameter]`
`31`		`- private bool $reportArrayKeyCast,`
	`31`	`+ private bool $allowFloatBoolNullAsArrayKey,`
`32`	`32`	`)`
`33`	`33`	`{`
`34`	`34`	`}`
`@@ -61,18 +61,18 @@ public function processNode(Node $node, Scope $scope): array`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`$phpVersion = $this->phpVersion;`
`64`		`- $reportArrayKeyCast = $this->reportArrayKeyCast;`
	`64`	`+ $allowFloatBoolNullAsArrayKey = $this->allowFloatBoolNullAsArrayKey;`
`65`	`65`	`$dimensionType = $this->ruleLevelHelper->findTypeToCheck(`
`66`	`66`	`$scope,`
`67`	`67`	`$node->dim,`
`68`	`68`	`'',`
`69`		`- static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion, $reportArrayKeyCast)->isSuperTypeOf($dimType)->yes(),`
	`69`	`+ static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion, $allowFloatBoolNullAsArrayKey)->isSuperTypeOf($dimType)->yes(),`
`70`	`70`	`)->getType();`
`71`	`71`	`if ($dimensionType instanceof ErrorType) {`
`72`	`72`	`return [];`
`73`	`73`	`}`
`74`	`74`
`75`		`- $isSuperType = AllowedArrayKeysTypes::getType($phpVersion, $reportArrayKeyCast)->isSuperTypeOf($dimensionType);`
	`75`	`+ $isSuperType = AllowedArrayKeysTypes::getType($phpVersion, $allowFloatBoolNullAsArrayKey)->isSuperTypeOf($dimensionType);`
`76`	`76`	`if ($isSuperType->yes() \|\| ($isSuperType->maybe() && !$this->reportMaybes)) {`
`77`	`77`	`return [];`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function __construct(`
`26`	`26`	`private RuleLevelHelper $ruleLevelHelper,`
`27`	`27`	`private PhpVersion $phpVersion,`
`28`	`28`	`#[AutowiredParameter]`
`29`		`- private bool $reportArrayKeyCast,`
	`29`	`+ private bool $allowFloatBoolNullAsArrayKey,`
`30`	`30`	`)`
`31`	`31`	`{`
`32`	`32`	`}`
`@@ -43,18 +43,18 @@ public function processNode(Node $node, Scope $scope): array`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`$phpVersion = $this->phpVersion;`
`46`		`- $reportArrayKeyCast = $this->reportArrayKeyCast;`
	`46`	`+ $allowFloatBoolNullAsArrayKey = $this->allowFloatBoolNullAsArrayKey;`
`47`	`47`	`$dimensionType = $this->ruleLevelHelper->findTypeToCheck(`
`48`	`48`	`$scope,`
`49`	`49`	`$node->key,`
`50`	`50`	`'',`
`51`		`- static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion, $reportArrayKeyCast)->isSuperTypeOf($dimType)->yes(),`
	`51`	`+ static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion, $allowFloatBoolNullAsArrayKey)->isSuperTypeOf($dimType)->yes(),`
`52`	`52`	`)->getType();`
`53`	`53`	`if ($dimensionType instanceof ErrorType) {`
`54`	`54`	`return [];`
`55`	`55`	`}`
`56`	`56`
`57`		`- $isSuperType = AllowedArrayKeysTypes::getType($phpVersion, $reportArrayKeyCast)->isSuperTypeOf($dimensionType);`
	`57`	`+ $isSuperType = AllowedArrayKeysTypes::getType($phpVersion, $allowFloatBoolNullAsArrayKey)->isSuperTypeOf($dimensionType);`
`58`	`58`	`if ($isSuperType->yes()) {`
`59`	`59`	`return [];`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`class InvalidKeyInArrayDimFetchRuleTest extends RuleTestCase`
`16`	`16`	`{`
`17`	`17`
`18`		`- private bool $reportCastedArrayKey = false;`
	`18`	`+ private bool $allowFloatBoolNullAsArrayKey = true;`
`19`	`19`
`20`	`20`	`protected function getRule(): Rule`
`21`	`21`	`{`
`@@ -24,7 +24,7 @@ protected function getRule(): Rule`
`24`	`24`	`$ruleLevelHelper,`
`25`	`25`	`self::getContainer()->getByType(PhpVersion::class),`
`26`	`26`	`true,`
`27`		`- $this->reportCastedArrayKey,`
	`27`	`+ $this->allowFloatBoolNullAsArrayKey,`
`28`	`28`	`);`
`29`	`29`	`}`
`30`	`30`
`@@ -168,7 +168,7 @@ public function testBug12981(): void`
`168`	`168`
`169`	`169`	`public function testUnsetFalseKey(): void`
`170`	`170`	`{`
`171`		`- $this->reportCastedArrayKey = true;`
	`171`	`+ $this->allowFloatBoolNullAsArrayKey = false;`
`172`	`172`
`173`	`173`	`$this->analyse([__DIR__ . '/data/unset-false-key.php'], [`
`174`	`174`	`[`