Merge branch 'master' of github.com:flarum/core

This commit is contained in:
Daniël Klabbers 2019-09-11 11:59:10 +02:00
commit 55d7e86a38
3 changed files with 19 additions and 1 deletions

View File

@ -1,5 +1,14 @@
<?php <?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\Queue\Console; namespace Flarum\Queue\Console;
use Illuminate\Queue\Listener; use Illuminate\Queue\Listener;

View File

@ -1,5 +1,14 @@
<?php <?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\Queue; namespace Flarum\Queue;
use Illuminate\Queue\ListenerOptions; use Illuminate\Queue\ListenerOptions;

View File

@ -18,8 +18,8 @@ use Illuminate\Contracts\Queue\Factory;
use Illuminate\Queue\Connectors\ConnectorInterface; use Illuminate\Queue\Connectors\ConnectorInterface;
use Illuminate\Queue\Console as Commands; use Illuminate\Queue\Console as Commands;
use Illuminate\Queue\Failed\NullFailedJobProvider; use Illuminate\Queue\Failed\NullFailedJobProvider;
use Illuminate\Queue\SyncQueue;
use Illuminate\Queue\Listener as QueueListener; use Illuminate\Queue\Listener as QueueListener;
use Illuminate\Queue\SyncQueue;
use Illuminate\Queue\Worker; use Illuminate\Queue\Worker;
class QueueServiceProvider extends AbstractServiceProvider class QueueServiceProvider extends AbstractServiceProvider