Move another trait out of obsolete Flarum\Core namespace

src/Core/Access/AssertPermissionTrait.php

@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Flarum\Core\Access;
-
-use Flarum\User\Exception\PermissionDeniedException;
-use Flarum\User\User;
-
-trait AssertPermissionTrait
-{
-    /**
-     * @param $condition
-     * @throws PermissionDeniedException
-     */
-    protected function assertPermission($condition)
-    {
-        if (! $condition) {
-            throw new PermissionDeniedException;
-        }
-    }
-
-    /**
-     * @param User $actor
-     * @param string $ability
-     * @param mixed $arguments
-     * @throws PermissionDeniedException
-     */
-    protected function assertCan(User $actor, $ability, $arguments = [])
-    {
-        $this->assertPermission($actor->can($ability, $arguments));
-    }
-
-    /**
-     * @param User $actor
-     * @throws \Flarum\User\Exception\PermissionDeniedException
-     */
-    protected function assertGuest(User $actor)
-    {
-        $this->assertPermission($actor->isGuest());
-    }
-
-    /**
-     * @param User $actor
-     * @throws PermissionDeniedException
-     */
-    protected function assertRegistered(User $actor)
-    {
-        $this->assertPermission(! $actor->isGuest());
-    }
-
-    /**
-     * @param User $actor
-     * @throws PermissionDeniedException
-     */
-    protected function assertAdmin(User $actor)
-    {
-        $this->assertCan($actor, 'administrate');
-    }
-}

src/Core/Command/CreateGroupHandler.php

@@ -11,8 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
-use Flarum\User\Exception\PermissionDeniedException;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\Group\Group;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\Group\GroupValidator;
@@ -21,7 +20,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class CreateGroupHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/DeleteAvatarHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\User\UserRepository;
 use Flarum\Foundation\DispatchEventsTrait;
@@ -21,7 +21,7 @@ use League\Flysystem\FilesystemInterface;
 
 class DeleteAvatarHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/DeleteDiscussionHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\Discussion\DiscussionRepository;
 use Flarum\Foundation\DispatchEventsTrait;
@@ -20,7 +20,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteDiscussionHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/DeleteGroupHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\Group\GroupRepository;
 use Flarum\Foundation\DispatchEventsTrait;
@@ -20,7 +20,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteGroupHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/DeletePostHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\Post\PostRepository;
 use Flarum\Foundation\DispatchEventsTrait;
@@ -20,7 +20,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class DeletePostHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/DeleteUserHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\User\UserRepository;
 use Flarum\Foundation\DispatchEventsTrait;
@@ -20,7 +20,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteUserHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/EditDiscussionHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\Discussion\DiscussionRepository;
 use Flarum\Foundation\DispatchEventsTrait;
@@ -21,7 +21,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class EditDiscussionHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/EditGroupHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\Group\Group;
 use Flarum\Group\GroupRepository;
@@ -22,7 +22,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class EditGroupHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/EditPostHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\Post\CommentPost;
 use Flarum\Post\PostRepository;
 use Flarum\Foundation\DispatchEventsTrait;
@@ -21,7 +21,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class EditPostHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/EditUserHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\UserRepository;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\User;
@@ -22,7 +22,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class EditUserHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/PostReplyHandler.php

@@ -12,7 +12,7 @@
 namespace Flarum\Core\Command;
 
 use DateTime;
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\Core\Notification\NotificationSyncer;
 use Flarum\Post\CommentPost;
 use Flarum\Discussion\DiscussionRepository;
@@ -23,7 +23,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class PostReplyHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/ReadAllNotificationsHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\Core\Repository\NotificationRepository;
 
 class ReadAllNotificationsHandler

src/Core/Command/ReadDiscussionHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\Discussion\DiscussionRepository;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\Discussion\Event\UserDataSaving;
@@ -19,7 +19,7 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class ReadDiscussionHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/ReadNotificationHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\Core\Command;
 
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\Core\Notification;
 
 class ReadNotificationHandler

src/Core/Command/RegisterUserHandler.php

@@ -12,7 +12,7 @@
 namespace Flarum\Core\Command;
 
 use Exception;
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\AuthToken;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\Foundation\DispatchEventsTrait;
@@ -33,7 +33,7 @@ use League\Flysystem\MountManager;
 
 class RegisterUserHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/StartDiscussionHandler.php

@@ -12,7 +12,7 @@
 namespace Flarum\Core\Command;
 
 use Exception;
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\Discussion\Discussion;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\Discussion\DiscussionValidator;
@@ -22,7 +22,7 @@ use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;
 
 class StartDiscussionHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**

src/Core/Command/UploadAvatarHandler.php

@@ -12,7 +12,7 @@
 namespace Flarum\Core\Command;
 
 use Exception;
-use Flarum\Core\Access\AssertPermissionTrait;
+use Flarum\User\AssertPermissionTrait;
 use Flarum\User\UserRepository;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AvatarValidator;
@@ -29,7 +29,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class UploadAvatarHandler
 {
-    use Flarum\Foundation\DispatchEventsTrait;
+    use DispatchEventsTrait;
     use AssertPermissionTrait;
 
     /**