Apply fixes from StyleCI

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
 {

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;

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;
 

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))
             );
         }
 

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;

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');
-
 };

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;

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);

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
 {

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))
         );
     }
 }

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
 {

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;
 

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;
 

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

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
 {

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

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

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

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');
-
 };

framework/core/src/Extend/Concerns/ExtendsRoutes.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Extend\Concerns;
 
 use Flarum\Foundation\Config;

framework/core/src/Forum/Content/User.php

@@ -14,7 +14,6 @@ use Flarum\Frontend\Document;
 use Flarum\Http\UrlGenerator;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
 
 class User
 {

framework/core/src/Forum/ForumServiceProvider.php

@@ -14,10 +14,6 @@ use Flarum\Extension\Event\Enabled;
 use Flarum\Formatter\Formatter;
 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;
@@ -181,7 +177,7 @@ class ForumServiceProvider extends AbstractServiceProvider
         /** @var \Illuminate\Routing\Route $route */
         $route = $router->getRoutes()->getRoutesByMethod()['GET'][$defaultRoutePath] ?? null;
 
-        if (!$route) {
+        if (! $route) {
             $route = $router->getRoutes()->getRoutesByMethod()['GET']['all'];
         }
 

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');
-
 };

framework/core/src/Foundation/Bootstrap/BootProviders.php

@@ -1,8 +1,14 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Foundation\Bootstrap;
 
-use Flarum\Foundation\Bootstrap\IlluminateBootstrapperInterface;
 use Flarum\Foundation\SafeBooter;
 use Illuminate\Contracts\Foundation\Application;
 

framework/core/src/Foundation/Bootstrap/IlluminateBootstrapperInterface.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Foundation\Bootstrap;
 
 use Illuminate\Contracts\Foundation\Application;

framework/core/src/Foundation/Bootstrap/PrepareInstaller.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Foundation\Bootstrap;
 
 use Flarum\Foundation\ErrorServiceProvider;

framework/core/src/Foundation/Bootstrap/RegisterCache.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Foundation\Bootstrap;
 
 use Illuminate\Cache\FileStore;

framework/core/src/Foundation/Bootstrap/RegisterCoreProviders.php

@@ -1,19 +1,24 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Foundation\Bootstrap;
 
 use Flarum\Admin\AdminServiceProvider;
 use Flarum\Api\ApiServiceProvider;
 use Flarum\Bus\BusServiceProvider;
 use Flarum\Console\ConsoleServiceProvider;
-use Flarum\Database\DatabaseServiceProvider;
 use Flarum\Discussion\DiscussionServiceProvider;
 use Flarum\Extension\ExtensionServiceProvider;
 use Flarum\Filesystem\FilesystemServiceProvider;
 use Flarum\Filter\FilterServiceProvider;
 use Flarum\Formatter\FormatterServiceProvider;
 use Flarum\Forum\ForumServiceProvider;
-use Flarum\Foundation\ErrorServiceProvider;
 use Flarum\Frontend\FrontendServiceProvider;
 use Flarum\Group\GroupServiceProvider;
 use Flarum\Http\HttpServiceProvider;
@@ -23,7 +28,6 @@ use Flarum\Notification\NotificationServiceProvider;
 use Flarum\Post\PostServiceProvider;
 use Flarum\Queue\QueueServiceProvider;
 use Flarum\Search\SearchServiceProvider;
-use Flarum\Settings\SettingsServiceProvider;
 use Flarum\Update\UpdateServiceProvider;
 use Flarum\User\SessionServiceProvider;
 use Flarum\User\UserServiceProvider;

framework/core/src/Foundation/Bootstrap/RegisterLogger.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Foundation\Bootstrap;
 
 use Illuminate\Contracts\Foundation\Application;

framework/core/src/Foundation/Bootstrap/RegisterMaintenanceHandler.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Foundation\Bootstrap;
 
 use Flarum\Foundation\MaintenanceModeHandler;

framework/core/src/Foundation/Config.php

@@ -41,7 +41,7 @@ class Config implements ArrayAccess
 
     public function path(string $frontend): string
     {
-        return match(true) {
+        return match (true) {
             isset($this->data['paths'][$frontend]) => $this->data['paths'][$frontend],
             $frontend === 'forum' => '/',
             default => $frontend,

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
         );
     }
 

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;
 
 /**

framework/core/src/Foundation/SafeBooter.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Foundation;
 
 use Flarum\Foundation\ErrorHandling\LogReporter;

framework/core/src/Http/Controller/AbstractController.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Http\Controller;
 
 use Illuminate\Routing\Controller;

framework/core/src/Http/Middleware/IlluminateMiddlewareInterface.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Http\Middleware;
 
 use Closure;

framework/core/src/Http/Middleware/InjectActorReference.php

@@ -19,7 +19,9 @@ class InjectActorReference implements IlluminateMiddlewareInterface
 {
     public function handle(Request $request, Closure $next): Response
     {
-        if (isset($GLOBALS['testing'])) dump('i', $request);
+        if (isset($GLOBALS['testing'])) {
+            dump('i', $request);
+        }
         $request = RequestUtil::withActor($request, new Guest);
 
         return $next($request);

framework/core/src/Http/Middleware/SetLocale.php

@@ -24,7 +24,9 @@ class SetLocale implements IlluminateMiddlewareInterface
 
     public function handle(Request $request, Closure $next): Response
     {
-        if (isset($GLOBALS['testing'])) dump('sl', $request);
+        if (isset($GLOBALS['testing'])) {
+            dump('sl', $request);
+        }
         $actor = RequestUtil::getActor($request);
 
         if ($actor->exists) {

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);

framework/core/src/Http/Router.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Http;
 
 use Illuminate\Routing\Router as IlluminateRouter;

framework/core/src/Http/RoutingServiceProvider.php

@@ -1,15 +1,20 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Http;
 
 use Flarum\Foundation\Config;
-use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Routing\RoutingServiceProvider as IlluminateRoutingServiceProvider;
 use Laminas\Diactoros\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 
 class RoutingServiceProvider extends IlluminateRoutingServiceProvider
 {
@@ -36,9 +41,12 @@ class RoutingServiceProvider extends IlluminateRoutingServiceProvider
             $container->instance('routes', $routes);
 
             $url = new UrlGenerator(
-                $routes, $container->rebinding(
+                $routes,
-                    'request', $this->requestRebinder()
+                $container->rebinding(
-                ), $container['config']['app.asset_url']
+                    'request',
+                    $this->requestRebinder()
+                ),
+                $container['config']['app.asset_url']
             );
 
             $url->setConfig(

framework/core/src/Http/UrlGenerator.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
 namespace Flarum\Http;
 
 use Flarum\Foundation\Config;

framework/core/tests/integration/api/AbstractSerializeControllerTest.php

@@ -13,7 +13,6 @@ use Flarum\Api\Controller\AbstractSerializeController;
 use Flarum\Extend;
 use Flarum\Testing\integration\TestCase;
 use Illuminate\Http\Request;
-use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 use Tobscure\JsonApi\ElementInterface;
 use Tobscure\JsonApi\SerializerInterface;

framework/core/tests/integration/api/access_tokens/AccessTokenLifecycleTest.php

@@ -14,7 +14,6 @@ use Flarum\Http\AccessToken;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Illuminate\Http\Request;
-use Laminas\Diactoros\ServerRequest;
 
 class AccessTokenLifecycleTest extends TestCase
 {

framework/core/tests/integration/extenders/FrontendTitleTest.php

@@ -15,7 +15,6 @@ use Flarum\Frontend\Driver\TitleDriverInterface;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Illuminate\Http\Request;
-use Psr\Http\Message\ServerRequestInterface;
 
 class FrontendTitleTest extends TestCase
 {

php-packages/testing/src/integration/Setup/Bootstrapper.php

@@ -17,7 +17,6 @@ use Flarum\Testing\integration\Extend\BeginTransactionAndSetDatabase;
 use Flarum\Testing\integration\Extend\OverrideExtensionManagerForTests;
 use Flarum\Testing\integration\Extend\SetSettingsBeforeBoot;
 use Flarum\Testing\integration\UsesTmpDir;
-use Illuminate\Database\ConnectionInterface;
 use Illuminate\Support\Arr;
 
 class Bootstrapper

php-packages/testing/src/integration/TestCase.php

@@ -18,7 +18,6 @@ use Illuminate\Contracts\Cache\Store;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
-use Psr\Http\Server\RequestHandlerInterface;
 use Symfony\Component\HttpFoundation\Response;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase