From d0b5aa2338fd706ae945cca7ce5e423d58dd4eb2 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 24 Jun 2017 13:19:56 +0200 Subject: [PATCH] Flatten Flarum\Http namespace --- framework/core/src/Admin/AdminServiceProvider.php | 2 +- framework/core/src/Admin/routes.php | 2 +- framework/core/src/Api/ApiServiceProvider.php | 2 +- framework/core/src/Api/routes.php | 2 +- framework/core/src/Event/AbstractConfigureRoutes.php | 4 ++-- framework/core/src/Forum/ForumServiceProvider.php | 2 +- framework/core/src/Forum/routes.php | 2 +- .../core/src/Http/{Handler => }/ControllerRouteHandler.php | 2 +- framework/core/src/Http/{Handler => }/RouteHandlerFactory.php | 2 +- framework/core/src/Install/InstallServiceProvider.php | 2 +- framework/core/src/Update/UpdateServiceProvider.php | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) rename framework/core/src/Http/{Handler => }/ControllerRouteHandler.php (98%) rename framework/core/src/Http/{Handler => }/RouteHandlerFactory.php (95%) diff --git a/framework/core/src/Admin/AdminServiceProvider.php b/framework/core/src/Admin/AdminServiceProvider.php index 87e784816..8d9b0cda1 100644 --- a/framework/core/src/Admin/AdminServiceProvider.php +++ b/framework/core/src/Admin/AdminServiceProvider.php @@ -15,7 +15,7 @@ use Flarum\Event\ExtensionWasDisabled; use Flarum\Event\ExtensionWasEnabled; use Flarum\Settings\Event\Saved; use Flarum\Foundation\AbstractServiceProvider; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; class AdminServiceProvider extends AbstractServiceProvider diff --git a/framework/core/src/Admin/routes.php b/framework/core/src/Admin/routes.php index 76f1aad4a..f2a04f74b 100644 --- a/framework/core/src/Admin/routes.php +++ b/framework/core/src/Admin/routes.php @@ -10,7 +10,7 @@ */ use Flarum\Admin\Controller; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; return function (RouteCollection $map, RouteHandlerFactory $route) { diff --git a/framework/core/src/Api/ApiServiceProvider.php b/framework/core/src/Api/ApiServiceProvider.php index 24020af42..8e524324f 100644 --- a/framework/core/src/Api/ApiServiceProvider.php +++ b/framework/core/src/Api/ApiServiceProvider.php @@ -17,7 +17,7 @@ use Flarum\Api\Serializer\NotificationSerializer; use Flarum\Event\ConfigureApiRoutes; use Flarum\Event\ConfigureNotificationTypes; use Flarum\Foundation\AbstractServiceProvider; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; use Tobscure\JsonApi\ErrorHandler; use Tobscure\JsonApi\Exception\Handler\FallbackExceptionHandler; diff --git a/framework/core/src/Api/routes.php b/framework/core/src/Api/routes.php index 0203b6131..f394141a7 100644 --- a/framework/core/src/Api/routes.php +++ b/framework/core/src/Api/routes.php @@ -10,7 +10,7 @@ */ use Flarum\Api\Controller; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; return function (RouteCollection $map, RouteHandlerFactory $route) { diff --git a/framework/core/src/Event/AbstractConfigureRoutes.php b/framework/core/src/Event/AbstractConfigureRoutes.php index fbd8d175c..fec628648 100644 --- a/framework/core/src/Event/AbstractConfigureRoutes.php +++ b/framework/core/src/Event/AbstractConfigureRoutes.php @@ -11,7 +11,7 @@ namespace Flarum\Event; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; abstract class AbstractConfigureRoutes @@ -28,7 +28,7 @@ abstract class AbstractConfigureRoutes /** * @param RouteCollection $routes - * @param RouteHandlerFactory $route + * @param \Flarum\Http\RouteHandlerFactory $route */ public function __construct(RouteCollection $routes, RouteHandlerFactory $route) { diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php index 4504443b4..69e684c22 100644 --- a/framework/core/src/Forum/ForumServiceProvider.php +++ b/framework/core/src/Forum/ForumServiceProvider.php @@ -16,7 +16,7 @@ use Flarum\Event\ExtensionWasDisabled; use Flarum\Event\ExtensionWasEnabled; use Flarum\Settings\Event\Saved; use Flarum\Foundation\AbstractServiceProvider; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; class ForumServiceProvider extends AbstractServiceProvider diff --git a/framework/core/src/Forum/routes.php b/framework/core/src/Forum/routes.php index 96e26dc3a..028fe37dd 100644 --- a/framework/core/src/Forum/routes.php +++ b/framework/core/src/Forum/routes.php @@ -10,7 +10,7 @@ */ use Flarum\Forum\Controller; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; return function (RouteCollection $map, RouteHandlerFactory $route) { diff --git a/framework/core/src/Http/Handler/ControllerRouteHandler.php b/framework/core/src/Http/ControllerRouteHandler.php similarity index 98% rename from framework/core/src/Http/Handler/ControllerRouteHandler.php rename to framework/core/src/Http/ControllerRouteHandler.php index 6e2f4855a..b65e106de 100644 --- a/framework/core/src/Http/Handler/ControllerRouteHandler.php +++ b/framework/core/src/Http/ControllerRouteHandler.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Http\Handler; +namespace Flarum\Http; use Flarum\Http\Controller\ControllerInterface; use Illuminate\Contracts\Container\Container; diff --git a/framework/core/src/Http/Handler/RouteHandlerFactory.php b/framework/core/src/Http/RouteHandlerFactory.php similarity index 95% rename from framework/core/src/Http/Handler/RouteHandlerFactory.php rename to framework/core/src/Http/RouteHandlerFactory.php index a225fc2ac..4831bb39c 100644 --- a/framework/core/src/Http/Handler/RouteHandlerFactory.php +++ b/framework/core/src/Http/RouteHandlerFactory.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Http\Handler; +namespace Flarum\Http; use Illuminate\Contracts\Container\Container; diff --git a/framework/core/src/Install/InstallServiceProvider.php b/framework/core/src/Install/InstallServiceProvider.php index e796f3895..26c089c06 100644 --- a/framework/core/src/Install/InstallServiceProvider.php +++ b/framework/core/src/Install/InstallServiceProvider.php @@ -12,7 +12,7 @@ namespace Flarum\Install; use Flarum\Foundation\AbstractServiceProvider; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; use Flarum\Install\Prerequisite\Composite; use Flarum\Install\Prerequisite\PhpExtensions; diff --git a/framework/core/src/Update/UpdateServiceProvider.php b/framework/core/src/Update/UpdateServiceProvider.php index 17b225f35..f45364230 100644 --- a/framework/core/src/Update/UpdateServiceProvider.php +++ b/framework/core/src/Update/UpdateServiceProvider.php @@ -12,7 +12,7 @@ namespace Flarum\Update; use Flarum\Foundation\AbstractServiceProvider; -use Flarum\Http\Handler\RouteHandlerFactory; +use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteCollection; class UpdateServiceProvider extends AbstractServiceProvider