From d3d6d078c4457e541d5f9dc153898f43b1e3627a Mon Sep 17 00:00:00 2001 From: Dave Smith-Hayes Date: Tue, 15 Apr 2025 21:04:24 -0400 Subject: [PATCH] Move to the Handler naming and namespace the pages. --- app/composer.lock | 45 ++++++++++--------- .../Channel/CreateChannelAction.php | 6 +-- .../Channel/CreateEpisodeAction.php | 8 ++-- .../Episode/UploadEpisodeFileAction.php | 6 +-- .../Channel/Page}/CreateChannelPage.php | 6 +-- .../Controller.php => Handler/Handler.php} | 4 +- .../{Controller => Handler}/HealthCheck.php | 8 ++-- .../Page}/DashboardPage.php | 7 +-- .../{Controller => Handler/Page}/HomePage.php | 5 ++- .../User/LoginUserAction.php | 6 +-- .../User/LogoutUserAction.php | 6 +-- .../User/Page}/LoginUserPage.php | 6 +-- .../User/Page}/RegisterUserPage.php | 6 +-- .../User/RegisterUserAction.php | 6 +-- app/src/Routes.php | 22 ++++----- .../{ControllerTest.php => HandlerTest.php} | 12 ++--- 16 files changed, 82 insertions(+), 77 deletions(-) rename app/src/{Controller => Handler}/Channel/CreateChannelAction.php (93%) rename app/src/{Controller => Handler}/Channel/CreateEpisodeAction.php (84%) rename app/src/{Controller => Handler}/Channel/Episode/UploadEpisodeFileAction.php (80%) rename app/src/{Controller/Channel => Handler/Channel/Page}/CreateChannelPage.php (62%) rename app/src/{Controller/Controller.php => Handler/Handler.php} (98%) rename app/src/{Controller => Handler}/HealthCheck.php (82%) rename app/src/{Controller => Handler/Page}/DashboardPage.php (91%) rename app/src/{Controller => Handler/Page}/HomePage.php (62%) rename app/src/{Controller => Handler}/User/LoginUserAction.php (93%) rename app/src/{Controller => Handler}/User/LogoutUserAction.php (84%) rename app/src/{Controller/User => Handler/User/Page}/LoginUserPage.php (59%) rename app/src/{Controller/User => Handler/User/Page}/RegisterUserPage.php (76%) rename app/src/{Controller => Handler}/User/RegisterUserAction.php (89%) rename app/tests/Controller/{ControllerTest.php => HandlerTest.php} (91%) diff --git a/app/composer.lock b/app/composer.lock index fcddb95..161aad3 100644 --- a/app/composer.lock +++ b/app/composer.lock @@ -4341,26 +4341,29 @@ "packages-dev": [ { "name": "doctrine/deprecations", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9" + "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9", - "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", + "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, + "conflict": { + "phpunit/phpunit": "<=7.5 || >=13" + }, "require-dev": { - "doctrine/coding-standard": "^9 || ^12", - "phpstan/phpstan": "1.4.10 || 2.0.3", + "doctrine/coding-standard": "^9 || ^12 || ^13", + "phpstan/phpstan": "1.4.10 || 2.1.11", "phpstan/phpstan-phpunit": "^1.0 || ^2", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12", "psr/log": "^1 || ^2 || ^3" }, "suggest": { @@ -4380,9 +4383,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.4" + "source": "https://github.com/doctrine/deprecations/tree/1.1.5" }, - "time": "2024-12-07T21:18:45+00:00" + "time": "2025-04-07T20:06:18+00:00" }, { "name": "doctrine/instantiator", @@ -4745,16 +4748,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.1", + "version": "5.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8" + "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", - "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/92dde6a5919e34835c506ac8c523ef095a95ed62", + "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62", "shasum": "" }, "require": { @@ -4803,9 +4806,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.2" }, - "time": "2024-12-07T09:39:29+00:00" + "time": "2025-04-13T19:20:35+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -5362,16 +5365,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.15", + "version": "11.5.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c" + "reference": "fd2e863a2995cdfd864fb514b5e0b28b09895b5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c", - "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fd2e863a2995cdfd864fb514b5e0b28b09895b5c", + "reference": "fd2e863a2995cdfd864fb514b5e0b28b09895b5c", "shasum": "" }, "require": { @@ -5443,7 +5446,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.17" }, "funding": [ { @@ -5459,7 +5462,7 @@ "type": "tidelift" } ], - "time": "2025-03-23T16:02:11+00:00" + "time": "2025-04-08T07:59:11+00:00" }, { "name": "sebastian/cli-parser", diff --git a/app/src/Controller/Channel/CreateChannelAction.php b/app/src/Handler/Channel/CreateChannelAction.php similarity index 93% rename from app/src/Controller/Channel/CreateChannelAction.php rename to app/src/Handler/Channel/CreateChannelAction.php index eae7660..47fad9a 100644 --- a/app/src/Controller/Channel/CreateChannelAction.php +++ b/app/src/Handler/Channel/CreateChannelAction.php @@ -1,16 +1,16 @@ sessionManager->get('user'); diff --git a/app/src/Controller/Channel/Episode/UploadEpisodeFileAction.php b/app/src/Handler/Channel/Episode/UploadEpisodeFileAction.php similarity index 80% rename from app/src/Controller/Channel/Episode/UploadEpisodeFileAction.php rename to app/src/Handler/Channel/Episode/UploadEpisodeFileAction.php index ac6193e..bd7f9e6 100644 --- a/app/src/Controller/Channel/Episode/UploadEpisodeFileAction.php +++ b/app/src/Handler/Channel/Episode/UploadEpisodeFileAction.php @@ -1,13 +1,13 @@ renderInline( @@ -32,7 +32,7 @@ class ControllerTest extends TestCase public function testHtmlInlineResponseCodes(): void { - $testController = new class extends Controller { + $testController = new class extends Handler { public function handle(): Response { $response = $this->renderInline( @@ -57,7 +57,7 @@ class ControllerTest extends TestCase public function testJsonResponse(): void { - $testController = new class extends Controller { + $testController = new class extends Handler { public function handle(): Response { return $this->json([ 'data' => 'hello' ]); @@ -83,7 +83,7 @@ class ControllerTest extends TestCase */ public function testRenderSiteName(): void { - $testController = new class extends Controller { + $testController = new class extends Handler { public function handle(): Response { return $this->renderInline("

{{ site_name }}

"); @@ -104,7 +104,7 @@ class ControllerTest extends TestCase $app = $this->getAppInstance(); $session = $app->getContainer()->get(SessionInterface::class); - $testController = new class($session) extends Controller { + $testController = new class($session) extends Handler { protected SessionInterface $session; public function __construct(SessionInterface $session)