Change order of service providers

admin.php

@@ -1,8 +1,6 @@
 <?php
 
 use Flarum\Core;
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
 use Zend\Diactoros\Server;
 use Zend\Stratigility\MiddlewarePipe;
 

api.php

@@ -1,8 +1,6 @@
 <?php
 
 use Flarum\Core;
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
 use Zend\Diactoros\Server;
 use Zend\Stratigility\MiddlewarePipe;
 

flarum/bootstrap.php

@@ -34,8 +34,8 @@ $app->instance('config', $config = new \Illuminate\Config\Repository([
         'port' => 25,
         'from' => ['address' => 'noreply@flarum.org', 'name' => 'Flarum Demo Forum'],
         'encryption' => 'tls',
-		'username' => '3041435124c4c166c',
-		'password' => 'a6949720835285',
+        'username' => '',
+        'password' => '',
         'sendmail' => '/usr/sbin/sendmail -bs',
         'pretend' => false,
     ],
@@ -87,25 +87,23 @@ $app->alias('cache', 'Illuminate\Contracts\Cache\Repository');
 
 // RegisterProviders
 $serviceProviders = [
+    'Flarum\Core\DatabaseServiceProvider',
+    'Flarum\Core\Settings\SettingsServiceProvider',
+    'Flarum\Locale\LocaleServiceProvider',
 
     'Illuminate\Bus\BusServiceProvider',
     'Illuminate\Filesystem\FilesystemServiceProvider',
     'Illuminate\Hashing\HashServiceProvider',
-	'Illuminate\Events\EventServiceProvider',
     'Illuminate\Mail\MailServiceProvider',
-	'Illuminate\Validation\ValidationServiceProvider',
     'Illuminate\View\ViewServiceProvider',
-
-	'Flarum\Core\DatabaseServiceProvider',
-
+    'Illuminate\Events\EventServiceProvider',
+    'Illuminate\Validation\ValidationServiceProvider',
 ];
 
 if (Core::isInstalled()) {
-	$serviceProviders[] = 'Flarum\Core\Settings\SettingsServiceProvider';
-	$serviceProviders[] = 'Flarum\Locale\LocaleServiceProvider';
-    $serviceProviders[] = 'Flarum\Support\ExtensionsServiceProvider';
     $serviceProviders[] = 'Flarum\Core\CoreServiceProvider';
     $serviceProviders[] = 'Flarum\Console\ConsoleServiceProvider';
+    $serviceProviders[] = 'Flarum\Support\ExtensionsServiceProvider';
 }
 
 foreach ($serviceProviders as $provider) {