From ec8fb202b335aa249eb503239f973cbb78bff6c9 Mon Sep 17 00:00:00 2001
From: Luke Downing <lukeraymonddowning@gmail.com>
Date: Mon, 13 Feb 2023 13:11:27 +0000
Subject: [PATCH] chore(cleanup): Tidy-up and tweaks of Pest Parallel
 integration.

---
 src/Plugins/Parallel.php | 13 +++++++++----
 src/Plugins/Retry.php    |  4 +---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Plugins/Parallel.php b/src/Plugins/Parallel.php
index bf60b425..8bba649c 100644
--- a/src/Plugins/Parallel.php
+++ b/src/Plugins/Parallel.php
@@ -28,6 +28,10 @@ final class Parallel implements HandlesArguments
         Parallel\Handlers\Pest::class,
         Parallel\Handlers\Laravel::class,
     ];
+    /**
+     * @var string[]
+     */
+    private const UNSUPPORTED_ARGUMENTS = ['--todo', '--retry'];
 
     /**
      * Whether the given command line arguments indicate that the test suite should be run in parallel.
@@ -35,8 +39,10 @@ final class Parallel implements HandlesArguments
     public static function isEnabled(): bool
     {
         $argv = new ArgvInput();
-
-        return $argv->hasParameterOption('--parallel') || $argv->hasParameterOption('-p');
+        if ($argv->hasParameterOption('--parallel')) {
+            return true;
+        }
+        return $argv->hasParameterOption('-p');
     }
 
     /**
@@ -156,10 +162,9 @@ final class Parallel implements HandlesArguments
      */
     private function hasArgumentsThatWouldBeFasterWithoutParallel(): bool
     {
-        $unsupportedArguments = ['--todo', '--retry'];
         $arguments = new ArgvInput();
 
-        foreach ($unsupportedArguments as $unsupportedArgument) {
+        foreach (self::UNSUPPORTED_ARGUMENTS as $unsupportedArgument) {
             if ($arguments->hasParameterOption($unsupportedArgument)) {
                 return true;
             }
diff --git a/src/Plugins/Retry.php b/src/Plugins/Retry.php
index 5f5f8423..f17d74c4 100644
--- a/src/Plugins/Retry.php
+++ b/src/Plugins/Retry.php
@@ -26,8 +26,6 @@ final class Retry implements HandlesArguments
 
         $arguments = $this->pushArgument('--order-by=defects', $arguments);
 
-        $arguments = $this->pushArgument('--stop-on-failure', $arguments);
-
-        return $arguments;
+        return $this->pushArgument('--stop-on-failure', $arguments);
     }
 }