Fix CS

Author: ondrejmirtes

src/Type/Constant/ConstantArrayType.php

@@ -78,6 +78,7 @@
 use function sort;
 use function sprintf;
 use function str_contains;
+use function usort;
 
 /**
  * @api

src/Type/TypeCombinator.php

@@ -1714,9 +1714,11 @@ private static function intersectDefiniteConstantArrays(ConstantArrayType $a, Co
 			$keysToProcess[$keyValue] = [$k, $bKeyByValue[$keyValue] ?? null];
 		}
 		foreach ($bKeyByValue as $keyValue => $k) {
-			if (!array_key_exists($keyValue, $keysToProcess)) {
-				$keysToProcess[$keyValue] = [null, $k];
+			if (array_key_exists($keyValue, $keysToProcess)) {
+				continue;
 			}
+
+			$keysToProcess[$keyValue] = [null, $k];
 		}
 
 		foreach ($keysToProcess as [$aIdx, $bIdx]) {

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -2929,7 +2929,7 @@ public function testBug11494(): void
 			[
 				'Parameter #1 $a of function Bug11494\test expects array{long: string, details: string}|array{short: string}, array{short: \'thing\', extra: \'other\'} given.',
 				18,
-				"• Type #1 from the union: Sealed array shape does not accept array with extra key 'extra'.\n• Type #2 from the union: Sealed array shape does not accept array with extra key 'extra'."
+				"• Type #1 from the union: Sealed array shape does not accept array with extra key 'extra'.\n• Type #2 from the union: Sealed array shape does not accept array with extra key 'extra'.",
 			],
 		]);
 	}

tests/PHPStan/Type/Constant/ConstantArrayTypeTest.php

@@ -31,6 +31,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use stdClass;
 use function array_map;
+use function is_string;
 use function sprintf;
 
 class ConstantArrayTypeTest extends PHPStanTestCase
@@ -616,9 +617,11 @@ public function testAccepts(Type $type, Type $otherType, TrinaryLogic $expectedR
 			$actualResult->result->describe(),
 			$testDescription,
 		);
-		if ($reasons !== null) {
-			$this->assertSame($reasons, $actualResult->reasons, $testDescription);
+		if ($reasons === null) {
+			return;
 		}
+
+		$this->assertSame($reasons, $actualResult->reasons, $testDescription);
 	}
 
 	public static function dataIsSuperTypeOf(): iterable

tests/PHPStan/Type/TypeCombinatorTest.php

@@ -67,6 +67,7 @@
 use function array_reverse;
 use function get_class;
 use function implode;
+use function is_string;
 use function sprintf;
 use const PHP_VERSION_ID;
 
@@ -5094,7 +5095,7 @@ public static function dataIntersect(): iterable
 					[new IntegerType(), new UnionType([
 						new ConstantStringType('0'),
 						new ConstantStringType('foo'),
-					])]
+					])],
 				),
 				new ConstantArrayType(
 					[new ConstantIntegerType(0), new ConstantIntegerType(1)],
@@ -5297,9 +5298,11 @@ public function testIntersect(
 		$typeStringResolver = self::getContainer()->getByType(TypeStringResolver::class);
 		foreach ($types as $i => $type) {
 			BleedingEdgeToggle::setBleedingEdge(true);
-			if (is_string($type)) {
-				$types[$i] = $typeStringResolver->resolve($type, null);
+			if (!is_string($type)) {
+				continue;
 			}
+
+			$types[$i] = $typeStringResolver->resolve($type, null);
 		}
 
 		BleedingEdgeToggle::setBleedingEdge($bleedingEdgeBackup);
@@ -5315,7 +5318,7 @@ public function testIntersect(
 	}
 
 	/**
-	 * @param list<Type> $types
+	 * @param list<Type>|list<string> $types
 	 * @param class-string<Type> $expectedTypeClass
 	 */
 	#[DataProvider('dataIntersect')]
@@ -5329,9 +5332,11 @@ public function testIntersectInversed(
 		$typeStringResolver = self::getContainer()->getByType(TypeStringResolver::class);
 		foreach ($types as $i => $type) {
 			BleedingEdgeToggle::setBleedingEdge(true);
-			if (is_string($type)) {
-				$types[$i] = $typeStringResolver->resolve($type, null);
+			if (!is_string($type)) {
+				continue;
 			}
+
+			$types[$i] = $typeStringResolver->resolve($type, null);
 		}
 
 		BleedingEdgeToggle::setBleedingEdge($bleedingEdgeBackup);