From 6dc163e38f2021ead2a538ac64e21617a14acb5e Mon Sep 17 00:00:00 2001
From: Adam Kelso <kelso.adam@gmail.com>
Date: Sat, 17 Feb 2024 15:09:58 -0700
Subject: [PATCH] Fix namespaces

---
 src/Filters/WithJson.php           |  1 -
 src/Filters/WithRpc.php            |  1 -
 src/Helpers/macros.php             | 27 ---------------------------
 tests/ExceptionMessageRegex.php    |  2 +-
 tests/Filters/WithEndpointTest.php |  2 +-
 tests/Filters/WithFileTest.php     |  2 +-
 tests/Filters/WithFormTest.php     |  2 +-
 tests/Filters/WithHeaderTest.php   |  2 +-
 tests/Filters/WithJsonTest.php     |  2 +-
 tests/Filters/WithOptionTest.php   |  2 +-
 tests/Filters/WithQueryTest.php    |  2 +-
 tests/Filters/WithRpcTest.php      |  2 +-
 tests/Filters/WithVersionTest.php  |  2 +-
 tests/GuzzlerTest.php              |  2 +-
 14 files changed, 11 insertions(+), 40 deletions(-)
 delete mode 100755 src/Helpers/macros.php

diff --git a/src/Filters/WithJson.php b/src/Filters/WithJson.php
index de5ad32..853f1bc 100755
--- a/src/Filters/WithJson.php
+++ b/src/Filters/WithJson.php
@@ -8,7 +8,6 @@
 
 class WithJson extends Base implements With
 {
-
     use RecursiveSort;
 
     /** @var string */
diff --git a/src/Filters/WithRpc.php b/src/Filters/WithRpc.php
index fb20f6f..9ee87a4 100755
--- a/src/Filters/WithRpc.php
+++ b/src/Filters/WithRpc.php
@@ -11,7 +11,6 @@
 
 class WithRpc extends Base implements With
 {
-
     use RecursiveSort;
 
     const JSON_RPC_VERSION = '2.0';
diff --git a/src/Helpers/macros.php b/src/Helpers/macros.php
deleted file mode 100755
index 34b3dd6..0000000
--- a/src/Helpers/macros.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-use BlastCloud\Guzzler\Expectation;
-
-Expectation::macro('synchronous', function (BlastCloud\Chassis\Expectation $e) {
-    return $e->withOption('synchronous', true);
-});
-
-Expectation::macro('asynchronous', function (BlastCloud\Chassis\Expectation $e) {
-    // Set to null, because if the request was asynchronous, the
-    // "synchronous" key is not set in the options array.
-    return $e->withOption('synchronous', null);
-});
-
-foreach (Expectation::VERBS as $verb) { // @codeCoverageIgnore
-    Expectation::macro($verb, function (BlastCloud\Chassis\Expectation $e, $uri) use ($verb) {
-        return $e->withEndpoint($uri, strtoupper($verb));
-    });
-}
-
-Expectation::macro('endpoint', function (BlastCloud\Chassis\Expectation $e, $url, $method) {
-    return $e->withEndpoint($url, strtoupper($method));
-});
-
-Expectation::macro('withoutQuery', function (BlastCloud\Chassis\Expectation $e) {
-    return $e->withQuery([], true);
-});
\ No newline at end of file
diff --git a/tests/ExceptionMessageRegex.php b/tests/ExceptionMessageRegex.php
index 1658b10..a3871bf 100755
--- a/tests/ExceptionMessageRegex.php
+++ b/tests/ExceptionMessageRegex.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests;
+namespace Tests;
 
 trait ExceptionMessageRegex
 {
diff --git a/tests/Filters/WithEndpointTest.php b/tests/Filters/WithEndpointTest.php
index 99e3147..5bca06a 100755
--- a/tests/Filters/WithEndpointTest.php
+++ b/tests/Filters/WithEndpointTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 use BlastCloud\Guzzler\Expectation;
 use BlastCloud\Guzzler\UsesGuzzler;
diff --git a/tests/Filters/WithFileTest.php b/tests/Filters/WithFileTest.php
index 2fb301a..e4f8a33 100755
--- a/tests/Filters/WithFileTest.php
+++ b/tests/Filters/WithFileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 use BlastCloud\Guzzler\Expectation;
 use BlastCloud\Chassis\Helpers\File;
diff --git a/tests/Filters/WithFormTest.php b/tests/Filters/WithFormTest.php
index ab363a3..78585c0 100755
--- a/tests/Filters/WithFormTest.php
+++ b/tests/Filters/WithFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 use BlastCloud\Guzzler\Expectation;
 use GuzzleHttp\Client;
diff --git a/tests/Filters/WithHeaderTest.php b/tests/Filters/WithHeaderTest.php
index 3890e1d..0f837e2 100755
--- a/tests/Filters/WithHeaderTest.php
+++ b/tests/Filters/WithHeaderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 use BlastCloud\Guzzler\Expectation;
 use BlastCloud\Guzzler\UsesGuzzler;
diff --git a/tests/Filters/WithJsonTest.php b/tests/Filters/WithJsonTest.php
index eda9cbe..bba41cb 100755
--- a/tests/Filters/WithJsonTest.php
+++ b/tests/Filters/WithJsonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 
 use BlastCloud\Guzzler\UsesGuzzler;
diff --git a/tests/Filters/WithOptionTest.php b/tests/Filters/WithOptionTest.php
index d20f63a..e4e09b4 100755
--- a/tests/Filters/WithOptionTest.php
+++ b/tests/Filters/WithOptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 use BlastCloud\Guzzler\UsesGuzzler;
 use GuzzleHttp\Psr7\Response;
diff --git a/tests/Filters/WithQueryTest.php b/tests/Filters/WithQueryTest.php
index 3964e07..3d07b0f 100755
--- a/tests/Filters/WithQueryTest.php
+++ b/tests/Filters/WithQueryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 use BlastCloud\Guzzler\UsesGuzzler;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Filters/WithRpcTest.php b/tests/Filters/WithRpcTest.php
index d9d1fc2..9cab961 100755
--- a/tests/Filters/WithRpcTest.php
+++ b/tests/Filters/WithRpcTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 
 use BlastCloud\Guzzler\Expectation;
diff --git a/tests/Filters/WithVersionTest.php b/tests/Filters/WithVersionTest.php
index 8e9e440..c510eea 100755
--- a/tests/Filters/WithVersionTest.php
+++ b/tests/Filters/WithVersionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\Filters;
+namespace Tests\Filters;
 
 use BlastCloud\Guzzler\UsesGuzzler;
 use GuzzleHttp\Psr7\Response;
diff --git a/tests/GuzzlerTest.php b/tests/GuzzlerTest.php
index 2ef19fd..0580fab 100755
--- a/tests/GuzzlerTest.php
+++ b/tests/GuzzlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests;
+namespace Tests;
 
 use GuzzleHttp\Exception\BadResponseException;
 use GuzzleHttp\Promise\Promise;