From c0a51b340b84d9a038909e69461b39aeff19ff44 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 19 Dec 2018 22:17:44 +0100
Subject: [PATCH] Fix UpdateServiceProvider

- Shorten registration of routes
- Do not resolve view factory before booting
---
 framework/core/src/Update/UpdateServiceProvider.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/core/src/Update/UpdateServiceProvider.php b/framework/core/src/Update/UpdateServiceProvider.php
index 7fc93cdc0..4ef233101 100644
--- a/framework/core/src/Update/UpdateServiceProvider.php
+++ b/framework/core/src/Update/UpdateServiceProvider.php
@@ -23,10 +23,10 @@ class UpdateServiceProvider extends AbstractServiceProvider
     public function register()
     {
         $this->app->singleton('flarum.update.routes', function () {
-            return new RouteCollection;
+            $routes = new RouteCollection;
+            $this->populateRoutes($routes);
+            return $routes;
         });
-
-        $this->loadViewsFrom(__DIR__.'/../../views/install', 'flarum.update');
     }
 
     /**
@@ -34,7 +34,7 @@ class UpdateServiceProvider extends AbstractServiceProvider
      */
     public function boot()
     {
-        $this->populateRoutes($this->app->make('flarum.update.routes'));
+        $this->loadViewsFrom(__DIR__.'/../../views/install', 'flarum.update');
     }
 
     /**