diff --git a/extensions/flags/src/Api/Controller/DeleteFlagsController.php b/extensions/flags/src/Api/Controller/DeleteFlagsController.php index 00125f571..3675693f9 100644 --- a/extensions/flags/src/Api/Controller/DeleteFlagsController.php +++ b/extensions/flags/src/Api/Controller/DeleteFlagsController.php @@ -26,7 +26,7 @@ class DeleteFlagsController extends AbstractDeleteController protected function delete(Request $request): void { $this->bus->dispatch( - new DeleteFlags($request->query('id'), RequestUtil::getActor($request), $request->json()->all()) + new DeleteFlags($request->route('id'), RequestUtil::getActor($request), $request->json()->all()) ); } } diff --git a/framework/core/src/Api/Controller/DeleteAccessTokenController.php b/framework/core/src/Api/Controller/DeleteAccessTokenController.php index 8badcd40a..ec41f42af 100644 --- a/framework/core/src/Api/Controller/DeleteAccessTokenController.php +++ b/framework/core/src/Api/Controller/DeleteAccessTokenController.php @@ -22,7 +22,7 @@ class DeleteAccessTokenController extends AbstractDeleteController protected function delete(Request $request): void { $actor = RequestUtil::getActor($request); - $id = $request->query('id'); + $id = $request->route('id'); $actor->assertRegistered(); diff --git a/framework/core/src/Api/Controller/DeleteAvatarController.php b/framework/core/src/Api/Controller/DeleteAvatarController.php index 7c50060d2..8f375e989 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->query( '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 605d3680a..d1bca2a8b 100644 --- a/framework/core/src/Api/Controller/DeleteDiscussionController.php +++ b/framework/core/src/Api/Controller/DeleteDiscussionController.php @@ -24,7 +24,7 @@ class DeleteDiscussionController extends AbstractDeleteController protected function delete(Request $request): void { - $id = $request->query('id'); + $id = $request->route('id'); $actor = RequestUtil::getActor($request); $input = $request->json()->all(); diff --git a/framework/core/src/Api/Controller/DeleteGroupController.php b/framework/core/src/Api/Controller/DeleteGroupController.php index 1c6f0d538..70e80c70e 100644 --- a/framework/core/src/Api/Controller/DeleteGroupController.php +++ b/framework/core/src/Api/Controller/DeleteGroupController.php @@ -24,7 +24,7 @@ class DeleteGroupController extends AbstractDeleteController protected function delete(Request $request): void { $this->bus->dispatch( - new DeleteGroup($request->query('id'), RequestUtil::getActor($request)) + new DeleteGroup($request->route('id'), RequestUtil::getActor($request)) ); } } diff --git a/framework/core/src/Api/Controller/DeletePostController.php b/framework/core/src/Api/Controller/DeletePostController.php index 1f4c1d3c9..c6fa8a438 100644 --- a/framework/core/src/Api/Controller/DeletePostController.php +++ b/framework/core/src/Api/Controller/DeletePostController.php @@ -24,7 +24,7 @@ class DeletePostController extends AbstractDeleteController protected function delete(Request $request): void { $this->bus->dispatch( - new DeletePost($request->query('id'), RequestUtil::getActor($request)) + new DeletePost($request->route('id'), RequestUtil::getActor($request)) ); } } diff --git a/framework/core/src/Api/Controller/DeleteUserController.php b/framework/core/src/Api/Controller/DeleteUserController.php index ecd24189f..0311086b8 100644 --- a/framework/core/src/Api/Controller/DeleteUserController.php +++ b/framework/core/src/Api/Controller/DeleteUserController.php @@ -24,7 +24,7 @@ class DeleteUserController extends AbstractDeleteController protected function delete(Request $request): void { $this->bus->dispatch( - new DeleteUser($request->query('id'), RequestUtil::getActor($request)) + new DeleteUser($request->route('id'), RequestUtil::getActor($request)) ); } } diff --git a/framework/core/src/Api/Controller/ShowDiscussionController.php b/framework/core/src/Api/Controller/ShowDiscussionController.php index c66fc50df..3d3c6202b 100644 --- a/framework/core/src/Api/Controller/ShowDiscussionController.php +++ b/framework/core/src/Api/Controller/ShowDiscussionController.php @@ -53,7 +53,7 @@ class ShowDiscussionController extends AbstractShowController protected function data(Request $request, Document $document): Discussion { - $discussionId = $request->query('id'); + $discussionId = $request->route('id'); $actor = RequestUtil::getActor($request); $include = $this->extractInclude($request); diff --git a/framework/core/src/Api/Controller/ShowExtensionReadmeController.php b/framework/core/src/Api/Controller/ShowExtensionReadmeController.php index 7a78b1631..e159e60ad 100644 --- a/framework/core/src/Api/Controller/ShowExtensionReadmeController.php +++ b/framework/core/src/Api/Controller/ShowExtensionReadmeController.php @@ -28,7 +28,7 @@ class ShowExtensionReadmeController extends AbstractShowController protected function data(Request $request, Document $document): ?Extension { - $extensionName = $request->query('name'); + $extensionName = $request->route('name'); RequestUtil::getActor($request)->assertAdmin(); diff --git a/framework/core/src/Api/Controller/ShowGroupController.php b/framework/core/src/Api/Controller/ShowGroupController.php index 79363a62b..37630486a 100644 --- a/framework/core/src/Api/Controller/ShowGroupController.php +++ b/framework/core/src/Api/Controller/ShowGroupController.php @@ -27,7 +27,7 @@ class ShowGroupController extends AbstractShowController protected function data(Request $request, Document $document): Group { - $id = $request->query('id'); + $id = $request->route('id'); $actor = RequestUtil::getActor($request); $group = $this->groups->findOrFail($id, $actor); diff --git a/framework/core/src/Api/Controller/ShowPostController.php b/framework/core/src/Api/Controller/ShowPostController.php index 694e4c24b..635cf726b 100644 --- a/framework/core/src/Api/Controller/ShowPostController.php +++ b/framework/core/src/Api/Controller/ShowPostController.php @@ -36,7 +36,7 @@ class ShowPostController extends AbstractShowController protected function data(Request $request, Document $document): Post { - $post = $this->posts->findOrFail($request->query('id'), RequestUtil::getActor($request)); + $post = $this->posts->findOrFail($request->route('id'), RequestUtil::getActor($request)); $include = $this->extractInclude($request); diff --git a/framework/core/src/Api/Controller/ShowUserController.php b/framework/core/src/Api/Controller/ShowUserController.php index 858cf5509..3d91a69b3 100644 --- a/framework/core/src/Api/Controller/ShowUserController.php +++ b/framework/core/src/Api/Controller/ShowUserController.php @@ -32,7 +32,7 @@ class ShowUserController extends AbstractShowController protected function data(Request $request, Document $document): User { - $id = $request->query('id'); + $id = $request->route('id'); $actor = RequestUtil::getActor($request); if ($request->query('bySlug', false)) { diff --git a/framework/core/src/Api/Controller/UninstallExtensionController.php b/framework/core/src/Api/Controller/UninstallExtensionController.php index 1911be7f8..bd9a03579 100644 --- a/framework/core/src/Api/Controller/UninstallExtensionController.php +++ b/framework/core/src/Api/Controller/UninstallExtensionController.php @@ -25,7 +25,7 @@ class UninstallExtensionController extends AbstractDeleteController { RequestUtil::getActor($request)->assertAdmin(); - $name = $request->query('name'); + $name = $request->route('name'); if ($this->extensions->getExtension($name) == null) { return; diff --git a/framework/core/src/Api/Controller/UpdateDiscussionController.php b/framework/core/src/Api/Controller/UpdateDiscussionController.php index cc9b99b68..ca9f18524 100644 --- a/framework/core/src/Api/Controller/UpdateDiscussionController.php +++ b/framework/core/src/Api/Controller/UpdateDiscussionController.php @@ -33,7 +33,7 @@ class UpdateDiscussionController extends AbstractShowController protected function data(Request $request, Document $document): Discussion { $actor = RequestUtil::getActor($request); - $discussionId = (int) $request->query('id'); + $discussionId = (int) $request->route('id'); $data = $request->json()->all(); /** @var Discussion $discussion */ diff --git a/framework/core/src/Api/Controller/UpdateGroupController.php b/framework/core/src/Api/Controller/UpdateGroupController.php index 0e520cf4f..8229e611a 100644 --- a/framework/core/src/Api/Controller/UpdateGroupController.php +++ b/framework/core/src/Api/Controller/UpdateGroupController.php @@ -29,7 +29,7 @@ class UpdateGroupController extends AbstractShowController protected function data(Request $request, Document $document): Group { - $id = $request->query('id'); + $id = $request->route('id'); $actor = RequestUtil::getActor($request); $data = $request->json()->all(); diff --git a/framework/core/src/Api/Controller/UpdateNotificationController.php b/framework/core/src/Api/Controller/UpdateNotificationController.php index 251e83e7e..fe757f5d6 100644 --- a/framework/core/src/Api/Controller/UpdateNotificationController.php +++ b/framework/core/src/Api/Controller/UpdateNotificationController.php @@ -29,7 +29,7 @@ class UpdateNotificationController extends AbstractShowController protected function data(Request $request, Document $document): Notification { - $id = $request->query('id'); + $id = $request->route('id'); $actor = RequestUtil::getActor($request); return $this->bus->dispatch( diff --git a/framework/core/src/Api/Controller/UpdatePostController.php b/framework/core/src/Api/Controller/UpdatePostController.php index 604334c90..701224f9e 100644 --- a/framework/core/src/Api/Controller/UpdatePostController.php +++ b/framework/core/src/Api/Controller/UpdatePostController.php @@ -33,7 +33,7 @@ class UpdatePostController extends AbstractShowController protected function data(Request $request, Document $document): Post { - $id = $request->query('id'); + $id = $request->route('id'); $actor = RequestUtil::getActor($request); $data = $request->json()->all(); diff --git a/framework/core/src/Api/Controller/UpdateUserController.php b/framework/core/src/Api/Controller/UpdateUserController.php index 9a100d830..d06ae526b 100644 --- a/framework/core/src/Api/Controller/UpdateUserController.php +++ b/framework/core/src/Api/Controller/UpdateUserController.php @@ -33,7 +33,7 @@ class UpdateUserController extends AbstractShowController protected function data(Request $request, Document $document): User { - $id = $request->query('id'); + $id = $request->route('id'); $actor = RequestUtil::getActor($request); $data = $request->json()->all(); diff --git a/framework/core/src/Api/Controller/UploadAvatarController.php b/framework/core/src/Api/Controller/UploadAvatarController.php index df1b9e88d..7bd9cc861 100644 --- a/framework/core/src/Api/Controller/UploadAvatarController.php +++ b/framework/core/src/Api/Controller/UploadAvatarController.php @@ -29,7 +29,7 @@ class UploadAvatarController extends AbstractShowController protected function data(Request $request, Document $document): User { - $id = $request->query('id'); + $id = $request->route('id'); $actor = RequestUtil::getActor($request); $file = $request->file('avatar'); diff --git a/framework/core/src/Console/Server.php b/framework/core/src/Console/Server.php index fa61d3a92..0ebbf8a2a 100644 --- a/framework/core/src/Console/Server.php +++ b/framework/core/src/Console/Server.php @@ -32,15 +32,21 @@ class Server public function listen(): never { - $app = $this->site->bootApp(); + $siteApp = $this->site->init(); $console = new Application('Flarum', \Flarum\Foundation\Application::VERSION); - foreach ($app->getConsoleCommands() as $command) { + foreach ($siteApp->getConsoleCommands() as $command) { $console->add($command); } - $this->handleEvents($console, $app->getContainer()); + $app = $siteApp->getContainer(); + + $app->bootstrapWith( + $this->site->bootstrappers() + ); + + $this->handleEvents($console, $app); exit($console->run()); } diff --git a/framework/core/src/Forum/Content/Discussion.php b/framework/core/src/Forum/Content/Discussion.php index f78b03440..94af84e71 100644 --- a/framework/core/src/Forum/Content/Discussion.php +++ b/framework/core/src/Forum/Content/Discussion.php @@ -28,7 +28,7 @@ class Discussion public function __invoke(Document $document, Request $request): Document { - $id = $request->query('id'); + $id = $request->route('id'); $near = intval($request->query('near')); $page = max(1, intval($request->query('page')), 1 + intdiv($near, 20)); diff --git a/framework/core/src/Forum/Content/User.php b/framework/core/src/Forum/Content/User.php index 6dd2c0325..bdce3b71b 100644 --- a/framework/core/src/Forum/Content/User.php +++ b/framework/core/src/Forum/Content/User.php @@ -26,7 +26,7 @@ class User public function __invoke(Document $document, Request $request): Document { - $username = $request->query('username'); + $username = $request->route('username'); $apiDocument = $this->getApiDocument($request, $username); $user = $apiDocument->data->attributes; diff --git a/framework/core/src/Http/Middleware/HandleErrors.php b/framework/core/src/Http/Middleware/HandleErrors.php index 2847f412b..719589ef4 100644 --- a/framework/core/src/Http/Middleware/HandleErrors.php +++ b/framework/core/src/Http/Middleware/HandleErrors.php @@ -49,6 +49,8 @@ class HandleErrors implements IlluminateMiddlewareInterface } } +// dump($e); + return $this->formatter->format($error, $request); } } diff --git a/framework/core/src/Queue/ExceptionHandler.php b/framework/core/src/Queue/ExceptionHandler.php index 973357834..f4b4e61cc 100644 --- a/framework/core/src/Queue/ExceptionHandler.php +++ b/framework/core/src/Queue/ExceptionHandler.php @@ -40,7 +40,7 @@ class ExceptionHandler implements ExceptionHandling */ public function render($request, Throwable $e) /** @phpstan-ignore-line */ { - // TODO: Implement render() method. +// dd($e); } /**