Move more event classes to appropriate namespaces

framework/core/src/Discussion/Event/Searching.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Event;
+namespace Flarum\Discussion\Event;
 
 use Flarum\Discussion\Search\DiscussionSearch;
 use Flarum\Search\SearchCriteria;
 
-class ConfigureDiscussionSearch
+class Searching
 {
     /**
      * @var DiscussionSearch

framework/core/src/Discussion/Search/DiscussionSearcher.php

@@ -13,7 +13,7 @@ namespace Flarum\Discussion\Search;
 
 use Flarum\Discussion\Discussion;
 use Flarum\Discussion\DiscussionRepository;
-use Flarum\Event\ConfigureDiscussionSearch;
+use Flarum\Discussion\Event\Searching;
 use Flarum\Post\PostRepository;
 use Flarum\Search\ApplySearchParametersTrait;
 use Flarum\Search\GambitManager;
@@ -81,7 +81,7 @@ class DiscussionSearcher
         $this->applyLimit($search, $limit + 1);
 
         // TODO: inject dispatcher
-        event(new ConfigureDiscussionSearch($search, $criteria));
+        event(new Searching($search, $criteria));
 
         // Execute the search query and retrieve the results. We get one more
         // results than the user asked for, so that we can say if there are more

framework/core/src/User/Command/DeleteAvatarHandler.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\User\Command;
 
-use Flarum\Event\AvatarWillBeDeleted;
+use Flarum\User\Event\AvatarDeleting;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
 use Flarum\User\UserRepository;
@@ -64,7 +64,7 @@ class DeleteAvatarHandler
         $user->changeAvatarPath(null);
 
         $this->events->fire(
-            new AvatarWillBeDeleted($user, $actor)
+            new AvatarDeleting($user, $actor)
         );
 
         $user->save();

framework/core/src/User/Command/UploadAvatarHandler.php

@@ -12,7 +12,7 @@
 namespace Flarum\User\Command;
 
 use Exception;
-use Flarum\Event\AvatarWillBeSaved;
+use Flarum\User\Event\AvatarSaving;
 use Flarum\Foundation\Application;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
@@ -110,7 +110,7 @@ class UploadAvatarHandler
             file_put_contents($tmpFile, $encodedImage);
 
             $this->events->fire(
-                new AvatarWillBeSaved($user, $actor, $tmpFile)
+                new AvatarSaving($user, $actor, $tmpFile)
             );
 
             $mount = new MountManager([

framework/core/src/User/Event/AvatarDeleting.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Event;
+namespace Flarum\User\Event;
 
 use Flarum\User\User;
 
-class AvatarWillBeDeleted
+class AvatarDeleting
 {
     /**
      * The user whose avatar will be deleted.

framework/core/src/User/Event/AvatarSaving.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Event;
+namespace Flarum\User\Event;
 
 use Flarum\User\User;
 
-class AvatarWillBeSaved
+class AvatarSaving
 {
     /**
      * The user whose avatar will be saved.

framework/core/src/User/Event/Searching.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Event;
+namespace Flarum\User\Event;
 
 use Flarum\Search\SearchCriteria;
 use Flarum\User\Search\UserSearch;
 
-class ConfigureUserSearch
+class Searching
 {
     /**
      * @var \Flarum\User\Search\UserSearch

framework/core/src/User/Search/UserSearcher.php

@@ -11,7 +11,7 @@
 
 namespace Flarum\User\Search;
 
-use Flarum\Event\ConfigureUserSearch;
+use Flarum\User\Event\Searching;
 use Flarum\Search\ApplySearchParametersTrait;
 use Flarum\Search\GambitManager;
 use Flarum\Search\SearchCriteria;
@@ -69,7 +69,7 @@ class UserSearcher
         $this->applyOffset($search, $offset);
         $this->applyLimit($search, $limit + 1);
 
-        event(new ConfigureUserSearch($search, $criteria));
+        event(new Searching($search, $criteria));
 
         // Execute the search query and retrieve the results. We get one more
         // results than the user asked for, so that we can say if there are more