Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/AccessLogHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions src/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/ErrorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/FilesystemHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace FrameworkX;

use FrameworkX\Io\HtmlHandler;
use FrameworkX\Io\RedirectHandler;
use Psr\Http\Message\ServerRequestInterface;
use React\Http\Message\Response;

Expand Down
2 changes: 1 addition & 1 deletion src/FiberHandler.php → src/Io/FiberHandler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace FrameworkX;
namespace FrameworkX\Io;

use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
Expand Down
2 changes: 1 addition & 1 deletion src/HtmlHandler.php → src/Io/HtmlHandler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace FrameworkX;
namespace FrameworkX\Io;

use Psr\Http\Message\ResponseInterface;
use React\Http\Message\Response;
Expand Down
2 changes: 1 addition & 1 deletion src/MiddlewareHandler.php → src/Io/MiddlewareHandler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace FrameworkX;
namespace FrameworkX\Io;

use Psr\Http\Message\ServerRequestInterface;

Expand Down
2 changes: 1 addition & 1 deletion src/RedirectHandler.php → src/Io/RedirectHandler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace FrameworkX;
namespace FrameworkX\Io;

use Psr\Http\Message\ResponseInterface;
use React\Http\Message\Response;
Expand Down
5 changes: 4 additions & 1 deletion src/RouteHandler.php → src/Io/RouteHandler.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/SapiHandler.php → src/Io/SapiHandler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace FrameworkX;
namespace FrameworkX\Io;

use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
Expand Down
4 changes: 2 additions & 2 deletions tests/AppMiddlewareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions tests/AppTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions tests/FiberHandlerTest.php → tests/Io/FiberHandlerTest.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tests/HtmlHandlerTest.php → tests/Io/HtmlHandlerTest.php
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions tests/RouteHandlerTest.php → tests/Io/RouteHandlerTest.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tests/SapiHandlerTest.php → tests/Io/SapiHandlerTest.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down