From 1f9e419c34ae7bbfb7682ea9da52a90bd7c5c129 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 4 Dec 2021 15:52:44 +0700
Subject: [PATCH 1/3] [Rectify] [Php81] Enable Rectify for Return Never Type
 only

---
 rector.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rector.php b/rector.php
index fdb74880f75..8e59ff4ce55 100644
--- a/rector.php
+++ b/rector.php
@@ -11,6 +11,7 @@
 use Rector\Core\Configuration\Option;
 use Rector\Nette\Set\NetteSetList;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
 use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;
 use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector;
@@ -22,7 +23,6 @@
 use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
-use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -86,8 +86,7 @@
         MyCLabsClassToEnumRector::class,
         SpatieEnumClassToEnumRector::class,
 
-        // temporary skip all with enable ArraySpreadInsteadOfArrayMergeRector
-        ReturnNeverTypeRector::class,
+        // temporary skip non return never type rector
         FinalizePublicClassConstantRector::class,
         MyCLabsMethodCallToEnumConstRector::class,
         Php81ResourceReturnToObjectRector::class,

From 5a0610429652bdeccc71417046616b129dbb6bab Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 4 Dec 2021 12:47:59 +0000
Subject: [PATCH 2/3] [ci-review] Rector Rectify

---
 .../PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php
index ccd6e73be6c..acee2b2ad3f 100644
--- a/packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php
+++ b/packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php
@@ -4,7 +4,6 @@
 
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
-use PhpParser\Node;
 use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
@@ -38,7 +37,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type, TypeKind $typeKind): Type
     /**
      * @param HasOffsetType $type
      */
-    public function mapToPhpParserNode(Type $type, TypeKind $typeKind): ?Node
+    public function mapToPhpParserNode(Type $type, TypeKind $typeKind): never
     {
         throw new ShouldNotHappenException();
     }

From f37f9d3a39f82c0bb3b59a6e8abd58eee20d120e Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 4 Dec 2021 12:52:15 +0000
Subject: [PATCH 3/3] [ci-review] Rector Rectify

---
 rector.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rector.php b/rector.php
index 8e59ff4ce55..f4703471042 100644
--- a/rector.php
+++ b/rector.php
@@ -11,7 +11,6 @@
 use Rector\Core\Configuration\Option;
 use Rector\Nette\Set\NetteSetList;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
-use Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
 use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;
 use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector;