proof of concept illuminate http

composer.json

@@ -109,7 +109,6 @@
         "ext-json": "*",
         "components/font-awesome": "^5.15.0",
         "composer/composer": "^2.0",
-        "dflydev/fig-cookies": "^3.0",
         "doctrine/dbal": "^3.6.2",
         "dragonmantank/cron-expression": "^3.3",
         "franzl/whoops-middleware": "2.0",
@@ -124,8 +123,10 @@
         "illuminate/events": "^10.0",
         "illuminate/filesystem": "^10.0",
         "illuminate/hashing": "^10.0",
+        "illuminate/http": "^10.0",
         "illuminate/mail": "^10.0",
         "illuminate/queue": "^10.0",
+        "illuminate/routing": "^10.0",
         "illuminate/session": "^10.0",
         "illuminate/support": "^10.0",
         "illuminate/validation": "^10.0",
@@ -143,7 +144,6 @@
         "middlewares/request-handler": "^2.0.2",
         "monolog/monolog": "^3.3",
         "nesbot/carbon": "^2.66",
-        "nikic/fast-route": "^1.3",
         "psr/http-message": "^1.1",
         "psr/http-server-handler": "^1.0.2",
         "psr/http-server-middleware": "^1.0.2",
@@ -160,6 +160,7 @@
         "symfony/mime": "^6.3",
         "symfony/polyfill-intl-messageformatter": "^1.27",
         "symfony/postmark-mailer": "^6.3",
+        "symfony/psr-http-message-bridge": "^2.3",
         "symfony/translation": "^6.3",
         "symfony/yaml": "^6.3",
         "wikimedia/less.php": "^4.1"

extensions/akismet/src/Provider/AkismetProvider.php

@@ -36,7 +36,7 @@ public function register(): void
 
             return new Akismet(
                 $settings->get('flarum-akismet.api_key'),
-                $url->to('forum')->base(),
+                $url->base('forum'),
                 $app::VERSION,
                 $extensions->getExtension('flarum-akismet')->getVersion() ?? 'unknown',
                 $config->inDebugMode()

extensions/approval/tests/integration/api/ListDiscussionsTest.php

@@ -38,7 +38,7 @@ public function can_only_see_approved_if_not_allowed_to_approve(?int $authentica
             $this->request('GET', '/api/discussions', compact('authenticatedAs'))
         );
 
-        $body = json_decode($response->getBody()->getContents(), true);
+        $body = json_decode($response->getContent(), true);
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEqualsCanonicalizing([1, 4, 5, 7], Arr::pluck($body['data'], 'id'));
@@ -54,7 +54,7 @@ public function can_see_unapproved_if_allowed_to_approve(int $authenticatedAs)
             $this->request('GET', '/api/discussions', compact('authenticatedAs'))
         );
 
-        $body = json_decode($response->getBody()->getContents(), true);
+        $body = json_decode($response->getContent(), true);
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEqualsCanonicalizing([1, 2, 3, 4, 5, 6, 7], Arr::pluck($body['data'], 'id'));

extensions/approval/tests/integration/api/ListPostsTest.php

@@ -12,6 +12,7 @@
 use Flarum\Approval\Tests\integration\InteractsWithUnapprovedContent;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
+use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 
 class ListPostsTest extends TestCase
@@ -35,16 +36,17 @@ protected function setUp(): void
     public function can_only_see_approved_if_not_allowed_to_approve(?int $authenticatedAs)
     {
         $response = $this->send(
-            $this
-                ->request('GET', '/api/posts', compact('authenticatedAs'))
-                ->withQueryParams([
+            tap(
+                $this->request('GET', '/api/posts', compact('authenticatedAs')),
+                fn (Request $request) => $request->query->add([
                     'filter' => [
                         'discussion' => 7
                     ]
                 ])
+            )
         );
 
-        $body = json_decode($response->getBody()->getContents(), true);
+        $body = json_decode($response->getContent(), true);
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEqualsCanonicalizing([7, 8, 10], Arr::pluck($body['data'], 'id'));
@@ -57,16 +59,17 @@ public function can_only_see_approved_if_not_allowed_to_approve(?int $authentica
     public function can_see_unapproved_if_allowed_to_approve(int $authenticatedAs)
     {
         $response = $this->send(
-            $this
-                ->request('GET', '/api/posts', compact('authenticatedAs'))
-                ->withQueryParams([
+            tap(
+                $this->request('GET', '/api/posts', compact('authenticatedAs')),
+                fn (Request $request) => $request->query->add([
                     'filter' => [
                         'discussion' => 7
                     ]
                 ])
+            )
         );
 
-        $body = json_decode($response->getBody()->getContents(), true);
+        $body = json_decode($response->getContent(), true);
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEqualsCanonicalizing([7, 8, 9, 10, 11], Arr::pluck($body['data'], 'id'));

extensions/embed/extend.php

@@ -9,7 +9,7 @@
 
 use Flarum\Extend;
 use Flarum\Frontend\Document;
-use Psr\Http\Message\ServerRequestInterface as Request;
+use Illuminate\Http\Request;
 
 return [
     (new Extend\Frontend('forum'))

extensions/flags/src/Api/Controller/CreateFlagController.php

@@ -15,8 +15,7 @@
 use Flarum\Flags\Flag;
 use Flarum\Http\RequestUtil;
 use Illuminate\Contracts\Bus\Dispatcher;
-use Illuminate\Support\Arr;
-use Psr\Http\Message\ServerRequestInterface;
+use Illuminate\Http\Request;
 use Tobscure\JsonApi\Document;
 
 class CreateFlagController extends AbstractCreateController
@@ -34,10 +33,10 @@ public function __construct(
     ) {
     }
 
-    protected function data(ServerRequestInterface $request, Document $document): Flag
+    protected function data(Request $request, Document $document): Flag
     {
         return $this->bus->dispatch(
-            new CreateFlag(RequestUtil::getActor($request), Arr::get($request->getParsedBody(), 'data', []))
+            new CreateFlag(RequestUtil::getActor($request), $request->json('data', []))
         );
     }
 }

extensions/flags/src/Api/Controller/DeleteFlagsController.php

@@ -13,8 +13,7 @@
 use Flarum\Flags\Command\DeleteFlags;
 use Flarum\Http\RequestUtil;
 use Illuminate\Contracts\Bus\Dispatcher;
-use Illuminate\Support\Arr;
-use Psr\Http\Message\ServerRequestInterface;
+use Illuminate\Http\Request;
 
 class DeleteFlagsController extends AbstractDeleteController
 {
@@ -23,10 +22,10 @@
     ) {
     }
 
-    protected function delete(ServerRequestInterface $request): void
+    protected function delete(Request $request): void
     {
         $this->bus->dispatch(
-            new DeleteFlags(Arr::get($request->getQueryParams(), 'id'), RequestUtil::getActor($request), $request->getParsedBody())
+            new DeleteFlags($request->route('id'), RequestUtil::getActor($request), $request->json()->all())
         );
     }
 }

extensions/flags/src/Api/Controller/ListFlagsController.php

@@ -14,7 +14,7 @@
 use Flarum\Flags\Api\Serializer\FlagSerializer;
 use Flarum\Flags\Flag;
 use Flarum\Http\RequestUtil;
-use Psr\Http\Message\ServerRequestInterface;
+use Illuminate\Http\Request;
 use Tobscure\JsonApi\Document;
 
 class ListFlagsController extends AbstractListController
@@ -28,7 +28,7 @@ class ListFlagsController extends AbstractListController
         'post.discussion'
     ];
 
-    protected function data(ServerRequestInterface $request, Document $document): iterable
+    protected function data(Request $request, Document $document): iterable
     {
         $actor = RequestUtil::getActor($request);
         $include = $this->extractInclude($request);

extensions/flags/src/PrepareFlagsApiData.php

@@ -13,11 +13,11 @@
 use Flarum\Flags\Api\Controller\CreateFlagController;
 use Flarum\Http\RequestUtil;
 use Illuminate\Database\Eloquent\Collection;
-use Psr\Http\Message\ServerRequestInterface;
+use Illuminate\Http\Request;
 
 class PrepareFlagsApiData
 {
-    public function __invoke(Controller\AbstractSerializeController $controller, mixed $data, ServerRequestInterface $request): void
+    public function __invoke(Controller\AbstractSerializeController $controller, mixed $data, Request $request): void
     {
         // For any API action that allows the 'flags' relationship to be
         // included, we need to preload this relationship onto the data (Post

extensions/flags/tests/integration/api/flags/ListTest.php

@@ -75,7 +75,7 @@ public function admin_can_see_one_flag_per_post()
 
         $this->assertEquals(200, $response->getStatusCode());
 
-        $data = json_decode($response->getBody()->getContents(), true)['data'];
+        $data = json_decode($response->getContent(), true)['data'];
 
         $ids = Arr::pluck($data, 'id');
         $this->assertEqualsCanonicalizing(['1', '4', '5'], $ids);
@@ -94,7 +94,7 @@ public function regular_user_sees_own_flags()
 
         $this->assertEquals(200, $response->getStatusCode());
 
-        $data = json_decode($response->getBody()->getContents(), true)['data'];
+        $data = json_decode($response->getContent(), true)['data'];
 
         $ids = Arr::pluck($data, 'id');
         $this->assertEqualsCanonicalizing(['2', '4'], $ids);
@@ -113,7 +113,7 @@ public function mod_can_see_one_flag_per_post()
 
         $this->assertEquals(200, $response->getStatusCode());
 
-        $data = json_decode($response->getBody()->getContents(), true)['data'];
+        $data = json_decode($response->getContent(), true)['data'];
 
         $ids = Arr::pluck($data, 'id');
         $this->assertEqualsCanonicalizing(['1', '4', '5'], $ids);

extensions/flags/tests/integration/api/flags/ListWithTagsTest.php

@@ -108,7 +108,7 @@ public function admin_can_see_one_flag_per_post()
 
         $this->assertEquals(200, $response->getStatusCode());
 
-        $data = json_decode($response->getBody()->getContents(), true)['data'];
+        $data = json_decode($response->getContent(), true)['data'];
 
         $ids = Arr::pluck($data, 'id');
         $this->assertEqualsCanonicalizing(['1', '4', '5', '6', '7', '8', '9'], $ids);
@@ -127,7 +127,7 @@ public function regular_user_sees_own_flags()
 
         $this->assertEquals(200, $response->getStatusCode());
 
-        $data = json_decode($response->getBody()->getContents(), true)['data'];
+        $data = json_decode($response->getContent(), true)['data'];
 
         $ids = Arr::pluck($data, 'id');
         $this->assertEqualsCanonicalizing(['2', '4'], $ids);
@@ -146,7 +146,7 @@ public function mod_can_see_one_flag_per_post()
 
         $this->assertEquals(200, $response->getStatusCode());
 
-        $data = json_decode($response->getBody()->getContents(), true)['data'];
+        $data = json_decode($response->getContent(), true)['data'];
 
         $ids = Arr::pluck($data, 'id');
         // 7 is included, even though mods can't view discussions.

extensions/likes/src/Api/LoadLikesRelationship.php

@@ -16,13 +16,13 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Query\Expression;
-use Psr\Http\Message\ServerRequestInterface;
+use Illuminate\Http\Request;
 
 class LoadLikesRelationship
 {
     public static int $maxLikes = 4;
 
-    public static function mutateRelation(BelongsToMany $query, ServerRequestInterface $request): void
+    public static function mutateRelation(BelongsToMany $query, Request $request): void
     {
         $actor = RequestUtil::getActor($request);
 

extensions/likes/tests/integration/api/LikePostTest.php

@@ -143,7 +143,7 @@ protected function sendLikeRequest(int $postId, ?int $authenticatedAs, bool $lik
                 $this->request('GET', '/')
             );
 
-            $token = $initial->getHeaderLine('X-CSRF-Token');
+            $token = $initial->headers->get('X-CSRF-Token');
         }
 
         $request = $this->request('PATCH', "/api/posts/$postId", [
@@ -159,7 +159,7 @@ protected function sendLikeRequest(int $postId, ?int $authenticatedAs, bool $lik
         ]);
 
         if (! isset($authenticatedAs)) {
-            $request = $request->withHeader('X-CSRF-Token', $token);
+            $request->headers->set('X-CSRF-Token', $token);
         }
 
         return $this->send($request);