Flatten Flarum\Http namespace

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

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) {

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;

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) {

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)
     {

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

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) {

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;

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;
 

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;

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