From 2e571c425ad96cce5be077d086028977d37d5d4b Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Mon, 27 Nov 2017 11:05:15 +0100 Subject: [PATCH] pleasing the angry god Circle --- .../Controller/SendConfirmationEmailController.php | 2 +- framework/core/src/Api/Serializer/GroupSerializer.php | 2 +- framework/core/src/Bus/Dispatcher.php | 11 ++++++++++- .../core/src/Database/DatabaseServiceProvider.php | 1 - .../src/Forum/Controller/ResetPasswordController.php | 2 +- framework/core/src/Foundation/AbstractValidator.php | 2 +- framework/core/src/Install/Console/InstallCommand.php | 2 +- framework/core/src/Locale/LocaleManager.php | 1 - framework/core/src/Locale/Translator.php | 2 +- .../src/User/Command/RequestPasswordResetHandler.php | 2 +- framework/core/src/User/EmailConfirmationMailer.php | 2 +- .../IlluminateValidationExceptionHandlerTest.php | 2 +- 12 files changed, 19 insertions(+), 12 deletions(-) diff --git a/framework/core/src/Api/Controller/SendConfirmationEmailController.php b/framework/core/src/Api/Controller/SendConfirmationEmailController.php index 8140fa997..dd9e37afa 100644 --- a/framework/core/src/Api/Controller/SendConfirmationEmailController.php +++ b/framework/core/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 diff --git a/framework/core/src/Api/Serializer/GroupSerializer.php b/framework/core/src/Api/Serializer/GroupSerializer.php index 820803223..94bf6b80f 100644 --- a/framework/core/src/Api/Serializer/GroupSerializer.php +++ b/framework/core/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 { diff --git a/framework/core/src/Bus/Dispatcher.php b/framework/core/src/Bus/Dispatcher.php index 13a3839ed..c0836d129 100644 --- a/framework/core/src/Bus/Dispatcher.php +++ b/framework/core/src/Bus/Dispatcher.php @@ -1,5 +1,14 @@ + * + * 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); diff --git a/framework/core/src/Database/DatabaseServiceProvider.php b/framework/core/src/Database/DatabaseServiceProvider.php index e54fb3e8e..8d3c08262 100644 --- a/framework/core/src/Database/DatabaseServiceProvider.php +++ b/framework/core/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 { diff --git a/framework/core/src/Forum/Controller/ResetPasswordController.php b/framework/core/src/Forum/Controller/ResetPasswordController.php index 4a737b497..0be98834d 100644 --- a/framework/core/src/Forum/Controller/ResetPasswordController.php +++ b/framework/core/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 { diff --git a/framework/core/src/Foundation/AbstractValidator.php b/framework/core/src/Foundation/AbstractValidator.php index 4d1a1fd4e..90b3af47c 100644 --- a/framework/core/src/Foundation/AbstractValidator.php +++ b/framework/core/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 { diff --git a/framework/core/src/Install/Console/InstallCommand.php b/framework/core/src/Install/Console/InstallCommand.php index de49c11f6..61c473f72 100644 --- a/framework/core/src/Install/Console/InstallCommand.php +++ b/framework/core/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 { diff --git a/framework/core/src/Locale/LocaleManager.php b/framework/core/src/Locale/LocaleManager.php index 837cd80ee..7bfa4b1eb 100644 --- a/framework/core/src/Locale/LocaleManager.php +++ b/framework/core/src/Locale/LocaleManager.php @@ -11,7 +11,6 @@ namespace Flarum\Locale; - use Illuminate\Contracts\Translation\Translator; class LocaleManager diff --git a/framework/core/src/Locale/Translator.php b/framework/core/src/Locale/Translator.php index 4e3668a4b..718a59e27 100644 --- a/framework/core/src/Locale/Translator.php +++ b/framework/core/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 { diff --git a/framework/core/src/User/Command/RequestPasswordResetHandler.php b/framework/core/src/User/Command/RequestPasswordResetHandler.php index fc03314d4..e1bb365bc 100644 --- a/framework/core/src/User/Command/RequestPasswordResetHandler.php +++ b/framework/core/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 { diff --git a/framework/core/src/User/EmailConfirmationMailer.php b/framework/core/src/User/EmailConfirmationMailer.php index 59b892ad3..fdafc8718 100755 --- a/framework/core/src/User/EmailConfirmationMailer.php +++ b/framework/core/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 { diff --git a/framework/core/tests/Flarum/Api/Handler/IlluminateValidationExceptionHandlerTest.php b/framework/core/tests/Flarum/Api/Handler/IlluminateValidationExceptionHandlerTest.php index fb2262624..fbdf16559 100644 --- a/framework/core/tests/Flarum/Api/Handler/IlluminateValidationExceptionHandlerTest.php +++ b/framework/core/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