- satisfying styleci

- cleared the merge conflict in the phpdoc
- changed some string class names to use ::class

src/Admin/AdminServiceProvider.php

@@ -11,14 +11,11 @@
 
 namespace Flarum\Admin;
 
+use Flarum\Admin\Listener\CheckCustomLessFormat;
 use Flarum\Admin\Middleware\RequireAdministrateAbility;
 use Flarum\Event\ConfigureMiddleware;
 use Flarum\Extension\Event\Disabled;
 use Flarum\Extension\Event\Enabled;
-use Flarum\Core\Listener\CheckCustomLessFormat;
-use Flarum\Event\ExtensionWasDisabled;
-use Flarum\Event\ExtensionWasEnabled;
-use Flarum\Event\SettingWasSet;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Http\Middleware\AuthenticateWithSession;
 use Flarum\Http\Middleware\DispatchRoute;

src/Admin/Listener/CheckCustomLessFormat.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core\Listener;
+namespace Flarum\Admin\Listener;
 
-use Flarum\Core\Exception\ValidationException;
+use Flarum\Foundation\ValidationException;
-use Flarum\Event\PrepareSerializedSetting;
+use Flarum\Settings\Event\Serializing;
 use Illuminate\Contracts\Events\Dispatcher;
 use Less_Exception_Parser;
 use Less_Parser;
@@ -21,10 +21,10 @@ class CheckCustomLessFormat
 {
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(PrepareSerializedSetting::class, [$this, 'check']);
+        $events->listen(Serializing::class, [$this, 'check']);
     }
 
-    public function check(PrepareSerializedSetting $event)
+    public function check(Serializing $event)
     {
         if ($event->key === 'custom_less') {
             $parser = new Less_Parser();

src/Api/Controller/ListNotificationsController.php

@@ -11,10 +11,10 @@
 
 namespace Flarum\Api\Controller;
 
+use Flarum\Api\UrlGenerator;
 use Flarum\Discussion\Discussion;
 use Flarum\Notification\NotificationRepository;
 use Flarum\User\Exception\PermissionDeniedException;
-use Flarum\Api\UrlGenerator;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 

src/Forum/ForumServiceProvider.php

@@ -26,9 +26,9 @@ use Flarum\Http\Middleware\StartSession;
 use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
-use Zend\Stratigility\MiddlewarePipe;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Symfony\Component\Translation\TranslatorInterface;
+use Zend\Stratigility\MiddlewarePipe;
 
 class ForumServiceProvider extends AbstractServiceProvider
 {

src/Foundation/Console/CacheClearCommand.php

@@ -25,20 +25,12 @@ class CacheClearCommand extends AbstractCommand
     protected $cache;
 
     /**
-<<<<<<< HEAD:src/Foundation/Console/CacheClearCommand.php
-     * @var \Flarum\Forum\Frontend
-=======
      * @var ForumWebApp
->>>>>>> master:src/Debug/Console/CacheClearCommand.php
      */
     protected $forum;
 
     /**
-<<<<<<< HEAD:src/Foundation/Console/CacheClearCommand.php
-     * @var \Flarum\Admin\Frontend
-=======
      * @var AdminWebApp
->>>>>>> master:src/Debug/Console/CacheClearCommand.php
      */
     protected $admin;
 

src/Http/Middleware/ShareErrorsFromSession.php

@@ -59,4 +59,3 @@ class ShareErrorsFromSession implements MiddlewareInterface
         return $out ? $out($request, $response) : $response;
     }
 }
-

src/User/AvatarUploader.php

@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core;
+namespace Flarum\User;
 
-use Flarum\User\User;
 use Illuminate\Support\Str;
 use Intervention\Image\Image;
 use League\Flysystem\FilesystemInterface;

src/User/Command/DeleteAvatarHandler.php

@@ -13,9 +13,9 @@ namespace Flarum\User\Command;
 
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
+use Flarum\User\AvatarUploader;
 use Flarum\User\Event\AvatarDeleting;
 use Flarum\User\UserRepository;
-use Flarum\Core\AvatarUploader;
 use Flarum\Event\AvatarWillBeDeleted;
 use Illuminate\Contracts\Events\Dispatcher;
 

src/User/Command/EditUserHandler.php

@@ -12,7 +12,7 @@
 namespace Flarum\User\Command;
 
 use Exception;
-use Flarum\Core\AvatarUploader;
+use Flarum\User\AvatarUploader;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Event\GroupsChanged;

src/User/Command/RegisterUserHandler.php

@@ -12,7 +12,7 @@
 namespace Flarum\User\Command;
 
 use Exception;
-use Flarum\Core\AvatarUploader;
+use Flarum\User\AvatarUploader;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\AssertPermissionTrait;

src/User/Command/UploadAvatarHandler.php

@@ -11,11 +11,10 @@
 
 namespace Flarum\User\Command;
 
-use Exception;
-use Flarum\Core\AvatarUploader;
 use Flarum\Foundation\Application;
 use Flarum\Foundation\DispatchEventsTrait;
 use Flarum\User\AssertPermissionTrait;
+use Flarum\User\AvatarUploader;
 use Flarum\User\AvatarValidator;
 use Flarum\User\Event\AvatarSaving;
 use Flarum\User\UserRepository;

src/User/Listener/SelfDemotionGuard.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core\Listener;
+namespace Flarum\User\Listener;
 
-use Flarum\Core\Exception\PermissionDeniedException;
+use Flarum\User\Exception\PermissionDeniedException;
-use Flarum\Core\Group;
+use Flarum\Group\Group;
-use Flarum\Event\UserWillBeSaved;
+use Flarum\User\Event\Saving;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class SelfDemotionGuard
@@ -23,15 +23,15 @@ class SelfDemotionGuard
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(UserWillBeSaved::class, [$this, 'whenUserWillBeSaved']);
+        $events->listen(Saving::class, [$this, 'whenUserWillBeSaved']);
     }
 
     /**
      * Prevent an admin from removing their admin permission via the API.
-     * @param UserWillBeSaved $event
+     * @param Saving $event
      * @throws PermissionDeniedException
      */
-    public function whenUserWillBeSaved(UserWillBeSaved $event)
+    public function whenUserWillBeSaved(Saving $event)
     {
         // Non-admin users pose no problem
         if (! $event->actor->isAdmin()) {

src/User/User.php

@@ -18,14 +18,6 @@ use Flarum\Event\ConfigureUserPreferences;
 use Flarum\Event\GetDisplayName;
 use Flarum\Event\PostWasDeleted;
 use Flarum\Event\PrepareUserGroups;
-use Flarum\Event\UserAvatarWasChanged;
-use Flarum\Event\UserEmailChangeWasRequested;
-use Flarum\Event\UserEmailWasChanged;
-use Flarum\Event\UserPasswordWasChanged;
-use Flarum\Event\UserWasActivated;
-use Flarum\Event\UserWasDeleted;
-use Flarum\Event\UserWasRegistered;
-use Flarum\Event\UserWasRenamed;
 use Flarum\Foundation\Application;
 use Flarum\Foundation\EventGeneratorTrait;
 use Flarum\Group\Group;

src/User/UserServiceProvider.php

@@ -30,7 +30,7 @@ class UserServiceProvider extends AbstractServiceProvider
         });
 
         $this->app->alias('flarum.gate', 'Illuminate\Contracts\Auth\Access\Gate');
-        $this->app->alias('flarum.gate', 'Flarum\User\Gate');
+        $this->app->alias('flarum.gate', Gate::class);
 
         $this->registerAvatarsFilesystem();
     }
@@ -45,11 +45,11 @@ class UserServiceProvider extends AbstractServiceProvider
             ->needs('League\Flysystem\FilesystemInterface')
             ->give($avatarsFilesystem);
 
-        $this->app->when('Flarum\User\Command\DeleteAvatarHandler')
+        $this->app->when(Command\DeleteAvatarHandler::class)
             ->needs('League\Flysystem\FilesystemInterface')
             ->give($avatarsFilesystem);
 
-        $this->app->when('Flarum\User\Command\RegisterUserHandler')
+        $this->app->when(Command\RegisterUserHandler::class)
             ->needs('League\Flysystem\FilesystemInterface')
             ->give($avatarsFilesystem);
     }
@@ -86,10 +86,10 @@ class UserServiceProvider extends AbstractServiceProvider
 
         $events = $this->app->make('events');
 
-        $events->subscribe('Flarum\Core\Listener\SelfDemotionGuard');
+        $events->subscribe(Listener\SelfDemotionGuard::class);
-        $events->subscribe('Flarum\User\EmailConfirmationMailer');
+        $events->subscribe(EmailConfirmationMailer::class);
-        $events->subscribe('Flarum\User\UserMetadataUpdater');
+        $events->subscribe(UserMetadataUpdater::class);
-        $events->subscribe('Flarum\User\UserPolicy');
+        $events->subscribe(UserPolicy::class);
 
         $events->listen(ConfigureUserPreferences::class, [$this, 'configureUserPreferences']);
     }