Merge branch 'master' into 1236-database-changes

# Conflicts:
#	src/Forum/Controller/IndexController.php
#	src/User/UserMetadataUpdater.php

src/Http/ControllerRouteHandler.php

@@ -25,13 +25,13 @@ class ControllerRouteHandler
     protected $container;
 
     /**
-     * @var string
+     * @var string|callable
      */
     protected $controller;
 
     /**
      * @param Container $container
-     * @param string $controller
+     * @param string|callable $controller
      */
     public function __construct(Container $container, $controller)
     {
@@ -54,12 +54,16 @@ class ControllerRouteHandler
     }
 
     /**
-     * @param string $class
+     * @param string|callable $class
      * @return RequestHandlerInterface
      */
     protected function resolveController($class)
     {
-        $controller = $this->container->make($class);
+        if (is_callable($class)) {
+            $controller = $this->container->call($class);
+        } else {
+            $controller = $this->container->make($class);
+        }
 
         if (! ($controller instanceof RequestHandlerInterface)) {
             throw new InvalidArgumentException(

src/Http/Middleware/SetLocale.php

@@ -46,6 +46,8 @@ class SetLocale implements Middleware
             $this->locales->setLocale($locale);
         }
 
+        $request = $request->withAttribute('locale', $this->locales->getLocale());
+
         return $handler->handle($request);
     }
 }

src/Http/RouteHandlerFactory.php

@@ -11,6 +11,7 @@
 
 namespace Flarum\Http;
 
+use Flarum\Frontend\Controller as FrontendController;
 use Illuminate\Contracts\Container\Container;
 
 class RouteHandlerFactory
@@ -29,11 +30,47 @@ class RouteHandlerFactory
     }
 
     /**
-     * @param string $controller
+     * @param string|callable $controller
      * @return ControllerRouteHandler
      */
     public function toController($controller)
     {
         return new ControllerRouteHandler($this->container, $controller);
     }
+
+    /**
+     * @param string $frontend
+     * @param string|null $content
+     * @return ControllerRouteHandler
+     */
+    public function toFrontend(string $frontend, string $content = null)
+    {
+        return $this->toController(function (Container $container) use ($frontend, $content) {
+            $frontend = $container->make($frontend);
+
+            if ($content) {
+                $frontend->add($container->make($content));
+            }
+
+            return new FrontendController($frontend);
+        });
+    }
+
+    /**
+     * @param string|null $content
+     * @return ControllerRouteHandler
+     */
+    public function toForum(string $content = null)
+    {
+        return $this->toFrontend('flarum.forum.frontend', $content);
+    }
+
+    /**
+     * @param string|null $content
+     * @return ControllerRouteHandler
+     */
+    public function toAdmin(string $content = null)
+    {
+        return $this->toFrontend('flarum.admin.frontend', $content);
+    }
 }