mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-18 10:16:09 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into psr-7

Browse Source 
Conflicts:
	src/Api/Actions/Discussions/IndexAction.php
	src/Api/Actions/SerializeAction.php
	src/Core/Formatter/FormatterManager.php
	src/Extend/ForumAssets.php
	src/Forum/Actions/IndexAction.php
	src/Forum/ForumServiceProvider.php
This commit is contained in:
Franz Liedke
2015-06-17 00:52:50 +02:00
parent ffb28838b5 d1e7453ffd
commit 1cbc60ca41
91 changed files with 1381 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Support/ServiceProvider.php
View File

@@ -17,8 +17,14 @@ class ServiceProvider extends IlluminateServiceProvider
public function extend()
{
foreach (func_get_args() as $extender) {
$extender->extend($this->app);
// @todo don't support func_get_args
foreach (func_get_args() as $extenders) {
if (! is_array($extenders)) {
$extenders = [$extenders];
}
foreach ($extenders as $extender) {
$extender->extend($this->app);
}
}
}
}