mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-09 18:07:02 +02:00
Code Issues Releases Wiki Activity

chore: some fixes

Browse Source
This commit is contained in:
Sami Mazouz
2023-08-14 13:11:26 +01:00
parent 2a0f8ff7ed
commit 835eba9178
20 changed files with 71 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
framework/core/src/Api/Client.php
View File

@@ -128,11 +128,27 @@ class Client
$request = RequestUtil::withActor($request, $this->actor);
}
$originalRequest = $this->container->make('request');
return (new Pipeline($this->container))
->send($request)
->through($this->middlewareStack)
->then(function (Request $request) {
return $this->container->make(Router::class)->dispatch($request);
->then(function (Request $request) use ($originalRequest) {
$this->container->instance('request', $request);
/** @var Router $router */
$router = $this->container->make(Router::class);
$originalMiddlewareGroup = $router->getMiddlewareGroups()['api'];
$router->middlewareGroup('api', $this->middlewareStack);
$response = $router->dispatch($request);
$router->middlewareGroup('api', $originalMiddlewareGroup);
$this->container->instance('request', $originalRequest);
return $response;
});
}
}

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

@@ -34,7 +34,7 @@ class UpdateDiscussionController extends AbstractShowController
{
$actor = RequestUtil::getActor($request);
$discussionId = (int) $request->route('id');
$data = $request->json()->all();
$data = $request->json('data', []);
/** @var Discussion $discussion */
$discussion = $this->bus->dispatch(

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

@@ -31,7 +31,7 @@ class UpdateGroupController extends AbstractShowController
{
$id = $request->route('id');
$actor = RequestUtil::getActor($request);
$data = $request->json()->all();
$data = $request->json('data', []);
return $this->bus->dispatch(
new EditGroup($id, $actor, $data)

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

@@ -35,7 +35,7 @@ class UpdatePostController extends AbstractShowController
{
$id = $request->route('id');
$actor = RequestUtil::getActor($request);
$data = $request->json()->all();
$data = $request->json('data', []);
$post = $this->bus->dispatch(
new EditPost($id, $actor, $data)

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

@@ -17,7 +17,6 @@ use Flarum\User\Exception\NotAuthenticatedException;
use Flarum\User\User;
use Illuminate\Contracts\Bus\Dispatcher;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Tobscure\JsonApi\Document;
class UpdateUserController extends AbstractShowController
@@ -35,7 +34,7 @@ class UpdateUserController extends AbstractShowController
{
$id = $request->route('id');
$actor = RequestUtil::getActor($request);
$data = $request->json()->all();
$data = $request->json('data', []);
if ($actor->id == $id) {
$this->serializer = CurrentUserSerializer::class;
@@ -44,7 +43,7 @@ class UpdateUserController extends AbstractShowController
// Require the user's current password if they are attempting to change
// their own email address.
if (isset($data['attributes']['email']) && $actor->id == $id) {
$password = (string) Arr::get($data, 'meta.password');
$password = (string) $request->json('meta.password');
if (! $actor->checkPassword($password)) {
throw new NotAuthenticatedException;

6
framework/core/src/Api/routes.php
View File

@@ -67,8 +67,7 @@ return function (Router $router, RouteHandlerFactory $factory) {
// Get a single user
$router
->get('/users/{id}', $factory->toController(Controller\ShowUserController::class))
->name('users.show')
->whereNumber('id');
->name('users.show');
// Edit a user
$router
@@ -146,8 +145,7 @@ return function (Router $router, RouteHandlerFactory $factory) {
// Show a single discussion
$router
->get('/discussions/{id}', $factory->toController(Controller\ShowDiscussionController::class))
->name('discussions.show')
->whereNumber('id');
->name('discussions.show');
// Edit a discussion
$router

2
framework/core/src/Forum/Controller/ConfirmEmailController.php
View File

@@ -30,7 +30,7 @@ class ConfirmEmailController extends AbstractController
public function __invoke(Request $request): ResponseInterface
{
$token = $request->query('token');
$token = $request->route('token');
$user = $this->bus->dispatch(
new ConfirmEmail($token)

2
framework/core/src/Forum/Controller/ConfirmEmailViewController.php
View File

@@ -24,7 +24,7 @@ class ConfirmEmailViewController extends AbstractHtmlController
public function render(Request $request): View
{
$token = $request->query('token');
$token = $request->route('token');
EmailToken::validOrFail($token);

2
framework/core/src/Forum/Controller/ResetPasswordController.php
View File

@@ -26,7 +26,7 @@ class ResetPasswordController extends AbstractHtmlController
public function render(Request $request): View
{
$token = $request->query('token');
$token = $request->route('token');
$token = PasswordToken::findOrFail($token);

7
framework/core/src/Forum/ForumServiceProvider.php
View File

@@ -179,7 +179,12 @@ class ForumServiceProvider extends AbstractServiceProvider
{
$defaultRoutePath = ltrim($settings->get('default_route', '/all'), '/');
/** @var \Illuminate\Routing\Route $route */
$route = $router->getRoutes()->getRoutesByMethod()['GET'][$defaultRoutePath];
$route = $router->getRoutes()->getRoutesByMethod()['GET'][$defaultRoutePath] ?? null;
if (!$route) {
$route = $router->getRoutes()->getRoutesByMethod()['GET']['all'];
}
$router->get('/', Arr::except($route->getAction(), ['as']))->name('forum.default');
}
}

8
framework/core/src/Foundation/ErrorHandling/ExceptionHandler.php
View File

@@ -83,11 +83,13 @@ class ExceptionHandler implements ExceptionHandling
protected function resolveFormatter(Request $request): HttpFormatter
{
$isApiFrontend = explode('/', trim($request->path(), '/'))[0] === $this->config->path('api');
return match (true) {
$request->expectsJson(),
$request->routeIs('api.*') => Arr::first($this->formatters, fn (HttpFormatter $formatter) => $formatter instanceof JsonApiFormatter),
$this->config->inDebugMode() => Arr::first($this->formatters, fn (HttpFormatter $formatter) => $formatter instanceof WhoopsFormatter),
default => Arr::first($this->formatters, fn (HttpFormatter $formatter) => $formatter instanceof ViewFormatter),
$isApiFrontend => Arr::first($this->formatters, fn (HttpFormatter $formatter) => $formatter instanceof JsonApiFormatter),
$this->config->inDebugMode() => Arr::first($this->formatters, fn (HttpFormatter $formatter) => $formatter instanceof WhoopsFormatter),
default => Arr::first($this->formatters, fn (HttpFormatter $formatter) => $formatter instanceof ViewFormatter),
};
}
}

2
framework/core/src/Foundation/ErrorServiceProvider.php
View File

@@ -16,6 +16,7 @@ use Illuminate\Contracts\Container\Container;
use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerContract;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Validation\ValidationException as IlluminateValidationException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Tobscure\JsonApi\Exception\InvalidParameterException;
class ErrorServiceProvider extends AbstractServiceProvider
@@ -61,6 +62,7 @@ class ErrorServiceProvider extends AbstractServiceProvider
return [
InvalidParameterException::class => 'invalid_parameter',
ModelNotFoundException::class => 'not_found',
NotFoundHttpException::class => 'not_found',
];
});

4
framework/core/src/Http/Middleware/CheckCsrfToken.php
View File

@@ -46,7 +46,9 @@ class CheckCsrfToken implements IlluminateMiddlewareInterface
{
$expected = (string) $request->attributes->get('session')->token();
$provided = $request->json('csrfToken', $request->header('X-CSRF-Token'));
$provided = $request->isJson()
? $request->json('csrfToken', $request->header('X-CSRF-Token'))
: $request->header('X-CSRF-Token');
if (! is_string($provided)) {
return false;

1
framework/core/src/Http/Middleware/InjectActorReference.php
View File

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

1
framework/core/src/Http/Middleware/SetLocale.php
View File

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

19
framework/core/src/Http/RoutingServiceProvider.php
View File

@@ -3,8 +3,13 @@
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
{
@@ -43,4 +48,18 @@ class RoutingServiceProvider extends IlluminateRoutingServiceProvider
return $url;
});
}
protected function registerPsrRequest(): void
{
$this->app->bind(ServerRequestInterface::class, function ($app) {
return RequestUtil::toPsr7($app->make('request'));
});
}
protected function registerPsrResponse(): void
{
$this->app->bind(ResponseInterface::class, function () {
return new Response();
});
}
}

2
framework/core/src/Http/Server.php
View File

@@ -43,6 +43,8 @@ class Server
->send($request)
->through($globalMiddleware)
->then(function (Request $request) use ($app) {
$app->instance('request', $request);
return $app->make(Router::class)->dispatch($request);
});
}

2
framework/core/src/User/Throttler/EmailActivationThrottler.php
View File

@@ -24,7 +24,7 @@ class EmailActivationThrottler
public function __invoke(Request $request): ?bool
{
if ($request->routeIs('api.users.confirmation.send')) {
if (! $request->routeIs('api.users.confirmation.send')) {
return null;
}

2
framework/core/src/User/Throttler/EmailChangeThrottler.php
View File

@@ -24,7 +24,7 @@ class EmailChangeThrottler
public function __invoke(Request $request): ?bool
{
if ($request->routeIs('api.users.update')) {
if (! $request->routeIs('api.users.update')) {
return null;
}

2
framework/core/src/User/Throttler/PasswordResetThrottler.php
View File

@@ -25,7 +25,7 @@ class PasswordResetThrottler
public function __invoke(Request $request): ?bool
{
if ($request->routeIs('forum.forgot')) {
if (! $request->routeIs('forum.forgot')) {
return null;
}