chore(deps): bump nanoid from 3.3.7 to 3.3.8

Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
perf(mentions): only access related mentions if loaded
2025-08-13 11:54:32 +02:00 · 2024-12-16 21:02:08 +00:00 · 2024-12-13 13:06:36 +01:00 · 2024-12-13 13:06:08 +01:00 · 2024-12-12 21:27:57 +01:00 · 2024-12-08 15:18:49 +01:00
1292 changed files with 27399 additions and 11074 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -40,7 +40,7 @@ body:
    validations:
      required: false
  - type: textarea
-    id: enironment
+    id: environment
    attributes:
      label: Environment
      value: |
--- a/.github/workflows/REUSABLE_backend.yml
+++ b/.github/workflows/REUSABLE_backend.yml
@@ -32,7 +32,7 @@ on:
        type: string
        required: false
        # Keep PHP versions synced with build-install-packages.yml
-        default: '["8.1", "8.2", "8.3"]'
+        default: '["8.2", "8.3", "8.4"]'

      php_extensions:
        description: PHP extensions to install.
@@ -44,7 +44,7 @@ on:
        description: Versions of databases to test with. Should be array of strings encoded as JSON array
        type: string
        required: false
-        default: '["mysql:5.7", "mysql:8.0.30", "mysql:8.1.0", "mariadb", "sqlite:3"]'
+        default: '["mysql:5.7", "mysql:8.0.30", "mysql:8.1.0", "mariadb", "sqlite:3", "postgres:10"]'

      php_ini_values:
        description: PHP ini values
@@ -68,6 +68,9 @@ env:
  # `inputs.composer_directory` defaults to `inputs.backend_directory`
  FLARUM_TEST_TMP_DIR_LOCAL: tests/integration/tmp
  COMPOSER_AUTH: ${{ secrets.composer_auth }}
+  DB_DATABASE: flarum_test
+  DB_USERNAME: flarum
+  DB_PASSWORD: password

 jobs:
  test:
@@ -91,13 +94,16 @@ jobs:
            driver: mysql
          - service: mariadb
            db: MariaDB
-            driver: mysql
+            driver: mariadb
          - service: 'mysql:8.1.0'
            db: MySQL 8.1
            driver: mysql
          - service: 'sqlite:3'
            db: SQLite
            driver: sqlite
+          - service: 'postgres:10'
+            db: PostgreSQL 10
+            driver: pgsql

          # Include Database prefix tests with only one PHP version.
          - php: ${{ fromJSON(inputs.php_versions)[0] }}
@@ -106,22 +112,10 @@ jobs:
            driver: mysql
            prefix: flarum_
            prefixStr: (prefix)
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'mysql:8.0.30'
-            db: MySQL 8.0
-            driver: mysql
-            prefix: flarum_
-            prefixStr: (prefix)
          - php: ${{ fromJSON(inputs.php_versions)[0] }}
            service: mariadb
            db: MariaDB
-            driver: mysql
-            prefix: flarum_
-            prefixStr: (prefix)
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'mysql:8.1.0'
-            db: MySQL 8.1
-            driver: mysql
+            driver: mariadb
            prefix: flarum_
            prefixStr: (prefix)
          - php: ${{ fromJSON(inputs.php_versions)[0] }}
@@ -130,6 +124,12 @@ jobs:
            driver: sqlite
            prefix: flarum_
            prefixStr: (prefix)
+          - php: ${{ fromJSON(inputs.php_versions)[0] }}
+            service: 'postgres:10'
+            db: PostgreSQL 10
+            driver: pgsql
+            prefix: flarum_
+            prefixStr: (prefix)

        # To reduce number of actions, we exclude some PHP versions from running with some DB versions.
        exclude:
@@ -147,12 +147,45 @@ jobs:
            service: 'sqlite:3'
          - php: ${{ fromJSON(inputs.php_versions)[1] }}
            service: 'sqlite:3'
+          - php: ${{ fromJSON(inputs.php_versions)[0] }}
+            service: 'postgres:10'
+          - php: ${{ fromJSON(inputs.php_versions)[1] }}
+            service: 'postgres:10'

    services:
      mysql:
-        image: ${{ matrix.service != 'sqlite:3' && matrix.service || '' }}
+        image: ${{ matrix.driver == 'mysql' && matrix.service || '' }}
+        env:
+          MYSQL_DATABASE: ${{ env.DB_DATABASE }}
+          MYSQL_USER: ${{ env.DB_USERNAME }}
+          MYSQL_PASSWORD: ${{ env.DB_PASSWORD }}
+          MYSQL_ROOT_PASSWORD: root
        ports:
-          - 13306:3306
+          - 3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=10
+      mariadb:
+        image: ${{ matrix.driver == 'mariadb' && matrix.service || '' }}
+        env:
+          MARIADB_DATABASE: ${{ env.DB_DATABASE }}
+          MARIADB_USER: ${{ env.DB_USERNAME }}
+          MARIADB_PASSWORD: ${{ env.DB_PASSWORD }}
+          MARIADB_ROOT_PASSWORD: root
+        ports:
+          - 3306
+        options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
+      postgres:
+        image: ${{ matrix.driver == 'pgsql' && matrix.service || '' }}
+        env:
+          POSTGRES_DB: ${{ env.DB_DATABASE }}
+          POSTGRES_USER: ${{ env.DB_USERNAME }}
+          POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }}
+        ports:
+          - 5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5

    name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'

@@ -161,7 +194,10 @@ jobs:
      ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) || github.event_name != 'pull_request')

    steps:
-      - uses: actions/checkout@master
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1

      - name: Setup PHP
        uses: shivammathur/setup-php@v2
@@ -172,12 +208,6 @@ jobs:
          tools: phpunit, composer:v2
          ini-values: ${{ matrix.php_ini_values }}

-      - name: Create MySQL Database
-        if: ${{ matrix.service != 'sqlite:3' }}
-        run: |
-          sudo systemctl start mysql
-          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
-
      - name: Install Composer dependencies
        run: composer install
        working-directory: ${{ inputs.backend_directory }}
@@ -200,8 +230,8 @@ jobs:
          fi
        working-directory: ${{ inputs.backend_directory }}
        env:
-          DB_PORT: 13306
-          DB_PASSWORD: root
+          DB_HOST: 127.0.0.1
+          DB_PORT: ${{ (matrix.driver == 'mysql' && job.services.mysql.ports['3306']) || (matrix.driver == 'mariadb' && job.services.mariadb.ports['3306']) || (matrix.driver == 'pgsql' && job.services.postgres.ports['5432']) }}
          DB_PREFIX: ${{ matrix.prefix }}
          DB_DRIVER: ${{ matrix.driver }}
          COMPOSER_PROCESS_TIMEOUT: 600
@@ -211,13 +241,7 @@ jobs:

    strategy:
      matrix:
-        php: ${{ fromJSON(inputs.php_versions) }}
-
-    services:
-      mysql:
-        image: mysql:8.0.30
-        ports:
-          - 33306:3306
+        php: ${{ fromJson(inputs.php_versions) }}

    name: 'PHPStan PHP ${{ matrix.php }}'

@@ -244,12 +268,13 @@ jobs:
      - name: Create MySQL Database
        run: |
          sudo systemctl start mysql
-          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 33306
+          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 3306

      - name: Run PHPStan
        run: composer analyse:phpstan
        env:
-          DB_PORT: 33306
+          DB_USERNAME: root
+          DB_PORT: 3306
          DB_PASSWORD: root
          COMPOSER_PROCESS_TIMEOUT: 600
          FLARUM_TEST_TMP_DIR_LOCAL: ./tmp
--- a/.github/workflows/REUSABLE_frontend.yml
+++ b/.github/workflows/REUSABLE_frontend.yml
@@ -74,7 +74,7 @@ on:
        description: The node version to use for the workflow.
        type: number
        required: false
-        default: 16
+        default: 20

      js_package_manager:
        description: "Enable TypeScript?"
@@ -105,6 +105,7 @@ env:
  ci_script: ${{ inputs.js_package_manager == 'yarn' && 'yarn install --immutable' || 'npm ci' }}
  cache_dependency_path: ${{ inputs.cache_dependency_path || format(inputs.js_package_manager == 'yarn' && '{0}/yarn.lock' || '{0}/package-lock.json', inputs.frontend_directory) }}
  COMPOSER_AUTH: ${{ secrets.composer_auth }}
+  DISABLE_V8_COMPILE_CACHE: 1

 jobs:
  build:
@@ -116,10 +117,10 @@ jobs:

    steps:
      - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: ${{ inputs.node_version }}
          cache: ${{ inputs.js_package_manager }}
@@ -142,7 +143,7 @@ jobs:
        working-directory: ${{ inputs.frontend_directory }}

      - name: JS Checks & Production Build
-        uses: flarum/action-build@v3
+        uses: flarum/action-build@v4
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          build_script: ${{ inputs.build_script }}
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -8,4 +8,4 @@ jobs:
    with:
      enable_backend_testing: true
      backend_directory: .
-      monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags"
+      monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages php-packages/testing/tests"
--- a/.github/workflows/build-install-packages.yml
+++ b/.github/workflows/build-install-packages.yml
@@ -6,7 +6,7 @@ on:

 env:
  VERSION: ${{ github.event.release.tag_name }}
-  PHP_VERSIONS: '8.1 8.2 8.3'
+  PHP_VERSIONS: '8.2 8.3 8.4'
  INSTALL_PACKAGES_INPUTS: '{ "flarum_version": "{0}", "php_versions": "{1}" }'

 jobs:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,124 @@
 # Changelog

+## [v2.0.0-beta.1](https://github.com/flarum/framework/compare/v1.8.9...v2.0.0-beta.1)
+### Changed
+- php 8.4 [#4103]
+- JSON:API refactor [#3971]
+- (mentions) allow renderer to be used without context [#3954]
+- (flags) add pagination to flags list [#3931]
+- (mentions) add integration test for reply approval notification [#3748]
+- (mentions,emoji) tie autocomplete to editor instance [#3913]
+- (phpstan) upgrade to be compatible with latest dependency updates [#3835]
+- (tags) prevent loading tag state if loaded previously [#4009]
+- (testing) run flarum/testing packages tests back again [#3844]
+- Do not catch exceptions when testing Console commands [#3813]
+- Patch vulnerability advisory [#3966]
+- Search box improvements on tablet devices [#4076]
+- Test using MySQL 8.1 [#3870]
+- Upgrade dependencies [#3830], [#4012]
+- Upgrade `intervention/image` to 3.2 [#3947]
+- Upgrade Wikimedia/less.php to 4.1 [#3837]
+- Upgrade Mithril to 2.2 [#3831]
+- (tags) Wrong tag input width if contains CJK characters [#4127]
+- allow custom actions runner to be defined [#3988]
+- avoid using `.fa()` mixins and `@fa-var` vars [#3912]
+- cleanup composer deps (40dcaf882cd017463ca792762d4aa11de8c5c7da)
+- corrected typos in routes comments [#3840]
+- extract `FormModal` from `Modal` [#3922]
+- extract `buildSettingComponent` method into a `FormGroup` component [#3927]
+- fix typos [#4021]
+- function names (d15438846895a5cf7b5a584479ef63a6e3119925)
+- handle deprecations from 1.x [#3909]
+- ignore deprecation errors in prod [#4072]
+- improve debugging experience [#3944]
+- improve test suite [#3814]
+- increase phpstan level to 6 [#3836]
+- `HeaderPrimary.js` converted to typescript [#4052]
+- merge the app with the container & implement the ApplicationContract [#3862]
+- recover bundlewatch [#3829]
+- remove ExtenderInterface[] as a conditional option, only support callable or ::class invoke [#3904]
+- remove listing of posts in the show discussion endpoint [#4067]
+- remove unused vars in catch [#3839]
+- simplify if else conditions [#3843]
+- simplify variable assignment using null coalescing operator [#4000]
+- support composer auth in workflows [#3961]
+- switch formatter to `format-message` [#4088]
+- transpile js to es6 [#3699]
+- unify frontend initializers naming [#4003]
+- update FontAwesome v6 icon search link [#4036]
+- use `::class` syntax to fetch class name instead of `get_class()` function [#3910]
+- use `hex_color` rule for color validation [#3936]
+- use `str_contains` instead of `strpos` [#3841]
+- graceful failure from extend/override errors [#4134]
+### Fixed
+- (a11y) convert empty links to buttons [#3926]
+- (approval) `PostWasApproved` event triggered incorrectly [#3930]
+- (em) prevent use if missing php functions (94b0d67a4020e1b7027e0df53dee1d681dc822e1)
+- (em) production ready check (f6e84a0dc576d1cfe8539b7438244edf156e3b1a)
+- (testing) use cookie for testing authentication [#3924]
+- 3 char hex color is incorrectly modified to 6 [#4013]
+- Add conditional rendering for email status in MailPage.tsx [#3997]
+- Logout controller allows open redirects [#3948], [#4091]
+- allow use of an attribute named `relationships` (1ead69e9b66ae9bc335be663498b7ea706adbf73)
+- cannot install without db prefix [#4001]
+- change length of email field [#4118]
+- color input changes while typing [#3919]
+- console extender does not accept `::class` attribute for schedule [#3903]
+- default labels with `SettingDropdown` and `SelectDropdown` [#3854]
+- duplicated `mentionsUsers` in extend.php (2b56129d70d18686a73d044ff65b418eef83f388)
+- handled API errors break preloaded content [#3920]
+- improve the flarum validator [#4133]
+- installation command config path can be null (07623afacde590c45a20537add3b72a919050819)
+- larastan changed namespace [#3955]
+- larastan changes frequently (af2a32a3a4f50874c63785f5168e1df60f947553)
+- load event mentioned tags on show discussion endpoint [#3915]
+- move `UserSearchResult` to common (35f76bce60361caac8001c41c421de30f567b221)
+- notify for all posts switch field loading state [#3938]
+- only set actor on events that have it [#3914]
+- overflowing forum stats [#3940]
+- paginated list limit hard to change [#3918]
+- prevent wiping out existing database on install [#4092]
+- reset save button state when an error occurs in admin page [#4010]
+- usage of `aria-hidden=false` might cause inconsistent behavior [#4074]
+- use dynamic viewport units for height of Modals [#3951]
+- user pages history not registered [#3916]
+- validate required cli install args [#4093]
+- make `WelcomeHero` extensible [#3848]
+- Update the scheduler info link in admin (#3826)
+### Added
+- Export Registry [#3842]
+- Code Splitting [#3860]
+- Fontawesome v6 [#4020]
+- extension bisect [#3980]
+- extension list UI [#4066]
+- admin search UI [#4022]
+- add support for `PgSQL` [#3985]
+- add support for `SQLite` [#3984]
+- separate `MariaDB` driver [#4132]
+- advanced maintenance modes [#3977]
+- notification unsubscribe links [#3872]
+- email overhaul with HTML multipart [#3872]
+- date time formats from locales [#4029]
+- messages extension [#4028]
+- search drivers (revamp search system) [#3893]
+- search UI/UX revamp [#3941]
+- post search adapted with global search [#4019]
+- vanilla CSS color scheme changes [#3996]
+- (emoji) allow the user to set the CDN address [#3908]
+- (nicknames) allow OAuth to provide a nickname [#4004]
+- (sticky) make excerpt optional in sticky [#4016]
+- JS `Notification` extender [#3974]
+- add `whenExtensionDisabled` to `Conditional` extender [#3847]
+- add option for filtering read stickied on all discussions page [#4073]
+- allow resetting settings to default [#3935]
+- define `FLARUM_START` constant [#4082]
+- dispatch event to `flarum/installation-packages` on release [#3625]
+- eloquent factories (primarily for tests) [#3982]
+- frontend content flexible order priorities [#3765]
+- improve emoji autocomplete [#3923]
+- recover support for ico favicon [#4126]
+- theming and extensibility improvements [#3876]
+
 ## [v1.8.1](https://github.com/flarum/framework/compare/v1.8.0...v1.8.1)
 ### Fixed
 * recover temporary solution for html entities in browser title (e72541e35de4f71f9d870bbd9bb46ddf586bdf1d)
@@ -470,7 +589,7 @@ looks rather complex and messy compared to the full list of changes made for thi
 - Pass filter params to getApiDocument (https://github.com/flarum/framework/pull/3037)
 - Use author filter instead of gambit to get a user's discussions (https://github.com/flarum/framework/pull/3068)
 - [A11Y] Accessibility improvements for the Search component (https://github.com/flarum/framework/pull/3017)
- Add determinsm to extension order resolution (https://github.com/flarum/framework/pull/3076)
+- Add determinism to extension order resolution (https://github.com/flarum/framework/pull/3076)
 - Add cache control headers to the admin area (https://github.com/flarum/framework/pull/3097)

 ### Fixed
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-<a href="https://flarum.org/"><img src="https://flarum.org/assets/img/logo.png"></a>
+<a href="https://flarum.org/"><img src="https://flarum.org/images/flarum.svg"></a>
 </p>

 <p align="center">
@@ -7,7 +7,6 @@
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/dt/flarum/core" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/github/v/release/flarum/core?sort=semver" alt="Latest Version"></a>
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/l/flarum/core" alt="License"></a>
-<a href="https://huntr.dev/bounties/disclose/?target=https://github.com/flarum/core"><img src="https://cdn.huntr.dev/huntr_security_badge_mono.svg" alt="huntr"></a>
 <a href="https://github.styleci.io/repos/28257573"><img src="https://github.styleci.io/repos/28257573/shield?style=flat" alt="StyleCI"></a>
 </p>

@@ -21,7 +20,7 @@

 * **Powerful and extensible.** Customize, extend, and integrate Flarum to suit your community. Flarum’s architecture is amazingly flexible, with a powerful Extension API.

-![Screenshot of a Flarum instance, showing multiple discussions and tags.](https://flarum.org/assets/img/home-screenshot.png)
+![Screenshot of a Flarum instance, showing multiple discussions and tags.](https://flarum.org/assets/flarum/home-screenshot.png)

 ## Installation

--- a/bin/test.sh
+++ b/bin/test.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+MONOREPO_TEST="framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages php-packages/testing/tests"
+
+for test in $MONOREPO_TEST; do
+  echo ""
+  echo "===> Testing $test"
+  echo ""
+
+  # composer test:setup --working-dir=$test
+  composer test --working-dir=$test
+
+  echo ""
+  echo "===> Done testing $test"
+  echo ""
+done
--- a/composer.json
+++ b/composer.json
@@ -53,6 +53,7 @@
            "Flarum\\Subscriptions\\": "extensions/subscriptions/src",
            "Flarum\\Suspend\\": "extensions/suspend/src",
            "Flarum\\Tags\\": "extensions/tags/src",
+            "Flarum\\Messages\\": "extensions/messages/src",
            "Flarum\\PHPStan\\": "php-packages/phpstan/src",
            "Flarum\\Testing\\": "php-packages/testing/src"
        },
@@ -77,6 +78,7 @@
            "Flarum\\Subscriptions\\Tests\\": "extensions/subscriptions/tests",
            "Flarum\\Suspend\\Tests\\": "extensions/suspend/tests",
            "Flarum\\Tags\\Tests\\": "extensions/tags/tests",
+            "Flarum\\Messages\\Tests\\": "extensions/messages/tests",
            "Flarum\\Testing\\Tests\\": "php-packages/testing/tests"
        }
    },
@@ -101,36 +103,38 @@
        "flarum/subscriptions": "self.version",
        "flarum/suspend": "self.version",
        "flarum/tags": "self.version",
+        "flarum/messages": "self.version",
        "flarum/phpstan": "self.version",
        "flarum/testing": "self.version"
    },
    "require": {
-        "php": "^8.1",
+        "php": "^8.2",
        "ext-json": "*",
-        "components/font-awesome": "^5.15.0",
+        "components/font-awesome": "^6.5.2",
        "composer/composer": "^2.7",
        "dflydev/fig-cookies": "^3.0",
        "doctrine/dbal": "^3.6.2",
        "dragonmantank/cron-expression": "^3.3",
        "fakerphp/faker": "^1.9.1",
+        "flarum/json-api-server": "^0.1.0",
        "franzl/whoops-middleware": "2.0",
        "guzzlehttp/guzzle": "*",
-        "illuminate/bus": "^10.0",
-        "illuminate/cache": "^10.0",
-        "illuminate/config": "^10.0",
-        "illuminate/console": "^10.0",
-        "illuminate/container": "^10.0",
-        "illuminate/contracts": "^10.0",
-        "illuminate/database": "^10.0",
-        "illuminate/events": "^10.0",
-        "illuminate/filesystem": "^10.0",
-        "illuminate/hashing": "^10.0",
-        "illuminate/mail": "^10.0",
-        "illuminate/queue": "^10.0",
-        "illuminate/session": "^10.0",
-        "illuminate/support": "^10.0",
-        "illuminate/validation": "^10.0",
-        "illuminate/view": "^10.0",
+        "illuminate/bus": "^11.0",
+        "illuminate/cache": "^11.0",
+        "illuminate/config": "^11.0",
+        "illuminate/console": "^11.0",
+        "illuminate/container": "^11.0",
+        "illuminate/contracts": "^11.0",
+        "illuminate/database": "^11.0",
+        "illuminate/events": "^11.0",
+        "illuminate/filesystem": "^11.0",
+        "illuminate/hashing": "^11.0",
+        "illuminate/mail": "^11.0",
+        "illuminate/queue": "^11.0",
+        "illuminate/session": "^11.0",
+        "illuminate/support": "^11.0",
+        "illuminate/validation": "^11.0",
+        "illuminate/view": "^11.0",
        "intervention/image": "^3.2",
        "jenssegers/agent": "^2.6",
        "laminas/laminas-diactoros": "^3.0",
@@ -143,34 +147,33 @@
        "middlewares/base-path-router": "^2.0.1",
        "middlewares/request-handler": "^2.0.2",
        "monolog/monolog": "^3.3",
-        "nesbot/carbon": "^2.66",
+        "nesbot/carbon": "^3.0",
        "nikic/fast-route": "^1.3",
        "psr/http-message": "^1.1",
        "psr/http-server-handler": "^1.0.2",
        "psr/http-server-middleware": "^1.0.2",
        "pusher/pusher-php-server": "^7.2",
        "s9e/text-formatter": "^2.13",
-        "staudenmeir/eloquent-eager-limit": "^1.8.2",
        "sycho/sourcemap": "^2.0.0",
-        "symfony/config": "^6.3",
-        "symfony/console": "^6.3",
-        "symfony/event-dispatcher": "^6.3",
-        "symfony/http-client": "^6.3",
-        "symfony/mailgun-mailer": "^6.3",
-        "symfony/mime": "^6.3",
+        "symfony/config": "^7.0",
+        "symfony/console": "^7.0",
+        "symfony/event-dispatcher": "^7.0",
+        "symfony/http-client": "^7.0",
+        "symfony/mailgun-mailer": "^7.0",
+        "symfony/mime": "^7.0",
        "symfony/polyfill-intl-messageformatter": "^1.27",
-        "symfony/postmark-mailer": "^6.3",
-        "symfony/translation": "^6.3",
-        "symfony/yaml": "^6.3",
-        "flarum/json-api-server": "^1.0.0",
+        "symfony/postmark-mailer": "^7.0",
+        "symfony/translation": "^7.0",
+        "symfony/yaml": "^7.0",
        "wikimedia/less.php": "^4.1"
    },
    "require-dev": {
        "mockery/mockery": "^1.5",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^11.0",
        "phpstan/phpstan": "^1.10.0",
-        "larastan/larastan": "^2.7",
-        "symfony/var-dumper": "^6.3"
+        "larastan/larastan": "2.9.12",
+        "symfony/var-dumper": "^7.0",
+        "flarum/testing-tests": "*@dev"
    },
    "config": {
        "sort-packages": true
@@ -197,7 +200,8 @@
            "extensions/sticky",
            "extensions/subscriptions",
            "extensions/suspend",
-            "extensions/tags"
+            "extensions/tags",
+            "extensions/messages"
        ],
        "branch-alias": {
            "dev-main": "2.x-dev"
@@ -214,5 +218,11 @@
    },
    "scripts-descriptions": {
        "analyse:phpstan": "Run static analysis"
-    }
+    },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "php-packages/testing/tests"
+        }
+    ]
 }
--- a/extensions/akismet/.gitignore
+++ b/extensions/akismet/.gitignore
@@ -4,6 +4,7 @@ composer.phar

 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
--- a/extensions/akismet/LICENSE
+++ b/extensions/akismet/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/extensions/akismet/composer.json
+++ b/extensions/akismet/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0",
+        "flarum/core": "^2.0.0-beta.1",
        "flarum/approval": "^2.0"
    },
    "autoload": {
--- a/extensions/akismet/js/dist-typings/admin/extend.d.ts
+++ b/extensions/akismet/js/dist-typings/admin/extend.d.ts
@@ -0,0 +1,2 @@
+declare const _default: import("flarum/common/extenders/Admin").default[];
+export default _default;
--- a/extensions/akismet/js/dist-typings/admin/index.d.ts
+++ b/extensions/akismet/js/dist-typings/admin/index.d.ts
@@ -1 +1 @@
-export {};
+export { default as extend } from './extend';
--- a/extensions/akismet/js/dist/admin.js
+++ b/extensions/akismet/js/dist/admin.js
@@ -1,2 +1,2 @@
-(()=>{var e={n:t=>{var a=t&&t.__esModule?()=>t.default:()=>t;return e.d(a,{a}),a},d:(t,a)=>{for(var r in a)e.o(a,r)&&!e.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:a[r]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};(()=>{"use strict";e.r(t);const a=flarum.reg.get("core","admin/app");var r=e.n(a);r().initializers.add("flarum-akismet",(()=>{r().extensionData.for("flarum-akismet").registerSetting({setting:"flarum-akismet.api_key",type:"text",label:r().translator.trans("flarum-akismet.admin.akismet_settings.api_key_label")}).registerSetting({setting:"flarum-akismet.delete_blatant_spam",type:"boolean",label:r().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_label"),help:r().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_help")}).registerPermission({icon:"fas fa-vote-yea",label:r().translator.trans("flarum-akismet.admin.permissions.bypass_akismet"),permission:"bypassAkismet"},"start")}))})(),module.exports=t})();
+(()=>{var e={n:t=>{var a=t&&t.__esModule?()=>t.default:()=>t;return e.d(a,{a}),a},d:(t,a)=>{for(var s in a)e.o(a,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:a[s]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};(()=>{"use strict";e.r(t),e.d(t,{extend:()=>n});const a=flarum.reg.get("core","admin/app");var s=e.n(a);const r=flarum.reg.get("core","common/extenders"),n=[(new(e.n(r)().Admin)).setting((()=>({setting:"flarum-akismet.api_key",type:"text",label:s().translator.trans("flarum-akismet.admin.akismet_settings.api_key_label")}))).setting((()=>({setting:"flarum-akismet.delete_blatant_spam",type:"boolean",label:s().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_label"),help:s().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_help")}))).permission((()=>({icon:"fas fa-vote-yea",label:s().translator.trans("flarum-akismet.admin.permissions.bypass_akismet"),permission:"bypassAkismet"})),"start")];s().initializers.add("flarum-akismet",(()=>{}))})(),module.exports=t})();
 //# sourceMappingURL=admin.js.map
--- a/extensions/akismet/js/dist/admin.js.map
+++ b/extensions/akismet/js/dist/admin.js.map
@@ -1 +1 @@
-{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,IACzBH,CAAM,ECLdF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,GAAO,G,+BCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,a,aCC5D,qBAAqB,kBAAkB,KACrC,sBAAsB,kBAAkBW,gBAAgB,CACtDC,QAAS,yBACTC,KAAM,OACNC,MAAO,qBAAqB,yDAC3BH,gBAAgB,CAEjBC,QAAS,qCACTC,KAAM,UACNC,MAAO,qBAAqB,mEAC5BC,KAAM,qBAAqB,oEAC1BC,mBAAmB,CACpBC,KAAM,kBACNH,MAAO,qBAAqB,mDAC5BI,WAAY,iBACX,QAAQ,G","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/webpack/runtime/make namespace object","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'admin/app')\"","webpack://@flarum/akismet/./src/admin/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'admin/app');","import app from 'flarum/admin/app';\napp.initializers.add('flarum-akismet', () => {\n  app.extensionData.for('flarum-akismet').registerSetting({\n    setting: 'flarum-akismet.api_key',\n    type: 'text',\n    label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label')\n  }).registerSetting({\n    //https://blog.akismet.com/2014/04/23/theres-a-ninja-in-your-akismet/\n    setting: 'flarum-akismet.delete_blatant_spam',\n    type: 'boolean',\n    label: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_label'),\n    help: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_help')\n  }).registerPermission({\n    icon: 'fas fa-vote-yea',\n    label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),\n    permission: 'bypassAkismet'\n  }, 'start');\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","reg","registerSetting","setting","type","label","help","registerPermission","icon","permission"],"sourceRoot":""}
+{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,IACzBH,CAAM,ECLdF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,GAAO,G,qDCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,a,aCA5D,MAAM,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,oBCE5D,IAAgB,I,MAAI,WAAeW,SAAQ,KAAM,CAC/CA,QAAS,yBACTC,KAAM,OACNC,MAAO,eAAeC,MAAM,2DAC1BH,SAAQ,KAAM,CAEhBA,QAAS,qCACTC,KAAM,UACNC,MAAO,eAAeC,MAAM,mEAC5BC,KAAM,eAAeD,MAAM,sEACzBE,YAAW,KAAM,CACnBC,KAAM,kBACNJ,MAAO,eAAeC,MAAM,mDAC5BE,WAAY,mBACV,UCdJ,iBAAiBE,IAAI,kBAAkB,Q","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/webpack/runtime/make namespace object","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'admin/app')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'common/extenders')\"","webpack://@flarum/akismet/./src/admin/extend.tsx","webpack://@flarum/akismet/./src/admin/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'admin/app');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extenders');","import Extend from 'flarum/common/extenders';\nimport app from 'flarum/admin/app';\nexport default [new Extend.Admin().setting(() => ({\n  setting: 'flarum-akismet.api_key',\n  type: 'text',\n  label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label')\n})).setting(() => ({\n  // https://blog.akismet.com/2014/04/23/theres-a-ninja-in-your-akismet/\n  setting: 'flarum-akismet.delete_blatant_spam',\n  type: 'boolean',\n  label: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_label'),\n  help: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_help')\n})).permission(() => ({\n  icon: 'fas fa-vote-yea',\n  label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),\n  permission: 'bypassAkismet'\n}), 'start')];","import app from 'flarum/admin/app';\nexport { default as extend } from './extend';\napp.initializers.add('flarum-akismet', () => {\n  // ...\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","reg","setting","type","label","trans","help","permission","icon","add"],"sourceRoot":""}
--- a/extensions/akismet/js/dist/forum.js
+++ b/extensions/akismet/js/dist/forum.js
@@ -1,2 +1,2 @@
-(()=>{var e={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return e.d(r,{a:r}),r},d:(t,r)=>{for(var o in r)e.o(r,o)&&!e.o(t,o)&&Object.defineProperty(t,o,{enumerable:!0,get:r[o]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};(()=>{"use strict";e.r(t);const r=flarum.reg.get("core","common/extend"),o=flarum.reg.get("core","forum/app");var a=e.n(o);const n=flarum.reg.get("core","forum/utils/PostControls");var s=e.n(n);const l=flarum.reg.get("core","forum/components/Post");var u=e.n(l);a().initializers.add("flarum-akismet",(()=>{(0,r.extend)(s(),"destructiveControls",(function(e,t){if(e.has("approve")){const r=t.flags();if(r&&r.some((e=>"akismet"===(null==e?void 0:e.type())))){const t=e.get("approve");t&&"object"==typeof t&&"children"in t&&(t.children=a().translator.trans("flarum-akismet.forum.post.not_spam_button"))}}})),(0,r.override)(u().prototype,"flagReason",(function(e,t){return"akismet"===t.type()?a().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):e(t)}))}))})(),module.exports=t})();
+(()=>{var e={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return e.d(r,{a:r}),r},d:(t,r)=>{for(var o in r)e.o(r,o)&&!e.o(t,o)&&Object.defineProperty(t,o,{enumerable:!0,get:r[o]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};(()=>{"use strict";const t=flarum.reg.get("core","common/extend"),r=flarum.reg.get("core","forum/app");var o=e.n(r);const a=flarum.reg.get("core","forum/utils/PostControls");var n=e.n(a);const s=flarum.reg.get("core","forum/components/Post");var m=e.n(s);o().initializers.add("flarum-akismet",(()=>{(0,t.extend)(n(),"destructiveControls",(function(e,t){if(e.has("approve")){const r=t.flags();if(r&&r.some((e=>"akismet"===e?.type()))){const t=e.get("approve");t&&"object"==typeof t&&"children"in t&&(t.children=o().translator.trans("flarum-akismet.forum.post.not_spam_button"))}}})),(0,t.override)(m().prototype,"flagReason",(function(e,t){return"akismet"===t.type()?o().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):e(t)}))}))})(),module.exports={}})();
 //# sourceMappingURL=forum.js.map
--- a/extensions/akismet/js/dist/forum.js.map
+++ b/extensions/akismet/js/dist/forum.js.map
@@ -1 +1 @@
-{"version":3,"file":"forum.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,EAAGH,IAC5BA,CAAM,ECLdF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,GAAO,G,+BCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,iBCAtD,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,a,aCA5D,MAAM,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,4B,aCA5D,MAAM,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,yB,aCI5D,qBAAqB,kBAAkB,MACrC,IAAAW,QAAO,IAAc,uBAAuB,SAAUC,EAAOC,GAC3D,GAAID,EAAME,IAAI,WAAY,CACxB,MAAMC,EAAQF,EAAKE,QACnB,GAAIA,GAASA,EAAMC,MAAKC,GAAkD,aAAjC,MAARA,OAAe,EAASA,EAAKC,UAAwB,CACpF,MAAMC,EAAcP,EAAMZ,IAAI,WAC1BmB,GAAsC,iBAAhBA,GAA4B,aAAcA,IAClEA,EAAYC,SAAW,qBAAqB,6CAEhD,CACF,CACF,KACA,IAAAC,UAAS,cAAyB,cAAc,SAAUC,EAAUL,GAClE,MAAoB,YAAhBA,EAAKC,OACA,qBAAqB,kDAEvBI,EAASL,EAClB,GAAE,G","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/webpack/runtime/make namespace object","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'common/extend')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/app')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/utils/PostControls')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/components/Post')\"","webpack://@flarum/akismet/./src/forum/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extend');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/app');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/utils/PostControls');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/components/Post');","import { extend, override } from 'flarum/common/extend';\nimport app from 'flarum/forum/app';\nimport PostControls from 'flarum/forum/utils/PostControls';\nimport PostComponent from 'flarum/forum/components/Post';\napp.initializers.add('flarum-akismet', () => {\n  extend(PostControls, 'destructiveControls', function (items, post) {\n    if (items.has('approve')) {\n      const flags = post.flags();\n      if (flags && flags.some(flag => (flag == null ? void 0 : flag.type()) === 'akismet')) {\n        const approveItem = items.get('approve');\n        if (approveItem && typeof approveItem === 'object' && 'children' in approveItem) {\n          approveItem.children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');\n        }\n      }\n    }\n  });\n  override(PostComponent.prototype, 'flagReason', function (original, flag) {\n    if (flag.type() === 'akismet') {\n      return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');\n    }\n    return original(flag);\n  });\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","reg","extend","items","post","has","flags","some","flag","type","approveItem","children","override","original"],"sourceRoot":""}
+{"version":3,"file":"forum.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,EAAGH,IAC5BA,CAAM,ECLdF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,I,mBCAlF,MAAM,EAA+BI,OAAOC,IAAIP,IAAI,OAAQ,iBCAtD,EAA+BM,OAAOC,IAAIP,IAAI,OAAQ,a,aCA5D,MAAM,EAA+BM,OAAOC,IAAIP,IAAI,OAAQ,4B,aCA5D,MAAM,EAA+BM,OAAOC,IAAIP,IAAI,OAAQ,yB,aCI5D,iBAAiBQ,IAAI,kBAAkB,MACrC,IAAAC,QAAO,IAAc,uBAAuB,SAAUC,EAAOC,GAC3D,GAAID,EAAME,IAAI,WAAY,CACxB,MAAMC,EAAQF,EAAKE,QACnB,GAAIA,GAASA,EAAMC,MAAKC,GAAyB,YAAjBA,GAAMC,SAAuB,CAC3D,MAAMC,EAAcP,EAAMV,IAAI,WAC1BiB,GAAsC,iBAAhBA,GAA4B,aAAcA,IAClEA,EAAYC,SAAW,eAAeC,MAAM,6CAEhD,CACF,CACF,KACA,IAAAC,UAAS,cAAyB,cAAc,SAAUC,EAAUN,GAClE,MAAoB,YAAhBA,EAAKC,OACA,eAAeG,MAAM,kDAEvBE,EAASN,EAClB,GAAE,G","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'common/extend')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/app')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/utils/PostControls')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/components/Post')\"","webpack://@flarum/akismet/./src/forum/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extend');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/app');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/utils/PostControls');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/components/Post');","import { extend, override } from 'flarum/common/extend';\nimport app from 'flarum/forum/app';\nimport PostControls from 'flarum/forum/utils/PostControls';\nimport PostComponent from 'flarum/forum/components/Post';\napp.initializers.add('flarum-akismet', () => {\n  extend(PostControls, 'destructiveControls', function (items, post) {\n    if (items.has('approve')) {\n      const flags = post.flags();\n      if (flags && flags.some(flag => flag?.type() === 'akismet')) {\n        const approveItem = items.get('approve');\n        if (approveItem && typeof approveItem === 'object' && 'children' in approveItem) {\n          approveItem.children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');\n        }\n      }\n    }\n  });\n  override(PostComponent.prototype, 'flagReason', function (original, flag) {\n    if (flag.type() === 'akismet') {\n      return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');\n    }\n    return original(flag);\n  });\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","flarum","reg","add","extend","items","post","has","flags","some","flag","type","approveItem","children","trans","override","original"],"sourceRoot":""}
--- a/extensions/akismet/js/package.json
+++ b/extensions/akismet/js/package.json
@@ -17,9 +17,9 @@
    },
    "devDependencies": {
        "@flarum/prettier-config": "^1.0.0",
-        "flarum-tsconfig": "^1.0.2",
+        "flarum-tsconfig": "^2.0.0",
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "typescript": "^4.5.4",
--- a/extensions/akismet/js/src/admin/extend.tsx
+++ b/extensions/akismet/js/src/admin/extend.tsx
@@ -0,0 +1,26 @@
+import Extend from 'flarum/common/extenders';
+import app from 'flarum/admin/app';
+
+export default [
+  new Extend.Admin()
+    .setting(() => ({
+      setting: 'flarum-akismet.api_key',
+      type: 'text',
+      label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label'),
+    }))
+    .setting(() => ({
+      // https://blog.akismet.com/2014/04/23/theres-a-ninja-in-your-akismet/
+      setting: 'flarum-akismet.delete_blatant_spam',
+      type: 'boolean',
+      label: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_label'),
+      help: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_help'),
+    }))
+    .permission(
+      () => ({
+        icon: 'fas fa-vote-yea',
+        label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),
+        permission: 'bypassAkismet',
+      }),
+      'start'
+    ),
+];
--- a/extensions/akismet/js/src/admin/index.ts
+++ b/extensions/akismet/js/src/admin/index.ts
@@ -1,26 +1,7 @@
 import app from 'flarum/admin/app';

+export { default as extend } from './extend';
+
 app.initializers.add('flarum-akismet', () => {
-  app.extensionData
-    .for('flarum-akismet')
-    .registerSetting({
-      setting: 'flarum-akismet.api_key',
-      type: 'text',
-      label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label'),
-    })
-    .registerSetting({
-      //https://blog.akismet.com/2014/04/23/theres-a-ninja-in-your-akismet/
-      setting: 'flarum-akismet.delete_blatant_spam',
-      type: 'boolean',
-      label: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_label'),
-      help: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_help'),
-    })
-    .registerPermission(
-      {
-        icon: 'fas fa-vote-yea',
-        label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),
-        permission: 'bypassAkismet',
-      },
-      'start'
-    );
+  // ...
 });
--- a/extensions/akismet/tests/phpunit.integration.xml
+++ b/extensions/akismet/tests/phpunit.integration.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
-    backupStaticAttributes="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
    processIsolation="true"
    stopOnFailure="false"
    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <coverage processUncoveredFiles="true">
+    <source>
        <include>
            <directory suffix=".php">../src/</directory>
        </include>
-    </coverage>
+    </source>
    <testsuites>
        <testsuite name="Flarum Integration Tests">
            <directory suffix="Test.php">./integration</directory>
--- a/extensions/akismet/tests/phpunit.unit.xml
+++ b/extensions/akismet/tests/phpunit.unit.xml
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
-    backupStaticAttributes="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
    processIsolation="false"
    stopOnFailure="false"
    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <coverage processUncoveredFiles="true">
+    <source>
        <include>
            <directory suffix=".php">../src/</directory>
        </include>
-    </coverage>
+    </source>
    <testsuites>
        <testsuite name="Flarum Unit Tests">
            <directory suffix="Test.php">./unit</directory>
        </testsuite>
    </testsuites>
-    <listeners>
-        <listener class="\Mockery\Adapter\Phpunit\TestListener" />
-    </listeners>
 </phpunit>
--- a/extensions/approval/.gitignore
+++ b/extensions/approval/.gitignore
@@ -4,6 +4,7 @@ composer.phar

 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
--- a/extensions/approval/LICENSE
+++ b/extensions/approval/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/extensions/approval/composer.json
+++ b/extensions/approval/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0",
+        "flarum/core": "^2.0.0-beta.1",
        "flarum/flags": "^2.0"
    },
    "autoload": {
--- a/extensions/approval/js/admin.ts
+++ b/extensions/approval/js/admin.ts
--- a/extensions/approval/js/dist/admin.js
+++ b/extensions/approval/js/dist/admin.js
@@ -1,2 +1,2 @@
-(()=>{var r={n:e=>{var s=e&&e.__esModule?()=>e.default:()=>e;return r.d(s,{a:s}),s},d:(e,s)=>{for(var a in s)r.o(s,a)&&!r.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:s[a]})},o:(r,e)=>Object.prototype.hasOwnProperty.call(r,e),r:r=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(r,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(r,"__esModule",{value:!0})}},e={};(()=>{"use strict";r.r(e);const s=flarum.reg.get("core","common/extend"),a=flarum.reg.get("core","admin/app");var o=r.n(a);o().initializers.add("flarum-approval",(()=>{(0,s.extend)(o(),"getRequiredPermissions",(function(r,e){"discussion.startWithoutApproval"===e&&r.push("startDiscussion"),"discussion.replyWithoutApproval"===e&&r.push("discussion.reply")})),o().extensionData.for("flarum-approval").registerPermission({icon:"fas fa-check",label:o().translator.trans("flarum-approval.admin.permissions.start_discussions_without_approval_label"),permission:"discussion.startWithoutApproval"},"start",95).registerPermission({icon:"fas fa-check",label:o().translator.trans("flarum-approval.admin.permissions.reply_without_approval_label"),permission:"discussion.replyWithoutApproval"},"reply",95).registerPermission({icon:"fas fa-check",label:o().translator.trans("flarum-approval.admin.permissions.approve_posts_label"),permission:"discussion.approvePosts"},"moderate",65)}))})(),module.exports=e})();
+(()=>{var e={n:r=>{var s=r&&r.__esModule?()=>r.default:()=>r;return e.d(s,{a:s}),s},d:(r,s)=>{for(var o in s)e.o(s,o)&&!e.o(r,o)&&Object.defineProperty(r,o,{enumerable:!0,get:s[o]})},o:(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},r={};(()=>{"use strict";e.r(r),e.d(r,{extend:()=>i});const s=flarum.reg.get("core","common/extend"),o=flarum.reg.get("core","admin/app");var a=e.n(o);const t=flarum.reg.get("core","common/extenders"),i=[(new(e.n(t)().Admin)).permission((()=>({icon:"fas fa-check",label:a().translator.trans("flarum-approval.admin.permissions.start_discussions_without_approval_label"),permission:"discussion.startWithoutApproval"})),"start",95).permission((()=>({icon:"fas fa-check",label:a().translator.trans("flarum-approval.admin.permissions.reply_without_approval_label"),permission:"discussion.replyWithoutApproval"})),"reply",95).permission((()=>({icon:"fas fa-check",label:a().translator.trans("flarum-approval.admin.permissions.approve_posts_label"),permission:"discussion.approvePosts"})),"moderate",65)];a().initializers.add("flarum-approval",(()=>{(0,s.extend)(a(),"getRequiredPermissions",(function(e,r){"discussion.startWithoutApproval"===r&&e.push("startDiscussion"),"discussion.replyWithoutApproval"===r&&e.push("discussion.reply")}))}))})(),module.exports=r})();
 //# sourceMappingURL=admin.js.map
--- a/extensions/approval/js/dist/admin.js.map
+++ b/extensions/approval/js/dist/admin.js.map
@@ -1 +1 @@
-{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,EAAGH,IAC5BA,CAAM,ECLdF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,GAAO,G,+BCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,iBCAtD,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,a,aCE5D,qBAAqB,mBAAmB,MACtC,IAAAW,QAAO,IAAK,0BAA0B,SAAUC,EAAUC,GACrC,oCAAfA,GACFD,EAASE,KAAK,mBAEG,oCAAfD,GACFD,EAASE,KAAK,mBAElB,IACA,sBAAsB,mBAAmBC,mBAAmB,CAC1DC,KAAM,eACNC,MAAO,qBAAqB,8EAC5BJ,WAAY,mCACX,QAAS,IAAIE,mBAAmB,CACjCC,KAAM,eACNC,MAAO,qBAAqB,kEAC5BJ,WAAY,mCACX,QAAS,IAAIE,mBAAmB,CACjCC,KAAM,eACNC,MAAO,qBAAqB,yDAC5BJ,WAAY,2BACX,WAAY,GAAG,G","sources":["webpack://@flarum/approval/webpack/bootstrap","webpack://@flarum/approval/webpack/runtime/compat get default export","webpack://@flarum/approval/webpack/runtime/define property getters","webpack://@flarum/approval/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/approval/webpack/runtime/make namespace object","webpack://@flarum/approval/external root \"flarum.reg.get('core', 'common/extend')\"","webpack://@flarum/approval/external root \"flarum.reg.get('core', 'admin/app')\"","webpack://@flarum/approval/./src/admin/index.js"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extend');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'admin/app');","import { extend } from 'flarum/common/extend';\nimport app from 'flarum/admin/app';\napp.initializers.add('flarum-approval', () => {\n  extend(app, 'getRequiredPermissions', function (required, permission) {\n    if (permission === 'discussion.startWithoutApproval') {\n      required.push('startDiscussion');\n    }\n    if (permission === 'discussion.replyWithoutApproval') {\n      required.push('discussion.reply');\n    }\n  });\n  app.extensionData.for('flarum-approval').registerPermission({\n    icon: 'fas fa-check',\n    label: app.translator.trans('flarum-approval.admin.permissions.start_discussions_without_approval_label'),\n    permission: 'discussion.startWithoutApproval'\n  }, 'start', 95).registerPermission({\n    icon: 'fas fa-check',\n    label: app.translator.trans('flarum-approval.admin.permissions.reply_without_approval_label'),\n    permission: 'discussion.replyWithoutApproval'\n  }, 'reply', 95).registerPermission({\n    icon: 'fas fa-check',\n    label: app.translator.trans('flarum-approval.admin.permissions.approve_posts_label'),\n    permission: 'discussion.approvePosts'\n  }, 'moderate', 65);\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","reg","extend","required","permission","push","registerPermission","icon","label"],"sourceRoot":""}
+{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,EAAGH,IAC5BA,CAAM,ECLdF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,GAAO,G,qDCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,iBCAtD,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,a,aCA5D,MAAM,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,oBCE5D,IAAgB,I,MAAI,WAAeW,YAAW,KAAM,CAClDC,KAAM,eACNC,MAAO,eAAeC,MAAM,8EAC5BH,WAAY,qCACV,QAAS,IAAIA,YAAW,KAAM,CAChCC,KAAM,eACNC,MAAO,eAAeC,MAAM,kEAC5BH,WAAY,qCACV,QAAS,IAAIA,YAAW,KAAM,CAChCC,KAAM,eACNC,MAAO,eAAeC,MAAM,yDAC5BH,WAAY,6BACV,WAAY,KCXhB,iBAAiBI,IAAI,mBAAmB,MACtC,IAAAC,QAAO,IAAK,0BAA0B,SAAUC,EAAUN,GACrC,oCAAfA,GACFM,EAASC,KAAK,mBAEG,oCAAfP,GACFM,EAASC,KAAK,mBAElB,GAAE,G","sources":["webpack://@flarum/approval/webpack/bootstrap","webpack://@flarum/approval/webpack/runtime/compat get default export","webpack://@flarum/approval/webpack/runtime/define property getters","webpack://@flarum/approval/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/approval/webpack/runtime/make namespace object","webpack://@flarum/approval/external root \"flarum.reg.get('core', 'common/extend')\"","webpack://@flarum/approval/external root \"flarum.reg.get('core', 'admin/app')\"","webpack://@flarum/approval/external root \"flarum.reg.get('core', 'common/extenders')\"","webpack://@flarum/approval/./src/admin/extend.tsx","webpack://@flarum/approval/./src/admin/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extend');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'admin/app');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extenders');","import Extend from 'flarum/common/extenders';\nimport app from 'flarum/admin/app';\nexport default [new Extend.Admin().permission(() => ({\n  icon: 'fas fa-check',\n  label: app.translator.trans('flarum-approval.admin.permissions.start_discussions_without_approval_label'),\n  permission: 'discussion.startWithoutApproval'\n}), 'start', 95).permission(() => ({\n  icon: 'fas fa-check',\n  label: app.translator.trans('flarum-approval.admin.permissions.reply_without_approval_label'),\n  permission: 'discussion.replyWithoutApproval'\n}), 'reply', 95).permission(() => ({\n  icon: 'fas fa-check',\n  label: app.translator.trans('flarum-approval.admin.permissions.approve_posts_label'),\n  permission: 'discussion.approvePosts'\n}), 'moderate', 65)];","import { extend } from 'flarum/common/extend';\nimport app from 'flarum/admin/app';\nexport { default as extend } from './extend';\napp.initializers.add('flarum-approval', () => {\n  extend(app, 'getRequiredPermissions', function (required, permission) {\n    if (permission === 'discussion.startWithoutApproval') {\n      required.push('startDiscussion');\n    }\n    if (permission === 'discussion.replyWithoutApproval') {\n      required.push('discussion.reply');\n    }\n  });\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","reg","permission","icon","label","trans","add","extend","required","push"],"sourceRoot":""}
--- a/extensions/approval/js/dist/forum.js
+++ b/extensions/approval/js/dist/forum.js
@@ -1,2 +1,2 @@
-(()=>{var o={n:t=>{var e=t&&t.__esModule?()=>t.default:()=>t;return o.d(e,{a:e}),e},d:(t,e)=>{for(var r in e)o.o(e,r)&&!o.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:e[r]})},o:(o,t)=>Object.prototype.hasOwnProperty.call(o,t),r:o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})}},t={};(()=>{"use strict";o.r(t);const e=flarum.reg.get("core","common/extend"),r=flarum.reg.get("core","forum/app");var a=o.n(r);const n=flarum.reg.get("core","common/models/Discussion");var p=o.n(n);const s=flarum.reg.get("core","common/models/Post");var i=o.n(s);const c=flarum.reg.get("core","common/components/Badge");var u=o.n(c);const l=flarum.reg.get("core","forum/components/DiscussionListItem");var d=o.n(l);const v=flarum.reg.get("core","forum/components/Post");var f=o.n(v);const g=flarum.reg.get("core","forum/components/CommentPost");var A=o.n(g);const y=flarum.reg.get("core","common/components/Button");var b=o.n(y);const h=flarum.reg.get("core","forum/utils/PostControls");var _=o.n(h);a().initializers.add("flarum-approval",(()=>{p().prototype.isApproved=p().attribute("isApproved"),(0,e.extend)(p().prototype,"badges",(function(o){this.isApproved()||o.has("hidden")||o.add("awaitingApproval",m(u(),{type:"awaitingApproval",icon:"fas fa-gavel",label:a().translator.trans("flarum-approval.forum.badge.awaiting_approval_tooltip")}))})),i().prototype.isApproved=i().attribute("isApproved"),i().prototype.canApprove=i().attribute("canApprove"),(0,e.extend)(d().prototype,"elementAttrs",(function(o){this.attrs.discussion.isApproved()||(o.className+=" DiscussionListItem--unapproved")})),(0,e.extend)(f().prototype,"elementAttrs",(function(o){this.attrs.post.isApproved()||(o.className+=" Post--unapproved")})),(0,e.extend)(A().prototype,"headerItems",(function(o){this.attrs.post.isApproved()||this.attrs.post.isHidden()||o.add("unapproved",a().translator.trans("flarum-approval.forum.post.awaiting_approval_text"))})),(0,e.override)(f().prototype,"flagReason",(function(o,t){return"approval"===t.type()?a().translator.trans("flarum-approval.forum.post.awaiting_approval_text"):o(t)})),(0,e.extend)(_(),"destructiveControls",(function(o,t){!t.isApproved()&&t.canApprove()&&o.add("approve",m(b(),{icon:"fas fa-check",onclick:_().approveAction.bind(t)},a().translator.trans("flarum-approval.forum.post_controls.approve_button")),10)})),_().approveAction=function(){this.save({isApproved:!0}),1===this.number()&&this.discussion().pushAttributes({isApproved:!0})}}),-10)})(),module.exports=t})();
+(()=>{var t={n:o=>{var r=o&&o.__esModule?()=>o.default:()=>o;return t.d(r,{a:r}),r},d:(o,r)=>{for(var e in r)t.o(r,e)&&!t.o(o,e)&&Object.defineProperty(o,e,{enumerable:!0,get:r[e]})},o:(t,o)=>Object.prototype.hasOwnProperty.call(t,o)};(()=>{"use strict";const o=flarum.reg.get("core","common/extend"),r=flarum.reg.get("core","forum/app");var e=t.n(r);const a=flarum.reg.get("core","common/models/Discussion");var n=t.n(a);const p=flarum.reg.get("core","common/models/Post");var s=t.n(p);const i=flarum.reg.get("core","common/components/Badge");var c=t.n(i);const u=flarum.reg.get("core","forum/components/DiscussionListItem");var l=t.n(u);const d=flarum.reg.get("core","forum/components/Post");var v=t.n(d);const f=flarum.reg.get("core","forum/components/CommentPost");var g=t.n(f);const A=flarum.reg.get("core","common/components/Button");var h=t.n(A);const b=flarum.reg.get("core","forum/utils/PostControls");var y=t.n(b);e().initializers.add("flarum-approval",(()=>{n().prototype.isApproved=n().attribute("isApproved"),(0,o.extend)(n().prototype,"badges",(function(t){this.isApproved()||t.has("hidden")||t.add("awaitingApproval",m(c(),{type:"awaitingApproval",icon:"fas fa-gavel",label:e().translator.trans("flarum-approval.forum.badge.awaiting_approval_tooltip")}))})),s().prototype.isApproved=s().attribute("isApproved"),s().prototype.canApprove=s().attribute("canApprove"),(0,o.extend)(l().prototype,"elementAttrs",(function(t){this.attrs.discussion.isApproved()||(t.className+=" DiscussionListItem--unapproved")})),(0,o.extend)(v().prototype,"elementAttrs",(function(t){this.attrs.post.isApproved()||(t.className+=" Post--unapproved")})),(0,o.extend)(g().prototype,"headerItems",(function(t){this.attrs.post.isApproved()||this.attrs.post.isHidden()||t.add("unapproved",e().translator.trans("flarum-approval.forum.post.awaiting_approval_text"))})),(0,o.override)(v().prototype,"flagReason",(function(t,o){return"approval"===o.type()?e().translator.trans("flarum-approval.forum.post.awaiting_approval_text"):t(o)})),(0,o.extend)(y(),"destructiveControls",(function(t,o){!o.isApproved()&&o.canApprove()&&t.add("approve",m(h(),{icon:"fas fa-check",onclick:y().approveAction.bind(o)},e().translator.trans("flarum-approval.forum.post_controls.approve_button")),10)})),y().approveAction=function(){this.save({isApproved:!0}),1===this.number()&&this.discussion().pushAttributes({isApproved:!0})}}),-10)})(),module.exports={}})();
 //# sourceMappingURL=forum.js.map
--- a/extensions/approval/js/dist/forum.js.map
+++ b/extensions/approval/js/dist/forum.js.map
--- a/extensions/approval/js/forum.ts
+++ b/extensions/approval/js/forum.ts
--- a/extensions/approval/js/package.json
+++ b/extensions/approval/js/package.json
@@ -5,7 +5,7 @@
    "prettier": "@flarum/prettier-config",
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
--- a/extensions/approval/js/src/admin/extend.tsx
+++ b/extensions/approval/js/src/admin/extend.tsx
@@ -1,43 +1,33 @@
-import { extend } from 'flarum/common/extend';
+import Extend from 'flarum/common/extenders';
 import app from 'flarum/admin/app';

-app.initializers.add('flarum-approval', () => {
-  extend(app, 'getRequiredPermissions', function (required, permission) {
-    if (permission === 'discussion.startWithoutApproval') {
-      required.push('startDiscussion');
-    }
-    if (permission === 'discussion.replyWithoutApproval') {
-      required.push('discussion.reply');
-    }
-  });
-
-  app.extensionData
-    .for('flarum-approval')
-    .registerPermission(
-      {
+export default [
+  new Extend.Admin()
+    .permission(
+      () => ({
        icon: 'fas fa-check',
        label: app.translator.trans('flarum-approval.admin.permissions.start_discussions_without_approval_label'),
        permission: 'discussion.startWithoutApproval',
-      },
+      }),
      'start',
      95
    )
-    .registerPermission(
-      {
+    .permission(
+      () => ({
        icon: 'fas fa-check',
        label: app.translator.trans('flarum-approval.admin.permissions.reply_without_approval_label'),
        permission: 'discussion.replyWithoutApproval',
-      },
+      }),
      'reply',
      95
    )
-    .registerPermission(
-      {
+    .permission(
+      () => ({
        icon: 'fas fa-check',
        label: app.translator.trans('flarum-approval.admin.permissions.approve_posts_label'),
        permission: 'discussion.approvePosts',
-      },
+      }),
      'moderate',
      65
-    );
-});
+    ),
+];
--- a/extensions/approval/js/src/admin/index.ts
+++ b/extensions/approval/js/src/admin/index.ts
@@ -0,0 +1,15 @@
+import { extend } from 'flarum/common/extend';
+import app from 'flarum/admin/app';
+
+export { default as extend } from './extend';
+
+app.initializers.add('flarum-approval', () => {
+  extend(app, 'getRequiredPermissions', function (required, permission) {
+    if (permission === 'discussion.startWithoutApproval') {
+      required.push('startDiscussion');
+    }
+    if (permission === 'discussion.replyWithoutApproval') {
+      required.push('discussion.reply');
+    }
+  });
+});
--- a/extensions/approval/js/tsconfig.json
+++ b/extensions/approval/js/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  // Use Flarum's tsconfig as a starting point
+  "extends": "flarum-tsconfig",
+  // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
+  // and also tells your Typescript server to read core's global typings for
+  // access to `dayjs` and `$` in the global namespace.
+  "include": ["src/**/*", "../../../*/*/js/dist-typings/@types/**/*", "@types/**/*"],
+  "compilerOptions": {
+    // This will output typings to `dist-typings`
+    "declarationDir": "./dist-typings",
+    "paths": {
+      "flarum/*": ["../../../framework/core/js/dist-typings/*"]
+    }
+  }
+}
--- a/extensions/approval/tests/integration/InteractsWithUnapprovedContent.php
+++ b/extensions/approval/tests/integration/InteractsWithUnapprovedContent.php
@@ -64,7 +64,7 @@ trait InteractsWithUnapprovedContent
    /**
     * null: Guest, 2: Normal User.
     */
-    public function unallowedUsers(): array
+    public static function unallowedUsers(): array
    {
        return [[null], [2]];
    }
@@ -72,7 +72,7 @@ trait InteractsWithUnapprovedContent
    /**
     * 1: Admin, 3: Permission Given, 4: Discussions Author.
     */
-    public function allowedUsers(): array
+    public static function allowedUsers(): array
    {
        return [[1], [3], [4]];
    }
--- a/extensions/approval/tests/integration/api/ApprovePostsTest.php
+++ b/extensions/approval/tests/integration/api/ApprovePostsTest.php
@@ -11,8 +11,13 @@ namespace Flarum\Approval\Tests\integration\api;

 use Carbon\Carbon;
 use Flarum\Approval\Tests\integration\InteractsWithUnapprovedContent;
+use Flarum\Discussion\Discussion;
+use Flarum\Group\Group;
+use Flarum\Post\Post;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
+use Flarum\User\User;
+use PHPUnit\Framework\Attributes\Test;

 class ApprovePostsTest extends TestCase
 {
@@ -26,23 +31,23 @@ class ApprovePostsTest extends TestCase
        $this->extension('flarum-approval');

        $this->prepareDatabase([
-            'users' => [
+            User::class => [
                ['id' => 1, 'username' => 'Muralf', 'email' => 'muralf@machine.local', 'is_email_confirmed' => 1],
                $this->normalUser(),
                ['id' => 3, 'username' => 'acme', 'email' => 'acme@machine.local', 'is_email_confirmed' => 1],
                ['id' => 4, 'username' => 'luceos', 'email' => 'luceos@machine.local', 'is_email_confirmed' => 1],
            ],
-            'discussions' => [
+            Discussion::class => [
                ['id' => 1, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 1, 'comment_count' => 1, 'is_approved' => 1],
            ],
-            'posts' => [
-                ['id' => 1, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => 0, 'is_approved' => 1, 'number' => 1],
-                ['id' => 2, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => 0, 'is_approved' => 1, 'number' => 2],
-                ['id' => 3, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => 0, 'is_approved' => 0, 'number' => 3],
+            Post::class => [
+                ['id' => 1, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => null, 'is_approved' => 1, 'number' => 1],
+                ['id' => 2, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => null, 'is_approved' => 1, 'number' => 2],
+                ['id' => 3, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => null, 'is_approved' => 0, 'number' => 3],
                ['id' => 4, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => Carbon::now(), 'is_approved' => 1, 'number' => 4],
-                ['id' => 5, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => 0, 'is_approved' => 0, 'number' => 5],
+                ['id' => 5, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'hidden_at' => null, 'is_approved' => 0, 'number' => 5],
            ],
-            'groups' => [
+            Group::class => [
                ['id' => 4, 'name_singular' => 'Acme', 'name_plural' => 'Acme', 'is_hidden' => 0],
                ['id' => 5, 'name_singular' => 'Acme', 'name_plural' => 'Acme', 'is_hidden' => 0],
            ],
@@ -55,9 +60,7 @@ class ApprovePostsTest extends TestCase
        ]);
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function can_approve_unapproved_post()
    {
        $response = $this->send(
@@ -77,9 +80,7 @@ class ApprovePostsTest extends TestCase
        $this->assertEquals(1, $this->database()->table('posts')->where('id', 3)->where('is_approved', 1)->count());
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function cannot_approve_post_without_permission()
    {
        $response = $this->send(
@@ -99,9 +100,7 @@ class ApprovePostsTest extends TestCase
        $this->assertEquals(0, $this->database()->table('posts')->where('id', 3)->where('is_approved', 1)->count());
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function hiding_post_silently_approves_it()
    {
        $response = $this->send(
--- a/extensions/approval/tests/integration/api/CreatePostsTest.php
+++ b/extensions/approval/tests/integration/api/CreatePostsTest.php
@@ -11,9 +11,14 @@ namespace Flarum\Approval\Tests\integration\api;

 use Carbon\Carbon;
 use Flarum\Approval\Tests\integration\InteractsWithUnapprovedContent;
+use Flarum\Discussion\Discussion;
 use Flarum\Group\Group;
+use Flarum\Post\Post;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
+use Flarum\User\User;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;

 class CreatePostsTest extends TestCase
 {
@@ -27,18 +32,18 @@ class CreatePostsTest extends TestCase
        $this->extension('flarum-flags', 'flarum-approval');

        $this->prepareDatabase([
-            'users' => [
+            User::class => [
                ['id' => 1, 'username' => 'Muralf', 'email' => 'muralf@machine.local', 'is_email_confirmed' => 1],
                $this->normalUser(),
                ['id' => 3, 'username' => 'acme', 'email' => 'acme@machine.local', 'is_email_confirmed' => 1],
                ['id' => 4, 'username' => 'luceos', 'email' => 'luceos@machine.local', 'is_email_confirmed' => 1],
            ],
-            'discussions' => [
+            Discussion::class => [
                ['id' => 1, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 1, 'comment_count' => 1, 'is_approved' => 1],
                ['id' => 2, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 2, 'comment_count' => 1, 'is_approved' => 0],
                ['id' => 3, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 3, 'comment_count' => 1, 'is_approved' => 0],
            ],
-            'posts' => [
+            Post::class => [
                ['id' => 1, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 1],
                ['id' => 2, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 2],
                ['id' => 3, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 3],
@@ -49,7 +54,7 @@ class CreatePostsTest extends TestCase
                ['id' => 8, 'discussion_id' => 3, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 2],
                ['id' => 9, 'discussion_id' => 3, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 0, 'number' => 3],
            ],
-            'groups' => [
+            Group::class => [
                ['id' => 4, 'name_singular' => 'Acme', 'name_plural' => 'Acme', 'is_hidden' => 0],
                ['id' => 5, 'name_singular' => 'Acme', 'name_plural' => 'Acme', 'is_hidden' => 0],
            ],
@@ -60,14 +65,13 @@ class CreatePostsTest extends TestCase
            'group_permission' => [
                ['group_id' => 4, 'permission' => 'discussion.startWithoutApproval'],
                ['group_id' => 5, 'permission' => 'discussion.replyWithoutApproval'],
+                ['group_id' => Group::MEMBER_ID, 'permission' => 'postWithoutThrottle'],
            ]
        ]);
    }

-    /**
-     * @dataProvider startDiscussionDataProvider
-     * @test
-     */
+    #[Test]
+    #[DataProvider('startDiscussionDataProvider')]
    public function can_start_discussion_without_approval_when_allowed(int $authenticatedAs, bool $allowed)
    {
        $this->database()->table('group_permission')->where('group_id', Group::MEMBER_ID)->where('permission', 'discussion.startWithoutApproval')->delete();
@@ -94,10 +98,8 @@ class CreatePostsTest extends TestCase
        $this->assertEquals($allowed ? 1 : 0, $this->database()->table('discussions')->where('id', $json['data']['id'])->value('is_approved'));
    }

-    /**
-     * @dataProvider replyToDiscussionDataProvider
-     * @test
-     */
+    #[Test]
+    #[DataProvider('replyToDiscussionDataProvider')]
    public function can_reply_without_approval_when_allowed(?int $authenticatedAs, bool $allowed)
    {
        $this->database()->table('group_permission')->where('group_id', Group::MEMBER_ID)->where('permission', 'discussion.replyWithoutApproval')->delete();
--- a/extensions/approval/tests/integration/api/ListDiscussionsTest.php
+++ b/extensions/approval/tests/integration/api/ListDiscussionsTest.php
@@ -13,6 +13,8 @@ use Flarum\Approval\Tests\integration\InteractsWithUnapprovedContent;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Illuminate\Support\Arr;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;

 class ListDiscussionsTest extends TestCase
 {
@@ -28,10 +30,8 @@ class ListDiscussionsTest extends TestCase
        $this->prepareUnapprovedDatabaseContent();
    }

-    /**
-     * @dataProvider unallowedUsers
-     * @test
-     */
+    #[Test]
+    #[DataProvider('unallowedUsers')]
    public function can_only_see_approved_if_not_allowed_to_approve(?int $authenticatedAs)
    {
        $response = $this->send(
@@ -44,10 +44,8 @@ class ListDiscussionsTest extends TestCase
        $this->assertEqualsCanonicalizing([1, 4, 5, 7], Arr::pluck($body['data'], 'id'));
    }

-    /**
-     * @dataProvider allowedUsers
-     * @test
-     */
+    #[Test]
+    #[DataProvider('allowedUsers')]
    public function can_see_unapproved_if_allowed_to_approve(int $authenticatedAs)
    {
        $response = $this->send(
--- a/extensions/approval/tests/integration/api/ListPostsTest.php
+++ b/extensions/approval/tests/integration/api/ListPostsTest.php
@@ -13,6 +13,8 @@ use Flarum\Approval\Tests\integration\InteractsWithUnapprovedContent;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Illuminate\Support\Arr;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;

 class ListPostsTest extends TestCase
 {
@@ -28,10 +30,8 @@ class ListPostsTest extends TestCase
        $this->prepareUnapprovedDatabaseContent();
    }

-    /**
-     * @dataProvider unallowedUsers
-     * @test
-     */
+    #[Test]
+    #[DataProvider('unallowedUsers')]
    public function can_only_see_approved_if_not_allowed_to_approve(?int $authenticatedAs)
    {
        $response = $this->send(
@@ -50,10 +50,8 @@ class ListPostsTest extends TestCase
        $this->assertEqualsCanonicalizing([7, 8, 10], Arr::pluck($body['data'], 'id'));
    }

-    /**
-     * @dataProvider allowedUsers
-     * @test
-     */
+    #[Test]
+    #[DataProvider('allowedUsers')]
    public function can_see_unapproved_if_allowed_to_approve(int $authenticatedAs)
    {
        $response = $this->send(
--- a/extensions/approval/tests/phpunit.integration.xml
+++ b/extensions/approval/tests/phpunit.integration.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
-    backupStaticAttributes="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
    processIsolation="true"
    stopOnFailure="false"
    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <coverage processUncoveredFiles="true">
+    <source>
        <include>
            <directory suffix=".php">../src/</directory>
        </include>
-    </coverage>
+    </source>
    <testsuites>
        <testsuite name="Flarum Integration Tests">
            <directory suffix="Test.php">./integration</directory>
--- a/extensions/approval/tests/phpunit.unit.xml
+++ b/extensions/approval/tests/phpunit.unit.xml
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
-    backupStaticAttributes="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
    processIsolation="false"
    stopOnFailure="false"
    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <coverage processUncoveredFiles="true">
+    <source>
        <include>
            <directory suffix=".php">../src/</directory>
        </include>
-    </coverage>
+    </source>
    <testsuites>
        <testsuite name="Flarum Unit Tests">
            <directory suffix="Test.php">./unit</directory>
        </testsuite>
    </testsuites>
-    <listeners>
-        <listener class="\Mockery\Adapter\Phpunit\TestListener" />
-    </listeners>
 </phpunit>
--- a/extensions/bbcode/.gitignore
+++ b/extensions/bbcode/.gitignore
@@ -4,6 +4,7 @@ composer.phar

 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
--- a/extensions/bbcode/LICENSE
+++ b/extensions/bbcode/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/extensions/bbcode/composer.json
+++ b/extensions/bbcode/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^2.0.0-beta.1"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/embed/.gitignore
+++ b/extensions/embed/.gitignore
@@ -4,6 +4,7 @@ composer.phar

 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
--- a/extensions/embed/LICENSE
+++ b/extensions/embed/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/extensions/embed/composer.json
+++ b/extensions/embed/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^2.0.0-beta.1"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/embed/js/dist/forum.js
+++ b/extensions/embed/js/dist/forum.js
--- a/extensions/embed/js/dist/forum.js.map
+++ b/extensions/embed/js/dist/forum.js.map
--- a/extensions/embed/js/package.json
+++ b/extensions/embed/js/package.json
@@ -8,7 +8,7 @@
    },
    "devDependencies": {
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
--- a/extensions/emoji/.gitignore
+++ b/extensions/emoji/.gitignore
@@ -4,6 +4,7 @@ composer.phar

 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
--- a/extensions/emoji/LICENSE
+++ b/extensions/emoji/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/extensions/emoji/composer.json
+++ b/extensions/emoji/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^2.0.0-beta.1"
    },
    "extra": {
        "branch-alias": {
--- a/extensions/emoji/extend.php
+++ b/extensions/emoji/extend.php
@@ -11,6 +11,9 @@ use Flarum\Extend;
 use s9e\TextFormatter\Configurator;

 return [
+    (new Extend\Frontend('admin'))
+        ->js(__DIR__.'/js/dist/admin.js'),
+
    (new Extend\Frontend('forum'))
        ->js(__DIR__.'/js/dist/forum.js')
        ->css(__DIR__.'/less/forum.less')
@@ -30,4 +33,8 @@ return [
        }),

    new Extend\Locales(__DIR__.'/locale'),
+
+    (new Extend\Settings)
+        ->serializeToForum('flarum-emoji.cdn', 'flarum-emoji.cdn')
+        ->default('flarum-emoji.cdn', 'https://cdn.jsdelivr.net/gh/twitter/twemoji@[version]/assets/'),
 ];
--- a/extensions/emoji/js/admin.js
+++ b/extensions/emoji/js/admin.js
@@ -0,0 +1 @@
+export * from './src/admin';
--- a/extensions/emoji/js/dist/admin.js
+++ b/extensions/emoji/js/dist/admin.js
--- a/extensions/emoji/js/dist/admin.js.map
+++ b/extensions/emoji/js/dist/admin.js.map
--- a/extensions/emoji/js/dist/forum.js
+++ b/extensions/emoji/js/dist/forum.js
--- a/extensions/emoji/js/dist/forum.js.map
+++ b/extensions/emoji/js/dist/forum.js.map
--- a/extensions/emoji/js/dist/forum/emojiMap.js
+++ b/extensions/emoji/js/dist/forum/emojiMap.js
--- a/extensions/emoji/js/package.json
+++ b/extensions/emoji/js/package.json
@@ -9,8 +9,8 @@
    },
    "devDependencies": {
        "@flarum/prettier-config": "^1.0.0",
-        "flarum-tsconfig": "^1.0.2",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-tsconfig": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "prettier": "^2.5.1",
        "typescript": "^4.5.4",
        "typescript-coverage-report": "^0.6.1",
--- a/extensions/emoji/js/src/admin/extend.tsx
+++ b/extensions/emoji/js/src/admin/extend.tsx
@@ -0,0 +1,14 @@
+import Extend from 'flarum/common/extenders';
+import app from 'flarum/admin/app';
+import { version } from '../common/cdn';
+
+export default [
+  new Extend.Admin().setting(() => ({
+    setting: 'flarum-emoji.cdn',
+    type: 'text',
+    label: app.translator.trans('flarum-emoji.admin.settings.cdn_label'),
+    help: app.translator.trans('flarum-emoji.admin.settings.cdn_help', {
+      version: version,
+    }),
+  })),
+];
--- a/extensions/emoji/js/src/admin/index.ts
+++ b/extensions/emoji/js/src/admin/index.ts
@@ -0,0 +1,7 @@
+import app from 'flarum/admin/app';
+
+export { default as extend } from './extend';
+
+app.initializers.add('flarum-emoji', () => {
+  // ...
+});
--- a/extensions/emoji/js/src/common/cdn.js
+++ b/extensions/emoji/js/src/common/cdn.js
@@ -0,0 +1,7 @@
+import twemoji from 'twemoji';
+
+export const version = /([0-9]+).[0-9]+.[0-9]+/g.exec(twemoji.base)[1];
+
+export default function () {
+  return app.forum.attribute('flarum-emoji.cdn').replace('[version]', version);
+}
--- a/extensions/emoji/js/src/forum/addComposerAutocomplete.js
+++ b/extensions/emoji/js/src/forum/addComposerAutocomplete.js
@@ -6,7 +6,7 @@ import AutocompleteReader from 'flarum/common/utils/AutocompleteReader';

 import AutocompleteDropdown from './fragments/AutocompleteDropdown';
 import getEmojiIconCode from './helpers/getEmojiIconCode';
-import cdn from './cdn';
+import cdn from '../common/cdn';

 export default function addComposerAutocomplete() {
  let emojiMap = null;
@@ -40,6 +40,7 @@ export default function addComposerAutocomplete() {

  extend('flarum/common/components/TextEditor', 'buildEditorParams', function (params) {
    const emojiKeys = Object.keys(emojiMap);
+    const resolvedCdn = cdn();

    const autocompleteReader = new AutocompleteReader(':');

@@ -75,7 +76,7 @@ export default function addComposerAutocomplete() {
                  emojiDropdown.setIndex($(this).parent().index() - 1);
                }}
              >
-                <img alt={emoji} className="emoji" draggable="false" loading="lazy" src={`${cdn}72x72/${code}.png`} title={name} />
+                <img alt={emoji} className="emoji" draggable="false" loading="lazy" src={`${resolvedCdn}72x72/${code}.png`} title={name} />
              </button>
            </Tooltip>
          );
--- a/extensions/emoji/js/src/forum/cdn.js
+++ b/extensions/emoji/js/src/forum/cdn.js
@@ -1,5 +0,0 @@
-import twemoji from 'twemoji';
-
-export const version = /([0-9]+).[0-9]+.[0-9]+/g.exec(twemoji.base)[1];
-
-export default `https://cdn.jsdelivr.net/gh/twitter/twemoji@${version}/assets/`;
--- a/extensions/emoji/js/src/forum/renderEmoji.js
+++ b/extensions/emoji/js/src/forum/renderEmoji.js
@@ -3,14 +3,16 @@ import twemoji from 'twemoji';
 import { override } from 'flarum/common/extend';
 import Post from 'flarum/common/models/Post';

-import base from './cdn';
+import cdn from '../common/cdn';

-const options = {
-  base,
-  attributes: () => ({
-    loading: 'lazy',
-  }),
-};
+function options() {
+  return {
+    base: cdn(),
+    attributes: () => ({
+      loading: 'lazy',
+    }),
+  };
+}

 /**
 * Parses an HTML string into a `<body>` node containing the HTML content.
@@ -40,7 +42,7 @@ export default function renderEmoji() {
      // element. This gets stripped below.
      //
      // See https://github.com/flarum/core/issues/2958
-      const emojifiedDom = twemoji.parse(parseHTML(contentHtml), options);
+      const emojifiedDom = twemoji.parse(parseHTML(contentHtml), options());

      // Steal the HTML string inside the emojified DOM `<body>` tag.
      this.emojifiedContentHtml = emojifiedDom.innerHTML;
@@ -54,6 +56,6 @@ export default function renderEmoji() {
  override(s9e.TextFormatter, 'preview', (original, text, element) => {
    original(text, element);

-    twemoji.parse(element, options);
+    twemoji.parse(element, options());
  });
 }
--- a/extensions/emoji/js/tsconfig.json
+++ b/extensions/emoji/js/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  // Use Flarum's tsconfig as a starting point
+  "extends": "flarum-tsconfig",
+  // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
+  // and also tells your Typescript server to read core's global typings for
+  // access to `dayjs` and `$` in the global namespace.
+  "include": ["src/**/*", "../../../*/*/js/dist-typings/@types/**/*", "@types/**/*"],
+  "compilerOptions": {
+    // This will output typings to `dist-typings`
+    "declarationDir": "./dist-typings",
+    "paths": {
+      "flarum/*": ["../../../framework/core/js/dist-typings/*"]
+    }
+  }
+}
--- a/extensions/emoji/locale/en.yml
+++ b/extensions/emoji/locale/en.yml
@@ -4,6 +4,14 @@ flarum-emoji:
  # UNIQUE KEYS - The following keys are used in only one location each.
  ##

+  # Translations in this namespace are used by the admin interface.
+  admin:
+
+    # These translations are used in the Settings page of the admin interface.
+    settings:
+      cdn_label: CDN mirror address
+      cdn_help: "e.g. https://cdn.jsdelivr.net/gh/twitter/twemoji@[version]/assets/, The current version is: {version}"
+
  # Translations in this namespace are used by the forum user interface.
  forum:

--- a/extensions/flags/.gitignore
+++ b/extensions/flags/.gitignore
@@ -4,6 +4,7 @@ composer.phar

 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
--- a/extensions/flags/LICENSE
+++ b/extensions/flags/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/extensions/flags/composer.json
+++ b/extensions/flags/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^2.0.0-beta.1"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/flags/extend.php
+++ b/extensions/flags/extend.php
@@ -52,11 +52,6 @@ return [
    (new Extend\ApiResource(Resource\ForumResource::class))
        ->fields(ForumResourceFields::class),

-    (new Extend\ApiResource(Resource\DiscussionResource::class))
-        ->endpoint(Endpoint\Show::class, function (Endpoint\Show $endpoint) {
-            return $endpoint->addDefaultInclude(['posts.flags', 'posts.flags.user']);
-        }),
-
    (new Extend\ApiResource(Resource\PostResource::class))
        ->endpoint([Endpoint\Index::class, Endpoint\Show::class], function (Endpoint\Index|Endpoint\Show $endpoint) {
            return $endpoint->addDefaultInclude(['flags', 'flags.user']);
--- a/extensions/flags/js/dist-typings/admin/extend.d.ts
+++ b/extensions/flags/js/dist-typings/admin/extend.d.ts
@@ -0,0 +1,2 @@
+declare const _default: import("flarum/common/extenders/Admin").default[];
+export default _default;
--- a/extensions/flags/js/dist-typings/admin/index.d.ts
+++ b/extensions/flags/js/dist-typings/admin/index.d.ts
@@ -1 +1 @@
-export {};
+export { default as extend } from './extend';
--- a/extensions/flags/js/dist-typings/forum/components/FlagList.d.ts
+++ b/extensions/flags/js/dist-typings/forum/components/FlagList.d.ts
@@ -2,11 +2,13 @@ import Component from 'flarum/common/Component';
 import type { ComponentAttrs } from 'flarum/common/Component';
 import type Mithril from 'mithril';
 import type FlagListState from '../states/FlagListState';
+import ItemList from 'flarum/common/utils/ItemList';
 export interface IFlagListAttrs extends ComponentAttrs {
    state: FlagListState;
 }
 export default class FlagList<CustomAttrs extends IFlagListAttrs = IFlagListAttrs> extends Component<CustomAttrs, FlagListState> {
    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
    view(): JSX.Element;
+    controlItems(): ItemList<unknown>;
    content(state: FlagListState): JSX.Element[][] | null;
 }
--- a/extensions/flags/js/dist-typings/forum/components/FlagPostModal.d.ts
+++ b/extensions/flags/js/dist-typings/forum/components/FlagPostModal.d.ts
@@ -1,11 +1,10 @@
-/// <reference types="flarum/@types/translator-icu-rich" />
 export default class FlagPostModal extends FormModal<import("flarum/common/components/FormModal").IFormModalAttrs, undefined> {
    constructor();
    oninit(vnode: any): void;
    success: boolean | undefined;
    reason: Stream<string> | undefined;
    reasonDetail: Stream<string> | undefined;
-    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    title(): string | any[];
    content(): JSX.Element;
    flagReasons(): ItemList<any>;
    onsubmit(e: any): void;
--- a/extensions/flags/js/dist-typings/forum/extend.d.ts
+++ b/extensions/flags/js/dist-typings/forum/extend.d.ts
@@ -1,2 +1,2 @@
-declare const _default: (import("flarum/common/extenders/Model").default | import("flarum/common/extenders/Routes").default | import("flarum/common/extenders/Store").default)[];
+declare const _default: (import("flarum/common/extenders/Routes").default | import("flarum/common/extenders/Store").default | import("flarum/common/extenders/Model").default)[];
 export default _default;
--- a/extensions/flags/js/dist/admin.js
+++ b/extensions/flags/js/dist/admin.js
@@ -1,2 +1,2 @@
-(()=>{var e={n:a=>{var s=a&&a.__esModule?()=>a.default:()=>a;return e.d(s,{a:s}),s},d:(a,s)=>{for(var r in s)e.o(s,r)&&!e.o(a,r)&&Object.defineProperty(a,r,{enumerable:!0,get:s[r]})},o:(e,a)=>Object.prototype.hasOwnProperty.call(e,a),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},a={};(()=>{"use strict";e.r(a);const s=flarum.reg.get("core","admin/app");var r=e.n(s);r().initializers.add("flarum-flags",(()=>{r().extensionData.for("flarum-flags").registerSetting({setting:"flarum-flags.guidelines_url",type:"text",label:r().translator.trans("flarum-flags.admin.settings.guidelines_url_label")},15).registerSetting({setting:"flarum-flags.can_flag_own",type:"boolean",label:r().translator.trans("flarum-flags.admin.settings.flag_own_posts_label")}).registerPermission({icon:"fas fa-flag",label:r().translator.trans("flarum-flags.admin.permissions.view_flags_label"),permission:"discussion.viewFlags"},"moderate",65).registerPermission({icon:"fas fa-flag",label:r().translator.trans("flarum-flags.admin.permissions.flag_posts_label"),permission:"discussion.flagPosts"},"reply",65)}))})(),module.exports=a})();
+(()=>{var e={n:a=>{var s=a&&a.__esModule?()=>a.default:()=>a;return e.d(s,{a:s}),s},d:(a,s)=>{for(var l in s)e.o(s,l)&&!e.o(a,l)&&Object.defineProperty(a,l,{enumerable:!0,get:s[l]})},o:(e,a)=>Object.prototype.hasOwnProperty.call(e,a),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},a={};(()=>{"use strict";e.r(a),e.d(a,{extend:()=>t});const s=flarum.reg.get("core","admin/app");var l=e.n(s);const r=flarum.reg.get("core","common/extenders"),t=[(new(e.n(r)().Admin)).setting((()=>({setting:"flarum-flags.guidelines_url",type:"text",label:l().translator.trans("flarum-flags.admin.settings.guidelines_url_label")})),15).setting((()=>({setting:"flarum-flags.can_flag_own",type:"boolean",label:l().translator.trans("flarum-flags.admin.settings.flag_own_posts_label")}))).permission((()=>({icon:"fas fa-flag",label:l().translator.trans("flarum-flags.admin.permissions.view_flags_label"),permission:"discussion.viewFlags"})),"moderate",65).permission((()=>({icon:"fas fa-flag",label:l().translator.trans("flarum-flags.admin.permissions.flag_posts_label"),permission:"discussion.flagPosts"})),"reply",65)];l().initializers.add("flarum-flags",(()=>{}))})(),module.exports=a})();
 //# sourceMappingURL=admin.js.map
--- a/extensions/flags/js/dist/admin.js.map
+++ b/extensions/flags/js/dist/admin.js.map
@@ -1 +1 @@
-{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,EAAGH,IAC5BA,CAAM,ECLdF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,GAAO,G,+BCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,a,aCC5D,qBAAqB,gBAAgB,KACnC,sBAAsB,gBAAgBW,gBAAgB,CACpDC,QAAS,8BACTC,KAAM,OACNC,MAAO,qBAAqB,qDAC3B,IAAIH,gBAAgB,CACrBC,QAAS,4BACTC,KAAM,UACNC,MAAO,qBAAqB,sDAC3BC,mBAAmB,CACpBC,KAAM,cACNF,MAAO,qBAAqB,mDAC5BG,WAAY,wBACX,WAAY,IAAIF,mBAAmB,CACpCC,KAAM,cACNF,MAAO,qBAAqB,mDAC5BG,WAAY,wBACX,QAAS,GAAG,G","sources":["webpack://@flarum/flags/webpack/bootstrap","webpack://@flarum/flags/webpack/runtime/compat get default export","webpack://@flarum/flags/webpack/runtime/define property getters","webpack://@flarum/flags/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/flags/webpack/runtime/make namespace object","webpack://@flarum/flags/external root \"flarum.reg.get('core', 'admin/app')\"","webpack://@flarum/flags/./src/admin/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'admin/app');","import app from 'flarum/admin/app';\napp.initializers.add('flarum-flags', () => {\n  app.extensionData.for('flarum-flags').registerSetting({\n    setting: 'flarum-flags.guidelines_url',\n    type: 'text',\n    label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label')\n  }, 15).registerSetting({\n    setting: 'flarum-flags.can_flag_own',\n    type: 'boolean',\n    label: app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label')\n  }).registerPermission({\n    icon: 'fas fa-flag',\n    label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),\n    permission: 'discussion.viewFlags'\n  }, 'moderate', 65).registerPermission({\n    icon: 'fas fa-flag',\n    label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),\n    permission: 'discussion.flagPosts'\n  }, 'reply', 65);\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","reg","registerSetting","setting","type","label","registerPermission","icon","permission"],"sourceRoot":""}
+{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,EAAGH,IAC5BA,CAAM,ECLdF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,GAAO,G,qDCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,a,aCA5D,MAAM,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,oBCE5D,IAAgB,I,MAAI,WAAeW,SAAQ,KAAM,CAC/CA,QAAS,8BACTC,KAAM,OACNC,MAAO,eAAeC,MAAM,uDAC1B,IAAIH,SAAQ,KAAM,CACpBA,QAAS,4BACTC,KAAM,UACNC,MAAO,eAAeC,MAAM,wDAC1BC,YAAW,KAAM,CACnBC,KAAM,cACNH,MAAO,eAAeC,MAAM,mDAC5BC,WAAY,0BACV,WAAY,IAAIA,YAAW,KAAM,CACnCC,KAAM,cACNH,MAAO,eAAeC,MAAM,mDAC5BC,WAAY,0BACV,QAAS,KChBb,iBAAiBE,IAAI,gBAAgB,Q","sources":["webpack://@flarum/flags/webpack/bootstrap","webpack://@flarum/flags/webpack/runtime/compat get default export","webpack://@flarum/flags/webpack/runtime/define property getters","webpack://@flarum/flags/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/flags/webpack/runtime/make namespace object","webpack://@flarum/flags/external root \"flarum.reg.get('core', 'admin/app')\"","webpack://@flarum/flags/external root \"flarum.reg.get('core', 'common/extenders')\"","webpack://@flarum/flags/./src/admin/extend.tsx","webpack://@flarum/flags/./src/admin/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'admin/app');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extenders');","import Extend from 'flarum/common/extenders';\nimport app from 'flarum/admin/app';\nexport default [new Extend.Admin().setting(() => ({\n  setting: 'flarum-flags.guidelines_url',\n  type: 'text',\n  label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label')\n}), 15).setting(() => ({\n  setting: 'flarum-flags.can_flag_own',\n  type: 'boolean',\n  label: app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label')\n})).permission(() => ({\n  icon: 'fas fa-flag',\n  label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),\n  permission: 'discussion.viewFlags'\n}), 'moderate', 65).permission(() => ({\n  icon: 'fas fa-flag',\n  label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),\n  permission: 'discussion.flagPosts'\n}), 'reply', 65)];","import app from 'flarum/admin/app';\nexport { default as extend } from './extend';\napp.initializers.add('flarum-flags', () => {\n  // ...\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","reg","setting","type","label","trans","permission","icon","add"],"sourceRoot":""}
--- a/extensions/flags/js/dist/forum.js
+++ b/extensions/flags/js/dist/forum.js
--- a/extensions/flags/js/dist/forum.js.map
+++ b/extensions/flags/js/dist/forum.js.map
--- a/extensions/flags/js/package.json
+++ b/extensions/flags/js/package.json
@@ -6,11 +6,11 @@
    "devDependencies": {
        "@types/mithril": "^2.0.8",
        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
+        "flarum-webpack-config": "^3.0.0",
        "webpack": "^5.76.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0",
-        "flarum-tsconfig": "^1.0.2",
+        "flarum-tsconfig": "^2.0.0",
        "typescript": "^4.5.4",
        "typescript-coverage-report": "^0.6.1"
    },
--- a/extensions/flags/js/src/admin/extend.tsx
+++ b/extensions/flags/js/src/admin/extend.tsx
@@ -0,0 +1,37 @@
+import Extend from 'flarum/common/extenders';
+import app from 'flarum/admin/app';
+
+export default [
+  new Extend.Admin()
+    .setting(
+      () => ({
+        setting: 'flarum-flags.guidelines_url',
+        type: 'text',
+        label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label'),
+      }),
+      15
+    )
+    .setting(() => ({
+      setting: 'flarum-flags.can_flag_own',
+      type: 'boolean',
+      label: app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label'),
+    }))
+    .permission(
+      () => ({
+        icon: 'fas fa-flag',
+        label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
+        permission: 'discussion.viewFlags',
+      }),
+      'moderate',
+      65
+    )
+    .permission(
+      () => ({
+        icon: 'fas fa-flag',
+        label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),
+        permission: 'discussion.flagPosts',
+      }),
+      'reply',
+      65
+    ),
+];
--- a/extensions/flags/js/src/admin/index.ts
+++ b/extensions/flags/js/src/admin/index.ts
@@ -1,38 +1,7 @@
 import app from 'flarum/admin/app';

-app.initializers.add('flarum-flags', () => {
-  app.extensionData
-    .for('flarum-flags')
-    .registerSetting(
-      {
-        setting: 'flarum-flags.guidelines_url',
-        type: 'text',
-        label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label'),
-      },
-      15
-    )
-    .registerSetting({
-      setting: 'flarum-flags.can_flag_own',
-      type: 'boolean',
-      label: app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label'),
-    })
-    .registerPermission(
-      {
-        icon: 'fas fa-flag',
-        label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
-        permission: 'discussion.viewFlags',
-      },
-      'moderate',
-      65
-    )
+export { default as extend } from './extend';

-    .registerPermission(
-      {
-        icon: 'fas fa-flag',
-        label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),
-        permission: 'discussion.flagPosts',
-      },
-      'reply',
-      65
-    );
+app.initializers.add('flarum-flags', () => {
+  // ...
 });
--- a/extensions/flags/js/src/forum/components/FlagList.tsx
+++ b/extensions/flags/js/src/forum/components/FlagList.tsx
@@ -10,6 +10,7 @@ import type Post from 'flarum/common/models/Post';
 import type FlagListState from '../states/FlagListState';
 import type Flag from '../models/Flag';
 import { Page } from 'flarum/common/states/PaginatedListState';
+import ItemList from 'flarum/common/utils/ItemList';

 export interface IFlagListAttrs extends ComponentAttrs {
  state: FlagListState;
@@ -27,6 +28,7 @@ export default class FlagList<CustomAttrs extends IFlagListAttrs = IFlagListAttr
      <HeaderList
        className="FlagList"
        title={app.translator.trans('flarum-flags.forum.flagged_posts.title')}
+        controls={this.controlItems()}
        hasItems={state.hasItems()}
        loading={state.isLoading()}
        emptyText={app.translator.trans('flarum-flags.forum.flagged_posts.empty_text')}
@@ -37,6 +39,12 @@ export default class FlagList<CustomAttrs extends IFlagListAttrs = IFlagListAttr
    );
  }

+  controlItems() {
+    const items = new ItemList();
+
+    return items;
+  }
+
  content(state: FlagListState) {
    if (!state.isLoading() && state.hasItems()) {
      return state.getPages().map((page: Page<Flag>) => {
--- a/extensions/flags/less/forum.less
+++ b/extensions/flags/less/forum.less
@@ -1,3 +1,11 @@
+[data-theme^=light] {
+  .light-contents-vars(@color: @body-bg-light; @control-color: @body-bg-light; @name: 'flagged-post');
+}
+
+[data-theme^=dark] {
+  .light-contents-vars(@color: @body-bg-dark; @control-color: @body-bg-dark; @name: 'flagged-post');
+}
+
 .Post--flagged {
  --border-width: 2px;
  padding-top: 0 !important;
@@ -16,7 +24,7 @@
  padding: 10px;
  border-radius: var(--border-radius) var(--border-radius) 0 0;
  overflow: hidden;
-  .light-contents(@color: @body-bg; @control-color: @body-bg);
+  .light-contents(@name: 'flagged-post');

  display: flex;
  align-items: center;
--- a/extensions/flags/migrations/2019_10_22_000000_change_reason_text_col_type.php
+++ b/extensions/flags/migrations/2019_10_22_000000_change_reason_text_col_type.php
@@ -13,13 +13,13 @@ use Illuminate\Database\Schema\Builder;
 return [
    'up' => function (Builder $schema) {
        $schema->table('flags', function (Blueprint $table) {
-            $table->text('reason_detail')->change();
+            $table->text('reason_detail')->nullable()->change();
        });
    },

    'down' => function (Builder $schema) {
        $schema->table('flags', function (Blueprint $table) {
-            $table->string('reason_detail')->change();
+            $table->string('reason_detail')->nullable()->change();
        });
    }
 ];
--- a/extensions/flags/src/Api/Resource/FlagResource.php
+++ b/extensions/flags/src/Api/Resource/FlagResource.php
@@ -53,7 +53,10 @@ class FlagResource extends AbstractDatabaseResource
    public function query(Context $context): object
    {
        if ($context->listing(self::class)) {
-            $query = Flag::query()->groupBy('post_id');
+            $query = Flag::query()->whenPgSql(
+                fn (Builder $query) => $query->distinct('post_id')->orderBy('post_id'),
+                else: fn (Builder $query) => $query->groupBy('post_id')
+            );

            $this->scope($query, $context);

--- a/extensions/flags/tests/integration/api/flags/ListTest.php
+++ b/extensions/flags/tests/integration/api/flags/ListTest.php
@@ -9,6 +9,7 @@

 namespace Flarum\Flags\Tests\integration\api\flags;

+use Carbon\Carbon;
 use Flarum\Discussion\Discussion;
 use Flarum\Flags\Flag;
 use Flarum\Group\Group;
@@ -16,7 +17,9 @@ use Flarum\Post\Post;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Flarum\User\User;
+use Illuminate\Database\PostgresConnection;
 use Illuminate\Support\Arr;
+use PHPUnit\Framework\Attributes\Test;

 class ListTest extends TestCase
 {
@@ -58,19 +61,17 @@ class ListTest extends TestCase
                ['id' => 4, 'discussion_id' => 1, 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p></p></t>', 'is_private' => true],
            ],
            Flag::class => [
-                ['id' => 1, 'post_id' => 1, 'user_id' => 1],
-                ['id' => 2, 'post_id' => 1, 'user_id' => 2],
-                ['id' => 3, 'post_id' => 1, 'user_id' => 3],
-                ['id' => 4, 'post_id' => 2, 'user_id' => 2],
-                ['id' => 5, 'post_id' => 3, 'user_id' => 1],
-                ['id' => 6, 'post_id' => 4, 'user_id' => 1],
+                ['id' => 1, 'post_id' => 1, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(2)],
+                ['id' => 2, 'post_id' => 1, 'user_id' => 2, 'created_at' => Carbon::now()->addMinutes(3)],
+                ['id' => 3, 'post_id' => 1, 'user_id' => 3, 'created_at' => Carbon::now()->addMinutes(4)],
+                ['id' => 4, 'post_id' => 2, 'user_id' => 2, 'created_at' => Carbon::now()->addMinutes(5)],
+                ['id' => 5, 'post_id' => 3, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(6)],
+                ['id' => 6, 'post_id' => 4, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(7)],
            ]
        ]);
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function admin_can_see_one_flag_per_visible_post()
    {
        $response = $this->send(
@@ -79,17 +80,22 @@ class ListTest extends TestCase
            ])
        );

-        $this->assertEquals(200, $response->getStatusCode(), $body = $response->getBody()->getContents());
+        $body = $response->getBody()->getContents();
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);

        $data = json_decode($body, true)['data'];

        $ids = Arr::pluck($data, 'id');
-        $this->assertEqualsCanonicalizing(['1', '4', '5'], $ids);
+
+        if ($this->database() instanceof PostgresConnection) {
+            $this->assertEqualsCanonicalizing(['3', '4', '5'], $ids);
+        } else {
+            $this->assertEqualsCanonicalizing(['1', '4', '5'], $ids);
+        }
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function regular_user_sees_own_flags_of_visible_posts()
    {
        $response = $this->send(
@@ -106,9 +112,7 @@ class ListTest extends TestCase
        $this->assertEqualsCanonicalizing(['2', '4'], $ids);
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function mod_can_see_one_flag_per_visible_post()
    {
        $response = $this->send(
@@ -122,12 +126,10 @@ class ListTest extends TestCase
        $data = json_decode($response->getBody()->getContents(), true)['data'];

        $ids = Arr::pluck($data, 'id');
-        $this->assertEqualsCanonicalizing(['1', '4', '5'], $ids);
+        $this->assertCount(3, $data);
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function guest_cant_see_flags()
    {
        $response = $this->send(
--- a/extensions/flags/tests/integration/api/flags/ListWithTagsTest.php
+++ b/extensions/flags/tests/integration/api/flags/ListWithTagsTest.php
@@ -18,6 +18,8 @@ use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Flarum\User\User;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
+use PHPUnit\Framework\Attributes\Test;

 class ListWithTagsTest extends TestCase
 {
@@ -86,23 +88,21 @@ class ListWithTagsTest extends TestCase
            ],
            Flag::class => [
                // From regular ListTest
-                ['id' => 1, 'post_id' => 1, 'user_id' => 1],
-                ['id' => 2, 'post_id' => 1, 'user_id' => 2],
-                ['id' => 3, 'post_id' => 1, 'user_id' => 3],
-                ['id' => 4, 'post_id' => 2, 'user_id' => 2],
-                ['id' => 5, 'post_id' => 3, 'user_id' => 1],
+                ['id' => 1, 'post_id' => 1, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(2)],
+                ['id' => 2, 'post_id' => 1, 'user_id' => 2, 'created_at' => Carbon::now()->addMinutes(3)],
+                ['id' => 3, 'post_id' => 1, 'user_id' => 3, 'created_at' => Carbon::now()->addMinutes(4)],
+                ['id' => 4, 'post_id' => 2, 'user_id' => 2, 'created_at' => Carbon::now()->addMinutes(5)],
+                ['id' => 5, 'post_id' => 3, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(6)],
                // In tags
-                ['id' => 6, 'post_id' => 4, 'user_id' => 1],
-                ['id' => 7, 'post_id' => 5, 'user_id' => 1],
-                ['id' => 8, 'post_id' => 6, 'user_id' => 1],
-                ['id' => 9, 'post_id' => 7, 'user_id' => 1],
+                ['id' => 6, 'post_id' => 4, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(7)],
+                ['id' => 7, 'post_id' => 5, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(8)],
+                ['id' => 8, 'post_id' => 6, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(9)],
+                ['id' => 9, 'post_id' => 7, 'user_id' => 1, 'created_at' => Carbon::now()->addMinutes(10)],
            ]
        ]);
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function admin_can_see_one_flag_per_post()
    {
        $response = $this->send(
@@ -111,17 +111,17 @@ class ListWithTagsTest extends TestCase
            ])
        );

-        $this->assertEquals(200, $response->getStatusCode());
+        $body = $response->getBody()->getContents();

-        $data = json_decode($response->getBody()->getContents(), true)['data'];
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+
+        $data = json_decode($body, true)['data'];

        $ids = Arr::pluck($data, 'id');
-        $this->assertEqualsCanonicalizing(['1', '4', '5', '6', '7', '8', '9'], $ids);
+        $this->assertCount(7, $data);
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function regular_user_sees_own_flags()
    {
        $response = $this->send(
@@ -138,9 +138,7 @@ class ListWithTagsTest extends TestCase
        $this->assertEqualsCanonicalizing(['2', '4'], $ids);
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function mod_can_see_one_flag_per_post()
    {
        $response = $this->send(
@@ -154,12 +152,12 @@ class ListWithTagsTest extends TestCase
        $data = json_decode($response->getBody()->getContents(), true)['data'];

        $ids = Arr::pluck($data, 'id');
-        $this->assertEqualsCanonicalizing(['1', '4', '5', '8', '9'], $ids);
+        // 7 is included, even though mods can't view discussions.
+        // This is because the UI doesnt allow discussions.viewFlags without viewDiscussions.
+        $this->assertCount(5, $data);
    }

-    /**
-     * @test
-     */
+    #[Test]
    public function guest_cant_see_flags()
    {
        $response = $this->send(
--- a/extensions/flags/tests/integration/api/posts/IncludeFlagsVisibilityTest.php
+++ b/extensions/flags/tests/integration/api/posts/IncludeFlagsVisibilityTest.php
@@ -9,10 +9,17 @@

 namespace Flarum\Flags\Tests\integration\api\posts;

+use Flarum\Discussion\Discussion;
+use Flarum\Flags\Flag;
 use Flarum\Group\Group;
+use Flarum\Post\Post;
+use Flarum\Tags\Tag;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
+use Flarum\User\User;
 use Illuminate\Support\Arr;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;

 class IncludeFlagsVisibilityTest extends TestCase
 {
@@ -28,7 +35,7 @@ class IncludeFlagsVisibilityTest extends TestCase
        $this->extension('flarum-tags', 'flarum-flags');

        $this->prepareDatabase([
-            'users' => [
+            User::class => [
                $this->normalUser(),
                [
                    'id' => 3,
@@ -56,7 +63,7 @@ class IncludeFlagsVisibilityTest extends TestCase
                ['group_id' => 5, 'user_id' => 2],
                ['group_id' => 6, 'user_id' => 3],
            ],
-            'groups' => [
+            Group::class => [
                ['id' => 5, 'name_singular' => 'group5', 'name_plural' => 'group5', 'color' => null, 'icon' => 'fas fa-crown', 'is_hidden' => false],
                ['id' => 6, 'name_singular' => 'group1', 'name_plural' => 'group1', 'color' => null, 'icon' => 'fas fa-cog', 'is_hidden' => false],
            ],
@@ -67,11 +74,11 @@ class IncludeFlagsVisibilityTest extends TestCase
                ['group_id' => 6, 'permission' => 'tag1.discussion.viewFlags'],
                ['group_id' => 6, 'permission' => 'tag1.viewForum'],
            ],
-            'tags' => [
+            Tag::class => [
                ['id' => 1, 'name' => 'Tag 1', 'slug' => 'tag-1', 'is_primary' => false, 'position' => null, 'parent_id' => null, 'is_restricted' => true],
                ['id' => 2, 'name' => 'Tag 2', 'slug' => 'tag-2', 'is_primary' => true, 'position' => 2, 'parent_id' => null, 'is_restricted' => false],
            ],
-            'discussions' => [
+            Discussion::class => [
                ['id' => 1, 'title' => 'Test1', 'user_id' => 1, 'comment_count' => 1],
                ['id' => 2, 'title' => 'Test2', 'user_id' => 1, 'comment_count' => 1],
            ],
@@ -79,7 +86,7 @@ class IncludeFlagsVisibilityTest extends TestCase
                ['discussion_id' => 1, 'tag_id' => 1],
                ['discussion_id' => 2, 'tag_id' => 2],
            ],
-            'posts' => [
+            Post::class => [
                ['id' => 1, 'discussion_id' => 1, 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p></p></t>'],
                ['id' => 2, 'discussion_id' => 1, 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p></p></t>'],
                ['id' => 3, 'discussion_id' => 1, 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p></p></t>'],
@@ -87,7 +94,7 @@ class IncludeFlagsVisibilityTest extends TestCase
                ['id' => 4, 'discussion_id' => 2, 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p></p></t>'],
                ['id' => 5, 'discussion_id' => 2, 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p></p></t>'],
            ],
-            'flags' => [
+            Flag::class => [
                ['id' => 1, 'post_id' => 1, 'user_id' => 1],
                ['id' => 2, 'post_id' => 1, 'user_id' => 5],
                ['id' => 3, 'post_id' => 1, 'user_id' => 3],
@@ -101,10 +108,8 @@ class IncludeFlagsVisibilityTest extends TestCase
        ]);
    }

-    /**
-     * @dataProvider listFlagsIncludesDataProvider
-     * @test
-     */
+    #[Test]
+    #[DataProvider('listFlagsIncludesDataProvider')]
    public function user_sees_where_allowed_with_included_tags(int $actorId, array $expectedIncludes)
    {
        $response = $this->send(
@@ -121,7 +126,7 @@ class IncludeFlagsVisibilityTest extends TestCase

        $data = $responseBody['data'];

-        $this->assertEquals(['1', '2', '3', '4', '5'], Arr::pluck($data, 'id'));
+        $this->assertEqualsCanonicalizing(['1', '2', '3', '4', '5'], Arr::pluck($data, 'id'));
        $this->assertEqualsCanonicalizing(
            $expectedIncludes,
            collect($responseBody['included'] ?? [])
@@ -132,7 +137,7 @@ class IncludeFlagsVisibilityTest extends TestCase
        );
    }

-    public function listFlagsIncludesDataProvider(): array
+    public static function listFlagsIncludesDataProvider(): array
    {
        return [
            'admin_sees_all' => [1, [1, 2, 3, 4, 5, 6, 7, 8]],
--- a/extensions/flags/tests/phpunit.integration.xml
+++ b/extensions/flags/tests/phpunit.integration.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
-    backupStaticAttributes="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
    processIsolation="true"
    stopOnFailure="false"
    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <coverage processUncoveredFiles="true">
+    <source>
        <include>
            <directory suffix=".php">../src/</directory>
        </include>
-    </coverage>
+    </source>
    <testsuites>
        <testsuite name="Flarum Integration Tests">
            <directory suffix="Test.php">./integration</directory>
--- a/extensions/flags/tests/phpunit.unit.xml
+++ b/extensions/flags/tests/phpunit.unit.xml
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
-    backupStaticAttributes="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
    processIsolation="false"
    stopOnFailure="false"
    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <coverage processUncoveredFiles="true">
+    <source>
        <include>
            <directory suffix=".php">../src/</directory>
        </include>
-    </coverage>
+    </source>
    <testsuites>
        <testsuite name="Flarum Unit Tests">
            <directory suffix="Test.php">./unit</directory>
        </testsuite>
    </testsuites>
-    <listeners>
-        <listener class="\Mockery\Adapter\Phpunit\TestListener" />
-    </listeners>
 </phpunit>
--- a/extensions/lang-english/.gitignore
+++ b/extensions/lang-english/.gitignore
@@ -4,6 +4,7 @@ composer.phar

 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
--- a/extensions/lang-english/LICENSE
+++ b/extensions/lang-english/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)

 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/extensions/lang-english/composer.json
+++ b/extensions/lang-english/composer.json
@@ -7,7 +7,7 @@
    ],
    "license": "MIT",
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^2.0.0-beta.1"
    },
    "extra": {
        "branch-alias": {
--- a/extensions/likes/.gitignore
+++ b/extensions/likes/.gitignore
@@ -4,6 +4,7 @@ composer.phar

 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
--- a/Show More
+++ b/Show More