From 0ca16d30e9ba124e3e1a313c813fef43aa8136c9 Mon Sep 17 00:00:00 2001
From: IanM <ian@morland.me>
Date: Tue, 9 Jun 2026 13:21:45 +0100
Subject: [PATCH 1/2] chore: prep rc.3

---
 CHANGELOG.md                                  | 19 +++++++++++++++++++
 framework/core/src/Foundation/Application.php |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c178361ed9..bfd2969ed4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [v2.0.0-rc.3](https://github.com/flarum/framework/compare/v2.0.0-rc.2...v2.0.0-rc.3)
+
+### Added
+
+- (core) detect and surface a database driver/server mismatch (e.g. MariaDB vs MySQL) by @imorland [#4682]
+- (core) content negotiation for forum error handling by @dsevillamartin [#4677]
+
+### Fixed
+
+- (core) refresh the user count and list after user creation by @DavideIadeluca [#4687]
+- (core) lopsided post divider on mobile by @linkrobins [#4691]
+- (core) stub the full Queue Pause/Resume surface on `QueueFactory` by @imorland [#4683]
+- (mentions) align mentions in post with the rest of the text by @dsevillamartin [#4692]
+- (emoji) reserve a square box for `img.emoji` to avoid layout shift (CLS) by @imorland [#4685]
+
+### Performance
+
+- (core) fix N+1 `group_user` queries when serializing users by @imorland [#4696]
+
 ## [v2.0.0-rc.2](https://github.com/flarum/framework/compare/v2.0.0-rc.1...v2.0.0-rc.2)
 
 ### Added
diff --git a/framework/core/src/Foundation/Application.php b/framework/core/src/Foundation/Application.php
index 4edb26fb92..315c0a9d6d 100644
--- a/framework/core/src/Foundation/Application.php
+++ b/framework/core/src/Foundation/Application.php
@@ -27,7 +27,7 @@ class Application extends IlluminateContainer implements LaravelApplication
      *
      * @var string
      */
-    public const VERSION = '2.0.0-rc.2';
+    public const VERSION = '2.0.0-rc.3';
 
     protected bool $booted = false;
 

From 67449e16a23c4b9db764a66df4727904741628a1 Mon Sep 17 00:00:00 2001
From: IanM <ian@morland.me>
Date: Tue, 9 Jun 2026 13:23:40 +0100
Subject: [PATCH 2/2] chore: bump composer reqs

---
 extensions/akismet/composer.json         | 2 +-
 extensions/approval/composer.json        | 2 +-
 extensions/bbcode/composer.json          | 2 +-
 extensions/embed/composer.json           | 2 +-
 extensions/emoji/composer.json           | 2 +-
 extensions/flags/composer.json           | 2 +-
 extensions/gdpr/composer.json            | 6 +++---
 extensions/lang-english/composer.json    | 2 +-
 extensions/likes/composer.json           | 2 +-
 extensions/lock/composer.json            | 2 +-
 extensions/markdown/composer.json        | 2 +-
 extensions/mentions/composer.json        | 2 +-
 extensions/messages/composer.json        | 2 +-
 extensions/nicknames/composer.json       | 2 +-
 extensions/package-manager/composer.json | 2 +-
 extensions/pusher/composer.json          | 2 +-
 extensions/realtime/composer.json        | 2 +-
 extensions/statistics/composer.json      | 2 +-
 extensions/sticky/composer.json          | 2 +-
 extensions/subscriptions/composer.json   | 2 +-
 extensions/suspend/composer.json         | 2 +-
 extensions/tags/composer.json            | 2 +-
 22 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/extensions/akismet/composer.json b/extensions/akismet/composer.json
index 8869d1145a..b20d25cdac 100644
--- a/extensions/akismet/composer.json
+++ b/extensions/akismet/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2",
+        "flarum/core": "^2.0.0-rc.3",
         "flarum/approval": "^2.0"
     },
     "autoload": {
diff --git a/extensions/approval/composer.json b/extensions/approval/composer.json
index d3ba5d0606..b4937c0691 100644
--- a/extensions/approval/composer.json
+++ b/extensions/approval/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2",
+        "flarum/core": "^2.0.0-rc.3",
         "flarum/flags": "^2.0"
     },
     "autoload": {
diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json
index c76643f02b..766302dc10 100644
--- a/extensions/bbcode/composer.json
+++ b/extensions/bbcode/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/embed/composer.json b/extensions/embed/composer.json
index b0624ecc88..08307ad340 100644
--- a/extensions/embed/composer.json
+++ b/extensions/embed/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/emoji/composer.json b/extensions/emoji/composer.json
index 74ed5084a9..4a75c20563 100644
--- a/extensions/emoji/composer.json
+++ b/extensions/emoji/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "extra": {
         "branch-alias": {
diff --git a/extensions/flags/composer.json b/extensions/flags/composer.json
index adf15b88d6..94b55aa520 100644
--- a/extensions/flags/composer.json
+++ b/extensions/flags/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/gdpr/composer.json b/extensions/gdpr/composer.json
index 2448871057..efe26296ca 100644
--- a/extensions/gdpr/composer.json
+++ b/extensions/gdpr/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2",
+        "flarum/core": "^2.0.0-rc.3",
         "nelexa/zip": "^4.0.2"
     },
     "autoload": {
@@ -88,7 +88,7 @@
         "test:setup": "Sets up a database for use with integration tests. Execute this only once."
     },
     "require-dev": {
-        "flarum/testing": "^2.0.0-rc.2",
-        "flarum/phpstan": "^2.0.0-rc.2"
+        "flarum/testing": "^2.0.0-rc.3",
+        "flarum/phpstan": "^2.0.0-rc.3"
     }
 }
diff --git a/extensions/lang-english/composer.json b/extensions/lang-english/composer.json
index 194f4533b0..148db0c754 100644
--- a/extensions/lang-english/composer.json
+++ b/extensions/lang-english/composer.json
@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "extra": {
         "branch-alias": {
diff --git a/extensions/likes/composer.json b/extensions/likes/composer.json
index dccb10d32e..c10487e612 100644
--- a/extensions/likes/composer.json
+++ b/extensions/likes/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/lock/composer.json b/extensions/lock/composer.json
index 2c6a16d826..31e4727fc1 100644
--- a/extensions/lock/composer.json
+++ b/extensions/lock/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/markdown/composer.json b/extensions/markdown/composer.json
index fe12194d4f..efb3643367 100644
--- a/extensions/markdown/composer.json
+++ b/extensions/markdown/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "extra": {
         "branch-alias": {
diff --git a/extensions/mentions/composer.json b/extensions/mentions/composer.json
index 9ccaf0f2d3..3e3f7e37b4 100644
--- a/extensions/mentions/composer.json
+++ b/extensions/mentions/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/messages/composer.json b/extensions/messages/composer.json
index d3f5dac1e6..f10bafdf73 100644
--- a/extensions/messages/composer.json
+++ b/extensions/messages/composer.json
@@ -7,7 +7,7 @@
     "type": "flarum-extension",
     "license": "MIT",
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "authors": [
         {
diff --git a/extensions/nicknames/composer.json b/extensions/nicknames/composer.json
index 49ed90323b..ee32e51140 100644
--- a/extensions/nicknames/composer.json
+++ b/extensions/nicknames/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/package-manager/composer.json b/extensions/package-manager/composer.json
index bd98df3b71..301a8bf7a1 100755
--- a/extensions/package-manager/composer.json
+++ b/extensions/package-manager/composer.json
@@ -22,7 +22,7 @@
         "source": "https://github.com/flarum/extension-manager"
     },
     "require": {
-        "flarum/core": "^2.0.0-rc.2",
+        "flarum/core": "^2.0.0-rc.3",
         "composer/composer": "^2.7"
     },
     "require-dev": {
diff --git a/extensions/pusher/composer.json b/extensions/pusher/composer.json
index c469fdad04..64a9af4500 100644
--- a/extensions/pusher/composer.json
+++ b/extensions/pusher/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2",
+        "flarum/core": "^2.0.0-rc.3",
         "pusher/pusher-php-server": "^7.2"
     },
     "require-dev": {
diff --git a/extensions/realtime/composer.json b/extensions/realtime/composer.json
index 02d9f0abef..8331fc6668 100644
--- a/extensions/realtime/composer.json
+++ b/extensions/realtime/composer.json
@@ -23,7 +23,7 @@
     ],
     "type": "flarum-extension",
     "require": {
-        "flarum/core": "^2.0.0-rc.2",
+        "flarum/core": "^2.0.0-rc.3",
         "plesk/ratchetphp": "v1.0.4",
         "pusher/pusher-php-server": "^7.2.0"
     },
diff --git a/extensions/statistics/composer.json b/extensions/statistics/composer.json
index 304de447f0..07cf104b92 100644
--- a/extensions/statistics/composer.json
+++ b/extensions/statistics/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/sticky/composer.json b/extensions/sticky/composer.json
index a7ec2ede09..3911f56ec7 100644
--- a/extensions/sticky/composer.json
+++ b/extensions/sticky/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/subscriptions/composer.json b/extensions/subscriptions/composer.json
index 4d05b0fc70..944791d3c4 100644
--- a/extensions/subscriptions/composer.json
+++ b/extensions/subscriptions/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/suspend/composer.json b/extensions/suspend/composer.json
index 0d6a887db1..9558e2e326 100644
--- a/extensions/suspend/composer.json
+++ b/extensions/suspend/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/extensions/tags/composer.json b/extensions/tags/composer.json
index 6c01734724..39aab50ce5 100644
--- a/extensions/tags/composer.json
+++ b/extensions/tags/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-rc.2"
+        "flarum/core": "^2.0.0-rc.3"
     },
     "autoload": {
         "psr-4": {