Raise Rector sets

Author: Jean85

rector.php

@@ -10,11 +10,14 @@
         __DIR__ . '/tests',
     ])
     // uncomment to reach your current PHP version
-    // ->withPhpSets()
-    ->withTypeCoverageLevel(0)
-    ->withDeadCodeLevel(0)
-    ->withCodeQualityLevel(0)
-    ->withAttributesSets(phpunit: true)
+    ->withImportNames(importShortClasses: false)
+    ->withPhpSets()
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        typeDeclarations: true
+    )
+    ->withAttributesSets(all: true)
     ->withSets([
         \Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_100,
     ])

src/AbstractTerminableCommand.php

@@ -13,19 +13,9 @@ abstract class AbstractTerminableCommand extends Command implements SignalableCo
 {
     private const REQUEST_TO_TERMINATE = 143;
 
-    /** @var int */
-    private $sleepDuration;
+    private int $sleepDuration = 0;
 
-    /** @var bool */
-    private $signalShutdownRequested;
-
-    public function __construct(?string $name = null)
-    {
-        $this->sleepDuration = 0;
-        $this->signalShutdownRequested = false;
-
-        parent::__construct($name);
-    }
+    private bool $signalShutdownRequested = false;
 
     final protected function execute(InputInterface $input, OutputInterface $output): int
     {
@@ -41,7 +31,7 @@ final protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->sleep($output);
 
-        /** @psalm-suppress DocblockTypeContradiction */
+        /** @psalm-suppress TypeDoesNotContainType */
         if ($this->signalShutdownRequested) {
             $output->writeln('Signal received, terminating with exit code ' . self::REQUEST_TO_TERMINATE, OutputInterface::VERBOSITY_NORMAL);
 

tests/E2E/TerminateCommandTest.php

@@ -4,6 +4,7 @@
 
 namespace Facile\TerminableLoop\Tests\E2E;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Process\Process;
@@ -19,7 +20,7 @@ class TerminateCommandTest extends TestCase
     /**
      * @param string[] $commandLine
      */
-    #[\PHPUnit\Framework\Attributes\DataProvider('commandLineProvider')]
+    #[DataProvider('commandLineProvider')]
     public function testStubCommand(array $commandLine): void
     {
         $process = new Process($commandLine);
@@ -57,7 +58,7 @@ public static function commandLineProvider(): array
         ];
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('provideSignals')]
+    #[DataProvider('provideSignals')]
     public function testSignalsDuringCommandBody(int $signal, int $exitCode): void
     {
         $process = new Process([
@@ -84,7 +85,7 @@ public function testSignalsDuringCommandBody(int $signal, int $exitCode): void
         $this->assertSame($exitCode, $process->getExitCode());
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('provideSignals')]
+    #[DataProvider('provideSignals')]
     public function testSigTermDuringSleep(int $signal, int $exitCode): void
     {
         $process = new Process([

tests/Stub/StubTerminableCommand.php

@@ -28,7 +28,7 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
         $stubDuration = $this->getOption($input, 'stub');
         $sleepDuration = $this->getOption($input, 'sleep');
 
-        if ($stubDuration) {
+        if ($stubDuration !== 0) {
             $process = new Process(['sleep', $stubDuration]);
             $process->run();
         }

tests/Unit/AbstractTerminableCommandTest.php

@@ -4,6 +4,7 @@
 
 namespace Facile\TerminableLoop\Tests\Unit;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Facile\TerminableLoop\AbstractTerminableCommand;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -78,17 +79,13 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
         $stubCommand->run(new ArrayInput([]), $output->reveal());
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('signalProvider')]
+    #[DataProvider('signalProvider')]
     public function testReceiveSignalDuringCommandBody(int $signal): void
     {
         $stubCommand = new class ($signal) extends AbstractTerminableCommand {
-            /** @var int */
-            private $signal;
-
-            public function __construct(int $signal)
+            public function __construct(private readonly int $signal)
             {
                 parent::__construct('dummy:command');
-                $this->signal = $signal;
             }
 
             protected function commandBody(InputInterface $input, OutputInterface $output): int
@@ -110,7 +107,7 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
         $this->assertSame(143, $exitCode);
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('signalProvider')]
+    #[DataProvider('signalProvider')]
     public function testReceiveSignalBeforeCommandBody(int $signal): void
     {
         $stubCommand = $this->createStubTerminableCommand();
@@ -129,7 +126,7 @@ public function testReceiveSignalBeforeCommandBody(int $signal): void
         $this->assertSame(143, $exitCode);
     }
 
-    #[\PHPUnit\Framework\Attributes\DataProvider('signalProvider')]
+    #[DataProvider('signalProvider')]
     public function testGetSubscribedSignals(int $signal): void
     {
         $stubCommand = $this->createStubTerminableCommand();