mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-25 02:31:17 +02:00
Code Issues Releases Wiki Activity

Re-introduce Compat extender

Browse Source 
Turns out Container::call() does not work with invokable classes.
Thus, we need to wrap callables in a custom extender class to
support injecting any resolvable type-hint automatically.

Refs #851.
This commit is contained in:
Franz Liedke
2018-01-10 19:32:57 +01:00
parent 1c1cefa017
commit 0af97c427c
7 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Extension/ExtensionManager.php
View File

@@ -12,6 +12,7 @@
namespace Flarum\Extension;
use Flarum\Database\Migrator;
use Flarum\Extend\Compat;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Disabling;
use Flarum\Extension\Event\Enabled;
@@ -285,7 +286,14 @@ class ExtensionManager
if ($this->filesystem->exists($bootstrapper)) {
$extenders = require $bootstrapper;
return (array) $extenders;
if (is_array($extenders)) {
return $extenders;
}
// Assume that the extension has not yet switched to the new
// bootstrap.php format, and wrap the callback in a Compat
// extender.
return [new Compat($extenders)];
} else {
return [];
}