diff --git a/tests/Httpful/ClientMultiAndPromiseTest.php b/tests/Httpful/ClientMultiAndPromiseTest.php
index 8b859b2274f53358bd2f76fb9b1d66776a2ba08c..78c69f7ed33f7ce0dc262c7fec1c76b7bfa8afd8 100644
--- a/tests/Httpful/ClientMultiAndPromiseTest.php
+++ b/tests/Httpful/ClientMultiAndPromiseTest.php
@@ -34,10 +34,14 @@ final class ClientMultiAndPromiseTest extends TestCase
     public function testMultiCurlCallbacks(): void
     {
         $mc = new MultiCurl();
-        $s = static function () {};
-        $e = static function () {};
-        $c = static function () {};
-        $b = static function () {};
+        $s = static function () {
+        };
+        $e = static function () {
+        };
+        $c = static function () {
+        };
+        $b = static function () {
+        };
 
         static::assertSame($mc, $mc->success($s));
         static::assertSame($mc, $mc->error($e));
@@ -57,7 +61,9 @@ final class ClientMultiAndPromiseTest extends TestCase
     {
         $mc = new MultiCurl();
         static::assertSame($mc, $mc->setRetry(3));
-        static::assertSame($mc, $mc->setRetry(static function () { return false; }));
+        static::assertSame($mc, $mc->setRetry(static function () {
+            return false;
+        }));
     }
 
     public function testMultiCurlAddCurl(): void
@@ -73,7 +79,9 @@ final class ClientMultiAndPromiseTest extends TestCase
         $mc = new MultiCurl();
         $curl = new Curl();
         $called = false;
-        $result = $mc->addDownload($curl, static function () use (&$called) { $called = true; });
+        $result = $mc->addDownload($curl, static function () use (&$called) {
+            $called = true;
+        });
         static::assertSame($curl, $result);
         static::assertIsResource($curl->getFileHandle());
     }
@@ -133,8 +141,12 @@ final class ClientMultiAndPromiseTest extends TestCase
         $rejected = false;
 
         $newPromise = $promise->then(
-            static function () use (&$completed) { $completed = true; },
-            static function () use (&$rejected) { $rejected = true; }
+            static function () use (&$completed) {
+                $completed = true;
+            },
+            static function () use (&$rejected) {
+                $rejected = true;
+            }
         );
 
         static::assertInstanceOf(MultiCurlPromise::class, $newPromise);
@@ -182,8 +194,10 @@ final class ClientMultiAndPromiseTest extends TestCase
 
     public function testClientMultiConstructWithCallbacks(): void
     {
-        $onSuccess = static function () {};
-        $onComplete = static function () {};
+        $onSuccess = static function () {
+        };
+        $onComplete = static function () {
+        };
         $cm = new ClientMulti($onSuccess, $onComplete);
         static::assertInstanceOf(MultiCurl::class, $cm->curlMulti);
     }
@@ -480,7 +494,9 @@ final class ClientMultiAndPromiseTest extends TestCase
     {
         $called = false;
         $req = Request::get('http://localhost:1349/')
-            ->beforeSend(static function () use (&$called) { $called = true; });
+            ->beforeSend(static function () use (&$called) {
+                $called = true;
+            });
         $req->_curlPrep();
         static::assertTrue($called);
     }
@@ -556,22 +572,27 @@ final class ClientMultiAndPromiseTest extends TestCase
     {
         $req = Request::get('http://localhost:1349/');
         $multiCurl = $req->initMulti(
-            static function () {},
-            static function () {}
+            static function () {
+            },
+            static function () {
+            }
         );
         static::assertInstanceOf(MultiCurl::class, $multiCurl);
     }
 
     public function testRequestGetSendCallback(): void
     {
-        $cb = static function () {};
+        $cb = static function () {
+        };
         $req = Request::get('http://localhost:1349/')->beforeSend($cb);
         static::assertContains($cb, $req->getSendCallback());
     }
 
     public function testRequestGetParseCallback(): void
     {
-        $cb = static function ($body) { return $body; };
+        $cb = static function ($body) {
+            return $body;
+        };
         $req = Request::get('http://localhost:1349/')->withParseCallback($cb);
         static::assertSame($cb, $req->getParseCallback());
         static::assertTrue($req->hasParseCallback());
diff --git a/tests/Httpful/ExtraCoverageExtendedTest.php b/tests/Httpful/ExtraCoverageExtendedTest.php
index 6632b915d41da1b930d5f245ecebf7af2c0a3348..e1b49730a5e5fc17d9e4a726e7e6aa11e9c2a1d5 100644
--- a/tests/Httpful/ExtraCoverageExtendedTest.php
+++ b/tests/Httpful/ExtraCoverageExtendedTest.php
@@ -59,9 +59,12 @@ final class ExtraCoverageExtendedTest extends TestCase
     public function testCurlSuccessErrorCompleteCallbacks(): void
     {
         $curl = $this->makeCurl();
-        $s = static function () {};
-        $e = static function () {};
-        $c = static function () {};
+        $s = static function () {
+        };
+        $e = static function () {
+        };
+        $c = static function () {
+        };
         $curl->success($s);
         $curl->error($e);
         $curl->complete($c);
@@ -73,7 +76,8 @@ final class ExtraCoverageExtendedTest extends TestCase
     public function testCurlBeforeSendCallback(): void
     {
         $curl = $this->makeCurl();
-        $cb = static function () {};
+        $cb = static function () {
+        };
         $curl->beforeSend($cb);
         static::assertSame($cb, $curl->getBeforeSendCallback());
     }
@@ -82,7 +86,9 @@ final class ExtraCoverageExtendedTest extends TestCase
     {
         $curl = $this->makeCurl();
         $called = false;
-        $cb = static function (Curl $c) use (&$called) { $called = true; };
+        $cb = static function (Curl $c) use (&$called) {
+            $called = true;
+        };
         $curl->call($cb);
         static::assertTrue($called);
     }
@@ -247,7 +253,9 @@ final class ExtraCoverageExtendedTest extends TestCase
     public function testCurlSetRetryCallable(): void
     {
         $curl = $this->makeCurl();
-        $decider = static function (Curl $c): bool { return $c->getAttempts() < 2; };
+        $decider = static function (Curl $c): bool {
+            return $c->getAttempts() < 2;
+        };
         $curl->setRetry($decider);
         static::assertSame($decider, $curl->getRetryDecider());
         static::assertSame(0, $curl->getRemainingRetries());
@@ -262,7 +270,8 @@ final class ExtraCoverageExtendedTest extends TestCase
     public function testCurlProgress(): void
     {
         $curl = $this->makeCurl();
-        $cb = static function () {};
+        $cb = static function () {
+        };
         static::assertSame($curl, $curl->progress($cb));
     }
 
@@ -335,7 +344,9 @@ final class ExtraCoverageExtendedTest extends TestCase
     {
         $curl = $this->makeCurl();
         $called = false;
-        $cb = static function () use (&$called) { $called = true; };
+        $cb = static function () use (&$called) {
+            $called = true;
+        };
         $result = $curl->download($cb);
         static::assertSame($curl, $result);
         static::assertIsResource($curl->getFileHandle());
@@ -838,8 +849,10 @@ final class ExtraCoverageExtendedTest extends TestCase
     public function testRequestBeforeSendAddsCallback(): void
     {
         $req = Request::get('http://example.com/')
-            ->beforeSend(static function () {})
-            ->beforeSend(static function () {});
+            ->beforeSend(static function () {
+            })
+            ->beforeSend(static function () {
+            });
         static::assertCount(2, $req->getSendCallback());
     }
 
diff --git a/tests/Httpful/ExtraCoverageTest.php b/tests/Httpful/ExtraCoverageTest.php
index a82774aebdcf6d21ce1124676b58e7157c79f96e..41753c1782751d0000f3d750bd792b4cf629bb29 100644
--- a/tests/Httpful/ExtraCoverageTest.php
+++ b/tests/Httpful/ExtraCoverageTest.php
@@ -15,7 +15,6 @@ use Httpful\Handlers\XmlMimeHandler;
 use Httpful\Headers;
 use Httpful\Http;
 use Httpful\Mime;
-use Httpful\Proxy;
 use Httpful\Request;
 use Httpful\Response;
 use Httpful\Stream;
@@ -186,7 +185,9 @@ final class ExtraCoverageTest extends TestCase
 
     public function testWithParseCallback(): void
     {
-        $callback = static function ($body) { return $body; };
+        $callback = static function ($body) {
+            return $body;
+        };
         $req = Request::get('http://example.com/')->withParseCallback($callback);
         static::assertTrue($req->hasParseCallback());
         static::assertSame($callback, $req->getParseCallback());
@@ -202,14 +203,17 @@ final class ExtraCoverageTest extends TestCase
     {
         $called = false;
         $req = Request::get('http://example.com/')
-            ->beforeSend(static function () use (&$called) { $called = true; });
+            ->beforeSend(static function () use (&$called) {
+                $called = true;
+            });
         static::assertCount(1, $req->getSendCallback());
     }
 
     public function testWithSendCallback(): void
     {
         $req = Request::get('http://example.com/')
-            ->withSendCallback(static function () {});
+            ->withSendCallback(static function () {
+            });
         static::assertCount(1, $req->getSendCallback());
     }
 
@@ -221,7 +225,8 @@ final class ExtraCoverageTest extends TestCase
 
     public function testWithErrorHandler(): void
     {
-        $handler = static function ($err) {};
+        $handler = static function ($err) {
+        };
         $req = Request::get('http://example.com/')->withErrorHandler($handler);
         static::assertSame($handler, $req->getErrorHandler());
     }
@@ -379,43 +384,43 @@ final class ExtraCoverageTest extends TestCase
 
     public function testExpectsVariousTypes(): void
     {
-        static::assertSame(Mime::getFullMime(Mime::CSV),    Request::get('http://example.com/')->expectsCsv()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::FORM),   Request::get('http://example.com/')->expectsForm()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::HTML),   Request::get('http://example.com/')->expectsHtml()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::JS),     Request::get('http://example.com/')->expectsJavascript()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::JS),     Request::get('http://example.com/')->expectsJs()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::JSON),   Request::get('http://example.com/')->expectsJson()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::PLAIN),  Request::get('http://example.com/')->expectsPlain()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::PLAIN),  Request::get('http://example.com/')->expectsText()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::CSV), Request::get('http://example.com/')->expectsCsv()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::FORM), Request::get('http://example.com/')->expectsForm()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::HTML), Request::get('http://example.com/')->expectsHtml()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::JS), Request::get('http://example.com/')->expectsJavascript()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::JS), Request::get('http://example.com/')->expectsJs()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::JSON), Request::get('http://example.com/')->expectsJson()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::PLAIN), Request::get('http://example.com/')->expectsPlain()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::PLAIN), Request::get('http://example.com/')->expectsText()->getExpectedType());
         static::assertSame(Mime::getFullMime(Mime::UPLOAD), Request::get('http://example.com/')->expectsUpload()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::XHTML),  Request::get('http://example.com/')->expectsXhtml()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::XML),    Request::get('http://example.com/')->expectsXml()->getExpectedType());
-        static::assertSame(Mime::getFullMime(Mime::YAML),   Request::get('http://example.com/')->expectsYaml()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::XHTML), Request::get('http://example.com/')->expectsXhtml()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::XML), Request::get('http://example.com/')->expectsXml()->getExpectedType());
+        static::assertSame(Mime::getFullMime(Mime::YAML), Request::get('http://example.com/')->expectsYaml()->getExpectedType());
     }
 
     public function testSendsVariousTypes(): void
     {
-        static::assertSame(Mime::getFullMime(Mime::CSV),    Request::get('http://example.com/')->sendsCsv()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::FORM),   Request::get('http://example.com/')->sendsForm()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::HTML),   Request::get('http://example.com/')->sendsHtml()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::JS),     Request::get('http://example.com/')->sendsJavascript()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::JS),     Request::get('http://example.com/')->sendsJs()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::JSON),   Request::get('http://example.com/')->sendsJson()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::PLAIN),  Request::get('http://example.com/')->sendsPlain()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::PLAIN),  Request::get('http://example.com/')->sendsText()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::CSV), Request::get('http://example.com/')->sendsCsv()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::FORM), Request::get('http://example.com/')->sendsForm()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::HTML), Request::get('http://example.com/')->sendsHtml()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::JS), Request::get('http://example.com/')->sendsJavascript()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::JS), Request::get('http://example.com/')->sendsJs()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::JSON), Request::get('http://example.com/')->sendsJson()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::PLAIN), Request::get('http://example.com/')->sendsPlain()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::PLAIN), Request::get('http://example.com/')->sendsText()->getContentType());
         static::assertSame(Mime::getFullMime(Mime::UPLOAD), Request::get('http://example.com/')->sendsUpload()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::XHTML),  Request::get('http://example.com/')->sendsXhtml()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::XML),    Request::get('http://example.com/')->sendsXml()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::XHTML), Request::get('http://example.com/')->sendsXhtml()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::XML), Request::get('http://example.com/')->sendsXml()->getContentType());
     }
 
     public function testWithContentTypeHelpers(): void
     {
-        static::assertSame(Mime::getFullMime(Mime::CSV),  Request::get('http://example.com/')->withContentTypeCsv()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::CSV), Request::get('http://example.com/')->withContentTypeCsv()->getContentType());
         static::assertSame(Mime::getFullMime(Mime::FORM), Request::get('http://example.com/')->withContentTypeForm()->getContentType());
         static::assertSame(Mime::getFullMime(Mime::HTML), Request::get('http://example.com/')->withContentTypeHtml()->getContentType());
         static::assertSame(Mime::getFullMime(Mime::JSON), Request::get('http://example.com/')->withContentTypeJson()->getContentType());
         static::assertSame(Mime::getFullMime(Mime::PLAIN), Request::get('http://example.com/')->withContentTypePlain()->getContentType());
-        static::assertSame(Mime::getFullMime(Mime::XML),  Request::get('http://example.com/')->withContentTypeXml()->getContentType());
+        static::assertSame(Mime::getFullMime(Mime::XML), Request::get('http://example.com/')->withContentTypeXml()->getContentType());
         static::assertSame(Mime::getFullMime(Mime::YAML), Request::get('http://example.com/')->withContentTypeYaml()->getContentType());
     }
 
@@ -674,7 +679,9 @@ final class ExtraCoverageTest extends TestCase
 
     public function testRegisterPayloadSerializer(): void
     {
-        $callback = static function ($p) { return json_encode($p); };
+        $callback = static function ($p) {
+            return json_encode($p);
+        };
         $req = Request::get('http://example.com/')
             ->registerPayloadSerializer(Mime::JSON, $callback);
         static::assertInstanceOf(Request::class, $req);
@@ -682,7 +689,9 @@ final class ExtraCoverageTest extends TestCase
 
     public function testWithSerializePayload(): void
     {
-        $callback = static function ($p) { return serialize($p); };
+        $callback = static function ($p) {
+            return serialize($p);
+        };
         $req = Request::get('http://example.com/')->withSerializePayload($callback);
         static::assertInstanceOf(Request::class, $req);
     }