From a14d65369245d8757f06a7a77144ba98f8e41266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@clue.engineering>
Date: Thu, 7 Jul 2022 11:43:18 +0200
Subject: [PATCH] Move all internal handlers to `Io` namespace

---
 src/AccessLogHandler.php                 | 1 +
 src/App.php                              | 5 +++++
 src/ErrorHandler.php                     | 1 +
 src/FilesystemHandler.php                | 2 ++
 src/{ => Io}/FiberHandler.php            | 2 +-
 src/{ => Io}/HtmlHandler.php             | 2 +-
 src/{ => Io}/MiddlewareHandler.php       | 2 +-
 src/{ => Io}/RedirectHandler.php         | 2 +-
 src/{ => Io}/RouteHandler.php            | 5 ++++-
 src/{ => Io}/SapiHandler.php             | 2 +-
 tests/AppMiddlewareTest.php              | 4 ++--
 tests/AppTest.php                        | 8 ++++----
 tests/{ => Io}/FiberHandlerTest.php      | 6 ++----
 tests/{ => Io}/HtmlHandlerTest.php       | 4 ++--
 tests/{ => Io}/MiddlewareHandlerTest.php | 4 ++--
 tests/{ => Io}/RedirectHandlerTest.php   | 4 ++--
 tests/{ => Io}/RouteHandlerTest.php      | 6 +++---
 tests/{ => Io}/SapiHandlerTest.php       | 4 ++--
 18 files changed, 37 insertions(+), 27 deletions(-)
 rename src/{ => Io}/FiberHandler.php (98%)
 rename src/{ => Io}/HtmlHandler.php (98%)
 rename src/{ => Io}/MiddlewareHandler.php (96%)
 rename src/{ => Io}/RedirectHandler.php (97%)
 rename src/{ => Io}/RouteHandler.php (96%)
 rename src/{ => Io}/SapiHandler.php (99%)
 rename tests/{ => Io}/FiberHandlerTest.php (97%)
 rename tests/{ => Io}/HtmlHandlerTest.php (96%)
 rename tests/{ => Io}/MiddlewareHandlerTest.php (98%)
 rename tests/{ => Io}/RedirectHandlerTest.php (98%)
 rename tests/{ => Io}/RouteHandlerTest.php (99%)
 rename tests/{ => Io}/SapiHandlerTest.php (99%)

diff --git a/src/AccessLogHandler.php b/src/AccessLogHandler.php
index 4b26259..6cecaba 100644
--- a/src/AccessLogHandler.php
+++ b/src/AccessLogHandler.php
@@ -2,6 +2,7 @@
 
 namespace FrameworkX;
 
+use FrameworkX\Io\SapiHandler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Http\Message\Response;
diff --git a/src/App.php b/src/App.php
index 94475be..5efb4c9 100644
--- a/src/App.php
+++ b/src/App.php
@@ -2,6 +2,11 @@
 
 namespace FrameworkX;
 
+use FrameworkX\Io\FiberHandler;
+use FrameworkX\Io\MiddlewareHandler;
+use FrameworkX\Io\RedirectHandler;
+use FrameworkX\Io\RouteHandler;
+use FrameworkX\Io\SapiHandler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use React\EventLoop\Loop;
diff --git a/src/ErrorHandler.php b/src/ErrorHandler.php
index 54bf577..39d691a 100644
--- a/src/ErrorHandler.php
+++ b/src/ErrorHandler.php
@@ -2,6 +2,7 @@
 
 namespace FrameworkX;
 
+use FrameworkX\Io\HtmlHandler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Http\Message\Response;
diff --git a/src/FilesystemHandler.php b/src/FilesystemHandler.php
index 5deaf47..be46c76 100644
--- a/src/FilesystemHandler.php
+++ b/src/FilesystemHandler.php
@@ -2,6 +2,8 @@
 
 namespace FrameworkX;
 
+use FrameworkX\Io\HtmlHandler;
+use FrameworkX\Io\RedirectHandler;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Http\Message\Response;
 
diff --git a/src/FiberHandler.php b/src/Io/FiberHandler.php
similarity index 98%
rename from src/FiberHandler.php
rename to src/Io/FiberHandler.php
index bc432dd..a9deff0 100644
--- a/src/FiberHandler.php
+++ b/src/Io/FiberHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FrameworkX;
+namespace FrameworkX\Io;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/src/HtmlHandler.php b/src/Io/HtmlHandler.php
similarity index 98%
rename from src/HtmlHandler.php
rename to src/Io/HtmlHandler.php
index e04874a..2eb0a94 100644
--- a/src/HtmlHandler.php
+++ b/src/Io/HtmlHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FrameworkX;
+namespace FrameworkX\Io;
 
 use Psr\Http\Message\ResponseInterface;
 use React\Http\Message\Response;
diff --git a/src/MiddlewareHandler.php b/src/Io/MiddlewareHandler.php
similarity index 96%
rename from src/MiddlewareHandler.php
rename to src/Io/MiddlewareHandler.php
index ad6990b..3feeea0 100644
--- a/src/MiddlewareHandler.php
+++ b/src/Io/MiddlewareHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FrameworkX;
+namespace FrameworkX\Io;
 
 use Psr\Http\Message\ServerRequestInterface;
 
diff --git a/src/RedirectHandler.php b/src/Io/RedirectHandler.php
similarity index 97%
rename from src/RedirectHandler.php
rename to src/Io/RedirectHandler.php
index 737d9c2..39ab3b9 100644
--- a/src/RedirectHandler.php
+++ b/src/Io/RedirectHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FrameworkX;
+namespace FrameworkX\Io;
 
 use Psr\Http\Message\ResponseInterface;
 use React\Http\Message\Response;
diff --git a/src/RouteHandler.php b/src/Io/RouteHandler.php
similarity index 96%
rename from src/RouteHandler.php
rename to src/Io/RouteHandler.php
index b920ada..5757d05 100644
--- a/src/RouteHandler.php
+++ b/src/Io/RouteHandler.php
@@ -1,11 +1,14 @@
 <?php
 
-namespace FrameworkX;
+namespace FrameworkX\Io;
 
 use FastRoute\DataGenerator\GroupCountBased as RouteGenerator;
 use FastRoute\Dispatcher\GroupCountBased as RouteDispatcher;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std as RouteParser;
+use FrameworkX\AccessLogHandler;
+use FrameworkX\Container;
+use FrameworkX\ErrorHandler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Promise\PromiseInterface;
diff --git a/src/SapiHandler.php b/src/Io/SapiHandler.php
similarity index 99%
rename from src/SapiHandler.php
rename to src/Io/SapiHandler.php
index ecf776c..57a9470 100644
--- a/src/SapiHandler.php
+++ b/src/Io/SapiHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FrameworkX;
+namespace FrameworkX\Io;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/tests/AppMiddlewareTest.php b/tests/AppMiddlewareTest.php
index 35fec4d..340f4e5 100644
--- a/tests/AppMiddlewareTest.php
+++ b/tests/AppMiddlewareTest.php
@@ -4,8 +4,8 @@
 
 use FrameworkX\AccessLogHandler;
 use FrameworkX\App;
-use FrameworkX\FiberHandler;
-use FrameworkX\RouteHandler;
+use FrameworkX\Io\FiberHandler;
+use FrameworkX\Io\RouteHandler;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/tests/AppTest.php b/tests/AppTest.php
index 24e8e0a..efe2333 100644
--- a/tests/AppTest.php
+++ b/tests/AppTest.php
@@ -6,10 +6,10 @@
 use FrameworkX\App;
 use FrameworkX\Container;
 use FrameworkX\ErrorHandler;
-use FrameworkX\FiberHandler;
-use FrameworkX\MiddlewareHandler;
-use FrameworkX\RouteHandler;
-use FrameworkX\SapiHandler;
+use FrameworkX\Io\FiberHandler;
+use FrameworkX\Io\MiddlewareHandler;
+use FrameworkX\Io\RouteHandler;
+use FrameworkX\Io\SapiHandler;
 use FrameworkX\Tests\Fixtures\InvalidAbstract;
 use FrameworkX\Tests\Fixtures\InvalidConstructorInt;
 use FrameworkX\Tests\Fixtures\InvalidConstructorIntersection;
diff --git a/tests/FiberHandlerTest.php b/tests/Io/FiberHandlerTest.php
similarity index 97%
rename from tests/FiberHandlerTest.php
rename to tests/Io/FiberHandlerTest.php
index 85edc4e..26837a2 100644
--- a/tests/FiberHandlerTest.php
+++ b/tests/Io/FiberHandlerTest.php
@@ -1,14 +1,12 @@
 <?php
 
-namespace Framework\Tests;
+namespace Framework\Tests\Io;
 
-use FrameworkX\FiberHandler;
+use FrameworkX\Io\FiberHandler;
 use PHPUnit\Framework\TestCase;
-use React\EventLoop\Loop;
 use React\Http\Message\Response;
 use React\Http\Message\ServerRequest;
 use React\Promise\Deferred;
-use React\Promise\Promise;
 use React\Promise\PromiseInterface;
 use function React\Async\await;
 use function React\Promise\reject;
diff --git a/tests/HtmlHandlerTest.php b/tests/Io/HtmlHandlerTest.php
similarity index 96%
rename from tests/HtmlHandlerTest.php
rename to tests/Io/HtmlHandlerTest.php
index ed29580..55204c7 100644
--- a/tests/HtmlHandlerTest.php
+++ b/tests/Io/HtmlHandlerTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Framework\Tests;
+namespace Framework\Tests\Io;
 
+use FrameworkX\Io\HtmlHandler;
 use PHPUnit\Framework\TestCase;
-use FrameworkX\HtmlHandler;
 
 class HtmlHandlerTest extends TestCase
 {
diff --git a/tests/MiddlewareHandlerTest.php b/tests/Io/MiddlewareHandlerTest.php
similarity index 98%
rename from tests/MiddlewareHandlerTest.php
rename to tests/Io/MiddlewareHandlerTest.php
index efe0b65..7fa75f3 100644
--- a/tests/MiddlewareHandlerTest.php
+++ b/tests/Io/MiddlewareHandlerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FrameworkX\Tests;
+namespace FrameworkX\Tests\Io;
 
-use FrameworkX\MiddlewareHandler;
+use FrameworkX\Io\MiddlewareHandler;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/tests/RedirectHandlerTest.php b/tests/Io/RedirectHandlerTest.php
similarity index 98%
rename from tests/RedirectHandlerTest.php
rename to tests/Io/RedirectHandlerTest.php
index 1a111c6..1f49146 100644
--- a/tests/RedirectHandlerTest.php
+++ b/tests/Io/RedirectHandlerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Framework\Tests;
+namespace Framework\Tests\Io;
 
-use FrameworkX\RedirectHandler;
+use FrameworkX\Io\RedirectHandler;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 
diff --git a/tests/RouteHandlerTest.php b/tests/Io/RouteHandlerTest.php
similarity index 99%
rename from tests/RouteHandlerTest.php
rename to tests/Io/RouteHandlerTest.php
index 7d112bc..ae5f0fa 100644
--- a/tests/RouteHandlerTest.php
+++ b/tests/Io/RouteHandlerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace FrameworkX\Tests;
+namespace FrameworkX\Tests\Io;
 
 use FastRoute\RouteCollector;
 use FrameworkX\Container;
-use FrameworkX\MiddlewareHandler;
-use FrameworkX\RouteHandler;
+use FrameworkX\Io\MiddlewareHandler;
+use FrameworkX\Io\RouteHandler;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/tests/SapiHandlerTest.php b/tests/Io/SapiHandlerTest.php
similarity index 99%
rename from tests/SapiHandlerTest.php
rename to tests/Io/SapiHandlerTest.php
index 14b7e60..277b95d 100644
--- a/tests/SapiHandlerTest.php
+++ b/tests/Io/SapiHandlerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FrameworkX\Tests;
+namespace FrameworkX\Tests\Io;
 
-use FrameworkX\SapiHandler;
+use FrameworkX\Io\SapiHandler;
 use PHPUnit\Framework\TestCase;
 use React\Http\Message\Response;
 use React\Stream\ThroughStream;