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

Properly use ServiceProvider extender

Browse Source
This commit is contained in:
Alexander Skvortsov
2020-12-08 13:00:55 -05:00
parent 358a19f3c1
commit ed3d5b25e4
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/pusher/extend.php
View File

@@ -11,9 +11,8 @@ use Flarum\Extend;
use Flarum\Post\Event\Posted; use Flarum\Post\Event\Posted;
use Flarum\Pusher\Api\Controller\AuthController; use Flarum\Pusher\Api\Controller\AuthController;
use Flarum\Pusher\Listener; use Flarum\Pusher\Listener;
use Flarum\Pusher\Provider\PusherProvider;
use Flarum\Pusher\PusherNotificationDriver; use Flarum\Pusher\PusherNotificationDriver;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Container\Container;
return [ return [
(new Extend\Frontend('forum')) (new Extend\Frontend('forum'))
@@ -38,22 +37,6 @@ return [
(new Extend\Event()) (new Extend\Event())
->listen(Posted::class, Listener\PushNewPost::class), ->listen(Posted::class, Listener\PushNewPost::class),
function (Container $container) { (new Extend\ServiceProvider())
$container->bind(Pusher::class, function ($app) { ->register(PusherProvider::class),
$settings = $app->make(SettingsRepositoryInterface::class);
$options = [];
if ($cluster = $settings->get('flarum-pusher.app_cluster')) {
$options['cluster'] = $cluster;
}
return new Pusher(
$settings->get('flarum-pusher.app_key'),
$settings->get('flarum-pusher.app_secret'),
$settings->get('flarum-pusher.app_id'),
$options
);
});
},
]; ];

29
extensions/pusher/src/Provider/PusherProvider.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
namespace Flarum\Pusher\Provider;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Settings\SettingsRepositoryInterface;
class PusherProvider extends AbstractServiceProvider
{
public function register()
{
$this->app->bind(\Pusher::class, function () {
$settings = $this->app->make(SettingsRepositoryInterface::class);
$options = [];
if ($cluster = $settings->get('flarum-pusher.app_cluster')) {
$options['cluster'] = $cluster;
}
return new \Pusher(
$settings->get('flarum-pusher.app_key'),
$settings->get('flarum-pusher.app_secret'),
$settings->get('flarum-pusher.app_id'),
$options
);
});
}
}