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

Merge branch 'evented-api'

pull/9/head
Toby Zerner 2015-07-21 10:41:23 +09:30
parent 39ec918232 1312c816b1
commit c8122c37f7
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api.php
View File

@ -10,9 +10,7 @@ use Zend\Stratigility\MiddlewarePipe;
$app = require __DIR__.'/system/bootstrap.php'; $app = require __DIR__.'/system/bootstrap.php';
// Set up everything we need for the API // Set up everything we need for the API
$app->instance('type', 'api');
$app->register('Flarum\Api\ApiServiceProvider'); $app->register('Flarum\Api\ApiServiceProvider');
$app->register('Flarum\Support\Extensions\ExtensionsServiceProvider');
// Build a middleware pipeline for the API // Build a middleware pipeline for the API
$api = new MiddlewarePipe(); $api = new MiddlewarePipe();

2
index.php
View File

@ -10,9 +10,7 @@ use Zend\Stratigility\MiddlewarePipe;
$app = require __DIR__.'/system/bootstrap.php'; $app = require __DIR__.'/system/bootstrap.php';
// Set up everything we need for the frontend // Set up everything we need for the frontend
$app->instance('type', 'forum');
$app->register('Flarum\Forum\ForumServiceProvider'); $app->register('Flarum\Forum\ForumServiceProvider');
$app->register('Flarum\Support\Extensions\ExtensionsServiceProvider');
// Build a middleware pipeline for Flarum // Build a middleware pipeline for Flarum
$flarum = new MiddlewarePipe(); $flarum = new MiddlewarePipe();

9
system/bootstrap.php
View File

@ -138,9 +138,12 @@ $serviceProviders = [
]; ];
if (Core::isInstalled()) { if (Core::isInstalled()) {
$serviceProviders[] = 'Flarum\Core\CoreServiceProvider'; $serviceProviders[] = 'Flarum\Core\DatabaseServiceProvider';
$serviceProviders[] = 'Flarum\Core\DatabaseServiceProvider'; $serviceProviders[] = 'Flarum\Core\Settings\SettingsServiceProvider';
$serviceProviders[] = 'Flarum\Console\ConsoleServiceProvider'; $serviceProviders[] = 'Flarum\Support\ExtensionsServiceProvider';
$serviceProviders[] = 'Flarum\Core\CoreServiceProvider';
$serviceProviders[] = 'Flarum\Locale\LocaleServiceProvider';
$serviceProviders[] = 'Flarum\Console\ConsoleServiceProvider';
} }
foreach ($serviceProviders as $provider) { foreach ($serviceProviders as $provider) {

2
system/core

@ -1 +1 @@
Subproject commit 22f91bb7e43ded9876a3749c56f23da0035711b9 Subproject commit 0cb3378658b4a6ff3b4a8d5a06378ae8b6c5b87a