Code refactor

Author: nunomaduro

composer.json

@@ -46,7 +46,7 @@
     "scripts": {
         "lint": "pint",
         "refactor": "rector",
-        "test:type-coverage": "pest --type-coverage --min=99",
+        "test:type-coverage": "pest --type-coverage --exactly=99",
         "test:typos": "peck",
         "test:lint": "pint --test",
         "test:unit": "pest --coverage --exactly=100",

package-lock.json

@@ -2,26 +2,19 @@
 
 declare(strict_types=1);
 
-use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
-use Rector\Set\ValueObject\LevelSetList;
-use Rector\Set\ValueObject\SetList;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->paths([
+return RectorConfig::configure()
+    ->withPaths([
         __DIR__.'/src',
-    ]);
-
-    $rectorConfig->rules([
-        InlineConstructorDefaultToPropertyRector::class,
-    ]);
-
-    $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_82,
-        SetList::CODE_QUALITY,
-        SetList::DEAD_CODE,
-        SetList::EARLY_RETURN,
-        SetList::TYPE_DECLARATION,
-        SetList::PRIVATIZATION,
-    ]);
-};
+        __DIR__.'/tests',
+    ])
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        typeDeclarations: true,
+        privatization: true,
+        earlyReturn: true,
+        strictBooleans: true,
+    )
+    ->withPhpSets();

rector.php

@@ -52,7 +52,7 @@ public function assertTitle(string $expectedTitle): self
      * @param  iterable  $response  The response (array or Generator)
      * @return mixed The extracted value
      */
-    private function extractResultValue(iterable $response)
+    private function extractResultValue(iterable $response): mixed
     {
         // Get all values from keys matching *.result.value
         $values = [];

src/PendingTest.php

@@ -12,11 +12,11 @@
  */
 final class Playground
 {
-    private const DEFAULT_SCHEME = 'http';
+    private const string DEFAULT_SCHEME = 'http';
 
-    private const DEFAULT_HOST = 'localhost';
+    private const string DEFAULT_HOST = 'localhost';
 
-    private const DEFAULT_PORT = 9357;
+    private const int DEFAULT_PORT = 9357;
 
     /**
      * Playground instance.
@@ -26,15 +26,15 @@ final class Playground
     /**
      * Artisan serve process.
      */
-    private Process $process;
+    private readonly Process $process;
 
     /**
      * Constructs new instance and starts Artisan serve process.
      */
     private function __construct(
-        private string $scheme,
-        private string $host,
-        private int $port
+        private readonly string $scheme,
+        private readonly string $host,
+        private readonly int $port
     ) {
         $this->shutdownIdleProcesses();
 
@@ -56,7 +56,7 @@ public function __destruct()
      */
     public static function start(): self
     {
-        if (self::$instance === null) {
+        if (! self::$instance instanceof self) {
             self::$instance = new self(
                 Arr::get($_ENV, 'PEST_BROWSER_PLUGIN_PLAYGROUND_SCHEME', self::DEFAULT_SCHEME), // @phpstan-ignore-line
                 Arr::get($_ENV, 'PEST_BROWSER_PLUGIN_PLAYGROUND_HOST', self::DEFAULT_HOST), // @phpstan-ignore-line

src/Playground.php

@@ -86,7 +86,7 @@ public function isRunning(): bool
         $process->run();
         $output = $process->getOutput();
 
-        $pids = array_filter(explode("\n", mb_trim($output)), fn ($pid): bool => (int) $pid > 0);
+        $pids = array_filter(explode("\n", mb_trim($output)), fn (string $pid): bool => (int) $pid > 0);
 
         return count($pids) > 0;
     }
@@ -97,7 +97,6 @@ public function isRunning(): bool
     public function stop(): void
     {
         if ($this->isRunning()) {
-            // Stop this way because initial process changes PID for some reason
             $command = Process::fromShellCommandline("kill -9 $(lsof -t -i :{$this->port})");
             $command->disableOutput();
             $command->run();

src/Playwright/Server.php

@@ -11,7 +11,7 @@
  */
 final class Screenshot
 {
-    private const DEFAULT_DIR = '/tmp/pest-browser-screenshots';
+    private const string DEFAULT_DIR = '/tmp/pest-browser-screenshots';
 
     /**
      * Return the path to the screenshots directory.

src/Support/Screenshot.php

@@ -18,7 +18,9 @@ function cleanupScreenshots(): void
         }
     }
 
-    file_exists($basePath) && rmdir($basePath);
+    if (file_exists($basePath)) {
+        rmdir($basePath);
+    }
 }
 
 function playgroundUrl(string $path = '/'): string

tests/Pest.php

@@ -4,23 +4,23 @@
 
 use Pest\Browser\Support\Str;
 
-test('one character non-regex string', function () {
+test('one character non-regex string', function (): void {
     $string = 'a';
 
     $result = Str::isRegex($string);
 
     expect($result)->toBeFalse();
 });
 
-it('detects regex expressions', function () {
+it('detects regex expressions', function (): void {
     $regex = '/^.*$/';
 
     $result = Str::isRegex($regex);
 
     expect($result)->toBeTrue();
 });
 
-it('detects non-regex expressions', function () {
+it('detects non-regex expressions', function (): void {
     $string = 'string';
 
     $result = Str::isRegex($string);