From fc4d3ead059392287c53add7e5832b33b7b3be33 Mon Sep 17 00:00:00 2001
From: Pierre PLAZANET <plazanet.pierre@gmail.com>
Date: Mon, 26 Apr 2021 11:53:13 +0200
Subject: [PATCH] fix: phpspec void remove linebreak (#140)

---
 src/PedroTroller/CS/Fixer/PhpspecFixer.php    | 13 +++-
 tests/Runner.php                              |  6 +-
 tests/UseCase.php                             | 19 ++----
 tests/UseCase/Behat.php                       | 10 +--
 tests/UseCase/CommentLineToPhpdocBlock.php    | 22 ++----
 .../DoctrineMigrations/UselessComments.php    | 22 ++----
 .../UselessGetDescription.php                 | 22 ++----
 tests/UseCase/ExceptionsPunctuation.php       | 22 ++----
 tests/UseCase/ForbiddenFunctions.php          | 22 ++----
 tests/UseCase/FuncSpec.php                    | 22 ++----
 tests/UseCase/LineBreakBetweenMethods.php     | 22 ++----
 .../Regression/Case1.php                      | 22 ++----
 .../Regression/Case2.php                      | 22 ++----
 .../Regression/Case3.php                      | 22 ++----
 .../Regression/Case4.php                      | 22 ++----
 .../Regression/Case5.php                      | 22 ++----
 ...eBreakBetweenMethodsWithNoReformatting.php | 22 ++----
 ...etweenMethodsWithNoSplitOnNumberOfArgs.php | 22 ++----
 tests/UseCase/LineBreakBetweenStatements.php  | 22 ++----
 tests/UseCase/OrderedSpecElements.php         | 22 ++----
 .../OrderedSpecElements/Regression/Case1.php  | 22 ++----
 .../OrderedWithGetterAndSetterFirst.php       | 22 ++----
 .../Regression/Case1.php                      | 22 ++----
 .../Regression/Case2.php                      | 22 ++----
 tests/UseCase/Phpspec.php                     | 67 ++++++++++++-------
 tests/UseCase/Phpspec/Regression/Case1.php    | 22 ++----
 tests/UseCase/Phpspec/Regression/Case2.php    | 22 ++----
 tests/UseCase/PhpspecScenarioScope.php        | 22 ++----
 tests/UseCase/SingleLineComment/Collapsed.php | 23 ++-----
 tests/UseCase/SingleLineComment/Expanded.php  | 23 ++-----
 tests/UseCase/UselessCodeAfterReturn.php      | 22 ++----
 .../Regression/Case1.php                      | 31 +++++++++
 .../{Sample1 => Case1}/file.php.txt           |  0
 .../Regression/Sample1.php                    | 43 ------------
 tests/UseCase/UselessComment.php              | 22 ++----
 tests/UseCase/UselessComment/Php71.php        | 22 ++----
 .../UselessComment/Regression/DocBlockEnd.php | 22 ++----
 .../Regression/DoubleLineBreak.php            | 22 ++----
 .../Regression/WithInterface.php              | 22 ++----
 39 files changed, 257 insertions(+), 616 deletions(-)
 create mode 100644 tests/UseCase/UselessCodeAfterReturn/Regression/Case1.php
 rename tests/UseCase/UselessCodeAfterReturn/Regression/{Sample1 => Case1}/file.php.txt (100%)
 delete mode 100644 tests/UseCase/UselessCodeAfterReturn/Regression/Sample1.php

diff --git a/src/PedroTroller/CS/Fixer/PhpspecFixer.php b/src/PedroTroller/CS/Fixer/PhpspecFixer.php
index eee078c..b6f3bfc 100644
--- a/src/PedroTroller/CS/Fixer/PhpspecFixer.php
+++ b/src/PedroTroller/CS/Fixer/PhpspecFixer.php
@@ -6,6 +6,7 @@
 
 use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
 use PhpCsFixer\Fixer\ConfigurationDefinitionFixerInterface;
+use PhpCsFixer\Fixer\FunctionNotation\VoidReturnFixer;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
 use PhpCsFixer\Tokenizer\Token;
@@ -99,7 +100,10 @@ public function getDocumentation()
      */
     public function getPriority()
     {
-        return Priority::after(VisibilityRequiredFixer::class);
+        return Priority::after(
+            VisibilityRequiredFixer::class,
+            VoidReturnFixer::class
+        );
     }
 
     /**
@@ -223,7 +227,12 @@ private function removeReturn(SplFileInfo $file, Tokens $tokens): void
             }
 
             $tokens->clearRange($closeBraceIndex + 1, $openCurlyBracket - 1);
-            $tokens->ensureWhitespaceAtIndex($openCurlyBracket, 0, "\n".$this->analyze($tokens)->getLineIndentation($openBraceIndex));
+
+            if ($tokens[$closeBraceIndex - 1]->isWhitespace() && false !== strpos($tokens[$closeBraceIndex - 1]->getContent(), "\n")) {
+                $tokens->ensureWhitespaceAtIndex($openCurlyBracket, 0, ' ');
+            } else {
+                $tokens->ensureWhitespaceAtIndex($openCurlyBracket, 0, "\n".$this->analyze($tokens)->getLineIndentation($openBraceIndex));
+            }
         }
     }
 
diff --git a/tests/Runner.php b/tests/Runner.php
index 5160176..c035c5c 100644
--- a/tests/Runner.php
+++ b/tests/Runner.php
@@ -80,7 +80,7 @@ private static function runUseCases(): void
                 continue;
             }
 
-            $fixer  = $usecase->getFixer();
+            $fixers = $usecase->getFixers();
             $tokens = Tokens::fromCode($usecase->getRawScript());
 
             $differ = new Differ();
@@ -90,7 +90,9 @@ private static function runUseCases(): void
             echo "#######################################################################################\n";
             echo "\n";
 
-            $fixer->fix(new SplFileInfo(__FILE__), $tokens);
+            foreach ($fixers as $fixer) {
+                $fixer->fix(new SplFileInfo(__FILE__), $tokens);
+            }
 
             if ($usecase->getExpectation() !== $tokens->generateCode()) {
                 throw new Exception($differ->diff($usecase->getExpectation(), $tokens->generateCode()));
diff --git a/tests/UseCase.php b/tests/UseCase.php
index d961301..d9081d8 100644
--- a/tests/UseCase.php
+++ b/tests/UseCase.php
@@ -9,22 +9,13 @@
 interface UseCase
 {
     /**
-     * @return FixerInterface
+     * @return iterable<FixerInterface>
      */
-    public function getFixer();
+    public function getFixers(): iterable;
 
-    /**
-     * @return string
-     */
-    public function getRawScript();
+    public function getRawScript(): string;
 
-    /**
-     * @return string
-     */
-    public function getExpectation();
+    public function getExpectation(): string;
 
-    /**
-     * @return int
-     */
-    public function getMinSupportedPhpVersion();
+    public function getMinSupportedPhpVersion(): int;
 }
diff --git a/tests/UseCase/Behat.php b/tests/UseCase/Behat.php
index 99266c2..dded23a 100644
--- a/tests/UseCase/Behat.php
+++ b/tests/UseCase/Behat.php
@@ -9,12 +9,12 @@
 
 final class Behat implements UseCase
 {
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new OrderBehatStepsFixer();
+        yield new OrderBehatStepsFixer();
     }
 
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'CONTEXT'
 <?php
@@ -129,7 +129,7 @@ public function iAmAnnon()
 CONTEXT;
     }
 
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'CONTEXT'
 <?php
@@ -227,7 +227,7 @@ public function doSomething()
 CONTEXT;
     }
 
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/CommentLineToPhpdocBlock.php b/tests/UseCase/CommentLineToPhpdocBlock.php
index 546e689..29a8227 100644
--- a/tests/UseCase/CommentLineToPhpdocBlock.php
+++ b/tests/UseCase/CommentLineToPhpdocBlock.php
@@ -9,18 +9,12 @@
 
 final class CommentLineToPhpdocBlock implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new CommentLineToPhpdocBlockFixer();
+        yield new CommentLineToPhpdocBlockFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -79,10 +73,7 @@ public function update(array $data)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -150,10 +141,7 @@ public function update(array $data)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/DoctrineMigrations/UselessComments.php b/tests/UseCase/DoctrineMigrations/UselessComments.php
index fd9b97f..9056267 100644
--- a/tests/UseCase/DoctrineMigrations/UselessComments.php
+++ b/tests/UseCase/DoctrineMigrations/UselessComments.php
@@ -9,18 +9,12 @@
 
 final class UselessComments implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new DoctrineMigrationsFixer();
+        yield new DoctrineMigrationsFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -61,10 +55,7 @@ public function down(Schema $schema): void
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -100,10 +91,7 @@ public function down(Schema $schema): void
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/DoctrineMigrations/UselessGetDescription.php b/tests/UseCase/DoctrineMigrations/UselessGetDescription.php
index 4e6a1c7..8599081 100644
--- a/tests/UseCase/DoctrineMigrations/UselessGetDescription.php
+++ b/tests/UseCase/DoctrineMigrations/UselessGetDescription.php
@@ -9,18 +9,12 @@
 
 final class UselessGetDescription implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new DoctrineMigrationsFixer();
+        yield new DoctrineMigrationsFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -56,10 +50,7 @@ public function down(Schema $schema): void
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -91,10 +82,7 @@ public function down(Schema $schema): void
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/ExceptionsPunctuation.php b/tests/UseCase/ExceptionsPunctuation.php
index b3dd708..cd1efcb 100644
--- a/tests/UseCase/ExceptionsPunctuation.php
+++ b/tests/UseCase/ExceptionsPunctuation.php
@@ -9,18 +9,12 @@
 
 final class ExceptionsPunctuation implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new ExceptionsPunctuationFixer();
+        yield new ExceptionsPunctuationFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -52,10 +46,7 @@ public function fun4($data)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -87,10 +78,7 @@ public function fun4($data)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/ForbiddenFunctions.php b/tests/UseCase/ForbiddenFunctions.php
index 0d0b8d1..4e73425 100644
--- a/tests/UseCase/ForbiddenFunctions.php
+++ b/tests/UseCase/ForbiddenFunctions.php
@@ -9,10 +9,7 @@
 
 final class ForbiddenFunctions implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new ForbiddenFunctionsFixer();
 
@@ -21,13 +18,10 @@ public function getFixer()
             'functions' => ['var_dump', 'dump'],
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -54,10 +48,7 @@ public function dump($data)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -84,10 +75,7 @@ public function dump($data)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/FuncSpec.php b/tests/UseCase/FuncSpec.php
index 1241d20..1091ca7 100644
--- a/tests/UseCase/FuncSpec.php
+++ b/tests/UseCase/FuncSpec.php
@@ -9,10 +9,7 @@
 
 final class FuncSpec implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new PhpspecFixer();
 
@@ -22,13 +19,10 @@ public function getFixer()
             ],
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'SPEC'
 <?php
@@ -75,10 +69,7 @@ function it_keeps_track_of_entity_dirtiness()
 SPEC;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'SPEC'
 <?php
@@ -125,10 +116,7 @@ public function foo()
 SPEC;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/LineBreakBetweenMethods.php b/tests/UseCase/LineBreakBetweenMethods.php
index f375caa..b218a42 100644
--- a/tests/UseCase/LineBreakBetweenMethods.php
+++ b/tests/UseCase/LineBreakBetweenMethods.php
@@ -9,18 +9,12 @@
 
 final class LineBreakBetweenMethods implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new LineBreakBetweenMethodArgumentsFixer();
+        yield new LineBreakBetweenMethodArgumentsFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -66,10 +60,7 @@ public function php71($arg1, array $arg2 = [], \ArrayAccess $arg3 = null, $foo =
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -125,10 +116,7 @@ public function php71(
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/LineBreakBetweenMethods/Regression/Case1.php b/tests/UseCase/LineBreakBetweenMethods/Regression/Case1.php
index 8c552e3..33d64fd 100644
--- a/tests/UseCase/LineBreakBetweenMethods/Regression/Case1.php
+++ b/tests/UseCase/LineBreakBetweenMethods/Regression/Case1.php
@@ -9,10 +9,7 @@
 
 final class Case1 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new LineBreakBetweenMethodArgumentsFixer();
 
@@ -21,29 +18,20 @@ public function getFixer()
             'max-length' => 80,
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return file_get_contents(sprintf('%s/Case1/CamelizeNamingStrategy.php.text', __DIR__));
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return file_get_contents(sprintf('%s/Case1/CamelizeNamingStrategy.php.text', __DIR__));
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/LineBreakBetweenMethods/Regression/Case2.php b/tests/UseCase/LineBreakBetweenMethods/Regression/Case2.php
index 445c597..e84aafd 100644
--- a/tests/UseCase/LineBreakBetweenMethods/Regression/Case2.php
+++ b/tests/UseCase/LineBreakBetweenMethods/Regression/Case2.php
@@ -9,10 +9,7 @@
 
 final class Case2 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new LineBreakBetweenMethodArgumentsFixer();
 
@@ -21,13 +18,10 @@ public function getFixer()
             'max-length' => 80,
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -43,10 +37,7 @@ public function thisIsAVeryLongMethodWithALengthHightThenFourtyCharsButNoArgumen
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -62,10 +53,7 @@ public function thisIsAVeryLongMethodWithALengthHightThenFourtyCharsButNoArgumen
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/LineBreakBetweenMethods/Regression/Case3.php b/tests/UseCase/LineBreakBetweenMethods/Regression/Case3.php
index 97b4f5d..a6074b1 100644
--- a/tests/UseCase/LineBreakBetweenMethods/Regression/Case3.php
+++ b/tests/UseCase/LineBreakBetweenMethods/Regression/Case3.php
@@ -9,10 +9,7 @@
 
 final class Case3 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new LineBreakBetweenMethodArgumentsFixer();
 
@@ -21,13 +18,10 @@ public function getFixer()
             'max-length' => 80,
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -66,10 +60,7 @@ public function thisIsAVeryLongMethodNameAndItWillBeBreak(string $string, int $i
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -110,10 +101,7 @@ public function thisIsAVeryLongMethodNameAndItWillBeBreak(
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70000;
     }
diff --git a/tests/UseCase/LineBreakBetweenMethods/Regression/Case4.php b/tests/UseCase/LineBreakBetweenMethods/Regression/Case4.php
index 012fb7f..acaffc1 100644
--- a/tests/UseCase/LineBreakBetweenMethods/Regression/Case4.php
+++ b/tests/UseCase/LineBreakBetweenMethods/Regression/Case4.php
@@ -12,10 +12,7 @@
  */
 final class Case4 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new LineBreakBetweenMethodArgumentsFixer();
 
@@ -24,13 +21,10 @@ public function getFixer()
             'max-length' => 100,
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -70,10 +64,7 @@ function someFuncName(
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -113,10 +104,7 @@ function someFuncName(string $format, string $time, DateTimeZone $timezone = nul
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70000;
     }
diff --git a/tests/UseCase/LineBreakBetweenMethods/Regression/Case5.php b/tests/UseCase/LineBreakBetweenMethods/Regression/Case5.php
index ace8a86..7232cca 100644
--- a/tests/UseCase/LineBreakBetweenMethods/Regression/Case5.php
+++ b/tests/UseCase/LineBreakBetweenMethods/Regression/Case5.php
@@ -12,10 +12,7 @@
  */
 final class Case5 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new LineBreakBetweenMethodArgumentsFixer();
 
@@ -24,13 +21,10 @@ public function getFixer()
             'max-length' => 100,
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -39,10 +33,7 @@ public function getRawScript()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -51,10 +42,7 @@ public function getExpectation()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/LineBreakBetweenMethodsWithNoReformatting.php b/tests/UseCase/LineBreakBetweenMethodsWithNoReformatting.php
index b75ed09..101f9a2 100644
--- a/tests/UseCase/LineBreakBetweenMethodsWithNoReformatting.php
+++ b/tests/UseCase/LineBreakBetweenMethodsWithNoReformatting.php
@@ -9,10 +9,7 @@
 
 final class LineBreakBetweenMethodsWithNoReformatting implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new LineBreakBetweenMethodArgumentsFixer();
 
@@ -20,13 +17,10 @@ public function getFixer()
             'automatic-argument-merge' => false,
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -72,10 +66,7 @@ public function php71($arg1, array $arg2 = [], \ArrayAccess $arg3 = null, $foo =
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -133,10 +124,7 @@ public function php71(
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/LineBreakBetweenMethodsWithNoSplitOnNumberOfArgs.php b/tests/UseCase/LineBreakBetweenMethodsWithNoSplitOnNumberOfArgs.php
index 91027f5..c011e92 100644
--- a/tests/UseCase/LineBreakBetweenMethodsWithNoSplitOnNumberOfArgs.php
+++ b/tests/UseCase/LineBreakBetweenMethodsWithNoSplitOnNumberOfArgs.php
@@ -9,10 +9,7 @@
 
 final class LineBreakBetweenMethodsWithNoSplitOnNumberOfArgs implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new LineBreakBetweenMethodArgumentsFixer();
 
@@ -21,13 +18,10 @@ public function getFixer()
             'max-length' => 90,
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -55,10 +49,7 @@ public function fun4($foo, $bar, $bar, $boolean = true, $integer = 1, $string =
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -90,10 +81,7 @@ public function fun4(
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/LineBreakBetweenStatements.php b/tests/UseCase/LineBreakBetweenStatements.php
index adbc870..d3cd20b 100644
--- a/tests/UseCase/LineBreakBetweenStatements.php
+++ b/tests/UseCase/LineBreakBetweenStatements.php
@@ -9,18 +9,12 @@
 
 final class LineBreakBetweenStatements implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new LineBreakBetweenStatementsFixer();
+        yield new LineBreakBetweenStatementsFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return '
 <?php
@@ -47,10 +41,7 @@ public function theFunction()
 }';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return '
 <?php
@@ -79,10 +70,7 @@ public function theFunction()
 }';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/OrderedSpecElements.php b/tests/UseCase/OrderedSpecElements.php
index 2a19064..ddf85d1 100644
--- a/tests/UseCase/OrderedSpecElements.php
+++ b/tests/UseCase/OrderedSpecElements.php
@@ -9,18 +9,12 @@
 
 final class OrderedSpecElements implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new OrderedSpecElementsFixer();
+        yield new OrderedSpecElementsFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -68,10 +62,7 @@ public function getMatchers()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -119,10 +110,7 @@ public function itIsNotASpec($file) {
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/OrderedSpecElements/Regression/Case1.php b/tests/UseCase/OrderedSpecElements/Regression/Case1.php
index 479cc82..3edeb00 100644
--- a/tests/UseCase/OrderedSpecElements/Regression/Case1.php
+++ b/tests/UseCase/OrderedSpecElements/Regression/Case1.php
@@ -9,18 +9,12 @@
 
 final class Case1 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new OrderedSpecElementsFixer();
+        yield new OrderedSpecElementsFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -60,10 +54,7 @@ function it_is_mutable()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -103,10 +94,7 @@ function it_is_mutable()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/OrderedWithGetterAndSetterFirst.php b/tests/UseCase/OrderedWithGetterAndSetterFirst.php
index bca9df1..6c2502d 100644
--- a/tests/UseCase/OrderedWithGetterAndSetterFirst.php
+++ b/tests/UseCase/OrderedWithGetterAndSetterFirst.php
@@ -9,18 +9,12 @@
 
 final class OrderedWithGetterAndSetterFirst implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new OrderedWithGetterAndSetterFirstFixer();
+        yield new OrderedWithGetterAndSetterFirstFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -104,10 +98,7 @@ public function hasIdentifier()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -191,10 +182,7 @@ public function disable()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/OrderedWithGetterAndSetterFirst/Regression/Case1.php b/tests/UseCase/OrderedWithGetterAndSetterFirst/Regression/Case1.php
index c7d153a..60fc967 100644
--- a/tests/UseCase/OrderedWithGetterAndSetterFirst/Regression/Case1.php
+++ b/tests/UseCase/OrderedWithGetterAndSetterFirst/Regression/Case1.php
@@ -9,18 +9,12 @@
 
 final class Case1 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new OrderedWithGetterAndSetterFirstFixer();
+        yield new OrderedWithGetterAndSetterFirstFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -775,10 +769,7 @@ private function pushStatusHistory(string $status)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -1533,10 +1524,7 @@ private function pushStatusHistory(string $status)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/OrderedWithGetterAndSetterFirst/Regression/Case2.php b/tests/UseCase/OrderedWithGetterAndSetterFirst/Regression/Case2.php
index 85c5b2c..e73c419 100644
--- a/tests/UseCase/OrderedWithGetterAndSetterFirst/Regression/Case2.php
+++ b/tests/UseCase/OrderedWithGetterAndSetterFirst/Regression/Case2.php
@@ -9,18 +9,12 @@
 
 final class Case2 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new OrderedWithGetterAndSetterFirstFixer();
+        yield new OrderedWithGetterAndSetterFirstFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -77,18 +71,12 @@ function it_is_free()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return $this->getRawScript();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/Phpspec.php b/tests/UseCase/Phpspec.php
index cd102b1..0efa0c4 100644
--- a/tests/UseCase/Phpspec.php
+++ b/tests/UseCase/Phpspec.php
@@ -5,22 +5,20 @@
 namespace tests\UseCase;
 
 use PedroTroller\CS\Fixer\PhpspecFixer;
+use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
+use PhpCsFixer\Fixer\FunctionNotation\VoidReturnFixer;
 use tests\UseCase;
 
 final class Phpspec implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new PhpspecFixer();
+        yield new VisibilityRequiredFixer();
+        yield new VoidReturnFixer();
+        yield new PhpspecFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'SPEC'
 <?php
@@ -44,7 +42,20 @@ public function it_is_a_spec($file) {
         return;
     }
 
-    public function itIsNotASpec($file) {
+    public function it_is_a_spec_with_linebreaks_between_arguments(
+        $file
+    ) {
+        return;
+    }
+
+    public function it_is_an_other_spec_with_linebreaks_between_arguments(
+        $file
+    )
+    {
+        return;
+    }
+
+    public function itIsNotASpec($file): void {
         return;
     }
 
@@ -63,10 +74,7 @@ public function its_other_function_as_a_spec($file) {
 SPEC;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'SPEC'
 <?php
@@ -78,18 +86,34 @@ public function getExpectation()
 class TheSpec extends ObjectBehavior
 {
 
-    function let($file) {
+    function let($file)
+    {
         return;
     }
-    function letGo($file) {
+    function letGo($file)
+    {
         return;
     }
 
-    function it_is_a_spec($file) {
+    function it_is_a_spec($file)
+    {
+        return;
+    }
+
+    function it_is_a_spec_with_linebreaks_between_arguments(
+        $file
+    ) {
         return;
     }
 
-    function its_other_function_as_a_spec($file) {
+    function it_is_an_other_spec_with_linebreaks_between_arguments(
+        $file
+    ) {
+        return;
+    }
+
+    function its_other_function_as_a_spec($file)
+    {
         return;
     }
 
@@ -102,17 +126,14 @@ public function foo()
         return 'bar';
     }
 
-    public function itIsNotASpec($file) {
+    public function itIsNotASpec($file): void {
         return;
     }
 }
 SPEC;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/Phpspec/Regression/Case1.php b/tests/UseCase/Phpspec/Regression/Case1.php
index 5b91233..946586a 100644
--- a/tests/UseCase/Phpspec/Regression/Case1.php
+++ b/tests/UseCase/Phpspec/Regression/Case1.php
@@ -9,10 +9,7 @@
 
 final class Case1 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new PhpspecFixer();
 
@@ -20,29 +17,20 @@ public function getFixer()
             'instanceof' => ['Funk\Spec'],
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return file_get_contents(sprintf('%s/Case1/file.php.txt', __DIR__));
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return file_get_contents(sprintf('%s/Case1/file.php.txt', __DIR__));
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/Phpspec/Regression/Case2.php b/tests/UseCase/Phpspec/Regression/Case2.php
index c91a54f..782c697 100644
--- a/tests/UseCase/Phpspec/Regression/Case2.php
+++ b/tests/UseCase/Phpspec/Regression/Case2.php
@@ -9,34 +9,22 @@
 
 final class Case2 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new PhpspecFixer();
+        yield new PhpspecFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return file_get_contents(sprintf('%s/Case2/file.php.txt', __DIR__));
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return file_get_contents(sprintf('%s/Case2/file.php.txt', __DIR__));
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/PhpspecScenarioScope.php b/tests/UseCase/PhpspecScenarioScope.php
index 220332a..6c3a4ee 100644
--- a/tests/UseCase/PhpspecScenarioScope.php
+++ b/tests/UseCase/PhpspecScenarioScope.php
@@ -9,18 +9,12 @@
 
 final class PhpspecScenarioScope implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new PhpspecScenarioScopeFixer();
+        yield new PhpspecScenarioScopeFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'SPEC'
 <?php
@@ -54,10 +48,7 @@ public function its_other_function_as_a_spec($file) {
 SPEC;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'SPEC'
 <?php
@@ -91,10 +82,7 @@ function its_other_function_as_a_spec($file) {
 SPEC;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/SingleLineComment/Collapsed.php b/tests/UseCase/SingleLineComment/Collapsed.php
index c584a8f..fbfcf02 100644
--- a/tests/UseCase/SingleLineComment/Collapsed.php
+++ b/tests/UseCase/SingleLineComment/Collapsed.php
@@ -9,24 +9,19 @@
 
 final class Collapsed implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new SingleLineCommentFixer();
+
         $fixer->configure([
             'action' => 'collapsed',
             'types'  => ['@var'],
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -58,10 +53,7 @@ public function fun2($file) {
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -91,10 +83,7 @@ public function fun2($file) {
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/SingleLineComment/Expanded.php b/tests/UseCase/SingleLineComment/Expanded.php
index d43b057..dafa1dc 100644
--- a/tests/UseCase/SingleLineComment/Expanded.php
+++ b/tests/UseCase/SingleLineComment/Expanded.php
@@ -9,24 +9,19 @@
 
 final class Expanded implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
         $fixer = new SingleLineCommentFixer();
+
         $fixer->configure([
             'action' => 'expanded',
             'types'  => ['@var'],
         ]);
 
-        return $fixer;
+        yield $fixer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -58,10 +53,7 @@ public function fun2($file) {
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -95,10 +87,7 @@ public function fun2($file) {
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/UselessCodeAfterReturn.php b/tests/UseCase/UselessCodeAfterReturn.php
index b71a32e..d6d9e9f 100644
--- a/tests/UseCase/UselessCodeAfterReturn.php
+++ b/tests/UseCase/UselessCodeAfterReturn.php
@@ -9,18 +9,12 @@
 
 final class UselessCodeAfterReturn implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new UselessCodeAfterReturnFixer();
+        yield new UselessCodeAfterReturnFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -66,10 +60,7 @@ public function buildCallable()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -111,10 +102,7 @@ public function buildCallable()
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/UselessCodeAfterReturn/Regression/Case1.php b/tests/UseCase/UselessCodeAfterReturn/Regression/Case1.php
new file mode 100644
index 0000000..65e566d
--- /dev/null
+++ b/tests/UseCase/UselessCodeAfterReturn/Regression/Case1.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace tests\UseCase\UselessCodeAfterReturn\Regression;
+
+use PedroTroller\CS\Fixer\DeadCode\UselessCodeAfterReturnFixer;
+use tests\UseCase;
+
+final class Case1 implements UseCase
+{
+    public function getFixers(): iterable
+    {
+        yield new UselessCodeAfterReturnFixer();
+    }
+
+    public function getRawScript(): string
+    {
+        return file_get_contents(__DIR__.'/Case1/file.php.txt');
+    }
+
+    public function getExpectation(): string
+    {
+        return file_get_contents(__DIR__.'/Case1/file.php.txt');
+    }
+
+    public function getMinSupportedPhpVersion(): int
+    {
+        return 70000;
+    }
+}
diff --git a/tests/UseCase/UselessCodeAfterReturn/Regression/Sample1/file.php.txt b/tests/UseCase/UselessCodeAfterReturn/Regression/Case1/file.php.txt
similarity index 100%
rename from tests/UseCase/UselessCodeAfterReturn/Regression/Sample1/file.php.txt
rename to tests/UseCase/UselessCodeAfterReturn/Regression/Case1/file.php.txt
diff --git a/tests/UseCase/UselessCodeAfterReturn/Regression/Sample1.php b/tests/UseCase/UselessCodeAfterReturn/Regression/Sample1.php
deleted file mode 100644
index 20925f7..0000000
--- a/tests/UseCase/UselessCodeAfterReturn/Regression/Sample1.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests\UseCase\UselessCodeAfterReturn\Regression;
-
-use PedroTroller\CS\Fixer\DeadCode\UselessCodeAfterReturnFixer;
-use tests\UseCase;
-
-final class Sample1 implements UseCase
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
-    {
-        return new UselessCodeAfterReturnFixer();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
-    {
-        return file_get_contents(__DIR__.'/Sample1/file.php.txt');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
-    {
-        return file_get_contents(__DIR__.'/Sample1/file.php.txt');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
-    {
-        return 70000;
-    }
-}
diff --git a/tests/UseCase/UselessComment.php b/tests/UseCase/UselessComment.php
index 9d07d5a..756d194 100644
--- a/tests/UseCase/UselessComment.php
+++ b/tests/UseCase/UselessComment.php
@@ -9,18 +9,12 @@
 
 final class UselessComment implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new UselessCommentFixer();
+        yield new UselessCommentFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -48,10 +42,7 @@ public function setUser(User $user)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -76,10 +67,7 @@ public function setUser(User $user)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/UselessComment/Php71.php b/tests/UseCase/UselessComment/Php71.php
index 3eeeaa5..4d59e04 100644
--- a/tests/UseCase/UselessComment/Php71.php
+++ b/tests/UseCase/UselessComment/Php71.php
@@ -9,18 +9,12 @@
 
 final class Php71 implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new UselessCommentFixer();
+        yield new UselessCommentFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -53,10 +47,7 @@ public function setName(string $name): void
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -81,10 +72,7 @@ public function setName(string $name): void
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/UselessComment/Regression/DocBlockEnd.php b/tests/UseCase/UselessComment/Regression/DocBlockEnd.php
index 666bce4..a87e64a 100644
--- a/tests/UseCase/UselessComment/Regression/DocBlockEnd.php
+++ b/tests/UseCase/UselessComment/Regression/DocBlockEnd.php
@@ -9,18 +9,12 @@
 
 final class DocBlockEnd implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new UselessCommentFixer();
+        yield new UselessCommentFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -58,10 +52,7 @@ public function canPublish(string $attribute, $subject, User $user): bool
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -91,10 +82,7 @@ public function canPublish(string $attribute, $subject, User $user): bool
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70100;
     }
diff --git a/tests/UseCase/UselessComment/Regression/DoubleLineBreak.php b/tests/UseCase/UselessComment/Regression/DoubleLineBreak.php
index cc86462..681ce76 100644
--- a/tests/UseCase/UselessComment/Regression/DoubleLineBreak.php
+++ b/tests/UseCase/UselessComment/Regression/DoubleLineBreak.php
@@ -9,18 +9,12 @@
 
 final class DoubleLineBreak implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new UselessCommentFixer();
+        yield new UselessCommentFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -49,10 +43,7 @@ public function setUser(User $user)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -79,10 +70,7 @@ public function setUser(User $user)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 0;
     }
diff --git a/tests/UseCase/UselessComment/Regression/WithInterface.php b/tests/UseCase/UselessComment/Regression/WithInterface.php
index ebdd4c9..4844643 100644
--- a/tests/UseCase/UselessComment/Regression/WithInterface.php
+++ b/tests/UseCase/UselessComment/Regression/WithInterface.php
@@ -9,18 +9,12 @@
 
 final class WithInterface implements UseCase
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getFixer()
+    public function getFixers(): iterable
     {
-        return new UselessCommentFixer();
+        yield new UselessCommentFixer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawScript()
+    public function getRawScript(): string
     {
         return <<<'PHP'
 <?php
@@ -49,10 +43,7 @@ public function disposable(array $payloads, DateTimeInterface $expiredAt = null)
 PHP;
     }
 
-    /**
-     * @return string
-     */
-    public function getExpectation()
+    public function getExpectation(): string
     {
         return <<<'PHP'
 <?php
@@ -75,10 +66,7 @@ public function disposable(array $payloads, DateTimeInterface $expiredAt = null)
 PHP;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMinSupportedPhpVersion()
+    public function getMinSupportedPhpVersion(): int
     {
         return 70000;
     }