github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 06:23:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of Compat extender

Browse Source 
Now that we support any form of callable to be returned from the
bootstrap.php files, it is no longer needed.
This commit is contained in:
Franz Liedke 2018-01-09 22:35:40 +01:00
parent 37c29a14e5
commit d7536d4f50
2 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
framework/core/src/Extend/Compat.php
View File

@ -1,38 +0,0 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Flarum\Extend;
use Illuminate\Contracts\Container\Container;
/**
* This class is used to wrap old bootstrap.php closures (as used in versions up
* to 0.1.0-beta7) in the new Extender format.
*
* This gives extensions the chance to work with the new API without making any
* changes, and have some time to convert to the pure usage of extenders.
*
* @deprecated
*/
class Compat
{
protected $callback;
public function __construct($callback)
{
$this->callback = $callback;
}
public function __invoke(Container $container)
{
$container->call($this->callback);
}
}

10
framework/core/src/Extension/ExtensionManager.php
View File

@ -12,7 +12,6 @@
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;
@ -286,14 +285,7 @@ class ExtensionManager
if ($this->filesystem->exists($bootstrapper)) {
$extenders = require $bootstrapper;
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)];
return (array) $extenders;
} else {
return [];
}