mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 23:47:32 +02:00
Code Issues Releases Wiki Activity

Remove AssertPermissionTrait (#26)

Browse Source 
* Remove AssertPermissionTrait

* Apply fixes from StyleCI

* Fix my dumb mistake

* Fix another small mistake ->assertRegistered

Co-authored-by: luceos <daniel+github@klabbers.email>
This commit is contained in:
Matt Kilgore
2020-07-20 02:02:29 -04:00
committed by GitHub
parent 5d64996b84
commit e85063fbf7
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/flags/src/Api/Controller/ListFlagsController.php
View File

@@ -12,14 +12,11 @@ namespace Flarum\Flags\Api\Controller;
use Flarum\Api\Controller\AbstractListController; use Flarum\Api\Controller\AbstractListController;
use Flarum\Flags\Api\Serializer\FlagSerializer; use Flarum\Flags\Api\Serializer\FlagSerializer;
use Flarum\Flags\Flag; use Flarum\Flags\Flag;
use Flarum\User\AssertPermissionTrait;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document; use Tobscure\JsonApi\Document;
class ListFlagsController extends AbstractListController class ListFlagsController extends AbstractListController
{ {
use AssertPermissionTrait;
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
@@ -42,7 +39,7 @@ class ListFlagsController extends AbstractListController
{ {
$actor = $request->getAttribute('actor'); $actor = $request->getAttribute('actor');
$this->assertRegistered($actor); $actor->assertRegistered();
$actor->read_flags_at = time(); $actor->read_flags_at = time();
$actor->save(); $actor->save();

5
extensions/flags/src/Command/CreateFlagHandler.php
View File

@@ -14,15 +14,12 @@ use Flarum\Foundation\ValidationException;
use Flarum\Post\CommentPost; use Flarum\Post\CommentPost;
use Flarum\Post\PostRepository; use Flarum\Post\PostRepository;
use Flarum\Settings\SettingsRepositoryInterface; use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Exception\PermissionDeniedException; use Flarum\User\Exception\PermissionDeniedException;
use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Translation\TranslatorInterface;
use Tobscure\JsonApi\Exception\InvalidParameterException; use Tobscure\JsonApi\Exception\InvalidParameterException;
class CreateFlagHandler class CreateFlagHandler
{ {
use AssertPermissionTrait;
/** /**
* @var PostRepository * @var PostRepository
*/ */
@@ -67,7 +64,7 @@ class CreateFlagHandler
throw new InvalidParameterException; throw new InvalidParameterException;
} }
$this->assertCan($actor, 'flag', $post); $actor->assertCan('flag', $post);
if ($actor->id === $post->user_id && ! $this->settings->get('flarum-flags.can_flag_own')) { if ($actor->id === $post->user_id && ! $this->settings->get('flarum-flags.can_flag_own')) {
throw new PermissionDeniedException(); throw new PermissionDeniedException();

5
extensions/flags/src/Command/DeleteFlagsHandler.php
View File

@@ -12,13 +12,10 @@ namespace Flarum\Flags\Command;
use Flarum\Flags\Event\FlagsWillBeDeleted; use Flarum\Flags\Event\FlagsWillBeDeleted;
use Flarum\Flags\Flag; use Flarum\Flags\Flag;
use Flarum\Post\PostRepository; use Flarum\Post\PostRepository;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class DeleteFlagsHandler class DeleteFlagsHandler
{ {
use AssertPermissionTrait;
/** /**
* @var PostRepository * @var PostRepository
*/ */
@@ -49,7 +46,7 @@ class DeleteFlagsHandler
$post = $this->posts->findOrFail($command->postId, $actor); $post = $this->posts->findOrFail($command->postId, $actor);
$this->assertCan($actor, 'viewFlags', $post->discussion); $actor->assertCan('viewFlags', $post->discussion);
$this->events->dispatch(new FlagsWillBeDeleted($post, $actor, $command->data)); $this->events->dispatch(new FlagsWillBeDeleted($post, $actor, $command->data));