mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00
Code Issues Releases Wiki Activity

Deprecate AssertPermissionTrait (#2044)

Browse Source
This commit is contained in:
Alexander Skvortsov
2020-07-17 09:16:15 -04:00
committed by GitHub
parent 2b3dec2be1
commit eaac78650f
36 changed files with 103 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Group/Command/CreateGroupHandler.php
View File

@@ -13,14 +13,12 @@ use Flarum\Foundation\DispatchEventsTrait;
use Flarum\Group\Event\Saving;
use Flarum\Group\Group;
use Flarum\Group\GroupValidator;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Support\Arr;
class CreateGroupHandler
{
use DispatchEventsTrait;
use AssertPermissionTrait;
/**
* @var \Flarum\Group\GroupValidator
@@ -47,8 +45,8 @@ class CreateGroupHandler
$actor = $command->actor;
$data = $command->data;
$this->assertRegistered($actor);
$this->assertCan($actor, 'createGroup');
$actor->assertRegistered();
$actor->assertCan('createGroup');
$group = Group::build(
Arr::get($data, 'attributes.nameSingular'),

4
src/Group/Command/DeleteGroupHandler.php
View File

@@ -12,14 +12,12 @@ namespace Flarum\Group\Command;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\Group\Event\Deleting;
use Flarum\Group\GroupRepository;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Exception\PermissionDeniedException;
use Illuminate\Contracts\Events\Dispatcher;
class DeleteGroupHandler
{
use DispatchEventsTrait;
use AssertPermissionTrait;
/**
* @var GroupRepository
@@ -46,7 +44,7 @@ class DeleteGroupHandler
$group = $this->groups->findOrFail($command->groupId, $actor);
$this->assertCan($actor, 'delete', $group);
$actor->assertCan('delete', $group);
$this->events->dispatch(
new Deleting($group, $actor, $command->data)

4
src/Group/Command/EditGroupHandler.php
View File

@@ -14,7 +14,6 @@ use Flarum\Group\Event\Saving;
use Flarum\Group\Group;
use Flarum\Group\GroupRepository;
use Flarum\Group\GroupValidator;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Exception\PermissionDeniedException;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Support\Arr;
@@ -22,7 +21,6 @@ use Illuminate\Support\Arr;
class EditGroupHandler
{
use DispatchEventsTrait;
use AssertPermissionTrait;
/**
* @var \Flarum\Group\GroupRepository
@@ -58,7 +56,7 @@ class EditGroupHandler
$group = $this->groups->findOrFail($command->groupId, $actor);
$this->assertCan($actor, 'edit', $group);
$actor->assertCan('edit', $group);
$attributes = Arr::get($data, 'attributes', []);