From 46a2cfbace5093e94a9247aa65a5cddee5ce348a Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Sun, 3 Sep 2023 22:43:54 +0100
Subject: [PATCH 1/3] Feature | V2 Prevent Stray Requests

---
 src/Exceptions/StrayRequestException.php | 11 +++++++++++
 src/Helpers/Config.php                   | 17 +++++++++++++++++
 tests/Unit/ConfigTest.php                | 13 +++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 src/Exceptions/StrayRequestException.php

diff --git a/src/Exceptions/StrayRequestException.php b/src/Exceptions/StrayRequestException.php
new file mode 100644
index 00000000..3eff46e1
--- /dev/null
+++ b/src/Exceptions/StrayRequestException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Saloon\Exceptions;
+
+class StrayRequestException extends SaloonException
+{
+    public function __construct()
+    {
+        parent::__construct('Attempted to make a real API request! Make sure to use a MockClient or Saloon::fake() if you are using Laravel.');
+    }
+}
diff --git a/src/Helpers/Config.php b/src/Helpers/Config.php
index c625e48c..5427c1a0 100644
--- a/src/Helpers/Config.php
+++ b/src/Helpers/Config.php
@@ -4,7 +4,10 @@
 
 namespace Saloon\Helpers;
 
+use Saloon\Contracts\PendingRequest;
 use Saloon\Contracts\Sender;
+use Saloon\Exceptions\SaloonException;
+use Saloon\Exceptions\StrayRequestException;
 use Saloon\Http\Senders\GuzzleSender;
 use Saloon\Contracts\MiddlewarePipeline as MiddlewarePipelineContract;
 
@@ -101,4 +104,18 @@ public static function resetDefaultSender(): void
     {
         self::$defaultSender = self::DEFAULT_SENDER;
     }
+
+    /**
+     * Throw an exception if a request without a MockClient is made.
+     *
+     * @return void
+     */
+    public static function preventStrayRequests(): void
+    {
+        self::middleware()->onRequest(static function (PendingRequest $pendingRequest) {
+            if (! $pendingRequest->hasMockClient()) {
+                throw new StrayRequestException;
+            }
+        });
+    }
 }
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index ad2b3c13..7cfa68f8 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use Saloon\Exceptions\SaloonException;
+use Saloon\Exceptions\StrayRequestException;
 use Saloon\Http\Response;
 use Saloon\Helpers\Config;
 use Saloon\Http\PendingRequest;
@@ -68,3 +70,14 @@
 
     expect($sender)->toBeInstanceOf(GuzzleSender::class);
 });
+
+test('you can prevent stray api requests', function () {
+    Config::preventStrayRequests();
+
+    $this->expectException(StrayRequestException::class);
+    $this->expectExceptionMessage('Attempted to make a real API request! Make sure to use a MockClient or Saloon::fake() if you are using Laravel.');
+
+    TestConnector::make()->send(new UserRequest);
+
+    Config::resetMiddleware();
+});

From 27ac64a4883e4a230298c20bbb5198fb2e623059 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <Sammyjo20@users.noreply.github.com>
Date: Sun, 3 Sep 2023 21:44:59 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=AA=84=20Code=20Style=20Fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Exceptions/StrayRequestException.php | 2 ++
 src/Helpers/Config.php                   | 5 ++---
 tests/Unit/ConfigTest.php                | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Exceptions/StrayRequestException.php b/src/Exceptions/StrayRequestException.php
index 3eff46e1..950300c3 100644
--- a/src/Exceptions/StrayRequestException.php
+++ b/src/Exceptions/StrayRequestException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Saloon\Exceptions;
 
 class StrayRequestException extends SaloonException
diff --git a/src/Helpers/Config.php b/src/Helpers/Config.php
index 5427c1a0..0f357d21 100644
--- a/src/Helpers/Config.php
+++ b/src/Helpers/Config.php
@@ -4,11 +4,10 @@
 
 namespace Saloon\Helpers;
 
-use Saloon\Contracts\PendingRequest;
 use Saloon\Contracts\Sender;
-use Saloon\Exceptions\SaloonException;
-use Saloon\Exceptions\StrayRequestException;
+use Saloon\Contracts\PendingRequest;
 use Saloon\Http\Senders\GuzzleSender;
+use Saloon\Exceptions\StrayRequestException;
 use Saloon\Contracts\MiddlewarePipeline as MiddlewarePipelineContract;
 
 final class Config
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index 7cfa68f8..e08f3295 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
-use Saloon\Exceptions\SaloonException;
-use Saloon\Exceptions\StrayRequestException;
 use Saloon\Http\Response;
 use Saloon\Helpers\Config;
 use Saloon\Http\PendingRequest;
 use Saloon\Http\Faking\MockClient;
 use Saloon\Http\Faking\MockResponse;
 use Saloon\Http\Senders\GuzzleSender;
+use Saloon\Exceptions\StrayRequestException;
 use Saloon\Tests\Fixtures\Senders\ArraySender;
 use Saloon\Tests\Fixtures\Requests\UserRequest;
 use Saloon\Tests\Fixtures\Connectors\TestConnector;

From ce5ba51d35a78ec5a3da230335098fbe0991fa18 Mon Sep 17 00:00:00 2001
From: Sammyjo20 <29132017+Sammyjo20@users.noreply.github.com>
Date: Sun, 3 Sep 2023 22:45:40 +0100
Subject: [PATCH 3/3] Updated error message

---
 src/Exceptions/StrayRequestException.php | 2 +-
 tests/Unit/ConfigTest.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Exceptions/StrayRequestException.php b/src/Exceptions/StrayRequestException.php
index 950300c3..9fafdf63 100644
--- a/src/Exceptions/StrayRequestException.php
+++ b/src/Exceptions/StrayRequestException.php
@@ -8,6 +8,6 @@ class StrayRequestException extends SaloonException
 {
     public function __construct()
     {
-        parent::__construct('Attempted to make a real API request! Make sure to use a MockClient or Saloon::fake() if you are using Laravel.');
+        parent::__construct('Attempted to make a real API request! Make sure to use a mock response or fixture.');
     }
 }
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index e08f3295..0a6af4ac 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -74,7 +74,7 @@
     Config::preventStrayRequests();
 
     $this->expectException(StrayRequestException::class);
-    $this->expectExceptionMessage('Attempted to make a real API request! Make sure to use a MockClient or Saloon::fake() if you are using Laravel.');
+    $this->expectExceptionMessage('Attempted to make a real API request! Make sure to use a mock response or fixture.');
 
     TestConnector::make()->send(new UserRequest);