mirror of
https://github.com/flarum/framework.git
synced 2025-02-24 12:38:40 +08:00
run the convert.sh script by CDK2020 to replace namespaces to be comp… (#8)
* run the convert.sh script by CDK2020 to replace namespaces to be compatible for beta8 * update docbloc to match updated namespace
This commit is contained in:
parent
e5bdcce36d
commit
efe07bd696
@ -9,7 +9,7 @@
|
|||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Core\Group;
|
use Flarum\Group\Group;
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
|
||||||
return Migration::addPermissions([
|
return Migration::addPermissions([
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
|
|
||||||
namespace Flarum\Approval\Access;
|
namespace Flarum\Approval\Access;
|
||||||
|
|
||||||
use Flarum\Core\Access\AbstractPolicy;
|
use Flarum\User\AbstractPolicy;
|
||||||
use Flarum\Core\User;
|
use Flarum\User\User;
|
||||||
use Flarum\Tags\Tag;
|
use Flarum\Tags\Tag;
|
||||||
|
|
||||||
class TagPolicy extends AbstractPolicy
|
class TagPolicy extends AbstractPolicy
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
|
|
||||||
namespace Flarum\Approval\Event;
|
namespace Flarum\Approval\Event;
|
||||||
|
|
||||||
use Flarum\Core\Post;
|
use Flarum\Post\Post;
|
||||||
use Flarum\Core\User;
|
use Flarum\User\User;
|
||||||
|
|
||||||
class PostWasApproved
|
class PostWasApproved
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Flarum\Approval\Listener;
|
namespace Flarum\Approval\Listener;
|
||||||
|
|
||||||
use Flarum\Event\ConfigureWebApp;
|
use Flarum\Frontend\Event\Rendering;
|
||||||
use Illuminate\Contracts\Events\Dispatcher;
|
use Illuminate\Contracts\Events\Dispatcher;
|
||||||
|
|
||||||
class AddClientAssets
|
class AddClientAssets
|
||||||
@ -21,13 +21,13 @@ class AddClientAssets
|
|||||||
*/
|
*/
|
||||||
public function subscribe(Dispatcher $events)
|
public function subscribe(Dispatcher $events)
|
||||||
{
|
{
|
||||||
$events->listen(ConfigureWebApp::class, [$this, 'addAssets']);
|
$events->listen(Rendering::class, [$this, 'addAssets']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param ConfigureClientView $event
|
* @param Rendering $event
|
||||||
*/
|
*/
|
||||||
public function addAssets(ConfigureWebApp $event)
|
public function addAssets(Rendering $event)
|
||||||
{
|
{
|
||||||
if ($event->isForum()) {
|
if ($event->isForum()) {
|
||||||
$event->addAssets([
|
$event->addAssets([
|
||||||
|
@ -11,10 +11,10 @@
|
|||||||
|
|
||||||
namespace Flarum\Approval\Listener;
|
namespace Flarum\Approval\Listener;
|
||||||
|
|
||||||
use Flarum\Api\Serializer\DiscussionBasicSerializer;
|
use Flarum\Api\Serializer\BasicDiscussionSerializer;
|
||||||
use Flarum\Api\Serializer\PostBasicSerializer;
|
use Flarum\Api\Serializer\BasicPostSerializer;
|
||||||
use Flarum\Api\Serializer\PostSerializer;
|
use Flarum\Api\Serializer\PostSerializer;
|
||||||
use Flarum\Event\PrepareApiAttributes;
|
use Flarum\Api\Event\Serializing;
|
||||||
use Illuminate\Contracts\Events\Dispatcher;
|
use Illuminate\Contracts\Events\Dispatcher;
|
||||||
|
|
||||||
class AddPostApprovalAttributes
|
class AddPostApprovalAttributes
|
||||||
@ -24,15 +24,15 @@ class AddPostApprovalAttributes
|
|||||||
*/
|
*/
|
||||||
public function subscribe(Dispatcher $events)
|
public function subscribe(Dispatcher $events)
|
||||||
{
|
{
|
||||||
$events->listen(PrepareApiAttributes::class, [$this, 'addApiAttributes']);
|
$events->listen(Serializing::class, [$this, 'addApiAttributes']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param PrepareApiAttributes $event
|
* @param Serializing $event
|
||||||
*/
|
*/
|
||||||
public function addApiAttributes(PrepareApiAttributes $event)
|
public function addApiAttributes(Serializing $event)
|
||||||
{
|
{
|
||||||
if ($event->isSerializer(DiscussionBasicSerializer::class)
|
if ($event->isSerializer(BasicDiscussionSerializer::class)
|
||||||
|| $event->isSerializer(PostBasicSerializer::class)) {
|
|| $event->isSerializer(PostBasicSerializer::class)) {
|
||||||
$event->attributes['isApproved'] = (bool) $event->model->is_approved;
|
$event->attributes['isApproved'] = (bool) $event->model->is_approved;
|
||||||
}
|
}
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
namespace Flarum\Approval\Listener;
|
namespace Flarum\Approval\Listener;
|
||||||
|
|
||||||
use Flarum\Approval\Event\PostWasApproved;
|
use Flarum\Approval\Event\PostWasApproved;
|
||||||
use Flarum\Core\Access\AssertPermissionTrait;
|
use Flarum\User\AssertPermissionTrait;
|
||||||
use Flarum\Event\PostWillBeSaved;
|
use Flarum\Post\Event\Saving;
|
||||||
use Illuminate\Contracts\Events\Dispatcher;
|
use Illuminate\Contracts\Events\Dispatcher;
|
||||||
|
|
||||||
class ApproveContent
|
class ApproveContent
|
||||||
@ -25,14 +25,14 @@ class ApproveContent
|
|||||||
*/
|
*/
|
||||||
public function subscribe(Dispatcher $events)
|
public function subscribe(Dispatcher $events)
|
||||||
{
|
{
|
||||||
$events->listen(PostWillBeSaved::class, [$this, 'approvePost']);
|
$events->listen(Saving::class, [$this, 'approvePost']);
|
||||||
$events->listen(PostWasApproved::class, [$this, 'approveDiscussion']);
|
$events->listen(PostWasApproved::class, [$this, 'approveDiscussion']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param PostWillBeSaved $event
|
* @param Saving $event
|
||||||
*/
|
*/
|
||||||
public function approvePost(PostWillBeSaved $event)
|
public function approvePost(Saving $event)
|
||||||
{
|
{
|
||||||
$attributes = $event->data['attributes'];
|
$attributes = $event->data['attributes'];
|
||||||
$post = $event->post;
|
$post = $event->post;
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Flarum\Approval\Listener;
|
namespace Flarum\Approval\Listener;
|
||||||
|
|
||||||
use Flarum\Core\Discussion;
|
use Flarum\Discussion\Discussion;
|
||||||
use Flarum\Event\ScopeHiddenDiscussionVisibility;
|
use Flarum\Event\ScopeHiddenDiscussionVisibility;
|
||||||
use Flarum\Event\ScopeModelVisibility;
|
use Flarum\Event\ScopeModelVisibility;
|
||||||
use Flarum\Event\ScopePostVisibility;
|
use Flarum\Event\ScopePostVisibility;
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
|
|
||||||
namespace Flarum\Approval\Listener;
|
namespace Flarum\Approval\Listener;
|
||||||
|
|
||||||
use Flarum\Core\Post;
|
use Flarum\Post\Post;
|
||||||
use Flarum\Event\ConfigureModelDefaultAttributes;
|
use Flarum\Event\ConfigureModelDefaultAttributes;
|
||||||
use Flarum\Event\PostWillBeSaved;
|
use Flarum\Post\Event\Saving;
|
||||||
use Flarum\Flags\Flag;
|
use Flarum\Flags\Flag;
|
||||||
use Illuminate\Contracts\Events\Dispatcher;
|
use Illuminate\Contracts\Events\Dispatcher;
|
||||||
|
|
||||||
@ -25,7 +25,7 @@ class UnapproveNewContent
|
|||||||
public function subscribe(Dispatcher $events)
|
public function subscribe(Dispatcher $events)
|
||||||
{
|
{
|
||||||
$events->listen(ConfigureModelDefaultAttributes::class, [$this, 'approveByDefault']);
|
$events->listen(ConfigureModelDefaultAttributes::class, [$this, 'approveByDefault']);
|
||||||
$events->listen(PostWillBeSaved::class, [$this, 'unapproveNewPosts']);
|
$events->listen(Saving::class, [$this, 'unapproveNewPosts']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -39,9 +39,9 @@ class UnapproveNewContent
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param PostWillBeSaved $event
|
* @param Saving $event
|
||||||
*/
|
*/
|
||||||
public function unapproveNewPosts(PostWillBeSaved $event)
|
public function unapproveNewPosts(Saving $event)
|
||||||
{
|
{
|
||||||
$post = $event->post;
|
$post = $event->post;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user