diff --git a/rules/CodeQuality/Rector/Switch_/SingularSwitchToIfRector.php b/rules/CodeQuality/Rector/Switch_/SingularSwitchToIfRector.php index 161ef81fe41..f8835ebb0c2 100644 --- a/rules/CodeQuality/Rector/Switch_/SingularSwitchToIfRector.php +++ b/rules/CodeQuality/Rector/Switch_/SingularSwitchToIfRector.php @@ -81,8 +81,8 @@ CODE_SAMPLE // only default → basically unwrap if (!$onlyCase->cond instanceof Expr) { // remove default clause because it cause syntax error - return \array_filter($onlyCase->stmts, function (Stmt $statement) { - return !$statement instanceof Break_; + return \array_filter($onlyCase->stmts, static function (Stmt $stmt) : bool { + return !$stmt instanceof Break_; }); } $if = new If_(new Identical($node->cond, $onlyCase->cond)); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 37ca5407bd5..3b690912f55 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'ac072bc8af186b2c86256aa7d29e52bb608ece27'; + public const PACKAGE_VERSION = '2ec55701f292770fc7be3ca6e434d437e59c333b'; /** * @api * @var string */ - public const RELEASE_DATE = '2024-01-12 00:00:19'; + public const RELEASE_DATE = '2024-01-13 08:42:30'; /** * @var int */ diff --git a/src/Skipper/SkipCriteriaResolver/SkippedClassResolver.php b/src/Skipper/SkipCriteriaResolver/SkippedClassResolver.php index fd91bbd83c0..ffd07455c88 100644 --- a/src/Skipper/SkipCriteriaResolver/SkippedClassResolver.php +++ b/src/Skipper/SkipCriteriaResolver/SkippedClassResolver.php @@ -9,23 +9,25 @@ use Rector\Testing\PHPUnit\StaticPHPUnitEnvironment; final class SkippedClassResolver { /** - * @var array + * @var null|array */ - private $skippedClasses = []; + private $skippedClasses = null; /** * @return array */ public function resolve() : array { + // disable cache in tests if (StaticPHPUnitEnvironment::isPHPUnitRun()) { // disable cache in tests - $this->skippedClasses = []; + $this->skippedClasses = null; } - // skip cache in tests - if ($this->skippedClasses !== []) { + // already cached, even only empty array + if ($this->skippedClasses !== null) { return $this->skippedClasses; } $skip = SimpleParameterProvider::provideArrayParameter(Option::SKIP); + $this->skippedClasses = []; foreach ($skip as $key => $value) { // e.g. [SomeClass::class] → shift values to [SomeClass::class => null] if (\is_int($key)) { diff --git a/src/Skipper/SkipCriteriaResolver/SkippedPathsResolver.php b/src/Skipper/SkipCriteriaResolver/SkippedPathsResolver.php index 1f587ea856d..1b6327d155b 100644 --- a/src/Skipper/SkipCriteriaResolver/SkippedPathsResolver.php +++ b/src/Skipper/SkipCriteriaResolver/SkippedPathsResolver.php @@ -34,7 +34,7 @@ final class SkippedPathsResolver if (StaticPHPUnitEnvironment::isPHPUnitRun()) { $this->skippedPaths = null; } - // already filled, even empty array + // already cached, even only empty array if ($this->skippedPaths !== null) { return $this->skippedPaths; }