github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-18 03:02:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: some fixes

Browse Source
This commit is contained in:
Sami Mazouz 2023-08-13 15:50:09 +01:00
parent 6a812910dc
commit e1ab77f66a
No known key found for this signature in database
24 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/flags/src/Api/Controller/DeleteFlagsController.php
View File

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

2
framework/core/src/Api/Controller/DeleteAccessTokenController.php
View File

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

2
framework/core/src/Api/Controller/DeleteAvatarController.php
View File

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

2
framework/core/src/Api/Controller/DeleteDiscussionController.php
View File

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

2
framework/core/src/Api/Controller/DeleteGroupController.php
View File

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

2
framework/core/src/Api/Controller/DeletePostController.php
View File

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

2
framework/core/src/Api/Controller/DeleteUserController.php
View File

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

2
framework/core/src/Api/Controller/ShowDiscussionController.php
View File

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

2
framework/core/src/Api/Controller/ShowExtensionReadmeController.php
View File

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

2
framework/core/src/Api/Controller/ShowGroupController.php
View File

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

2
framework/core/src/Api/Controller/ShowPostController.php
View File

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

2
framework/core/src/Api/Controller/ShowUserController.php
View File

@ -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)) {

2
framework/core/src/Api/Controller/UninstallExtensionController.php
View File

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

2
framework/core/src/Api/Controller/UpdateDiscussionController.php
View File

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

2
framework/core/src/Api/Controller/UpdateGroupController.php
View File

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

2
framework/core/src/Api/Controller/UpdateNotificationController.php
View File

@ -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(

2
framework/core/src/Api/Controller/UpdatePostController.php
View File

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

2
framework/core/src/Api/Controller/UpdateUserController.php
View File

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

2
framework/core/src/Api/Controller/UploadAvatarController.php
View File

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

12
framework/core/src/Console/Server.php
View File

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

2
framework/core/src/Forum/Content/Discussion.php
View File

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

2
framework/core/src/Forum/Content/User.php
View File

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

2
framework/core/src/Http/Middleware/HandleErrors.php
View File

@ -49,6 +49,8 @@ class HandleErrors implements IlluminateMiddlewareInterface
}
}
// dump($e);
return $this->formatter->format($error, $request);
}
}

2
framework/core/src/Queue/ExceptionHandler.php
View File

@ -40,7 +40,7 @@ class ExceptionHandler implements ExceptionHandling
*/
public function render($request, Throwable $e) /** @phpstan-ignore-line */
{
// TODO: Implement render() method.
// dd($e);
}
/**