github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change order of service providers

pull/9/head
Toby Zerner 2015-08-13 13:10:17 +09:30
parent f60c9d92ce
commit 46bd6b6232
3 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin.php
View File

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

2
api.php
View File

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

18
flarum/bootstrap.php
View File

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