pleasing the angry god Circle

src/Api/Controller/SendConfirmationEmailController.php

@@ -18,9 +18,9 @@ use Flarum\User\AssertPermissionTrait;
 use Flarum\User\EmailToken;
 use Flarum\User\Exception\PermissionDeniedException;
 use Illuminate\Contracts\Mail\Mailer;
+use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Mail\Message;
 use Psr\Http\Message\ServerRequestInterface;
-use Illuminate\Contracts\Translation\Translator;
 use Zend\Diactoros\Response\EmptyResponse;
 
 class SendConfirmationEmailController implements ControllerInterface

src/Api/Serializer/GroupSerializer.php

@@ -12,8 +12,8 @@
 namespace Flarum\Api\Serializer;
 
 use Flarum\Group\Group;
-use InvalidArgumentException;
 use Illuminate\Contracts\Translation\Translator;
+use InvalidArgumentException;
 
 class GroupSerializer extends AbstractSerializer
 {

src/Bus/Dispatcher.php

@@ -1,5 +1,14 @@
 <?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\Bus;
 
 use Illuminate\Bus\Dispatcher as BaseDispatcher;
@@ -8,7 +17,7 @@ class Dispatcher extends BaseDispatcher
 {
     public function getCommandHandler($command)
     {
-        $handler = get_class($command) . 'Handler';
+        $handler = get_class($command).'Handler';
 
         if (class_exists($handler)) {
             return $this->container->make($handler);

src/Database/DatabaseServiceProvider.php

@@ -14,7 +14,6 @@ namespace Flarum\Database;
 use Flarum\Foundation\AbstractServiceProvider;
 use Illuminate\Database\ConnectionResolver;
 use Illuminate\Database\Connectors\ConnectionFactory;
-use PDO;
 
 class DatabaseServiceProvider extends AbstractServiceProvider
 {

src/Forum/Controller/ResetPasswordController.php

@@ -15,9 +15,9 @@ use DateTime;
 use Flarum\Http\Controller\AbstractHtmlController;
 use Flarum\User\Exception\InvalidConfirmationTokenException;
 use Flarum\User\PasswordToken;
+use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Contracts\View\Factory;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Illuminate\Contracts\Translation\Translator;
 
 class ResetPasswordController extends AbstractHtmlController
 {

src/Foundation/AbstractValidator.php

@@ -13,9 +13,9 @@ namespace Flarum\Foundation;
 
 use Flarum\Foundation\Event\Validating;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Contracts\Validation\ValidationException;
 use Illuminate\Validation\Factory;
-use Illuminate\Contracts\Translation\Translator;
 
 abstract class AbstractValidator
 {

src/Install/Console/InstallCommand.php

@@ -29,6 +29,7 @@ use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\User;
 use Flarum\User\UserServiceProvider;
 use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Database\Schema\Builder;
@@ -36,7 +37,6 @@ use Illuminate\Filesystem\Filesystem;
 use Illuminate\Validation\Factory;
 use PDO;
 use Symfony\Component\Console\Input\InputOption;
-use Illuminate\Contracts\Translation\Translator;
 
 class InstallCommand extends AbstractCommand
 {

src/Locale/LocaleManager.php

@@ -11,7 +11,6 @@
 
 namespace Flarum\Locale;
 
-
 use Illuminate\Contracts\Translation\Translator;
 
 class LocaleManager

src/Locale/Translator.php

@@ -11,9 +11,9 @@
 
 namespace Flarum\Locale;
 
+use Illuminate\Contracts\Translation\Translator as TranslatorContract;
 use Symfony\Component\Translation\MessageCatalogueInterface;
 use Symfony\Component\Translation\Translator as BaseTranslator;
-use Illuminate\Contracts\Translation\Translator as TranslatorContract;
 
 class Translator extends BaseTranslator implements TranslatorContract
 {

src/User/Command/RequestPasswordResetHandler.php

@@ -16,11 +16,11 @@ use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\PasswordToken;
 use Flarum\User\UserRepository;
 use Illuminate\Contracts\Mail\Mailer;
+use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Contracts\Validation\Factory;
 use Illuminate\Contracts\Validation\ValidationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Mail\Message;
-use Illuminate\Contracts\Translation\Translator;
 
 class RequestPasswordResetHandler
 {

src/User/EmailConfirmationMailer.php

@@ -17,8 +17,8 @@ use Flarum\User\Event\EmailChangeRequested;
 use Flarum\User\Event\Registered;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Mail\Mailer;
-use Illuminate\Mail\Message;
 use Illuminate\Contracts\Translation\Translator;
+use Illuminate\Mail\Message;
 
 class EmailConfirmationMailer
 {

tests/Flarum/Api/Handler/IlluminateValidationExceptionHandlerTest.php

@@ -15,8 +15,8 @@ use Exception;
 use Flarum\Api\ExceptionHandler\IlluminateValidationExceptionHandler;
 use Illuminate\Translation\ArrayLoader;
 use Illuminate\Translation\Translator;
-use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\Factory;
+use Illuminate\Validation\ValidationException;
 use Tests\Test\TestCase;
 
 class IlluminateValidationExceptionHandlerTest extends TestCase