mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-18 14:22:02 +02:00
Code Issues Releases Wiki Activity

Removes AssertPermissionTrait (#90)

Browse Source 
* Removes AssertPermissionTrait

* Apply fixes from StyleCI

Co-authored-by: luceos <daniel+github@klabbers.email>
This commit is contained in:
Matt Kilgore
2020-07-19 17:37:27 -04:00
committed by GitHub
parent b033b61164
commit 2237e597d0
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/tags/src/Api/Controller/OrderTagsController.php
View File

@@ -10,7 +10,6 @@
namespace Flarum\Tags\Api\Controller; namespace Flarum\Tags\Api\Controller;
use Flarum\Tags\Tag; use Flarum\Tags\Tag;
use Flarum\User\AssertPermissionTrait;
use Laminas\Diactoros\Response\EmptyResponse; use Laminas\Diactoros\Response\EmptyResponse;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
@@ -18,14 +17,12 @@ use Psr\Http\Server\RequestHandlerInterface;
class OrderTagsController implements RequestHandlerInterface class OrderTagsController implements RequestHandlerInterface
{ {
use AssertPermissionTrait;
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function handle(ServerRequestInterface $request): ResponseInterface public function handle(ServerRequestInterface $request): ResponseInterface
{ {
$this->assertAdmin($request->getAttribute('actor')); $request->getAttribute('actor')->assertAdmin();
$order = array_get($request->getParsedBody(), 'order'); $order = array_get($request->getParsedBody(), 'order');

5
extensions/tags/src/Command/CreateTagHandler.php
View File

@@ -12,12 +12,9 @@ namespace Flarum\Tags\Command;
use Flarum\Tags\Event\Creating; use Flarum\Tags\Event\Creating;
use Flarum\Tags\Tag; use Flarum\Tags\Tag;
use Flarum\Tags\TagValidator; use Flarum\Tags\TagValidator;
use Flarum\User\AssertPermissionTrait;
class CreateTagHandler class CreateTagHandler
{ {
use AssertPermissionTrait;
/** /**
* @var TagValidator * @var TagValidator
*/ */
@@ -40,7 +37,7 @@ class CreateTagHandler
$actor = $command->actor; $actor = $command->actor;
$data = $command->data; $data = $command->data;
$this->assertCan($actor, 'createTag'); $actor->assertCan('createTag');
$tag = Tag::build( $tag = Tag::build(
array_get($data, 'attributes.name'), array_get($data, 'attributes.name'),

5
extensions/tags/src/Command/DeleteTagHandler.php
View File

@@ -11,12 +11,9 @@ namespace Flarum\Tags\Command;
use Flarum\Tags\Event\Deleting; use Flarum\Tags\Event\Deleting;
use Flarum\Tags\TagRepository; use Flarum\Tags\TagRepository;
use Flarum\User\AssertPermissionTrait;
class DeleteTagHandler class DeleteTagHandler
{ {
use AssertPermissionTrait;
/** /**
* @var TagRepository * @var TagRepository
*/ */
@@ -41,7 +38,7 @@ class DeleteTagHandler
$tag = $this->tags->findOrFail($command->tagId, $actor); $tag = $this->tags->findOrFail($command->tagId, $actor);
$this->assertCan($actor, 'delete', $tag); $actor->assertCan('delete', $tag);
event(new Deleting($tag, $actor)); event(new Deleting($tag, $actor));

5
extensions/tags/src/Command/EditTagHandler.php
View File

@@ -12,12 +12,9 @@ namespace Flarum\Tags\Command;
use Flarum\Tags\Event\TagWillBeSaved; use Flarum\Tags\Event\TagWillBeSaved;
use Flarum\Tags\TagRepository; use Flarum\Tags\TagRepository;
use Flarum\Tags\TagValidator; use Flarum\Tags\TagValidator;
use Flarum\User\AssertPermissionTrait;
class EditTagHandler class EditTagHandler
{ {
use AssertPermissionTrait;
/** /**
* @var TagRepository * @var TagRepository
*/ */
@@ -50,7 +47,7 @@ class EditTagHandler
$tag = $this->tags->findOrFail($command->tagId, $actor); $tag = $this->tags->findOrFail($command->tagId, $actor);
$this->assertCan($actor, 'edit', $tag); $actor->assertCan('edit', $tag);
$attributes = array_get($data, 'attributes', []); $attributes = array_get($data, 'attributes', []);