From 677815e92220d811a4d8818b9d7abf43c0457793 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 19 Oct 2025 11:27:49 +0200 Subject: [PATCH] Compute allowedArrayType only once --- src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php | 6 +++--- src/Rules/Arrays/InvalidKeyInArrayItemRule.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php b/src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php index 50e74ca81a..0723234b36 100644 --- a/src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php +++ b/src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php @@ -58,18 +58,18 @@ public function processNode(Node $node, Scope $scope): array return []; } - $phpVersion = $this->phpVersion; + $allowedArrayKeys = AllowedArrayKeysTypes::getType($this->phpVersion); $dimensionType = $this->ruleLevelHelper->findTypeToCheck( $scope, $node->dim, '', - static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion)->isSuperTypeOf($dimType)->yes(), + static fn (Type $dimType): bool => $allowedArrayKeys->isSuperTypeOf($dimType)->yes(), )->getType(); if ($dimensionType instanceof ErrorType) { return []; } - $isSuperType = AllowedArrayKeysTypes::getType($phpVersion)->isSuperTypeOf($dimensionType); + $isSuperType = $allowedArrayKeys->isSuperTypeOf($dimensionType); if ($isSuperType->yes() || ($isSuperType->maybe() && !$this->reportMaybes)) { return []; } diff --git a/src/Rules/Arrays/InvalidKeyInArrayItemRule.php b/src/Rules/Arrays/InvalidKeyInArrayItemRule.php index ed47303512..298c65b565 100644 --- a/src/Rules/Arrays/InvalidKeyInArrayItemRule.php +++ b/src/Rules/Arrays/InvalidKeyInArrayItemRule.php @@ -39,18 +39,18 @@ public function processNode(Node $node, Scope $scope): array return []; } - $phpVersion = $this->phpVersion; + $allowedArrayKeys = AllowedArrayKeysTypes::getType($this->phpVersion); $dimensionType = $this->ruleLevelHelper->findTypeToCheck( $scope, $node->key, '', - static fn (Type $dimType): bool => AllowedArrayKeysTypes::getType($phpVersion)->isSuperTypeOf($dimType)->yes(), + static fn (Type $dimType): bool => $allowedArrayKeys->isSuperTypeOf($dimType)->yes(), )->getType(); if ($dimensionType instanceof ErrorType) { return []; } - $isSuperType = AllowedArrayKeysTypes::getType($phpVersion)->isSuperTypeOf($dimensionType); + $isSuperType = $allowedArrayKeys->isSuperTypeOf($dimensionType); if ($isSuperType->yes()) { return []; }