getphred/Atlas
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor: restructure into proper directory hierarchy

Browse source 
- Move Config class to src/Config/Config.php
- Move exception classes to src/Exception/
- Move Router components to src/Router/
- Update test files with proper namespace references
This commit is contained in:
Funky Waddle 2026-02-13 17:26:31 -06:00
parent 29980d8bc6
commit 30f84a5023
13 changed files with 67 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -25,6 +25,7 @@
},
"autoload-dev": {
"psr-4": {
"Atlas\\": "src/",
"Atlas\\Tests\\": "tests/"
}
},

2
src/Config.php → src/Config/Config.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Config;
use ArrayAccess;
use IteratorAggregate;

2
src/MissingConfigurationException.php → src/Exception/MissingConfigurationException.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Exception;
class MissingConfigurationException extends \RuntimeException
{

2
src/NotFoundRouteException.php → src/Exception/NotFoundRouteException.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Exception;
class NotFoundRouteException extends \RuntimeException
{

2
src/RouteNotFoundException.php → src/Exception/RouteNotFoundException.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Exception;
class RouteNotFoundException extends \RuntimeException
{

2
src/RouteValidationException.php → src/Exception/RouteValidationException.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Exception;
class RouteValidationException extends \RuntimeException
{

2
src/Route.php → src/Router/Route.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Router;
use Psr\Http\Message\ServerRequestInterface;

2
src/RouteDefinition.php → src/Router/RouteDefinition.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Router;
use Psr\Http\Message\UriInterface;

2
src/RouteGroup.php → src/Router/RouteGroup.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Router;
class RouteGroup
{

7
src/Router.php → src/Router/Router.php
View file

@ -1,6 +1,6 @@
<?php
namespace Atlas;
namespace Atlas\Router;
use Psr\Http\Message\ServerRequestInterface;
@ -10,8 +10,9 @@ class Router
protected mixed $fallbackHandler = null;
public function __construct(
private readonly Config $config
) {}
private readonly Config\Config $config
) {
}
public function get(string $path, string|callable $handler, string|null $name = null): self
{

42
tests/Unit/ErrorHandlingTest.php
View file

@ -2,7 +2,7 @@
namespace Atlas\Tests\Unit;
use Atlas\Router;
use Atlas\Router\Router;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\UriInterface;
@ -11,11 +11,11 @@ final class ErrorHandlingTest extends TestCase
{
public function testMatchOrFailThrowsExceptionWhenNoRouteFound(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$uri = $this->createMock(UriInterface::class);
$uri->method('getPath')->willReturn('/nonexistent');
@ -27,18 +27,18 @@ final class ErrorHandlingTest extends TestCase
$request->method('getMethod')->willReturn('GET');
$request->method('getUri')->willReturn($uri);
$this->expectException(\Atlas\NotFoundRouteException::class);
$this->expectException(\Atlas\Exception\NotFoundRouteException::class);
$router->matchOrFail($request);
}
public function testMatchReturnsNullWhenNoRouteFound(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$uri = $this->createMock(UriInterface::class);
$uri->method('getPath')->willReturn('/nonexistent');
@ -57,40 +57,38 @@ final class ErrorHandlingTest extends TestCase
public function testRouteChainingWithDifferentHttpMethods(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$result = new \Atlas\Router\Router($config)->get('/test', 'GetHandler')->post('/test', 'PostHandler');
$result = $router->get('/test', 'GetHandler')->post('/test', 'PostHandler');
$this->assertTrue($result instanceof Router);
$this->assertCount(2, $router->getRoutes());
$this->assertTrue($result instanceof \Atlas\Router\Router);
$this->assertCount(2, $result->getRoutes());
}
public function testMatchUsingRouteDefinition(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/test', 'TestMethod');
$routes = $router->getRoutes();
$this->assertCount(1, $routes);
$this->assertInstanceOf(\Atlas\RouteDefinition::class, $routes[0]);
$this->assertInstanceOf(\Atlas\Router\RouteDefinition::class, $routes[0]);
}
public function testCaseInsensitiveHttpMethodMatching(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/test', 'TestHandler');
@ -111,11 +109,11 @@ final class ErrorHandlingTest extends TestCase
public function testPathNormalizationLeadingSlashes(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/test', 'TestHandler');
@ -136,11 +134,11 @@ final class ErrorHandlingTest extends TestCase
public function testMatchOrFailThrowsExceptionForMultipleRoutes(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/test', 'TestHandler');
@ -156,6 +154,6 @@ final class ErrorHandlingTest extends TestCase
$matchedRoute = $router->matchOrFail($request);
$this->assertInstanceOf(\Atlas\RouteDefinition::class, $matchedRoute);
$this->assertInstanceOf(\Atlas\Router\RouteDefinition::class, $matchedRoute);
}
}

37
tests/Unit/RouteMatcherTest.php
View file

@ -2,7 +2,7 @@
namespace Atlas\Tests\Unit;
use Atlas\Router;
use Atlas\Router\Router;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\UriInterface;
@ -11,11 +11,11 @@ final class RouteMatcherTest extends TestCase
{
public function testReturnsRouteOnSuccessfulMatch(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/hello', 'HelloWorldHandler');
@ -31,18 +31,18 @@ final class RouteMatcherTest extends TestCase
$matchedRoute = $router->match($request);
$this->assertInstanceOf(\Atlas\RouteDefinition::class, $matchedRoute);
$this->assertInstanceOf(\Atlas\Router\RouteDefinition::class, $matchedRoute);
$this->assertSame('/hello', $matchedRoute->getPath());
$this->assertSame('HelloWorldHandler', $matchedRoute->getHandler());
}
public function testReturnsNullOnNoMatch(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/test', 'Handler');
@ -61,13 +61,13 @@ final class RouteMatcherTest extends TestCase
$this->assertNull($matchedRoute);
}
public function testHttpMethodMatchingCaseInsensitive(): void
public function testCaseInsensitiveHttpMethodMatching(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/test', 'Handler');
@ -88,11 +88,11 @@ final class RouteMatcherTest extends TestCase
public function testRouteCollectionIteratesCorrectly(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/route1', 'Handler1');
$router->post('/route2', 'Handler2');
@ -102,31 +102,32 @@ final class RouteMatcherTest extends TestCase
$routeArray = iterator_to_array($routes);
$this->assertCount(2, $routeArray);
$this->assertInstanceOf(\Atlas\RouteDefinition::class, $routeArray[0]);
$this->assertInstanceOf(\Atlas\RouteDefinition::class, $routeArray[1]);
$this->assertInstanceOf(\Atlas\Router\RouteDefinition::class, $routeArray[0]);
$this->assertInstanceOf(\Atlas\Router\RouteDefinition::class, $routeArray[1]);
}
public function testUrlGenerationWithNamedRoute(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/users', 'UserListHandler', 'user_list');
$url = $router->url('user_list');
$this->assertSame('/users', $url);
}
public function testHttpMethodsReturnSameInstanceForChaining(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$methodsResult = $router
->get('/get', 'Handler')
@ -135,6 +136,6 @@ final class RouteMatcherTest extends TestCase
->patch('/patch', 'Handler')
->delete('/delete', 'Handler');
$this->assertTrue($methodsResult instanceof Router);
$this->assertTrue($methodsResult instanceof \Atlas\Router\Router);
}
}

30
tests/Unit/RouterBasicTest.php
View file

@ -2,30 +2,30 @@
namespace Atlas\Tests\Unit;
use Atlas\Router;
use Atlas\Router\Router;
use PHPUnit\Framework\TestCase;
class RouterBasicTest extends TestCase
{
public function testRouterCanBeCreatedWithValidConfig(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules'],
'routes_file' => 'routes.php'
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$this->assertInstanceOf(Router::class, $router);
$this->assertInstanceOf(\Atlas\Router\Router::class, $router);
}
public function testRouterCanCreateSimpleRoute(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/hello', function() {
return 'Hello World';
@ -36,31 +36,31 @@ class RouterBasicTest extends TestCase
public function testRouterReturnsSameInstanceForChaining(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$result = $router->get('/get', 'handler')->post('/post', 'handler');
$this->assertTrue($result instanceof Router);
$this->assertTrue($result instanceof \Atlas\Router\Router);
}
public function testRouteHasCorrectProperties(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/test', 'test_handler', 'test_route');
$routes = $router->getRoutes();
$route = $routes[0] ?? null;
$this->assertInstanceOf(\Atlas\RouteDefinition::class, $route);
$this->assertInstanceOf(\Atlas\Router\RouteDefinition::class, $route);
$this->assertSame('GET', $route->getMethod());
$this->assertSame('/test', $route->getPath());
$this->assertSame('test_handler', $route->getHandler());
@ -72,18 +72,18 @@ class RouterBasicTest extends TestCase
public function testRouteNormalizesPath(): void
{
$config = new \Atlas\Config([
$config = new \Atlas\Tests\Config\Config([
'modules_path' => ['/path/to/modules']
]);
$router = new Router($config);
$router = new \Atlas\Router\Router($config);
$router->get('/api/test', 'handler');
$routes = $router->getRoutes();
$route = $routes[0] ?? null;
$this->assertInstanceOf(\Atlas\RouteDefinition::class, $route);
$this->assertInstanceOf(\Atlas\Router\RouteDefinition::class, $route);
$this->assertSame('/api/test', $route->getPath());
}
}