Extract new Flarum\Discussion namespace

src/Core/Command/DeleteDiscussionHandler.php

@@ -13,9 +13,9 @@ namespace Flarum\Core\Command;
 
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
-use Flarum\Core\Repository\DiscussionRepository;
+use Flarum\Discussion\DiscussionRepository;
 use Flarum\Foundation\DispatchEventsTrait;
-use Flarum\Event\DiscussionWillBeDeleted;
+use Flarum\Discussion\Event\Deleting;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteDiscussionHandler
@@ -24,7 +24,7 @@ class DeleteDiscussionHandler
     use AssertPermissionTrait;
 
     /**
-     * @var DiscussionRepository
+     * @var \Flarum\Discussion\DiscussionRepository
      */
     protected $discussions;
 
@@ -40,7 +40,7 @@ class DeleteDiscussionHandler
 
     /**
      * @param DeleteDiscussion $command
-     * @return \Flarum\Core\Discussion
+     * @return \Flarum\Discussion\Discussion
      * @throws PermissionDeniedException
      */
     public function handle(DeleteDiscussion $command)
@@ -52,7 +52,7 @@ class DeleteDiscussionHandler
         $this->assertCan($actor, 'delete', $discussion);
 
         $this->events->fire(
-            new DiscussionWillBeDeleted($discussion, $actor, $command->data)
+            new Deleting($discussion, $actor, $command->data)
         );
 
         $discussion->delete();

src/Core/Command/EditDiscussionHandler.php

@@ -13,10 +13,10 @@ namespace Flarum\Core\Command;
 
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
-use Flarum\Core\Repository\DiscussionRepository;
+use Flarum\Discussion\DiscussionRepository;
 use Flarum\Foundation\DispatchEventsTrait;
-use Flarum\Core\Validator\DiscussionValidator;
-use Flarum\Event\DiscussionWillBeSaved;
+use Flarum\Discussion\DiscussionValidator;
+use Flarum\Discussion\Event\Saving;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class EditDiscussionHandler
@@ -48,7 +48,7 @@ class EditDiscussionHandler
 
     /**
      * @param EditDiscussion $command
-     * @return \Flarum\Core\Discussion
+     * @return \Flarum\Discussion\Discussion
      * @throws \Flarum\User\Exception\PermissionDeniedException
      */
     public function handle(EditDiscussion $command)
@@ -76,7 +76,7 @@ class EditDiscussionHandler
         }
 
         $this->events->fire(
-            new DiscussionWillBeSaved($discussion, $actor, $data)
+            new Saving($discussion, $actor, $data)
         );
 
         $this->validator->assertValid($discussion->getDirty());

src/Core/Command/PostReplyHandler.php

@@ -15,7 +15,7 @@ use DateTime;
 use Flarum\Core\Access\AssertPermissionTrait;
 use Flarum\Core\Notification\NotificationSyncer;
 use Flarum\Post\CommentPost;
-use Flarum\Core\Repository\DiscussionRepository;
+use Flarum\Discussion\DiscussionRepository;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\Post\PostValidator;
 use Flarum\Post\Event\Saving;

src/Core/Command/ReadDiscussionHandler.php

@@ -12,9 +12,9 @@
 namespace Flarum\Core\Command;
 
 use Flarum\Core\Access\AssertPermissionTrait;
-use Flarum\Core\Repository\DiscussionRepository;
+use Flarum\Discussion\DiscussionRepository;
 use Flarum\Foundation\DispatchEventsTrait;
-use Flarum\Event\DiscussionStateWillBeSaved;
+use Flarum\Discussion\Event\UserDataSaving;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class ReadDiscussionHandler
@@ -54,7 +54,7 @@ class ReadDiscussionHandler
         $state->read($command->readNumber);
 
         $this->events->fire(
-            new DiscussionStateWillBeSaved($state)
+            new UserDataSaving($state)
         );
 
         $state->save();

src/Core/Command/StartDiscussionHandler.php

@@ -13,10 +13,10 @@ namespace Flarum\Core\Command;
 
 use Exception;
 use Flarum\Core\Access\AssertPermissionTrait;
-use Flarum\Core\Discussion;
+use Flarum\Discussion\Discussion;
 use Flarum\Foundation\DispatchEventsTrait;
-use Flarum\Core\Validator\DiscussionValidator;
-use Flarum\Event\DiscussionWillBeSaved;
+use Flarum\Discussion\DiscussionValidator;
+use Flarum\Discussion\Event\Saving;
 use Illuminate\Contracts\Bus\Dispatcher as BusDispatcher;
 use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;
 
@@ -31,14 +31,14 @@ class StartDiscussionHandler
     protected $bus;
 
     /**
-     * @var DiscussionValidator
+     * @var \Flarum\Discussion\DiscussionValidator
      */
     protected $validator;
 
     /**
      * @param EventDispatcher $events
      * @param BusDispatcher $bus
-     * @param DiscussionValidator $validator
+     * @param \Flarum\Discussion\DiscussionValidator $validator
      */
     public function __construct(EventDispatcher $events, BusDispatcher $bus, DiscussionValidator $validator)
     {
@@ -70,7 +70,7 @@ class StartDiscussionHandler
         );
 
         $this->events->fire(
-            new DiscussionWillBeSaved($discussion, $actor, $data)
+            new Saving($discussion, $actor, $data)
         );
 
         $this->validator->assertValid($discussion->getAttributes());