From e49dd8c8b73f8be9a2f4f2b72f1291d579dfed79 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 14 Aug 2023 12:18:42 +0000 Subject: [PATCH] Apply fixes from StyleCI --- .../Api/Controller/DeleteFlagsController.php | 1 - .../Controller/RemoveExtensionController.php | 1 - .../src/Api/Controller/WhyNotController.php | 1 - .../api/discussions/ReplyNotificationTest.php | 2 +- .../core/src/Admin/AdminServiceProvider.php | 6 +----- framework/core/src/Admin/routes.php | 4 +--- framework/core/src/Api/ApiServiceProvider.php | 3 --- framework/core/src/Api/Client.php | 8 +++++++- .../Controller/DeleteAccessTokenController.php | 1 - .../Api/Controller/DeleteAvatarController.php | 2 +- .../Controller/DeleteDiscussionController.php | 1 - .../src/Api/Controller/ListPostsController.php | 1 - .../Api/Controller/SetPermissionController.php | 1 - .../ShowExtensionReadmeController.php | 1 - .../UninstallExtensionController.php | 1 - .../Api/Controller/UpdateGroupController.php | 1 - .../UpdateNotificationController.php | 1 - .../Api/Controller/UploadAvatarController.php | 1 - framework/core/src/Api/routes.php | 2 -- .../core/src/Extend/Concerns/ExtendsRoutes.php | 7 +++++++ framework/core/src/Forum/Content/User.php | 1 - .../core/src/Forum/ForumServiceProvider.php | 6 +----- framework/core/src/Forum/routes.php | 2 -- .../src/Foundation/Bootstrap/BootProviders.php | 8 +++++++- .../IlluminateBootstrapperInterface.php | 7 +++++++ .../Foundation/Bootstrap/PrepareInstaller.php | 7 +++++++ .../src/Foundation/Bootstrap/RegisterCache.php | 7 +++++++ .../Bootstrap/RegisterCoreProviders.php | 10 +++++++--- .../Foundation/Bootstrap/RegisterLogger.php | 7 +++++++ .../Bootstrap/RegisterMaintenanceHandler.php | 7 +++++++ framework/core/src/Foundation/Config.php | 2 +- .../ErrorHandling/ExceptionHandler.php | 3 ++- .../Foundation/ErrorHandling/ViewFormatter.php | 1 - framework/core/src/Foundation/SafeBooter.php | 7 +++++++ .../src/Http/Controller/AbstractController.php | 7 +++++++ .../IlluminateMiddlewareInterface.php | 7 +++++++ .../Http/Middleware/InjectActorReference.php | 4 +++- .../core/src/Http/Middleware/SetLocale.php | 4 +++- framework/core/src/Http/RequestUtil.php | 5 ++++- framework/core/src/Http/Router.php | 7 +++++++ .../core/src/Http/RoutingServiceProvider.php | 18 +++++++++++++----- framework/core/src/Http/UrlGenerator.php | 7 +++++++ .../api/AbstractSerializeControllerTest.php | 1 - .../access_tokens/AccessTokenLifecycleTest.php | 1 - .../extenders/FrontendTitleTest.php | 1 - .../src/integration/Setup/Bootstrapper.php | 1 - .../testing/src/integration/TestCase.php | 1 - 47 files changed, 129 insertions(+), 56 deletions(-) diff --git a/extensions/flags/src/Api/Controller/DeleteFlagsController.php b/extensions/flags/src/Api/Controller/DeleteFlagsController.php index 3675693f9..76f950764 100644 --- a/extensions/flags/src/Api/Controller/DeleteFlagsController.php +++ b/extensions/flags/src/Api/Controller/DeleteFlagsController.php @@ -14,7 +14,6 @@ use Flarum\Flags\Command\DeleteFlags; use Flarum\Http\RequestUtil; use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Http\Request; -use Illuminate\Support\Arr; class DeleteFlagsController extends AbstractDeleteController { diff --git a/extensions/package-manager/src/Api/Controller/RemoveExtensionController.php b/extensions/package-manager/src/Api/Controller/RemoveExtensionController.php index c96864c2d..a1ae41bee 100755 --- a/extensions/package-manager/src/Api/Controller/RemoveExtensionController.php +++ b/extensions/package-manager/src/Api/Controller/RemoveExtensionController.php @@ -14,7 +14,6 @@ use Flarum\Http\RequestUtil; use Flarum\PackageManager\Command\RemoveExtension; use Flarum\PackageManager\Job\Dispatcher; use Illuminate\Http\Request; -use Illuminate\Support\Arr; use Laminas\Diactoros\Response\EmptyResponse; use Laminas\Diactoros\Response\JsonResponse; use Psr\Http\Message\ResponseInterface; diff --git a/extensions/package-manager/src/Api/Controller/WhyNotController.php b/extensions/package-manager/src/Api/Controller/WhyNotController.php index 42abe50a0..e2382dece 100755 --- a/extensions/package-manager/src/Api/Controller/WhyNotController.php +++ b/extensions/package-manager/src/Api/Controller/WhyNotController.php @@ -14,7 +14,6 @@ use Flarum\Http\RequestUtil; use Flarum\PackageManager\Command\WhyNot; use Flarum\PackageManager\Job\Dispatcher; use Illuminate\Http\Request; -use Illuminate\Support\Arr; use Laminas\Diactoros\Response\JsonResponse; use Psr\Http\Message\ResponseInterface; diff --git a/extensions/subscriptions/tests/integration/api/discussions/ReplyNotificationTest.php b/extensions/subscriptions/tests/integration/api/discussions/ReplyNotificationTest.php index d11f1c129..504a7dd31 100644 --- a/extensions/subscriptions/tests/integration/api/discussions/ReplyNotificationTest.php +++ b/extensions/subscriptions/tests/integration/api/discussions/ReplyNotificationTest.php @@ -89,7 +89,7 @@ class ReplyNotificationTest extends TestCase ], ], ], - ]), fn (Request $request ) => $request->attributes->set('bypassThrottling', true)) + ]), fn (Request $request) => $request->attributes->set('bypassThrottling', true)) ); } diff --git a/framework/core/src/Admin/AdminServiceProvider.php b/framework/core/src/Admin/AdminServiceProvider.php index 4e859a34e..6f2101481 100644 --- a/framework/core/src/Admin/AdminServiceProvider.php +++ b/framework/core/src/Admin/AdminServiceProvider.php @@ -13,18 +13,14 @@ use Flarum\Extension\Event\Disabled; use Flarum\Extension\Event\Enabled; use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\Config; -use Flarum\Foundation\ErrorHandling\Registry; -use Flarum\Foundation\ErrorHandling\Reporter; -use Flarum\Foundation\ErrorHandling\ViewFormatter; -use Flarum\Foundation\ErrorHandling\WhoopsFormatter; use Flarum\Foundation\Event\ClearingCache; use Flarum\Frontend\AddLocaleAssets; use Flarum\Frontend\AddTranslations; use Flarum\Frontend\Compiler\Source\SourceCollector; use Flarum\Frontend\RecompileFrontendAssets; use Flarum\Http\Middleware as HttpMiddleware; -use Flarum\Http\Router; use Flarum\Http\RouteHandlerFactory; +use Flarum\Http\Router; use Flarum\Locale\LocaleManager; use Flarum\Settings\Event\Saved; use Illuminate\Contracts\Container\Container; diff --git a/framework/core/src/Admin/routes.php b/framework/core/src/Admin/routes.php index ab93c9449..b7c11946c 100644 --- a/framework/core/src/Admin/routes.php +++ b/framework/core/src/Admin/routes.php @@ -9,11 +9,10 @@ use Flarum\Admin\Content\Index; use Flarum\Admin\Controller\UpdateExtensionController; -use Flarum\Http\Router; use Flarum\Http\RouteHandlerFactory; +use Flarum\Http\Router; return function (Router $router, RouteHandlerFactory $factory) { - $router ->get('/', $factory->toAdmin(Index::class)) ->name('index'); @@ -21,5 +20,4 @@ return function (Router $router, RouteHandlerFactory $factory) { $router ->post('/extensions/{name}', $factory->toController(UpdateExtensionController::class)) ->name('extensions.update'); - }; diff --git a/framework/core/src/Api/ApiServiceProvider.php b/framework/core/src/Api/ApiServiceProvider.php index 6e8a4a3d8..6295d6e8e 100644 --- a/framework/core/src/Api/ApiServiceProvider.php +++ b/framework/core/src/Api/ApiServiceProvider.php @@ -15,9 +15,6 @@ use Flarum\Api\Serializer\BasicDiscussionSerializer; use Flarum\Api\Serializer\NotificationSerializer; use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\Config; -use Flarum\Foundation\ErrorHandling\JsonApiFormatter; -use Flarum\Foundation\ErrorHandling\Registry; -use Flarum\Foundation\ErrorHandling\Reporter; use Flarum\Http\Middleware as HttpMiddleware; use Flarum\Http\RouteHandlerFactory; use Flarum\Http\Router; diff --git a/framework/core/src/Api/Client.php b/framework/core/src/Api/Client.php index 77b747e4b..2bf3d2994 100644 --- a/framework/core/src/Api/Client.php +++ b/framework/core/src/Api/Client.php @@ -113,7 +113,13 @@ class Client $config = $this->container->make(Config::class); $symfonyRequest = SymfonyRequest::create( - $config->path('api').$path, $method, $this->queryParams, $parent->cookies->all(), $parent->files->all(), $parent->server->all(), json_encode($this->body) + $config->path('api').$path, + $method, + $this->queryParams, + $parent->cookies->all(), + $parent->files->all(), + $parent->server->all(), + json_encode($this->body) ); $request = Request::createFromBase($symfonyRequest); diff --git a/framework/core/src/Api/Controller/DeleteAccessTokenController.php b/framework/core/src/Api/Controller/DeleteAccessTokenController.php index ec41f42af..54b59f85c 100644 --- a/framework/core/src/Api/Controller/DeleteAccessTokenController.php +++ b/framework/core/src/Api/Controller/DeleteAccessTokenController.php @@ -15,7 +15,6 @@ use Flarum\User\Exception\PermissionDeniedException; use Illuminate\Contracts\Session\Session; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\Request; -use Illuminate\Support\Arr; class DeleteAccessTokenController extends AbstractDeleteController { diff --git a/framework/core/src/Api/Controller/DeleteAvatarController.php b/framework/core/src/Api/Controller/DeleteAvatarController.php index 8f375e989..d05bc54d6 100644 --- a/framework/core/src/Api/Controller/DeleteAvatarController.php +++ b/framework/core/src/Api/Controller/DeleteAvatarController.php @@ -28,7 +28,7 @@ class DeleteAvatarController extends AbstractShowController protected function data(Request $request, Document $document): mixed { return $this->bus->dispatch( - new DeleteAvatar($request->route( 'id'), RequestUtil::getActor($request)) + new DeleteAvatar($request->route('id'), RequestUtil::getActor($request)) ); } } diff --git a/framework/core/src/Api/Controller/DeleteDiscussionController.php b/framework/core/src/Api/Controller/DeleteDiscussionController.php index d1bca2a8b..c1a742629 100644 --- a/framework/core/src/Api/Controller/DeleteDiscussionController.php +++ b/framework/core/src/Api/Controller/DeleteDiscussionController.php @@ -13,7 +13,6 @@ use Flarum\Discussion\Command\DeleteDiscussion; use Flarum\Http\RequestUtil; use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Http\Request; -use Illuminate\Support\Arr; class DeleteDiscussionController extends AbstractDeleteController { diff --git a/framework/core/src/Api/Controller/ListPostsController.php b/framework/core/src/Api/Controller/ListPostsController.php index 8ea3c9e0b..5024b25ad 100644 --- a/framework/core/src/Api/Controller/ListPostsController.php +++ b/framework/core/src/Api/Controller/ListPostsController.php @@ -16,7 +16,6 @@ use Flarum\Post\Filter\PostFilterer; use Flarum\Post\PostRepository; use Flarum\Query\QueryCriteria; use Illuminate\Http\Request; -use Illuminate\Support\Arr; use Tobscure\JsonApi\Document; use Tobscure\JsonApi\Exception\InvalidParameterException; diff --git a/framework/core/src/Api/Controller/SetPermissionController.php b/framework/core/src/Api/Controller/SetPermissionController.php index db748a86a..480b36593 100644 --- a/framework/core/src/Api/Controller/SetPermissionController.php +++ b/framework/core/src/Api/Controller/SetPermissionController.php @@ -13,7 +13,6 @@ use Flarum\Group\Permission; use Flarum\Http\Controller\AbstractController; use Flarum\Http\RequestUtil; use Illuminate\Http\Request; -use Illuminate\Support\Arr; use Laminas\Diactoros\Response\EmptyResponse; use Psr\Http\Message\ResponseInterface; diff --git a/framework/core/src/Api/Controller/ShowExtensionReadmeController.php b/framework/core/src/Api/Controller/ShowExtensionReadmeController.php index e159e60ad..63e4c9c07 100644 --- a/framework/core/src/Api/Controller/ShowExtensionReadmeController.php +++ b/framework/core/src/Api/Controller/ShowExtensionReadmeController.php @@ -14,7 +14,6 @@ use Flarum\Extension\Extension; use Flarum\Extension\ExtensionManager; use Flarum\Http\RequestUtil; use Illuminate\Http\Request; -use Illuminate\Support\Arr; use Tobscure\JsonApi\Document; class ShowExtensionReadmeController extends AbstractShowController diff --git a/framework/core/src/Api/Controller/UninstallExtensionController.php b/framework/core/src/Api/Controller/UninstallExtensionController.php index bd9a03579..f8ae6fa0b 100644 --- a/framework/core/src/Api/Controller/UninstallExtensionController.php +++ b/framework/core/src/Api/Controller/UninstallExtensionController.php @@ -12,7 +12,6 @@ namespace Flarum\Api\Controller; use Flarum\Extension\ExtensionManager; use Flarum\Http\RequestUtil; use Illuminate\Http\Request; -use Illuminate\Support\Arr; class UninstallExtensionController extends AbstractDeleteController { diff --git a/framework/core/src/Api/Controller/UpdateGroupController.php b/framework/core/src/Api/Controller/UpdateGroupController.php index 3e639a23a..ea283cfee 100644 --- a/framework/core/src/Api/Controller/UpdateGroupController.php +++ b/framework/core/src/Api/Controller/UpdateGroupController.php @@ -15,7 +15,6 @@ use Flarum\Group\Group; use Flarum\Http\RequestUtil; use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Http\Request; -use Illuminate\Support\Arr; use Tobscure\JsonApi\Document; class UpdateGroupController extends AbstractShowController diff --git a/framework/core/src/Api/Controller/UpdateNotificationController.php b/framework/core/src/Api/Controller/UpdateNotificationController.php index fe757f5d6..a9612ca3b 100644 --- a/framework/core/src/Api/Controller/UpdateNotificationController.php +++ b/framework/core/src/Api/Controller/UpdateNotificationController.php @@ -15,7 +15,6 @@ use Flarum\Notification\Command\ReadNotification; use Flarum\Notification\Notification; use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Http\Request; -use Illuminate\Support\Arr; use Tobscure\JsonApi\Document; class UpdateNotificationController extends AbstractShowController diff --git a/framework/core/src/Api/Controller/UploadAvatarController.php b/framework/core/src/Api/Controller/UploadAvatarController.php index 7bd9cc861..23d922d85 100644 --- a/framework/core/src/Api/Controller/UploadAvatarController.php +++ b/framework/core/src/Api/Controller/UploadAvatarController.php @@ -15,7 +15,6 @@ use Flarum\User\Command\UploadAvatar; use Flarum\User\User; use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Http\Request; -use Illuminate\Support\Arr; use Tobscure\JsonApi\Document; class UploadAvatarController extends AbstractShowController diff --git a/framework/core/src/Api/routes.php b/framework/core/src/Api/routes.php index d58eaa19e..b7d4488b0 100644 --- a/framework/core/src/Api/routes.php +++ b/framework/core/src/Api/routes.php @@ -12,7 +12,6 @@ use Flarum\Http\RouteHandlerFactory; use Flarum\Http\Router; return function (Router $router, RouteHandlerFactory $factory) { - // Get forum information $router ->get('/', $factory->toController(Controller\ShowForumController::class)) @@ -292,5 +291,4 @@ return function (Router $router, RouteHandlerFactory $factory) { $router ->post('/mail/test', $factory->toController(Controller\SendTestMailController::class)) ->name('mailTest'); - }; diff --git a/framework/core/src/Extend/Concerns/ExtendsRoutes.php b/framework/core/src/Extend/Concerns/ExtendsRoutes.php index b1c4f90da..aed50b93b 100644 --- a/framework/core/src/Extend/Concerns/ExtendsRoutes.php +++ b/framework/core/src/Extend/Concerns/ExtendsRoutes.php @@ -1,5 +1,12 @@ getRoutes()->getRoutesByMethod()['GET'][$defaultRoutePath] ?? null; - if (!$route) { + if (! $route) { $route = $router->getRoutes()->getRoutesByMethod()['GET']['all']; } diff --git a/framework/core/src/Forum/routes.php b/framework/core/src/Forum/routes.php index e8d4a3ddd..ab29e9299 100644 --- a/framework/core/src/Forum/routes.php +++ b/framework/core/src/Forum/routes.php @@ -13,7 +13,6 @@ use Flarum\Http\RouteHandlerFactory; use Flarum\Http\Router; return function (Router $router, RouteHandlerFactory $factory) { - $router ->get('/all', $factory->toForum(Content\Index::class)) ->name('index'); @@ -68,5 +67,4 @@ return function (Router $router, RouteHandlerFactory $factory) { $router ->post('/reset', $factory->toController(Controller\SavePasswordController::class)) ->name('savePassword'); - }; diff --git a/framework/core/src/Foundation/Bootstrap/BootProviders.php b/framework/core/src/Foundation/Bootstrap/BootProviders.php index 94a002057..86f5984bb 100644 --- a/framework/core/src/Foundation/Bootstrap/BootProviders.php +++ b/framework/core/src/Foundation/Bootstrap/BootProviders.php @@ -1,8 +1,14 @@ data['paths'][$frontend]) => $this->data['paths'][$frontend], $frontend === 'forum' => '/', default => $frontend, diff --git a/framework/core/src/Foundation/ErrorHandling/ExceptionHandler.php b/framework/core/src/Foundation/ErrorHandling/ExceptionHandler.php index 929137892..92fc6684c 100644 --- a/framework/core/src/Foundation/ErrorHandling/ExceptionHandler.php +++ b/framework/core/src/Foundation/ErrorHandling/ExceptionHandler.php @@ -51,7 +51,8 @@ class ExceptionHandler implements ExceptionHandling public function render($request, Throwable $e): Response /** @phpstan-ignore-line */ { return $this->resolveFormatter($request)->format( - $this->getHandledError($e), $request + $this->getHandledError($e), + $request ); } diff --git a/framework/core/src/Foundation/ErrorHandling/ViewFormatter.php b/framework/core/src/Foundation/ErrorHandling/ViewFormatter.php index ab4b9a3e0..63876ab0b 100644 --- a/framework/core/src/Foundation/ErrorHandling/ViewFormatter.php +++ b/framework/core/src/Foundation/ErrorHandling/ViewFormatter.php @@ -13,7 +13,6 @@ use Flarum\Locale\TranslatorInterface; use Flarum\Settings\SettingsRepositoryInterface; use Illuminate\Contracts\View\Factory as ViewFactory; use Illuminate\Http\Request; -use Laminas\Diactoros\Response\HtmlResponse; use Symfony\Component\HttpFoundation\Response; /** diff --git a/framework/core/src/Foundation/SafeBooter.php b/framework/core/src/Foundation/SafeBooter.php index 15ac625a7..efa084fbc 100644 --- a/framework/core/src/Foundation/SafeBooter.php +++ b/framework/core/src/Foundation/SafeBooter.php @@ -1,5 +1,12 @@ exists) { diff --git a/framework/core/src/Http/RequestUtil.php b/framework/core/src/Http/RequestUtil.php index 55374badf..621848339 100644 --- a/framework/core/src/Http/RequestUtil.php +++ b/framework/core/src/Http/RequestUtil.php @@ -75,7 +75,10 @@ class RequestUtil public static function toPsr7(SymfonyRequest $request): ServerRequestInterface { $psrHttpFactory = new PsrHttpFactory( - new ServerRequestFactory(), new StreamFactory(), new UploadedFileFactory(), new ResponseFactory() + new ServerRequestFactory(), + new StreamFactory(), + new UploadedFileFactory(), + new ResponseFactory() ); return $psrHttpFactory->createRequest($request); diff --git a/framework/core/src/Http/Router.php b/framework/core/src/Http/Router.php index e5f270c37..fbfb90016 100644 --- a/framework/core/src/Http/Router.php +++ b/framework/core/src/Http/Router.php @@ -1,5 +1,12 @@ instance('routes', $routes); $url = new UrlGenerator( - $routes, $container->rebinding( - 'request', $this->requestRebinder() - ), $container['config']['app.asset_url'] + $routes, + $container->rebinding( + 'request', + $this->requestRebinder() + ), + $container['config']['app.asset_url'] ); $url->setConfig( diff --git a/framework/core/src/Http/UrlGenerator.php b/framework/core/src/Http/UrlGenerator.php index a8f980521..75723bd4c 100644 --- a/framework/core/src/Http/UrlGenerator.php +++ b/framework/core/src/Http/UrlGenerator.php @@ -1,5 +1,12 @@