From c3ba40b6530e835fb4f9eac10d0d54ef3a375756 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 10 Feb 2025 14:06:26 +0000 Subject: [PATCH] Updated Rector to commit 50f9d87ff26cc0951921c42b1a7cd18ad714604d https://github.com/rectorphp/rector-src/commit/50f9d87ff26cc0951921c42b1a7cd18ad714604d Simplify NodeTypeResolver (#6728) --- src/Application/VersionResolver.php | 4 ++-- .../AccessoryNonEmptyStringTypeCorrector.php | 5 +---- src/NodeTypeResolver/NodeTypeResolver.php | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 18abbcdd86e..f2e97f1eee2 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 = '10180102a24697c63564755d9ea57860f8e98375'; + public const PACKAGE_VERSION = '50f9d87ff26cc0951921c42b1a7cd18ad714604d'; /** * @api * @var string */ - public const RELEASE_DATE = '2025-02-10 19:13:58'; + public const RELEASE_DATE = '2025-02-10 21:03:47'; /** * @var int */ diff --git a/src/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php b/src/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php index f122b1195d8..c49f4b0e56a 100644 --- a/src/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php +++ b/src/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php @@ -8,10 +8,7 @@ use PHPStan\Type\StringType; use PHPStan\Type\Type; final class AccessoryNonEmptyStringTypeCorrector { - /** - * @return \PHPStan\Type\Type|\PHPStan\Type\IntersectionType - */ - public function correct(Type $mainType) + public function correct(Type $mainType) : Type { if (!$mainType instanceof IntersectionType) { return $mainType; diff --git a/src/NodeTypeResolver/NodeTypeResolver.php b/src/NodeTypeResolver/NodeTypeResolver.php index f187c7dff9d..ddf990a5ac7 100644 --- a/src/NodeTypeResolver/NodeTypeResolver.php +++ b/src/NodeTypeResolver/NodeTypeResolver.php @@ -356,9 +356,9 @@ final class NodeTypeResolver } } if ($hasChanged) { - return $this->accessoryNonEmptyStringTypeCorrector->correct(new UnionType($types)); + return new UnionType($types); } - return $this->accessoryNonEmptyStringTypeCorrector->correct($unionType); + return $unionType; } private function isMatchObjectWithoutClassType(ObjectWithoutClassType $objectWithoutClassType, ObjectType $requiredObjectType) : bool {