From d723aca94674e7c0502d43a926b45b4e555e72a0 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Tue, 20 Apr 2021 14:41:41 +0200
Subject: [PATCH] [TypeDeclaratio] Skip abstract method in
 AddVoidReturnTypeWhereNoReturnRector (#6173)

---
 .../Fixture/skip_abstract_method.php.inc                    | 6 ++++++
 .../config/configured_rule.php                              | 1 -
 .../ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_abstract_method.php.inc

diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_abstract_method.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_abstract_method.php.inc
new file mode 100644
index 000000000000..16b0aee8c28c
--- /dev/null
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_abstract_method.php.inc
@@ -0,0 +1,6 @@
+<?php
+
+abstract class SkipAbstractMethod
+{
+    public abstract function getValues();
+}
diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/configured_rule.php
index c08a6369b406..4af22258daeb 100644
--- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/configured_rule.php
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/config/configured_rule.php
@@ -7,6 +7,5 @@
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
-
     $services->set(AddVoidReturnTypeWhereNoReturnRector::class);
 };
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php
index 588c6080ef3b..a23b430a7d4e 100644
--- a/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php
+++ b/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php
@@ -82,7 +82,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if ($node instanceof ClassMethod && $node->isMagic()) {
+        if ($node instanceof ClassMethod && ($node->isMagic() || $node->isAbstract())) {
             return null;
         }