1
0
mirror of https://github.com/flarum/core.git synced 2025-10-15 08:55:53 +02:00

Deprecate AssertPermissionTrait (#2044)

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

View File

@@ -11,15 +11,12 @@ namespace Flarum\Api\Controller;
use Flarum\Api\Serializer\MailSettingsSerializer;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Contracts\Validation\Factory;
use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document;
class ShowMailSettingsController extends AbstractShowController
{
use AssertPermissionTrait;
/**
* {@inheritdoc}
*/
@@ -30,7 +27,7 @@ class ShowMailSettingsController extends AbstractShowController
*/
protected function data(ServerRequestInterface $request, Document $document)
{
$this->assertAdmin($request->getAttribute('actor'));
$request->getAttribute('actor')->assertAdmin();
$drivers = array_map(function ($driver) {
return self::$container->make($driver);