Apply fixes from StyleCI

Enable conditional migrations through when callback
2025-08-17 22:01:44 +02:00 · 2022-11-21 13:28:11 +00:00 · 2022-11-21 14:27:44 +01:00
1579 changed files with 23706 additions and 27519 deletions
--- a/.bundlewatch.config.json
+++ b/.bundlewatch.config.json
@@ -1,25 +0,0 @@
-{
-    "files": [
-        {
-            "path": "./framework/core/js/dist/*.js",
-            "maxSize": "150KB"
-        },
-        {
-            "path": "./framework/core/js/dist/*/**/*.js",
-            "maxSize": "30KB"
-        },
-        {
-            "path": "./extensions/*/js/dist/*.js",
-            "maxSize": "30KB"
-        },
-        {
-            "path": "./extensions/*/js/dist/*/**/*.js",
-            "maxSize": "30KB"
-        }
-    ],
-    "defaultCompression": "gzip",
-    "ci": {
-        "repoBranchBase": "2.x",
-        "trackBranches": ["2.x"]
-    }
-}
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,7 +18,7 @@ trim_trailing_whitespace = false
 [*.{php,xml,json}]
 indent_size = 4

-[{tsconfig.json,prettierrc.json}]
+[tsconfig.json]
 indent_size = 2

 [*.neon]
--- a/.github/workflows/REUSABLE_backend.yml
+++ b/.github/workflows/REUSABLE_backend.yml
@@ -21,17 +21,11 @@ on:
        required: false
        default: '.'

-      # Only relevant in mono-repos.
-      monorepo_tests:
-        description: "The list of directories to test in a monorepo. This should be a space-separated list of directories relative to the backend directory."
-        type: string
-        required: false
-
      php_versions:
        description: Versions of PHP to test with. Should be array of strings encoded as JSON array
        type: string
        required: false
-        default: '["8.1", "8.2"]'
+        default: '["7.3", "7.4", "8.0", "8.1"]'

      php_extensions:
        description: PHP extensions to install.
@@ -53,7 +47,6 @@ on:

 env:
  COMPOSER_ROOT_VERSION: dev-main
-  # `inputs.composer_directory` defaults to `inputs.backend_directory`
  FLARUM_TEST_TMP_DIR_LOCAL: tests/integration/tmp

 jobs:
@@ -65,7 +58,6 @@ jobs:
        php: ${{ fromJSON(inputs.php_versions) }}
        service: ${{ fromJSON(inputs.db_versions) }}
        prefix: ['']
-        php_ini_values: [inputs.php_ini_values]

        # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrixinclude
        include:
@@ -98,6 +90,8 @@ jobs:
        exclude:
          - php: ${{ fromJSON(inputs.php_versions)[1] }}
            service: 'mysql:8.0.30'
+          - php: ${{ fromJSON(inputs.php_versions)[2] }}
+            service: 'mysql:8.0.30'

    services:
      mysql:
@@ -121,38 +115,33 @@ jobs:
          coverage: xdebug
          extensions: ${{ inputs.php_extensions }}
          tools: phpunit, composer:v2
-          ini-values: ${{ matrix.php_ini_values }}
+          ini-values: ${{ inputs.php_ini_values }}

+      # The authentication alter is necessary because newer mysql versions use the `caching_sha2_password` driver,
+      # which isn't supported prior to PHP7.4
+      # When we drop support for PHP7.3, we should remove this from the setup.
      - name: Create MySQL Database
        run: |
          sudo systemctl start mysql
          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
+          mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';" --port 13306

      - name: Install Composer dependencies
        run: composer install
        working-directory: ${{ inputs.backend_directory }}

-      # If we have a `inputs.monorepo_tests`, we will run tests for each item of the provided array in a ::group::item
-      # If we don't have a `inputs.monorepo_tests`, we will run tests for the current repository
-      # We also have to run the `composer test:setup` script first before running each test
-      - name: Run tests
-        run: |
-          if [ -z "${{ inputs.monorepo_tests }}" ]; then
-            composer test:setup
-            composer test
-          else
-            for test in ${{ inputs.monorepo_tests }}; do
-              echo "::group::Running tests for $test"
-              composer test:setup --working-dir=$test
-              composer test --working-dir=$test
-              echo "::endgroup::"
-            done
-          fi
+      - name: Setup Composer tests
+        run: composer test:setup
        working-directory: ${{ inputs.backend_directory }}
        env:
          DB_PORT: 13306
          DB_PASSWORD: root
          DB_PREFIX: ${{ matrix.prefix }}
+
+      - name: Run Composer tests
+        run: composer test
+        working-directory: ${{ inputs.backend_directory }}
+        env:
          COMPOSER_PROCESS_TIMEOUT: 600

  phpstan:
@@ -162,12 +151,6 @@ jobs:
      matrix:
        php: ${{ fromJSON(inputs.php_versions) }}

-    services:
-      mysql:
-        image: mysql:8.0.30
-        ports:
-          - 33306:3306
-
    name: 'PHPStan PHP ${{ matrix.php }}'

    if: >-
@@ -184,21 +167,11 @@ jobs:
          coverage: xdebug
          extensions: ${{ inputs.php_extensions }}
          tools: phpunit, composer:v2
-          ini-values: ${{ matrix.php_ini_values }}
+          ini-values: ${{ inputs.php_ini_values }}

      - name: Install Composer dependencies
        run: composer install
        working-directory: ${{ inputs.backend_directory }}

-      - name: Create MySQL Database
-        run: |
-          sudo systemctl start mysql
-          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 33306
-
      - name: Run PHPStan
        run: composer analyse:phpstan
-        env:
-          DB_PORT: 33306
-          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
@@ -28,11 +28,6 @@ on:
        type: string
        required: false
        default: check-typings-coverage
-      test_script:
-        description: "Script to run for tests. Empty value to disable."
-        type: string
-        required: false
-        default: test

      enable_bundlewatch:
        description: "Enable Bundlewatch?"
@@ -49,11 +44,6 @@ on:
        type: boolean
        default: true
        required: false
-      enable_tests:
-        description: "Enable Tests?"
-        type: boolean
-        default: false
-        required: false

      backend_directory:
        description: The directory of the project where backend code is located. This should contain a `composer.json` file, and is generally the root directory of the repo.
@@ -106,10 +96,10 @@ jobs:

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

      - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
        with:
          node-version: ${{ inputs.node_version }}
          cache: ${{ inputs.js_package_manager }}
@@ -118,7 +108,7 @@ jobs:
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: '8.2'
+          php-version: '8.0'
          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
          tools: composer:v2

@@ -132,7 +122,7 @@ jobs:
        working-directory: ${{ inputs.frontend_directory }}

      - name: JS Checks & Production Build
-        uses: flarum/action-build@v3
+        uses: flarum/action-build@3
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          build_script: ${{ inputs.build_script }}
@@ -140,7 +130,6 @@ jobs:
          format_script: ${{ inputs.enable_prettier == true && inputs.format_script || '' }}
          check_typings_script: ${{ inputs.enable_typescript == true && inputs.check_typings_script || '' }}
          type_coverage_script: ${{ inputs.enable_typescript == true && inputs.type_coverage_script || '' }}
-          test_script: ${{ inputs.enable_tests == true && inputs.test_script || '' }}
          package_manager: ${{ inputs.js_package_manager }}
          js_path: ${{ inputs.frontend_directory }}
          do_not_commit: ${{ github.ref != format('refs/heads/{0}', inputs.main_git_branch) || github.event_name != 'push' }}
@@ -152,4 +141,3 @@ jobs:
        env:
          BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.bundlewatch_github_token }}
          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
-          CI_BRANCH_BASE: ${{ github.event.pull_request.base.ref }}
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -1,11 +0,0 @@
-name: Backend Tests
-
-on: [workflow_dispatch, push, pull_request]
-
-jobs:
-  run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
-    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"
--- a/.github/workflows/flarum-akismet-backend.yml
+++ b/.github/workflows/flarum-akismet-backend.yml
@@ -0,0 +1,11 @@
+name: Akismet PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/akismet
--- a/.github/workflows/flarum-approval-backend.yml
+++ b/.github/workflows/flarum-approval-backend.yml
@@ -0,0 +1,11 @@
+name: Approval PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/approval
--- a/.github/workflows/flarum-core-backend.yml
+++ b/.github/workflows/flarum-core-backend.yml
@@ -0,0 +1,11 @@
+name: Core PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./framework/core
--- a/.github/workflows/flarum-embed-backend.yml
+++ b/.github/workflows/flarum-embed-backend.yml
@@ -0,0 +1,11 @@
+name: Embed PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/embed
--- a/.github/workflows/flarum-emoji-backend.yml
+++ b/.github/workflows/flarum-emoji-backend.yml
@@ -0,0 +1,11 @@
+name: Emoji PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/emoji
--- a/.github/workflows/flarum-flags-backend.yml
+++ b/.github/workflows/flarum-flags-backend.yml
@@ -0,0 +1,11 @@
+name: Flags PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/flags
--- a/.github/workflows/flarum-likes-backend.yml
+++ b/.github/workflows/flarum-likes-backend.yml
@@ -0,0 +1,11 @@
+name: Likes PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/likes
--- a/.github/workflows/flarum-lock-backend.yml
+++ b/.github/workflows/flarum-lock-backend.yml
@@ -0,0 +1,11 @@
+name: Lock PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/lock
--- a/.github/workflows/flarum-markdown-backend.yml
+++ b/.github/workflows/flarum-markdown-backend.yml
@@ -0,0 +1,11 @@
+name: Markdown PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/markdown
--- a/.github/workflows/flarum-mentions-backend.yml
+++ b/.github/workflows/flarum-mentions-backend.yml
@@ -0,0 +1,11 @@
+name: Mentions PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/mentions
--- a/.github/workflows/flarum-nicknames-backend.yml
+++ b/.github/workflows/flarum-nicknames-backend.yml
@@ -0,0 +1,11 @@
+name: Nicknames PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/nicknames
--- a/.github/workflows/flarum-package-manager-backend.yml
+++ b/.github/workflows/flarum-package-manager-backend.yml
@@ -0,0 +1,11 @@
+name: Package Manager PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/package-manager
--- a/.github/workflows/flarum-pusher-backend.yml
+++ b/.github/workflows/flarum-pusher-backend.yml
@@ -0,0 +1,11 @@
+name: Pusher PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/pusher
--- a/.github/workflows/flarum-statistics-backend.yml
+++ b/.github/workflows/flarum-statistics-backend.yml
@@ -0,0 +1,11 @@
+name: Statistics PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/statistics
--- a/.github/workflows/flarum-sticky-backend.yml
+++ b/.github/workflows/flarum-sticky-backend.yml
@@ -0,0 +1,11 @@
+name: Sticky PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/sticky
--- a/.github/workflows/flarum-subscriptions-backend.yml
+++ b/.github/workflows/flarum-subscriptions-backend.yml
@@ -0,0 +1,11 @@
+name: Subscriptions PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/subscriptions
--- a/.github/workflows/flarum-suspend-backend.yml
+++ b/.github/workflows/flarum-suspend-backend.yml
@@ -0,0 +1,11 @@
+name: Suspend PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/suspend
--- a/.github/workflows/flarum-tags-backend.yml
+++ b/.github/workflows/flarum-tags-backend.yml
@@ -0,0 +1,11 @@
+name: Tags PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/tags
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -1,4 +1,4 @@
-name: Frontend Workflow
+name: Framework JS

 on: [workflow_dispatch, push, pull_request]

@@ -10,9 +10,7 @@ jobs:
      backend_directory: ./
      js_package_manager: yarn
      cache_dependency_path: ./yarn.lock
-      main_git_branch: 2.x
-      enable_tests: true
-      enable_bundlewatch: true
+      main_git_branch: main

    secrets:
      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,4 +1,4 @@
-name: Static Code Analysis
+name: Framework PHP

 on: [workflow_dispatch, push, pull_request]

@@ -8,4 +8,5 @@ jobs:
    with:
      enable_backend_testing: false
      enable_phpstan: true
+
      backend_directory: .
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -20,7 +20,7 @@ jobs:
        uses: actions/checkout@v3
      - name: Prepare release
        uses: flarum/action-release@master
-        with:
-          next_tag: ${{ inputs.version }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          open_collective_token: ${{ secrets.OPEN_COLLECTIVE_TOKEN }}
+        env:
+          NEXT_TAG: ${{ inputs.version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          OPEN_COLLECTIVE_TOKEN: ${{ secrets.OPEN_COLLECTIVE_TOKEN }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,130 +1,5 @@
 # Changelog

-## [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)
-* custom contrast color affected by parents (577890d89c593ae5b6cb96083fab69e2f1ae600c)
-* reply placeholder wrong positioning (253a3d281dbf5ce3fa712b629b80587cf67e7dbe)
-* (mentions) missed post mentions UI changes with lazy loading [#3832]
-* (mentions) cannot use newly introduced mentionables extender [#3849]
-* (mentions) missing slug from post mention links ([5a4bb7c](5a4bb7ccf226f66dd44816cb69b3d7cfe4ad7f7c))
-
-## [v1.8.0](https://github.com/flarum/framework/compare/v1.7.1...v1.8.0)
-### Fixed
- (a11y) reply placeholder not accessible [#3793]
- (bbcode) highlight.js does not work after changing post content [#3817]
- (bbcode) localize quote `wrote` string [#3809]
- (mentions) mentions XHR fired even after mentioning is done [#3806]
- (package-manager) available core updates cause an error in the dashboard ([fab71f2](fab71f2d01fa20ce9b3002833339dc5ea3ea6301))
- (tags) not all tags are loaded in the permission grid [#3804]
- (tags) tag discussion modal filters with exact matches only after first index [#3786]
- (testing) always clear cache in integration test's tearDown [#3818]
- `UserSecurityPage` not exported ([232618a](232618aba604ab003425df38b895208c863d3260))
- `isDark()` utility can receive null value [#3774]
- approving a post does not bump user `comment_count` [#3790]
- circular dependencies disable all involved extensions [#3785]
- color input overflowing the input box [#3796]
- deleting a discussion from the profile does not visually remove it [#3799]
- discussion page showing horizontal scroll on iOS [#3821]
- empty string displayed as SelectDropdown title [#3773]
- filter values are not validated [#3795]
- infinite scroll not initialized for notifications on big screens [#3733]
- notification subject discussion eager loading fails [#3788]
- null as 2nd param in `preg_match` is deprecated [#3801]
- unread count in post stream not visible [#3791]
- unreadable badge icon on certain colors [#3810]
- integrity constraint violation [#3772]
-### Changed
- (core,mentions) limit `mentionedBy` post relation results [#3780]
- (likes) limit `likes` relationship results [#3781]
- Change some methods from private to protected, to be able to extend the affected classes [#3802]
- Do not catch exceptions when testing Console commands [#3813]
- drop usage of jquery in `install` and `update` interfaces [#3797]
- extensibility improvements [#3729]
- major frontend JS cleanup [#3609]
- revert ineffective code for encoding of page title [#3768]
- speed up post creation time [#3808]
-### Added
- (mentions,tags) tag mentions [#3769]
- add delete own posts permission [#3784]
- add a trait to flush the formatter cache in tests [#3811]
- add user creation to users list page [#3744]
- cli command for enabling or disabling an extension [#3816]
- conditional extenders [#3759]
- provide old content to `Revised` event [#3789]
-
-## [v1.7.1](https://github.com/flarum/framework/compare/v1.7.0...v1.7.1)
-### Fixed
- (tags) composer tag selection modal using wrong primary max & min numbers (abc9670659426b765274376945b818b70d84848c)
- missing parameter names in token title translation. (#3752)
- hardcoded language strings in StatusWidget (#3754)
- hide developer tokens section in if there is nothing to display or create (#3753)
- improve sessions user UI on mobile (dd868ab44e11e892d020e3b9412553c6a789e68d)
-
-## [v1.7.0](https://github.com/flarum/framework/compare/v1.6.3...v1.7.0)
-### Added
- (actions) allow running JS tests in GH actions  [#3730]
- (core) PHP 8.2 Support [#3709]
- (jest) create jest config package for unit testing [#3678]
- (jest) mithril component testing [#3679]
- (phpstan) foundation for usage in extensions [#3666]
- (seo) Do not use h3 header for poster author in posts stream [#3732]
- (seo) Use h2 header for discussions on discussions list [#3731]
- (seo) shift h1 tag from logo to discussion title [#3724]
- (tags) admin tag selection component (reusable tag selection modal) [#3686]
- Admin User Search [#3712]
- access tokens user management UI [#3587]
- add display name column to admin users list [#3740]
- allow push additional items to the end of the poststream [#3691]
- allow using utf8 characters in tag slugs [#3588]
- expose queue driver, schedule status [#3593]
- expose {time} to eventPost data, fix renamed tooltip [#3698]
- frontend `Model` extender [#3646]
- global logout to clear all sessions, access tokens, email tokens and password tokens [#3605]
- improved page navigation for users list [#3741]
- introduce frontend extenders [#3645]
-### Fixed
- (mentions) correctly convert a 3 char. hex color to a 6 char. one [#3694]
- (mentions) post reply mention missing notification on approval [#3738]
- (phpstan) adapt phpstan package for extension use [#3727]
- (tags) clickable tag labels have underline [#3737]
- (tags) tag text color contrast [#3653]
- 3 digit hex color value in color input not supported [#3706]
- column `id` can be ambiguous in group filter with extensions [#3696]
- disallow certain dangerous LESS features ([1761660](1761660c98ea5a3e9665fb8e6041d1f2ee62a444))
- evaluated page title content [#3684]
- invalid translation key for scheduler dashboard [#3736]
- load actor.groups on showforumcontroller [#3716]
- make go-to-page input number-like [#3743]
- normal logout affects all sessions [#3571]
- permissions table on mobile is unusable [#3722]
- post dropdown opens all dropdowns in `.Post-actions` [#3675]
- typo in Formatter extender docblock [#3676]
- undefined showing in dropdown active title [#3700]
-### Changed
- (phpstan) enable phpstan in bundled extensions [#3667]
- Add missing states exports to `compat.ts` [#3683]
- Indicate cross-origin request in generic error message [#3669]
- Merge branch 'release/v1.6.2' ([e0b9dcf](e0b9dcfbcd7db175368dbc98255f9223da8df17d))
- The negate field doesn't get used, which means you cant exclude tags [#3713]
- Update forum.less to fix the misalignment of the choose tags button [#3726]
- `yarn audit-fix` ([8ddb0fe](8ddb0feb097dad06c5763107d7a7f7b5a55562c4))
- `yarn` ([ee1e04c](ee1e04cdc26b3e63057a58899f32f482901a95fd))
- convert `Dropdown` components to TS [#3608]
- fix php 8.1 on preg_match 2nd argument being null, which also optimizes slightly ([d7b9a03](d7b9a03f31847c39631ba495df8f515509774610))
- improve group mentions parsing [#3723]
- prepare `@flarum/jest-config` for release ([748cca6](748cca6d12f8b1744a6017c09395725bdbb4a118))
- remove use of deprecated phpunit assertion ([3af0481](3af0481f304277f5380fac9c9b169a7fa651f53b))
- set flarum version to 1.7.0 for dev ([2517bc0](2517bc0f70b0f0e3d3ea3f6ae06af8604d89b25d))
- update JS dependencies  [#3695]
-
-## [v1.6.3](https://github.com/flarum/framework/compare/v1.6.2...v1.6.3)
-### Fixed
-* Post mentions can be used to read any post on the forum without access control (ab1c868b978e8b0d09a5d682c54665dae17d0985).
-* Notifications can leak restricted content (d0a2b95dca57d3dae9a0d77b610b1cb1d0b1766a).
-* Any user including unactivated can reply in public discussions whose first post was permanently deleted (12f14112a0ecd1484d97330b82beb2a145919015).
-* (subscriptions) Post notifications not getting access checked (https://github.com/flarum/framework/commit/e5f05166a062a9a6eb7c12e28728bfd5db7270e3).
-
 ## [v1.6.2](https://github.com/flarum/framework/compare/v1.6.1...v1.6.2)
 ### Fixed
 * XSS Vulnerability in core (https://github.com/flarum/framework/pull/3684).
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,6 @@
            "Flarum\\": "framework/core/src",
            "Flarum\\Akismet\\": "extensions/akismet/src",
            "Flarum\\Approval\\": "extensions/approval/src",
-            "Flarum\\BBCode\\": "extensions/bbcode/src",
            "Flarum\\Flags\\": "extensions/flags/src",
            "Flarum\\Likes\\": "extensions/likes/src",
            "Flarum\\Lock\\": "extensions/lock/src",
@@ -60,26 +59,6 @@
            "framework/core/src/helpers.php"
        ]
    },
-    "autoload-dev": {
-        "psr-4": {
-            "Flarum\\Tests\\": "tests",
-            "Flarum\\Akismet\\Tests\\": "extensions/akismet/tests",
-            "Flarum\\Approval\\Tests\\": "extensions/approval/tests",
-            "Flarum\\Flags\\Tests\\": "extensions/flags/tests",
-            "Flarum\\Likes\\Tests\\": "extensions/likes/tests",
-            "Flarum\\Lock\\Tests\\": "extensions/lock/tests",
-            "Flarum\\Mentions\\Tests\\": "extensions/mentions/tests",
-            "Flarum\\Nicknames\\Tests\\": "extensions/nicknames/tests",
-            "Flarum\\PackageManager\\Tests\\": "extensions/package-manager/tests",
-            "Flarum\\Pusher\\Tests\\": "extensions/pusher/tests",
-            "Flarum\\Statistics\\Tests\\": "extensions/statistics/tests",
-            "Flarum\\Sticky\\Tests\\": "extensions/sticky/tests",
-            "Flarum\\Subscriptions\\Tests\\": "extensions/subscriptions/tests",
-            "Flarum\\Suspend\\Tests\\": "extensions/suspend/tests",
-            "Flarum\\Tags\\Tests\\": "extensions/tags/tests",
-            "Flarum\\Testing\\Tests\\": "php-packages/testing/tests"
-        }
-    },
    "replace": {
        "flarum/core": "self.version",
        "flarum/akismet": "self.version",
@@ -105,72 +84,64 @@
        "flarum/testing": "self.version"
    },
    "require": {
-        "php": "^8.1",
        "ext-json": "*",
-        "components/font-awesome": "^5.15.0",
+        "php": ">=7.3",
+        "components/font-awesome": "^5.14.0",
        "composer/composer": "^2.0",
-        "doctrine/dbal": "^3.6.2",
-        "dragonmantank/cron-expression": "^3.3",
-        "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/http": "^10.0",
-        "illuminate/mail": "^10.0",
-        "illuminate/queue": "^10.0",
-        "illuminate/routing": "^10.0",
-        "illuminate/session": "^10.0",
-        "illuminate/support": "^10.0",
-        "illuminate/validation": "^10.0",
-        "illuminate/view": "^10.0",
-        "intervention/image": "^2.7.2",
-        "jenssegers/agent": "^2.6",
-        "laminas/laminas-diactoros": "^3.0",
-        "laminas/laminas-httphandlerrunner": "^2.6",
-        "laminas/laminas-stratigility": "^3.10",
-        "league/flysystem": "^3.15",
-        "league/flysystem-memory": "^3.15",
+        "dflydev/fig-cookies": "^3.0.0",
+        "doctrine/dbal": "^2.7",
+        "dragonmantank/cron-expression": "^3.1.0",
+        "franzl/whoops-middleware": "^2.0.0",
+        "guzzlehttp/guzzle": "^6.0|^7.4",
+        "illuminate/bus": "^8.0",
+        "illuminate/cache": "^8.0",
+        "illuminate/config": "^8.0",
+        "illuminate/console": "^8.0",
+        "illuminate/container": "^8.0",
+        "illuminate/contracts": "^8.0",
+        "illuminate/database": "^8.0",
+        "illuminate/events": "^8.0",
+        "illuminate/filesystem": "^8.0",
+        "illuminate/hashing": "^8.0",
+        "illuminate/mail": "^8.0",
+        "illuminate/queue": "^8.0",
+        "illuminate/session": "^8.0",
+        "illuminate/support": "^8.0",
+        "illuminate/validation": "^8.0",
+        "illuminate/view": "^8.0",
+        "intervention/image": "2.5.* || ^2.6.1",
+        "laminas/laminas-diactoros": "^2.4.1",
+        "laminas/laminas-httphandlerrunner": "^1.2.0",
+        "laminas/laminas-stratigility": "^3.2.2",
+        "league/flysystem": "^1.0.11",
        "matthiasmullie/minify": "^1.3",
-        "middlewares/base-path": "^v2.1",
+        "middlewares/base-path": "^2.0.1",
        "middlewares/base-path-router": "^2.0.1",
-        "middlewares/request-handler": "^2.0.2",
-        "monolog/monolog": "^3.3",
-        "nesbot/carbon": "^2.66",
-        "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",
+        "middlewares/request-handler": "^2.0.1",
+        "monolog/monolog": "^1.16.0",
+        "nesbot/carbon": "^2.0",
+        "nikic/fast-route": "^0.6",
+        "psr/http-message": "^1.0",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0",
+        "pusher/pusher-php-server": "^2.2",
+        "s9e/text-formatter": "^2.3.6",
        "sycho/json-api": "^0.5.0",
        "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/polyfill-intl-messageformatter": "^1.27",
-        "symfony/postmark-mailer": "^6.3",
-        "symfony/psr-http-message-bridge": "^2.3",
-        "symfony/translation": "^6.3",
-        "symfony/yaml": "^6.3",
-        "wikimedia/less.php": "^4.1"
+        "symfony/config": "^5.2.2",
+        "symfony/console": "^5.2.2",
+        "symfony/event-dispatcher": "^5.2.2",
+        "symfony/mime": "^5.2.0",
+        "symfony/polyfill-intl-messageformatter": "^1.22.0",
+        "symfony/translation": "^5.1.5",
+        "symfony/yaml": "^5.2.2",
+        "wikimedia/less.php": "^3.0"
    },
    "require-dev": {
-        "mockery/mockery": "^1.5",
+        "mockery/mockery": "^1.4",
        "phpunit/phpunit": "^9.0",
-        "phpstan/phpstan": "^1.10.0",
-        "nunomaduro/larastan": "^2.6",
-        "symfony/var-dumper": "^6.3"
+        "phpstan/phpstan": ">=1.8.11 < 1.9.0",
+        "nunomaduro/larastan": "^1.0"
    },
    "config": {
        "sort-packages": true
@@ -200,7 +171,7 @@
            "extensions/tags"
        ],
        "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
        },
        "phpstan": {
            "includes": [
@@ -209,8 +180,7 @@
        }
    },
    "scripts": {
-        "analyse:phpstan": "phpstan analyse",
-        "clear-cache:phpstan": "phpstan clear-result-cache"
+        "analyse:phpstan": "phpstan analyse"
    },
    "scripts-descriptions": {
        "analyse:phpstan": "Run static analysis"
--- a/extensions/akismet/composer.json
+++ b/extensions/akismet/composer.json
@@ -19,8 +19,8 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0",
-        "flarum/approval": "^2.0"
+        "flarum/core": "^1.6",
+        "flarum/approval": "^1.2"
    },
    "autoload": {
        "psr-4": {
@@ -29,7 +29,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
        },
        "flarum-extension": {
            "title": "Akismet",
@@ -75,7 +75,7 @@
        "test:setup": "Sets up a database for use with integration tests. Execute this only once."
    },
    "require-dev": {
-        "flarum/testing": "^2.0"
+        "flarum/testing": "^1.0.0"
    },
    "repositories": [
        {
--- a/extensions/akismet/extend.php
+++ b/extensions/akismet/extend.php
@@ -13,7 +13,6 @@ use Flarum\Approval\Event\PostWasApproved;
 use Flarum\Extend;
 use Flarum\Post\Event\Hidden;
 use Flarum\Post\Event\Saving;
-use Flarum\Post\Post;

 return [
    (new Extend\Frontend('forum'))
@@ -31,7 +30,4 @@ return [

    (new Extend\ServiceProvider())
        ->register(AkismetProvider::class),
-
-    (new Extend\Model(Post::class))
-        ->cast('is_spam', 'bool'),
 ];
--- 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 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.core.compat["admin/app"];var r=e.n(a);r().initializers.add("flarum-akismet",(function(){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})();
 //# 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,+BCL9D,MAAM,EAA+BC,OAAOC,KAAKC,OAAO,a,aCExDC,IAAAA,aAAAA,IAAqB,kBAAkB,WACrCA,IAAAA,cAAAA,IACO,kBACJC,gBAAgB,CACfC,QAAS,yBACTC,KAAM,OACNC,MAAOJ,IAAAA,WAAAA,MAAqB,yDAE7BC,gBAAgB,CAEfC,QAAS,qCACTC,KAAM,UACNC,MAAOJ,IAAAA,WAAAA,MAAqB,mEAC5BK,KAAML,IAAAA,WAAAA,MAAqB,oEAE5BM,mBACC,CACEC,KAAM,kBACNH,MAAOJ,IAAAA,WAAAA,MAAqB,mDAC5BQ,WAAY,iBAEd,QAEL,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.core.compat['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.core.compat['admin/app'];","import app from 'flarum/admin/app';\n\napp.initializers.add('flarum-akismet', () => {\n  app.extensionData\n    .for('flarum-akismet')\n    .registerSetting({\n      setting: 'flarum-akismet.api_key',\n      type: 'text',\n      label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label'),\n    })\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    })\n    .registerPermission(\n      {\n        icon: 'fas fa-vote-yea',\n        label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),\n        permission: 'bypassAkismet',\n      },\n      'start'\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","core","compat","app","registerSetting","setting","type","label","help","registerPermission","icon","permission"],"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 t={n:e=>{var o=e&&e.__esModule?()=>e.default:()=>e;return t.d(o,{a:o}),o},d:(e,o)=>{for(var r in o)t.o(o,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:o[r]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};(()=>{"use strict";t.r(e);const o=flarum.core.compat["common/extend"],r=flarum.core.compat["forum/app"];var a=t.n(r);const n=flarum.core.compat["forum/utils/PostControls"];var m=t.n(n);const s=flarum.core.compat["forum/components/CommentPost"];var l=t.n(s);a().initializers.add("flarum-akismet",(function(){(0,o.extend)(m(),"destructiveControls",(function(t,e){if(t.has("approve")){var o=e.flags();if(o&&o.some((function(t){return"akismet"===(null==t?void 0:t.type())}))){var r=t.get("approve");r&&"object"==typeof r&&"children"in r&&(r.children=a().translator.trans("flarum-akismet.forum.post.not_spam_button"))}}})),(0,o.override)(l().prototype,"flagReason",(function(t,e){return"akismet"===e.type()?a().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):t(e)}))}))})(),module.exports=e})();
 //# 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,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,KAAKC,OAAO,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,4B,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,gC,aCSxDC,IAAAA,aAAAA,IAAqB,kBAAkB,YACrCC,EAAAA,EAAAA,QAAOC,IAAc,uBAAuB,SAAUC,EAAmCC,GACvF,GAAID,EAAME,IAAI,WAAY,CACxB,IAAMC,EAAQF,EAAKE,QAEnB,GAAIA,GAASA,EAAMC,MAAK,SAACC,GAAD,MAA2B,aAAb,MAAJA,OAAA,EAAAA,EAAMC,OAAhB,IAAuC,CAC7D,IAAMC,EAAcP,EAAMf,IAAI,WAC1BsB,GAAsC,iBAAhBA,GAA4B,aAAcA,IAClEA,EAAYC,SAAWX,IAAAA,WAAAA,MAAqB,6CAE/C,CACF,CACF,KAEDY,EAAAA,EAAAA,UAASC,IAAAA,UAAuB,cAAc,SAAUC,EAAUN,GAChE,MAAoB,YAAhBA,EAAKC,OACAT,IAAAA,WAAAA,MAAqB,kDAGvBc,EAASN,EACjB,GACF,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.core.compat['common/extend']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/app']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/utils/PostControls']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/components/CommentPost']\"","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.core.compat['common/extend'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/app'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/utils/PostControls'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/components/CommentPost'];","import { extend, override } from 'flarum/common/extend';\nimport app from 'flarum/forum/app';\nimport type Post from 'flarum/common/models/Post';\nimport type ItemList from 'flarum/common/utils/ItemList';\n\nimport PostControls from 'flarum/forum/utils/PostControls';\nimport CommentPost from 'flarum/forum/components/CommentPost';\nimport type Mithril from 'mithril';\n\napp.initializers.add('flarum-akismet', () => {\n  extend(PostControls, 'destructiveControls', function (items: ItemList<Mithril.Children>, post: Post) {\n    if (items.has('approve')) {\n      const flags = post.flags();\n\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\n  override(CommentPost.prototype, 'flagReason', function (original, flag) {\n    if (flag.type() === 'akismet') {\n      return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');\n    }\n\n    return original(flag);\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","core","compat","app","extend","PostControls","items","post","has","flags","some","flag","type","approveItem","children","override","CommentPost","original"],"sourceRoot":""}
--- a/extensions/akismet/js/package.json
+++ b/extensions/akismet/js/package.json
@@ -20,7 +20,7 @@
        "flarum-tsconfig": "^1.0.2",
        "prettier": "^2.5.1",
        "flarum-webpack-config": "^2.0.0",
-        "webpack": "^5.76.0",
+        "webpack": "^5.65.0",
        "webpack-cli": "^4.9.1",
        "typescript": "^4.5.4",
        "typescript-coverage-report": "^0.6.1"
--- a/extensions/akismet/js/src/forum/index.ts
+++ b/extensions/akismet/js/src/forum/index.ts
@@ -4,7 +4,7 @@ import type Post from 'flarum/common/models/Post';
 import type ItemList from 'flarum/common/utils/ItemList';

 import PostControls from 'flarum/forum/utils/PostControls';
-import PostComponent from 'flarum/forum/components/Post';
+import CommentPost from 'flarum/forum/components/CommentPost';
 import type Mithril from 'mithril';

 app.initializers.add('flarum-akismet', () => {
@@ -21,7 +21,7 @@ app.initializers.add('flarum-akismet', () => {
    }
  });

-  override(PostComponent.prototype, 'flagReason', function (original, flag) {
+  override(CommentPost.prototype, 'flagReason', function (original, flag) {
    if (flag.type() === 'akismet') {
      return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');
    }
--- a/extensions/akismet/js/tsconfig.json
+++ b/extensions/akismet/js/tsconfig.json
@@ -15,7 +15,7 @@
    "declarationDir": "./dist-typings",
    "paths": {
      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
-      "ext:flarum/flags/*": ["../../flags/js/dist-typings/*"]
+      "flarum/flags/*": ["../../flags/js/dist-typings/*"]
    }
  }
 }
--- a/extensions/akismet/src/Akismet.php
+++ b/extensions/akismet/src/Akismet.php
@@ -15,19 +15,22 @@ use Psr\Http\Message\ResponseInterface;

 class Akismet
 {
-    private string $apiUrl;
-    private array $params = [];
+    private $apiKey;
+    private $apiUrl;
+    private $flarumVersion;
+    private $extensionVersion;

-    public function __construct(
-        private readonly string $apiKey,
-        string $homeUrl,
-        private readonly string $flarumVersion,
-        private readonly string $extensionVersion,
-        bool $inDebugMode = false
-    ) {
+    private $params = [];
+
+    public function __construct(string $apiKey, string $homeUrl, string $flarumVersion, string $extensionVersion, bool $inDebugMode = false)
+    {
+        $this->apiKey = $apiKey;
        $this->apiUrl = "https://$apiKey.rest.akismet.com/1.1";
        $this->params['blog'] = $homeUrl;

+        $this->flarumVersion = $flarumVersion;
+        $this->extensionVersion = $extensionVersion;
+
        if ($inDebugMode) {
            $this->params['is_test'] = true;
        }
@@ -70,7 +73,7 @@ class Akismet
    /**
     * @throws GuzzleException
     */
-    public function submitSpam(): void
+    public function submitSpam()
    {
        $this->sendRequest('submit-spam');
    }
@@ -78,7 +81,7 @@ class Akismet
    /**
     * @throws GuzzleException
     */
-    public function submitHam(): void
+    public function submitHam()
    {
        $this->sendRequest('submit-ham');
    }
@@ -87,7 +90,7 @@ class Akismet
     * Allows you to set additional parameter
     * This lets you use Akismet features not supported directly in this util.
     */
-    public function withParam(string $key, mixed $value): Akismet
+    public function withParam(string $key, $value): Akismet
    {
        $new = clone $this;
        $new->params[$key] = $value;
--- a/extensions/akismet/src/Listener/SubmitHam.php
+++ b/extensions/akismet/src/Listener/SubmitHam.php
@@ -14,12 +14,17 @@ use Flarum\Approval\Event\PostWasApproved;

 class SubmitHam
 {
-    public function __construct(
-        protected Akismet $akismet
-    ) {
+    /**
+     * @var Akismet
+     */
+    protected $akismet;
+
+    public function __construct(Akismet $akismet)
+    {
+        $this->akismet = $akismet;
    }

-    public function handle(PostWasApproved $event): void
+    public function handle(PostWasApproved $event)
    {
        if (! $this->akismet->isConfigured()) {
            return;
--- a/extensions/akismet/src/Listener/SubmitSpam.php
+++ b/extensions/akismet/src/Listener/SubmitSpam.php
@@ -14,12 +14,17 @@ use Flarum\Post\Event\Hidden;

 class SubmitSpam
 {
-    public function __construct(
-        protected Akismet $akismet
-    ) {
+    /**
+     * @var Akismet
+     */
+    protected $akismet;
+
+    public function __construct(Akismet $akismet)
+    {
+        $this->akismet = $akismet;
    }

-    public function handle(Hidden $event): void
+    public function handle(Hidden $event)
    {
        if (! $this->akismet->isConfigured()) {
            return;
--- a/extensions/akismet/src/Listener/ValidatePost.php
+++ b/extensions/akismet/src/Listener/ValidatePost.php
@@ -18,13 +18,22 @@ use Flarum\Settings\SettingsRepositoryInterface;

 class ValidatePost
 {
-    public function __construct(
-        protected Akismet $akismet,
-        protected SettingsRepositoryInterface $settings
-    ) {
+    /**
+     * @var Akismet
+     */
+    protected $akismet;
+    /**
+     * @var SettingsRepositoryInterface
+     */
+    private $settings;
+
+    public function __construct(Akismet $akismet, SettingsRepositoryInterface $settings)
+    {
+        $this->akismet = $akismet;
+        $this->settings = $settings;
    }

-    public function handle(Saving $event): void
+    public function handle(Saving $event)
    {
        if (! $this->akismet->isConfigured()) {
            return;
@@ -41,7 +50,7 @@ class ValidatePost
            ->withContent($post->content)
            ->withAuthorName($post->user->username)
            ->withAuthorEmail($post->user->email)
-            ->withType($post->number === 1 ? 'forum-post' : 'reply')
+            ->withType($post->number == 1 ? 'forum-post' : 'reply')
            ->withIp($post->ip_address)
            ->withUserAgent($_SERVER['HTTP_USER_AGENT'])
            ->checkSpam();
--- a/extensions/akismet/src/Provider/AkismetProvider.php
+++ b/extensions/akismet/src/Provider/AkismetProvider.php
@@ -20,7 +20,7 @@ use Illuminate\Container\Container;

 class AkismetProvider extends AbstractServiceProvider
 {
-    public function register(): void
+    public function register()
    {
        $this->container->bind(Akismet::class, function (Container $container) {
            /** @var SettingsRepositoryInterface $settings */
@@ -36,7 +36,7 @@ class AkismetProvider extends AbstractServiceProvider

            return new Akismet(
                $settings->get('flarum-akismet.api_key'),
-                $url->base('forum'),
+                $url->to('forum')->base(),
                $app::VERSION,
                $extensions->getExtension('flarum-akismet')->getVersion() ?? 'unknown',
                $config->inDebugMode()
--- a/extensions/akismet/tests/integration/setup.php
+++ b/extensions/akismet/tests/integration/setup.php
@@ -7,6 +7,10 @@
 * LICENSE file that was distributed with this source code.
 */

-$setup = require __DIR__.'/../../../../php-packages/testing/bootstrap/monorepo.php';
+use Flarum\Testing\integration\Setup\SetupScript;
+
+require __DIR__.'/../../vendor/autoload.php';
+
+$setup = new SetupScript();

 $setup->run();
--- a/extensions/akismet/tests/phpunit.integration.xml
+++ b/extensions/akismet/tests/phpunit.integration.xml
@@ -10,7 +10,6 @@
    convertWarningsToExceptions="true"
    processIsolation="true"
    stopOnFailure="false"
-    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
    <coverage processUncoveredFiles="true">
        <include>
--- a/extensions/akismet/tests/phpunit.unit.xml
+++ b/extensions/akismet/tests/phpunit.unit.xml
@@ -10,7 +10,6 @@
    convertWarningsToExceptions="true"
    processIsolation="false"
    stopOnFailure="false"
-    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
    <coverage processUncoveredFiles="true">
        <include>
--- a/extensions/approval/composer.json
+++ b/extensions/approval/composer.json
@@ -19,8 +19,8 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0",
-        "flarum/flags": "^2.0"
+        "flarum/core": "^1.6",
+        "flarum/flags": "^1.2"
    },
    "autoload": {
        "psr-4": {
@@ -29,7 +29,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
        },
        "flarum-extension": {
            "title": "Approval",
@@ -87,6 +87,6 @@
        "test:setup": "Sets up a database for use with integration tests. Execute this only once."
    },
    "require-dev": {
-        "flarum/testing": "^2.0"
+        "flarum/testing": "^1.0.0"
    }
 }
--- a/extensions/approval/extend.php
+++ b/extensions/approval/extend.php
@@ -28,17 +28,15 @@ return [

    // Discussions should be approved by default
    (new Extend\Model(Discussion::class))
-        ->default('is_approved', true)
-        ->cast('is_approved', 'bool'),
+        ->default('is_approved', true),

    // Posts should be approved by default
    (new Extend\Model(Post::class))
-        ->default('is_approved', true)
-        ->cast('is_approved', 'bool'),
+        ->default('is_approved', true),

    (new Extend\ApiSerializer(BasicDiscussionSerializer::class))
-        ->attribute('isApproved', function (BasicDiscussionSerializer $serializer, Discussion $discussion): bool {
-            return $discussion->is_approved;
+        ->attribute('isApproved', function ($serializer, Discussion $discussion) {
+            return (bool) $discussion->is_approved;
        }),

    (new Extend\ApiSerializer(PostSerializer::class))
@@ -65,8 +63,8 @@ return [
        ->scope(Access\ScopePrivateDiscussionVisibility::class, 'viewPrivate'),

    (new Extend\ModelPrivate(Discussion::class))
-        ->checker(Listener\UnapproveNewContent::markUnapprovedContentAsPrivate(...)),
+        ->checker([Listener\UnapproveNewContent::class, 'markUnapprovedContentAsPrivate']),

    (new Extend\ModelPrivate(CommentPost::class))
-        ->checker(Listener\UnapproveNewContent::markUnapprovedContentAsPrivate(...)),
+        ->checker([Listener\UnapproveNewContent::class, 'markUnapprovedContentAsPrivate']),
 ];
--- 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 r={n:s=>{var e=s&&s.__esModule?()=>s.default:()=>s;return r.d(e,{a:e}),e},d:(s,e)=>{for(var a in e)r.o(e,a)&&!r.o(s,a)&&Object.defineProperty(s,a,{enumerable:!0,get:e[a]})},o:(r,s)=>Object.prototype.hasOwnProperty.call(r,s),r:r=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(r,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(r,"__esModule",{value:!0})}},s={};(()=>{"use strict";r.r(s);const e=flarum.core.compat["common/extend"],a=flarum.core.compat["admin/app"];var o=r.n(a);o().initializers.add("flarum-approval",(function(){(0,e.extend)(o(),"getRequiredPermissions",(function(r,s){"discussion.startWithoutApproval"===s&&r.push("startDiscussion"),"discussion.replyWithoutApproval"===s&&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=s})();
 //# 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,+BCL9D,MAAM,EAA+BC,OAAOC,KAAKC,OAAO,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCGxDC,IAAAA,aAAAA,IAAqB,mBAAmB,YACtCC,EAAAA,EAAAA,QAAOD,IAAK,0BAA0B,SAAUE,EAAUC,GACrC,oCAAfA,GACFD,EAASE,KAAK,mBAEG,oCAAfD,GACFD,EAASE,KAAK,mBAEjB,IAEDJ,IAAAA,cAAAA,IACO,mBACJK,mBACC,CACEC,KAAM,eACNC,MAAOP,IAAAA,WAAAA,MAAqB,8EAC5BG,WAAY,mCAEd,QACA,IAEDE,mBACC,CACEC,KAAM,eACNC,MAAOP,IAAAA,WAAAA,MAAqB,kEAC5BG,WAAY,mCAEd,QACA,IAEDE,mBACC,CACEC,KAAM,eACNC,MAAOP,IAAAA,WAAAA,MAAqB,yDAC5BG,WAAY,2BAEd,WACA,GAEL,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.core.compat['common/extend']\"","webpack://@flarum/approval/external root \"flarum.core.compat['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.core.compat['common/extend'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['admin/app'];","import { extend } from 'flarum/common/extend';\nimport app from 'flarum/admin/app';\n\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\n  app.extensionData\n    .for('flarum-approval')\n    .registerPermission(\n      {\n        icon: 'fas fa-check',\n        label: app.translator.trans('flarum-approval.admin.permissions.start_discussions_without_approval_label'),\n        permission: 'discussion.startWithoutApproval',\n      },\n      'start',\n      95\n    )\n    .registerPermission(\n      {\n        icon: 'fas fa-check',\n        label: app.translator.trans('flarum-approval.admin.permissions.reply_without_approval_label'),\n        permission: 'discussion.replyWithoutApproval',\n      },\n      'reply',\n      95\n    )\n    .registerPermission(\n      {\n        icon: 'fas fa-check',\n        label: app.translator.trans('flarum-approval.admin.permissions.approve_posts_label'),\n        permission: 'discussion.approvePosts',\n      },\n      'moderate',\n      65\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","core","compat","app","extend","required","permission","push","registerPermission","icon","label"],"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 o={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return o.d(r,{a:r}),r},d:(t,r)=>{for(var e in r)o.o(r,e)&&!o.o(t,e)&&Object.defineProperty(t,e,{enumerable:!0,get:r[e]})},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 r=flarum.core.compat["common/extend"],e=flarum.core.compat["forum/app"];var a=o.n(e);const p=flarum.core.compat["common/models/Discussion"];var n=o.n(p);const s=flarum.core.compat["common/models/Post"];var i=o.n(s);const c=flarum.core.compat["common/components/Badge"];var u=o.n(c);const l=flarum.core.compat["forum/components/DiscussionListItem"];var d=o.n(l);const v=flarum.core.compat["forum/components/Post"];var f=o.n(v);const A=flarum.core.compat["forum/components/CommentPost"];var y=o.n(A);const b=flarum.core.compat["common/components/Button"];var g=o.n(b);const h=flarum.core.compat["forum/utils/PostControls"];var _=o.n(h);a().initializers.add("flarum-approval",(function(){n().prototype.isApproved=n().attribute("isApproved"),(0,r.extend)(n().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,r.extend)(d().prototype,"elementAttrs",(function(o){this.attrs.discussion.isApproved()||(o.className+=" DiscussionListItem--unapproved")})),(0,r.extend)(f().prototype,"elementAttrs",(function(o){this.attrs.post.isApproved()||(o.className+=" Post--unapproved")})),(0,r.extend)(y().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,r.override)(f().prototype,"flagReason",(function(o,t){return"approval"===t.type()?a().translator.trans("flarum-approval.forum.post.awaiting_approval_text"):o(t)})),(0,r.extend)(_(),"destructiveControls",(function(o,t){!t.isApproved()&&t.canApprove()&&o.add("approve",m(g(),{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})();
 //# sourceMappingURL=forum.js.map
--- a/extensions/approval/js/dist/forum.js.map
+++ b/extensions/approval/js/dist/forum.js.map
--- a/extensions/approval/js/package.json
+++ b/extensions/approval/js/package.json
@@ -6,7 +6,7 @@
    "devDependencies": {
        "prettier": "^2.5.1",
        "flarum-webpack-config": "^2.0.0",
-        "webpack": "^5.76.0",
+        "webpack": "^5.65.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
    },
--- a/extensions/approval/src/Access/ScopePrivateDiscussionVisibility.php
+++ b/extensions/approval/src/Access/ScopePrivateDiscussionVisibility.php
@@ -14,7 +14,11 @@ use Illuminate\Database\Eloquent\Builder;

 class ScopePrivateDiscussionVisibility
 {
-    public function __invoke(User $actor, Builder $query): void
+    /**
+     * @param Builder $query
+     * @param User $actor
+     */
+    public function __invoke(User $actor, Builder $query)
    {
        // All statements need to be wrapped in an orWhere, since we're adding a
        // subset of private discussions that should be visible, not restricting the visible
--- a/extensions/approval/src/Access/ScopePrivatePostVisibility.php
+++ b/extensions/approval/src/Access/ScopePrivatePostVisibility.php
@@ -16,7 +16,11 @@ use Illuminate\Database\Eloquent\Builder;

 class ScopePrivatePostVisibility
 {
-    public function __invoke(User $actor, Builder $query): void
+    /**
+     * @param Builder $query
+     * @param User $actor
+     */
+    public function __invoke(User $actor, Builder $query)
    {
        // All statements need to be wrapped in an orWhere, since we're adding a
        // subset of private posts that should be visible, not restricting the visible
--- a/extensions/approval/src/Access/TagPolicy.php
+++ b/extensions/approval/src/Access/TagPolicy.php
@@ -15,7 +15,10 @@ use Flarum\User\User;

 class TagPolicy extends AbstractPolicy
 {
-    public function addToDiscussion(User $actor, Tag $tag): bool
+    /**
+     * @return bool|null
+     */
+    public function addToDiscussion(User $actor, Tag $tag)
    {
        return $actor->can('discussion.startWithoutApproval', $tag);
    }
--- a/extensions/approval/src/Event/PostWasApproved.php
+++ b/extensions/approval/src/Event/PostWasApproved.php
@@ -14,9 +14,25 @@ use Flarum\User\User;

 class PostWasApproved
 {
-    public function __construct(
-        public Post $post,
-        public User $actor
-    ) {
+    /**
+     * The post that was approved.
+     *
+     * @var Post
+     */
+    public $post;
+
+    /**
+     * @var User
+     */
+    public $actor;
+
+    /**
+     * @param Post $post
+     * @param User $actor
+     */
+    public function __construct(Post $post, User $actor)
+    {
+        $this->post = $post;
+        $this->actor = $actor;
    }
 }
--- a/extensions/approval/src/Listener/ApproveContent.php
+++ b/extensions/approval/src/Listener/ApproveContent.php
@@ -15,12 +15,15 @@ use Illuminate\Contracts\Events\Dispatcher;

 class ApproveContent
 {
-    public function subscribe(Dispatcher $events): void
+    /**
+     * @param Dispatcher $events
+     */
+    public function subscribe(Dispatcher $events)
    {
-        $events->listen(Saving::class, $this->approvePost(...));
+        $events->listen(Saving::class, [$this, 'approvePost']);
    }

-    public function approvePost(Saving $event): void
+    public function approvePost(Saving $event)
    {
        $attributes = $event->data['attributes'];
        $post = $event->post;
--- a/extensions/approval/src/Listener/UnapproveNewContent.php
+++ b/extensions/approval/src/Listener/UnapproveNewContent.php
@@ -9,7 +9,6 @@

 namespace Flarum\Approval\Listener;

-use Carbon\Carbon;
 use Flarum\Discussion\Discussion;
 use Flarum\Flags\Flag;
 use Flarum\Post\CommentPost;
@@ -18,12 +17,18 @@ use Illuminate\Contracts\Events\Dispatcher;

 class UnapproveNewContent
 {
-    public function subscribe(Dispatcher $events): void
+    /**
+     * @param Dispatcher $events
+     */
+    public function subscribe(Dispatcher $events)
    {
-        $events->listen(Saving::class, $this->unapproveNewPosts(...));
+        $events->listen(Saving::class, [$this, 'unapproveNewPosts']);
    }

-    public function unapproveNewPosts(Saving $event): void
+    /**
+     * @param Saving $event
+     */
+    public function unapproveNewPosts(Saving $event)
    {
        $post = $event->post;

@@ -50,19 +55,21 @@ class UnapproveNewContent

                $flag->post_id = $post->id;
                $flag->type = 'approval';
-                $flag->created_at = Carbon::now();
+                $flag->created_at = time();

                $flag->save();
            });
        }
    }

-    public static function markUnapprovedContentAsPrivate(Discussion|CommentPost $instance): ?bool
+    /**
+     * @param Discussion|CommentPost $instance
+     * @return bool|null
+     */
+    public static function markUnapprovedContentAsPrivate($instance)
    {
        if (! $instance->is_approved) {
            return true;
        }
-
-        return null;
    }
 }
--- a/extensions/approval/src/Listener/UpdateDiscussionAfterPostApproval.php
+++ b/extensions/approval/src/Listener/UpdateDiscussionAfterPostApproval.php
@@ -13,7 +13,7 @@ use Flarum\Approval\Event\PostWasApproved;

 class UpdateDiscussionAfterPostApproval
 {
-    public function handle(PostWasApproved $event): void
+    public function handle(PostWasApproved $event)
    {
        $post = $event->post;
        $discussion = $post->discussion;
@@ -22,7 +22,7 @@ class UpdateDiscussionAfterPostApproval
        $discussion->refreshCommentCount();
        $discussion->refreshLastPost();

-        if ($post->number === 1) {
+        if ($post->number == 1) {
            $discussion->is_approved = true;

            $discussion->afterSave(function () use ($user) {
@@ -36,10 +36,5 @@ class UpdateDiscussionAfterPostApproval
            $user->refreshCommentCount();
            $user->save();
        }
-
-        if ($post->user) {
-            $post->user->refreshCommentCount();
-            $post->user->save();
-        }
    }
 }
--- a/extensions/approval/tests/integration/api/ListDiscussionsTest.php
+++ b/extensions/approval/tests/integration/api/ListDiscussionsTest.php
@@ -38,7 +38,7 @@ class ListDiscussionsTest extends TestCase
            $this->request('GET', '/api/discussions', compact('authenticatedAs'))
        );

-        $body = json_decode($response->getContent(), true);
+        $body = json_decode($response->getBody()->getContents(), true);

        $this->assertEquals(200, $response->getStatusCode());
        $this->assertEqualsCanonicalizing([1, 4, 5, 7], Arr::pluck($body['data'], 'id'));
@@ -54,7 +54,7 @@ class ListDiscussionsTest extends TestCase
            $this->request('GET', '/api/discussions', compact('authenticatedAs'))
        );

-        $body = json_decode($response->getContent(), true);
+        $body = json_decode($response->getBody()->getContents(), true);

        $this->assertEquals(200, $response->getStatusCode());
        $this->assertEqualsCanonicalizing([1, 2, 3, 4, 5, 6, 7], Arr::pluck($body['data'], 'id'));
--- a/extensions/approval/tests/integration/api/ListPostsTest.php
+++ b/extensions/approval/tests/integration/api/ListPostsTest.php
@@ -12,7 +12,6 @@ namespace Flarum\Approval\Tests\integration\api;
 use Flarum\Approval\Tests\integration\InteractsWithUnapprovedContent;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
-use Illuminate\Http\Request;
 use Illuminate\Support\Arr;

 class ListPostsTest extends TestCase
@@ -36,17 +35,16 @@ class ListPostsTest extends TestCase
    public function can_only_see_approved_if_not_allowed_to_approve(?int $authenticatedAs)
    {
        $response = $this->send(
-            tap(
-                $this->request('GET', '/api/posts', compact('authenticatedAs')),
-                fn (Request $request) => $request->query->add([
+            $this
+                ->request('GET', '/api/posts', compact('authenticatedAs'))
+                ->withQueryParams([
                    'filter' => [
                        'discussion' => 7
                    ]
                ])
-            )
        );

-        $body = json_decode($response->getContent(), true);
+        $body = json_decode($response->getBody()->getContents(), true);

        $this->assertEquals(200, $response->getStatusCode());
        $this->assertEqualsCanonicalizing([7, 8, 10], Arr::pluck($body['data'], 'id'));
@@ -59,17 +57,16 @@ class ListPostsTest extends TestCase
    public function can_see_unapproved_if_allowed_to_approve(int $authenticatedAs)
    {
        $response = $this->send(
-            tap(
-                $this->request('GET', '/api/posts', compact('authenticatedAs')),
-                fn (Request $request) => $request->query->add([
+            $this
+                ->request('GET', '/api/posts', compact('authenticatedAs'))
+                ->withQueryParams([
                    'filter' => [
                        'discussion' => 7
                    ]
                ])
-            )
        );

-        $body = json_decode($response->getContent(), true);
+        $body = json_decode($response->getBody()->getContents(), true);

        $this->assertEquals(200, $response->getStatusCode());
        $this->assertEqualsCanonicalizing([7, 8, 9, 10, 11], Arr::pluck($body['data'], 'id'));
--- a/extensions/approval/tests/integration/setup.php
+++ b/extensions/approval/tests/integration/setup.php
@@ -7,6 +7,10 @@
 * LICENSE file that was distributed with this source code.
 */

-$setup = require __DIR__.'/../../../../php-packages/testing/bootstrap/monorepo.php';
+use Flarum\Testing\integration\Setup\SetupScript;
+
+require __DIR__.'/../../vendor/autoload.php';
+
+$setup = new SetupScript();

 $setup->run();
--- a/extensions/approval/tests/phpunit.integration.xml
+++ b/extensions/approval/tests/phpunit.integration.xml
@@ -10,7 +10,6 @@
    convertWarningsToExceptions="true"
    processIsolation="true"
    stopOnFailure="false"
-    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
    <coverage processUncoveredFiles="true">
        <include>
--- a/extensions/approval/tests/phpunit.unit.xml
+++ b/extensions/approval/tests/phpunit.unit.xml
@@ -10,7 +10,6 @@
    convertWarningsToExceptions="true"
    processIsolation="false"
    stopOnFailure="false"
-    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
    <coverage processUncoveredFiles="true">
        <include>
--- a/extensions/bbcode/composer.json
+++ b/extensions/bbcode/composer.json
@@ -19,16 +19,11 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Flarum\\BBCode\\": "src"
-        }
+        "flarum/core": "^1.6"
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
        },
        "flarum-extension": {
            "title": "BBCode",
--- a/extensions/bbcode/extend.php
+++ b/extensions/bbcode/extend.php
@@ -7,14 +7,24 @@
 * LICENSE file that was distributed with this source code.
 */

-namespace Flarum\BBCode;
-
 use Flarum\Extend;
+use s9e\TextFormatter\Configurator;

-return [
-    new Extend\Locales(__DIR__.'/locale'),
-
-    (new Extend\Formatter)
-        ->render(Render::class)
-        ->configure(Configure::class),
-];
+return (new Extend\Formatter)
+    ->configure(function (Configurator $config) {
+        $config->BBCodes->addFromRepository('B');
+        $config->BBCodes->addFromRepository('I');
+        $config->BBCodes->addFromRepository('U');
+        $config->BBCodes->addFromRepository('S');
+        $config->BBCodes->addFromRepository('URL');
+        $config->BBCodes->addFromRepository('IMG');
+        $config->BBCodes->addFromRepository('EMAIL');
+        $config->BBCodes->addFromRepository('CODE');
+        $config->BBCodes->addFromRepository('QUOTE');
+        $config->BBCodes->addFromRepository('LIST');
+        $config->BBCodes->addFromRepository('DEL');
+        $config->BBCodes->addFromRepository('COLOR');
+        $config->BBCodes->addFromRepository('CENTER');
+        $config->BBCodes->addFromRepository('SIZE');
+        $config->BBCodes->addFromRepository('*');
+    });
--- a/extensions/bbcode/locale/en.yml
+++ b/extensions/bbcode/locale/en.yml
@@ -1,10 +0,0 @@
-flarum-bbcode:
-
-  ##
-  # UNIQUE KEYS - The following keys are used in only one location each.
-  ##
-
-  # Translations in this namespace are used by the forum user interface.
-  forum:
-    quote:
-      wrote: wrote
--- a/extensions/bbcode/src/Configure.php
+++ b/extensions/bbcode/src/Configure.php
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\BBCode;
-
-use s9e\TextFormatter\Configurator;
-
-class Configure
-{
-    public function __invoke(Configurator $config): void
-    {
-        $this->addTagsFromRepositories($config);
-        $this->adaptHighlightJs($config);
-    }
-
-    protected function addTagsFromRepositories(Configurator $config): void
-    {
-        $config->BBCodes->addFromRepository('B');
-        $config->BBCodes->addFromRepository('I');
-        $config->BBCodes->addFromRepository('U');
-        $config->BBCodes->addFromRepository('S');
-        $config->BBCodes->addFromRepository('URL');
-        $config->BBCodes->addFromRepository('IMG');
-        $config->BBCodes->addFromRepository('EMAIL');
-        $config->BBCodes->addFromRepository('CODE');
-        $config->BBCodes->addFromRepository('QUOTE', 'default', [
-            'authorStr' => '<xsl:value-of select="@author"/> <xsl:value-of select="$L_WROTE"/>'
-        ]);
-        $config->BBCodes->addFromRepository('LIST');
-        $config->BBCodes->addFromRepository('DEL');
-        $config->BBCodes->addFromRepository('COLOR');
-        $config->BBCodes->addFromRepository('CENTER');
-        $config->BBCodes->addFromRepository('SIZE');
-        $config->BBCodes->addFromRepository('*');
-    }
-
-    /**
-     * Fix for highlight JS not working after changing post content.
-     *
-     * @link https://github.com/flarum/framework/issues/3794
-     */
-    protected function adaptHighlightJs(Configurator $config): void
-    {
-        $codeTag = $config->tags->get('CODE');
-        $script = '
-                <script>
-                    if(window.hljsLoader && !document.currentScript.parentNode.hasAttribute(\'data-s9e-livepreview-onupdate\')) {
-                        window.hljsLoader.highlightBlocks(document.currentScript.parentNode);
-                    }
-                </script>';
-        $codeTag->template = str_replace('</pre>', $script.'</pre>', $codeTag->template);
-    }
-}
--- a/extensions/bbcode/src/Render.php
+++ b/extensions/bbcode/src/Render.php
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\BBCode;
-
-use Flarum\Locale\TranslatorInterface;
-use s9e\TextFormatter\Renderer;
-
-class Render
-{
-    public function __construct(
-        protected TranslatorInterface $translator
-    ) {
-    }
-
-    public function __invoke(Renderer $renderer, $context, string $xml): string
-    {
-        $renderer->setParameter('L_WROTE', $this->translator->trans('flarum-bbcode.forum.quote.wrote'));
-
-        return $xml;
-    }
-}
--- a/extensions/embed/composer.json
+++ b/extensions/embed/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.6"
    },
    "autoload": {
        "psr-4": {
@@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
        },
        "flarum-extension": {
            "title": "Embed",
--- a/extensions/embed/extend.php
+++ b/extensions/embed/extend.php
@@ -9,7 +9,7 @@

 use Flarum\Extend;
 use Flarum\Frontend\Document;
-use Illuminate\Http\Request;
+use Psr\Http\Message\ServerRequestInterface as Request;

 return [
    (new Extend\Frontend('forum'))
--- 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
@@ -9,7 +9,7 @@
    "devDependencies": {
        "prettier": "^2.5.1",
        "flarum-webpack-config": "^2.0.0",
-        "webpack": "^5.76.0",
+        "webpack": "^5.65.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0"
    },
--- a/extensions/embed/js/src/forum/index.js
+++ b/extensions/embed/js/src/forum/index.js
@@ -4,6 +4,8 @@ import { override, extend } from 'flarum/common/extend';
 import app from 'flarum/forum/app';
 import Stream from 'flarum/common/utils/Stream';
 import ForumApplication from 'flarum/forum/ForumApplication';
+import Composer from 'flarum/forum/components/Composer';
+import PostStream from 'flarum/forum/components/PostStream';
 import ModalManager from 'flarum/common/components/ModalManager';
 import PostMeta from 'flarum/forum/components/PostMeta';

@@ -11,7 +13,7 @@ import DiscussionPage from 'flarum/forum/components/DiscussionPage';

 extend(ForumApplication.prototype, 'mount', function () {
  if (m.route.param('hideFirstPost')) {
-    extend('flarum/forum/components/PostStream', 'view', (vdom) => {
+    extend(PostStream.prototype, 'view', (vdom) => {
      if (vdom.children[0].attrs['data-number'] === 1) {
        vdom.children.splice(0, 1);
      }
@@ -40,7 +42,7 @@ const reposition = function () {
 };

 extend(ModalManager.prototype, 'show', reposition);
-extend('flarum/forum/components/Composer', 'show', reposition);
+extend(Composer.prototype, 'show', reposition);

 window.iFrameResizer = {
  readyCallback: function () {
@@ -48,7 +50,7 @@ window.iFrameResizer = {
  },
 };

-extend('flarum/forum/components/PostStream', 'goToNumber', function (promise, number) {
+extend(PostStream.prototype, 'goToNumber', function (promise, number) {
  if (number === 'reply' && 'parentIFrame' in window && app.composer.isFullScreen()) {
    const itemTop = this.$('.PostStream-item:last').offset().top;
    window.parentIFrame.scrollToOffset(0, itemTop);
--- a/extensions/emoji/composer.json
+++ b/extensions/emoji/composer.json
@@ -19,11 +19,11 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.6"
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
        },
        "flarum-extension": {
            "title": "Emoji",
--- a/extensions/emoji/extend.php
+++ b/extensions/emoji/extend.php
@@ -13,8 +13,7 @@ use s9e\TextFormatter\Configurator;
 return [
    (new Extend\Frontend('forum'))
        ->js(__DIR__.'/js/dist/forum.js')
-        ->css(__DIR__.'/less/forum.less')
-        ->jsDirectory(__DIR__.'/js/dist/forum'),
+        ->css(__DIR__.'/less/forum.less'),

    (new Extend\Formatter)
        ->configure(function (Configurator $config) {
--- 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/dist/forum/emojiMap.js.map
+++ b/extensions/emoji/js/dist/forum/emojiMap.js.map
@@ -1 +0,0 @@
-{"version":3,"file":"forum/emojiMap.js","mappings":"kJACA,E","sources":["webpack://@flarum/emoji/./src/forum/emojiMap.ts"],"sourcesContent":["import emojiMap from 'simple-emoji-map';\nexport default emojiMap;"],"names":[],"sourceRoot":""}
--- a/extensions/emoji/js/package.json
+++ b/extensions/emoji/js/package.json
@@ -14,7 +14,7 @@
        "prettier": "^2.5.1",
        "typescript": "^4.5.4",
        "typescript-coverage-report": "^0.6.1",
-        "webpack": "^5.76.0",
+        "webpack": "^5.65.0",
        "webpack-cli": "^4.9.1"
    },
    "scripts": {
--- a/extensions/emoji/js/src/forum/addComposerAutocomplete.js
+++ b/extensions/emoji/js/src/forum/addComposerAutocomplete.js
@@ -1,21 +1,20 @@
+import emojiMap from 'simple-emoji-map';
+
 import { extend } from 'flarum/common/extend';
+import TextEditor from 'flarum/common/components/TextEditor';
 import TextEditorButton from 'flarum/common/components/TextEditorButton';
-import KeyboardNavigatable from 'flarum/common/utils/KeyboardNavigatable';
+import KeyboardNavigatable from 'flarum/forum/utils/KeyboardNavigatable';

 import AutocompleteDropdown from './fragments/AutocompleteDropdown';
 import getEmojiIconCode from './helpers/getEmojiIconCode';
 import cdn from './cdn';

 export default function addComposerAutocomplete() {
+  const emojiKeys = Object.keys(emojiMap);
  const $container = $('<div class="ComposerBody-emojiDropdownContainer"></div>');
  const dropdown = new AutocompleteDropdown();
-  let emojiMap = null;

-  extend('flarum/common/components/TextEditor', 'oninit', function () {
-    this._loaders.push(async () => await import('./emojiMap').then((m) => (emojiMap = m.default)));
-  });
-
-  extend('flarum/common/components/TextEditor', 'onbuild', function () {
+  extend(TextEditor.prototype, 'oncreate', function () {
    const $editor = this.$('.TextEditor-editor').wrap('<div class="ComposerBody-emojiWrapper"></div>');

    this.navigator = new KeyboardNavigatable();
@@ -30,9 +29,7 @@ export default function addComposerAutocomplete() {
    $editor.after($container);
  });

-  extend('flarum/common/components/TextEditor', 'buildEditorParams', function (params) {
-    const emojiKeys = Object.keys(emojiMap);
-
+  extend(TextEditor.prototype, 'buildEditorParams', function (params) {
    let relEmojiStart;
    let absEmojiStart;
    let typed;
@@ -83,7 +80,7 @@ export default function addComposerAutocomplete() {
                dropdown.setIndex($(this).parent().index() - 1);
              }}
            >
-              <img alt={emoji} className="emoji" draggable="false" loading="lazy" src={`${cdn}72x72/${code}.png`} />
+              <img alt={emoji} class="emoji" draggable="false" loading="lazy" src={`${cdn}72x72/${code}.png`} />
              {name}
            </button>
          );
@@ -169,7 +166,7 @@ export default function addComposerAutocomplete() {
    });
  });

-  extend('flarum/common/components/TextEditor', 'toolbarItems', function (items) {
+  extend(TextEditor.prototype, 'toolbarItems', function (items) {
    items.add(
      'emoji',
      <TextEditorButton onclick={() => this.attrs.composer.editor.insertAtCursor(' :')} icon="far fa-smile">
--- a/extensions/emoji/js/src/forum/emojiMap.ts
+++ b/extensions/emoji/js/src/forum/emojiMap.ts
@@ -1,3 +0,0 @@
-import emojiMap from 'simple-emoji-map';
-
-export default emojiMap;
--- a/extensions/flags/composer.json
+++ b/extensions/flags/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.6"
    },
    "autoload": {
        "psr-4": {
@@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
        },
        "flarum-extension": {
            "title": "Flags",
@@ -75,7 +75,7 @@
    "require-dev": {
        "flarum/core": "*@dev",
        "flarum/tags": "*@dev",
-        "flarum/testing": "^2.0"
+        "flarum/testing": "^1.0.0"
    },
    "repositories": [
        {
--- a/extensions/flags/extend.php
+++ b/extensions/flags/extend.php
@@ -46,7 +46,7 @@ return [
        ->delete('/posts/{id}/flags', 'flags.delete', DeleteFlagsController::class),

    (new Extend\Model(User::class))
-        ->cast('read_flags_at', 'datetime'),
+        ->dateAttribute('read_flags_at'),

    (new Extend\Model(Post::class))
        ->hasMany('flags', Flag::class, 'post_id'),
--- a/extensions/flags/js/dist-typings/forum/compat.d.ts
+++ b/extensions/flags/js/dist-typings/forum/compat.d.ts
@@ -0,0 +1,19 @@
+declare var _default: {
+    'flags/addFlagsToPosts': typeof addFlagsToPosts;
+    'flags/addFlagControl': typeof addFlagControl;
+    'flags/addFlagsDropdown': typeof addFlagsDropdown;
+    'flags/models/Flag': typeof Flag;
+    'flags/components/FlagList': typeof FlagList;
+    'flags/components/FlagPostModal': typeof FlagPostModal;
+    'flags/components/FlagsPage': typeof FlagsPage;
+    'flags/components/FlagsDropdown': typeof FlagsDropdown;
+};
+export default _default;
+import addFlagsToPosts from "./addFlagsToPosts";
+import addFlagControl from "./addFlagControl";
+import addFlagsDropdown from "./addFlagsDropdown";
+import Flag from "./models/Flag";
+import FlagList from "./components/FlagList";
+import FlagPostModal from "./components/FlagPostModal";
+import FlagsPage from "./components/FlagsPage";
+import FlagsDropdown from "./components/FlagsDropdown";
--- a/extensions/flags/js/dist-typings/forum/components/FlagPostModal.d.ts
+++ b/extensions/flags/js/dist-typings/forum/components/FlagPostModal.d.ts
@@ -1,5 +1,5 @@
 /// <reference types="flarum/@types/translator-icu-rich" />
-export default class FlagPostModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs, undefined> {
+export default class FlagPostModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
    constructor();
    oninit(vnode: any): void;
    success: boolean | undefined;
--- a/extensions/flags/js/dist-typings/forum/components/FlagsDropdown.d.ts
+++ b/extensions/flags/js/dist-typings/forum/components/FlagsDropdown.d.ts
@@ -1,7 +1,7 @@
-export default class FlagsDropdown extends NotificationsDropdown<import("flarum/common/components/Dropdown").IDropdownAttrs> {
+export default class FlagsDropdown {
    static initAttrs(attrs: any): void;
-    constructor();
+    getMenu(): JSX.Element;
+    goToRoute(): void;
    getUnreadCount(): any;
    getNewCount(): unknown;
 }
-import NotificationsDropdown from "flarum/forum/components/NotificationsDropdown";
--- a/extensions/flags/js/dist-typings/forum/components/FlagsPage.d.ts
+++ b/extensions/flags/js/dist-typings/forum/components/FlagsPage.d.ts
@@ -2,9 +2,8 @@
 * The `FlagsPage` component shows the flags list. It is only
 * used on mobile devices where the flags dropdown is within the drawer.
 */
-export default class FlagsPage extends Page<import("flarum/common/components/Page").IPageAttrs, undefined> {
-    constructor();
+export default class FlagsPage {
    oninit(vnode: any): void;
+    bodyClass: string | undefined;
    view(): JSX.Element;
 }
-import Page from "flarum/common/components/Page";
--- a/extensions/flags/js/dist-typings/forum/extend.d.ts
+++ b/extensions/flags/js/dist-typings/forum/extend.d.ts
@@ -1,2 +0,0 @@
-declare const _default: (import("flarum/common/extenders/Model").default | import("flarum/common/extenders/Routes").default | import("flarum/common/extenders/Store").default)[];
-export default _default;
--- a/extensions/flags/js/dist-typings/forum/forum.d.ts
+++ b/extensions/flags/js/dist-typings/forum/forum.d.ts
@@ -1,8 +0,0 @@
-import './addFlagsToPosts';
-import './addFlagControl';
-import './addFlagsDropdown';
-import './models/Flag';
-import './components/FlagList';
-import './components/FlagPostModal';
-import './components/FlagsPage';
-import './components/FlagsDropdown';
--- a/extensions/flags/js/dist-typings/forum/index.d.ts
+++ b/extensions/flags/js/dist-typings/forum/index.d.ts
@@ -1,2 +1 @@
-export { default as extend } from './extend';
-import './forum';
+export {};
--- 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);const s=flarum.core.compat["admin/app"];var l=e.n(s);l().initializers.add("flarum-flags",(function(){l().extensionData.for("flarum-flags").registerSetting({setting:"flarum-flags.guidelines_url",type:"text",label:l().translator.trans("flarum-flags.admin.settings.guidelines_url_label")},15).registerSetting({setting:"flarum-flags.can_flag_own",type:"boolean",label:l().translator.trans("flarum-flags.admin.settings.flag_own_posts_label")}).registerPermission({icon:"fas fa-flag",label:l().translator.trans("flarum-flags.admin.permissions.view_flags_label"),permission:"discussion.viewFlags"},"moderate",65).registerPermission({icon:"fas fa-flag",label:l().translator.trans("flarum-flags.admin.permissions.flag_posts_label"),permission:"discussion.flagPosts"},"reply",65)}))})(),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,+BCL9D,MAAM,EAA+BC,OAAOC,KAAKC,OAAO,a,aCExDC,IAAAA,aAAAA,IAAqB,gBAAgB,WACnCA,IAAAA,cAAAA,IACO,gBACJC,gBACC,CACEC,QAAS,8BACTC,KAAM,OACNC,MAAOJ,IAAAA,WAAAA,MAAqB,qDAE9B,IAEDC,gBAAgB,CACfC,QAAS,4BACTC,KAAM,UACNC,MAAOJ,IAAAA,WAAAA,MAAqB,sDAE7BK,mBACC,CACEC,KAAM,cACNF,MAAOJ,IAAAA,WAAAA,MAAqB,mDAC5BO,WAAY,wBAEd,WACA,IAGDF,mBACC,CACEC,KAAM,cACNF,MAAOJ,IAAAA,WAAAA,MAAqB,mDAC5BO,WAAY,wBAEd,QACA,GAEL,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.core.compat['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.core.compat['admin/app'];","import app from 'flarum/admin/app';\n\napp.initializers.add('flarum-flags', () => {\n  app.extensionData\n    .for('flarum-flags')\n    .registerSetting(\n      {\n        setting: 'flarum-flags.guidelines_url',\n        type: 'text',\n        label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label'),\n      },\n      15\n    )\n    .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    })\n    .registerPermission(\n      {\n        icon: 'fas fa-flag',\n        label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),\n        permission: 'discussion.viewFlags',\n      },\n      'moderate',\n      65\n    )\n\n    .registerPermission(\n      {\n        icon: 'fas fa-flag',\n        label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),\n        permission: 'discussion.flagPosts',\n      },\n      'reply',\n      65\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","core","compat","app","registerSetting","setting","type","label","registerPermission","icon","permission"],"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
@@ -7,7 +7,7 @@
        "@types/mithril": "^2.0.8",
        "prettier": "^2.5.1",
        "flarum-webpack-config": "^2.0.0",
-        "webpack": "^5.76.0",
+        "webpack": "^5.65.0",
        "webpack-cli": "^4.9.1",
        "@flarum/prettier-config": "^1.0.0",
        "flarum-tsconfig": "^1.0.2",
--- a/extensions/flags/js/src/forum/addFlagsToPosts.js
+++ b/extensions/flags/js/src/forum/addFlagsToPosts.js
@@ -108,7 +108,7 @@ export default function () {
          user,
          reason,
        }),
-        !!detail && <span className="Post-flagged-detail">{detail}</span>,
+        detail ? <span className="Post-flagged-detail">{detail}</span> : '',
      ];
    }
  };
--- a/extensions/flags/js/src/forum/compat.js
+++ b/extensions/flags/js/src/forum/compat.js
@@ -0,0 +1,19 @@
+import addFlagsToPosts from './addFlagsToPosts';
+import addFlagControl from './addFlagControl';
+import addFlagsDropdown from './addFlagsDropdown';
+import Flag from './models/Flag';
+import FlagList from './components/FlagList';
+import FlagPostModal from './components/FlagPostModal';
+import FlagsPage from './components/FlagsPage';
+import FlagsDropdown from './components/FlagsDropdown';
+
+export default {
+  'flags/addFlagsToPosts': addFlagsToPosts,
+  'flags/addFlagControl': addFlagControl,
+  'flags/addFlagsDropdown': addFlagsDropdown,
+  'flags/models/Flag': Flag,
+  'flags/components/FlagList': FlagList,
+  'flags/components/FlagPostModal': FlagPostModal,
+  'flags/components/FlagsPage': FlagsPage,
+  'flags/components/FlagsDropdown': FlagsDropdown,
+};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
StyleCI Bot	a286e2a829	Apply fixes from StyleCI	2022-11-21 13:28:11 +00:00
Clark Winkelmann	b015a66456	Enable conditional migrations through `when` callback	2022-11-21 14:27:44 +01:00
				`@@ -1 +0,0 @@`
				`{"version":3,"file":"forum/emojiMap.js","mappings":"kJACA,E","sources":["webpack://@flarum/emoji/./src/forum/emojiMap.ts"],"sourcesContent":["import emojiMap from 'simple-emoji-map';\nexport default emojiMap;"],"names":[],"sourceRoot":""}`