Apply fixes from StyleCI

Illuminate components always expect the app to be the container, but also expect the app to be implementing the laravel app contract. This means that very often between minor illuminate updates we get a call to a method on the app that doesn't exist in the Flarum app. This fixes the issue once and for all.

.bundlewatch.config.json

@@ -0,0 +1,25 @@
+{
+    "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"]
+    }
+}

.github/workflows/REUSABLE_backend.yml

@@ -21,11 +21,17 @@ 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: '["7.3", "7.4", "8.0", "8.1", "8.2"]'
+        default: '["8.1", "8.2"]'
 
       php_extensions:
         description: PHP extensions to install.
@@ -47,6 +53,7 @@ on:
 
 env:
   COMPOSER_ROOT_VERSION: dev-main
+  # `inputs.composer_directory` defaults to `inputs.backend_directory`
   FLARUM_TEST_TMP_DIR_LOCAL: tests/integration/tmp
 
 jobs:
@@ -87,24 +94,10 @@ jobs:
             prefix: flarum_
             prefixStr: (prefix)
 
-          # @TODO: remove in 2.0
-          # Include testing PHP 8.2 with deprecation warnings disabled.
-          - php: 8.2
-            php_ini_values: error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED
-
         # To reduce number of actions, we exclude some PHP versions from running with some DB versions.
         exclude:
           - php: ${{ fromJSON(inputs.php_versions)[1] }}
             service: 'mysql:8.0.30'
-          - php: ${{ fromJSON(inputs.php_versions)[2] }}
-            service: 'mysql:8.0.30'
-          - php: ${{ fromJSON(inputs.php_versions)[3] }}
-            service: 'mysql:8.0.30'
-
-          # @TODO: remove in 2.0
-          # Exclude testing PHP 8.2 with deprecation warnings enabled.
-          - php: 8.2
-            php_ini_values: error_reporting=E_ALL
 
     services:
       mysql:
@@ -130,31 +123,36 @@ jobs:
           tools: phpunit, composer:v2
           ini-values: ${{ matrix.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 }}
 
-      - name: Setup Composer tests
-        run: composer test:setup
+      # 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
         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:
@@ -164,6 +162,12 @@ jobs:
       matrix:
         php: ${{ fromJSON(inputs.php_versions) }}
 
+    services:
+      mysql:
+        image: mysql:8.0.30
+        ports:
+          - 33306:3306
+
     name: 'PHPStan PHP ${{ matrix.php }}'
 
     if: >-
@@ -186,5 +190,15 @@ jobs:
         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

.github/workflows/REUSABLE_frontend.yml

@@ -152,3 +152,4 @@ 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 }}

.github/workflows/backend.yml

@@ -0,0 +1,11 @@
+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"

.github/workflows/flarum-akismet-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-approval-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-core-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-embed-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-emoji-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-flags-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-likes-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-lock-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-markdown-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-mentions-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-nicknames-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-package-manager-backend.yml

@@ -1,11 +0,0 @@
-name: Package Manager PHP
-
-on: [workflow_dispatch, push, pull_request]
-
-jobs:
-  run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
-    with:
-      enable_backend_testing: false
-
-      backend_directory: ./extensions/package-manager

.github/workflows/flarum-pusher-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-statistics-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-sticky-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-subscriptions-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-suspend-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/flarum-tags-backend.yml

@@ -1,11 +0,0 @@
-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

.github/workflows/frontend.yml

@@ -1,4 +1,4 @@
-name: Framework JS
+name: Frontend Workflow
 
 on: [workflow_dispatch, push, pull_request]
 
@@ -10,10 +10,9 @@ jobs:
       backend_directory: ./
       js_package_manager: yarn
       cache_dependency_path: ./yarn.lock
-      main_git_branch: main
+      main_git_branch: 2.x
       enable_tests: true
-      # @TODO: fix bundlewatch
-      enable_bundlewatch: false
+      enable_bundlewatch: true
 
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/phpstan.yml

@@ -1,4 +1,4 @@
-name: Framework PHP
+name: Static Code Analysis
 
 on: [workflow_dispatch, push, pull_request]
 
@@ -8,5 +8,4 @@ jobs:
     with:
       enable_backend_testing: false
       enable_phpstan: true
-
       backend_directory: .

composer.json

@@ -60,6 +60,26 @@
             "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",
@@ -85,66 +105,72 @@
         "flarum/testing": "self.version"
     },
     "require": {
-        "php": ">=7.3",
+        "php": "^8.1",
         "ext-json": "*",
-        "components/font-awesome": "^5.14.0",
+        "components/font-awesome": "^5.15.0",
         "composer/composer": "^2.0",
-        "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",
+        "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": "^2.4.1",
-        "laminas/laminas-httphandlerrunner": "^1.2.0 || ^2.3.0",
-        "laminas/laminas-stratigility": "^3.2.2",
-        "league/flysystem": "^1.0.11",
+        "laminas/laminas-diactoros": "^3.0",
+        "laminas/laminas-httphandlerrunner": "^2.6",
+        "laminas/laminas-stratigility": "^3.10",
+        "league/flysystem": "^3.15",
+        "league/flysystem-memory": "^3.15",
         "matthiasmullie/minify": "^1.3",
-        "middlewares/base-path": "^2.0.1",
+        "middlewares/base-path": "^v2.1",
         "middlewares/base-path-router": "^2.0.1",
-        "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",
-        "staudenmeir/eloquent-eager-limit": "^1.0",
+        "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",
         "sycho/json-api": "^0.5.0",
         "sycho/sourcemap": "^2.0.0",
-        "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"
+        "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"
     },
     "require-dev": {
-        "mockery/mockery": "^1.4",
+        "mockery/mockery": "^1.5",
         "phpunit/phpunit": "^9.0",
-        "phpstan/phpstan": ">=1.8.11 < 1.9.0",
-        "nunomaduro/larastan": "^1.0"
+        "phpstan/phpstan": "^1.10.0",
+        "nunomaduro/larastan": "^2.6",
+        "symfony/var-dumper": "^6.3"
     },
     "config": {
         "sort-packages": true
@@ -174,7 +200,7 @@
             "extensions/tags"
         ],
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
         },
         "phpstan": {
             "includes": [

extensions/akismet/composer.json

@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8",
-        "flarum/approval": "^1.7"
+        "flarum/core": "^2.0",
+        "flarum/approval": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.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": "^1.0.0"
+        "flarum/testing": "^2.0"
     },
     "repositories": [
         {

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.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})();
+(()=>{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})();
 //# sourceMappingURL=admin.js.map

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,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,QAEN,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":""}
+{"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":""}

extensions/akismet/js/dist/forum.js

@@ -1,2 +1,2 @@
-(()=>{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 s=t.n(n);const l=flarum.core.compat["forum/components/Post"];var u=t.n(l);a().initializers.add("flarum-akismet",(function(){(0,o.extend)(s(),"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)(u().prototype,"flagReason",(function(t,e){return"akismet"===e.type()?a().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):t(e)}))}))})(),module.exports=e})();
+(()=>{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})();
 //# sourceMappingURL=forum.js.map

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,KAAKC,OAAO,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,4B,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,yB,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,GAAI,MAAsB,aAAb,MAAJA,OAAI,EAAJA,EAAMC,OAAoB,IAAG,CAC7D,IAAMC,EAAcP,EAAMf,IAAI,WAC1BsB,GAAsC,iBAAhBA,GAA4B,aAAcA,IAClEA,EAAYC,SAAWX,IAAAA,WAAAA,MAAqB,6CAEhD,CACF,CACF,KAEAY,EAAAA,EAAAA,UAASC,IAAAA,UAAyB,cAAc,SAAUC,EAAUN,GAClE,MAAoB,YAAhBA,EAAKC,OACAT,IAAAA,WAAAA,MAAqB,kDAGvBc,EAASN,EAClB,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/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.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/Post'];","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 PostComponent from 'flarum/forum/components/Post';\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(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\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","PostComponent","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,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":""}

extensions/akismet/js/tsconfig.json

@@ -15,7 +15,7 @@
     "declarationDir": "./dist-typings",
     "paths": {
       "flarum/*": ["../../../framework/core/js/dist-typings/*"],
-      "flarum/flags/*": ["../../flags/js/dist-typings/*"]
+      "ext:flarum/flags/*": ["../../flags/js/dist-typings/*"]
     }
   }
 }

extensions/akismet/src/Akismet.php

@@ -15,22 +15,19 @@ use Psr\Http\Message\ResponseInterface;
 
 class Akismet
 {
-    private $apiKey;
-    private $apiUrl;
-    private $flarumVersion;
-    private $extensionVersion;
+    private string $apiUrl;
+    private array $params = [];
 
-    private $params = [];
-
-    public function __construct(string $apiKey, string $homeUrl, string $flarumVersion, string $extensionVersion, bool $inDebugMode = false)
-    {
-        $this->apiKey = $apiKey;
+    public function __construct(
+        private readonly string $apiKey,
+        string $homeUrl,
+        private readonly string $flarumVersion,
+        private readonly string $extensionVersion,
+        bool $inDebugMode = false
+    ) {
         $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;
         }
@@ -73,7 +70,7 @@ class Akismet
     /**
      * @throws GuzzleException
      */
-    public function submitSpam()
+    public function submitSpam(): void
     {
         $this->sendRequest('submit-spam');
     }
@@ -81,7 +78,7 @@ class Akismet
     /**
      * @throws GuzzleException
      */
-    public function submitHam()
+    public function submitHam(): void
     {
         $this->sendRequest('submit-ham');
     }
@@ -90,7 +87,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, $value): Akismet
+    public function withParam(string $key, mixed $value): Akismet
     {
         $new = clone $this;
         $new->params[$key] = $value;

extensions/akismet/src/Listener/SubmitHam.php

@@ -14,17 +14,12 @@ use Flarum\Approval\Event\PostWasApproved;
 
 class SubmitHam
 {
-    /**
-     * @var Akismet
-     */
-    protected $akismet;
-
-    public function __construct(Akismet $akismet)
-    {
-        $this->akismet = $akismet;
+    public function __construct(
+        protected Akismet $akismet
+    ) {
     }
 
-    public function handle(PostWasApproved $event)
+    public function handle(PostWasApproved $event): void
     {
         if (! $this->akismet->isConfigured()) {
             return;

extensions/akismet/src/Listener/SubmitSpam.php

@@ -14,17 +14,12 @@ use Flarum\Post\Event\Hidden;
 
 class SubmitSpam
 {
-    /**
-     * @var Akismet
-     */
-    protected $akismet;
-
-    public function __construct(Akismet $akismet)
-    {
-        $this->akismet = $akismet;
+    public function __construct(
+        protected Akismet $akismet
+    ) {
     }
 
-    public function handle(Hidden $event)
+    public function handle(Hidden $event): void
     {
         if (! $this->akismet->isConfigured()) {
             return;

extensions/akismet/src/Listener/ValidatePost.php

@@ -18,22 +18,13 @@ use Flarum\Settings\SettingsRepositoryInterface;
 
 class ValidatePost
 {
-    /**
-     * @var Akismet
-     */
-    protected $akismet;
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    private $settings;
-
-    public function __construct(Akismet $akismet, SettingsRepositoryInterface $settings)
-    {
-        $this->akismet = $akismet;
-        $this->settings = $settings;
+    public function __construct(
+        protected Akismet $akismet,
+        protected SettingsRepositoryInterface $settings
+    ) {
     }
 
-    public function handle(Saving $event)
+    public function handle(Saving $event): void
     {
         if (! $this->akismet->isConfigured()) {
             return;

extensions/akismet/src/Provider/AkismetProvider.php

@@ -20,7 +20,7 @@ use Illuminate\Container\Container;
 
 class AkismetProvider extends AbstractServiceProvider
 {
-    public function register()
+    public function register(): void
     {
         $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->to('forum')->base(),
+                $url->base('forum'),
                 $app::VERSION,
                 $extensions->getExtension('flarum-akismet')->getVersion() ?? 'unknown',
                 $config->inDebugMode()

extensions/akismet/tests/integration/setup.php

@@ -7,10 +7,6 @@
  * LICENSE file that was distributed with this source code.
  */
 
-use Flarum\Testing\integration\Setup\SetupScript;
-
-require __DIR__.'/../../vendor/autoload.php';
-
-$setup = new SetupScript();
+$setup = require __DIR__.'/../../../../php-packages/testing/bootstrap/monorepo.php';
 
 $setup->run();

extensions/akismet/tests/phpunit.integration.xml

@@ -10,6 +10,7 @@
     convertWarningsToExceptions="true"
     processIsolation="true"
     stopOnFailure="false"
+    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
     <coverage processUncoveredFiles="true">
         <include>

extensions/akismet/tests/phpunit.unit.xml

@@ -10,6 +10,7 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
+    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
     <coverage processUncoveredFiles="true">
         <include>

extensions/approval/composer.json

@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8",
-        "flarum/flags": "^1.7"
+        "flarum/core": "^2.0",
+        "flarum/flags": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.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": "^1.0.0"
+        "flarum/testing": "^2.0"
     }
 }

extensions/approval/extend.php

@@ -37,7 +37,7 @@ return [
         ->cast('is_approved', 'bool'),
 
     (new Extend\ApiSerializer(BasicDiscussionSerializer::class))
-        ->attribute('isApproved', function ($serializer, Discussion $discussion) {
+        ->attribute('isApproved', function (BasicDiscussionSerializer $serializer, Discussion $discussion): bool {
             return $discussion->is_approved;
         }),
 
@@ -65,8 +65,8 @@ return [
         ->scope(Access\ScopePrivateDiscussionVisibility::class, 'viewPrivate'),
 
     (new Extend\ModelPrivate(Discussion::class))
-        ->checker([Listener\UnapproveNewContent::class, 'markUnapprovedContentAsPrivate']),
+        ->checker(Listener\UnapproveNewContent::markUnapprovedContentAsPrivate(...)),
 
     (new Extend\ModelPrivate(CommentPost::class))
-        ->checker([Listener\UnapproveNewContent::class, 'markUnapprovedContentAsPrivate']),
+        ->checker(Listener\UnapproveNewContent::markUnapprovedContentAsPrivate(...)),
 ];

extensions/approval/js/dist/admin.js

@@ -1,2 +1,2 @@
-(()=>{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})();
+(()=>{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})();
 //# sourceMappingURL=admin.js.map

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,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,mBAElB,IAEAJ,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,GAEN,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":""}
+{"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":""}

extensions/approval/js/dist/forum.js

@@ -1,2 +1,2 @@
-(()=>{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})();
+(()=>{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})();
 //# sourceMappingURL=forum.js.map

extensions/approval/src/Access/ScopePrivateDiscussionVisibility.php

@@ -14,11 +14,7 @@ use Illuminate\Database\Eloquent\Builder;
 
 class ScopePrivateDiscussionVisibility
 {
-    /**
-     * @param Builder $query
-     * @param User $actor
-     */
-    public function __invoke(User $actor, Builder $query)
+    public function __invoke(User $actor, Builder $query): void
     {
         // 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

extensions/approval/src/Access/ScopePrivatePostVisibility.php

@@ -16,11 +16,7 @@ use Illuminate\Database\Eloquent\Builder;
 
 class ScopePrivatePostVisibility
 {
-    /**
-     * @param Builder $query
-     * @param User $actor
-     */
-    public function __invoke(User $actor, Builder $query)
+    public function __invoke(User $actor, Builder $query): void
     {
         // 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

extensions/approval/src/Access/TagPolicy.php

@@ -15,10 +15,7 @@ use Flarum\User\User;
 
 class TagPolicy extends AbstractPolicy
 {
-    /**
-     * @return bool|null
-     */
-    public function addToDiscussion(User $actor, Tag $tag)
+    public function addToDiscussion(User $actor, Tag $tag): bool
     {
         return $actor->can('discussion.startWithoutApproval', $tag);
     }

extensions/approval/src/Event/PostWasApproved.php

@@ -14,25 +14,9 @@ use Flarum\User\User;
 
 class PostWasApproved
 {
-    /**
-     * 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;
+    public function __construct(
+        public Post $post,
+        public User $actor
+    ) {
     }
 }

extensions/approval/src/Listener/ApproveContent.php

@@ -15,15 +15,12 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class ApproveContent
 {
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
+    public function subscribe(Dispatcher $events): void
     {
-        $events->listen(Saving::class, [$this, 'approvePost']);
+        $events->listen(Saving::class, $this->approvePost(...));
     }
 
-    public function approvePost(Saving $event)
+    public function approvePost(Saving $event): void
     {
         $attributes = $event->data['attributes'];
         $post = $event->post;

extensions/approval/src/Listener/UnapproveNewContent.php

@@ -18,18 +18,12 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 class UnapproveNewContent
 {
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
+    public function subscribe(Dispatcher $events): void
     {
-        $events->listen(Saving::class, [$this, 'unapproveNewPosts']);
+        $events->listen(Saving::class, $this->unapproveNewPosts(...));
     }
 
-    /**
-     * @param Saving $event
-     */
-    public function unapproveNewPosts(Saving $event)
+    public function unapproveNewPosts(Saving $event): void
     {
         $post = $event->post;
 
@@ -63,14 +57,12 @@ class UnapproveNewContent
         }
     }
 
-    /**
-     * @param Discussion|CommentPost $instance
-     * @return bool|null
-     */
-    public static function markUnapprovedContentAsPrivate($instance)
+    public static function markUnapprovedContentAsPrivate(Discussion|CommentPost $instance): ?bool
     {
         if (! $instance->is_approved) {
             return true;
         }
+
+        return null;
     }
 }

extensions/approval/src/Listener/UpdateDiscussionAfterPostApproval.php

@@ -13,7 +13,7 @@ use Flarum\Approval\Event\PostWasApproved;
 
 class UpdateDiscussionAfterPostApproval
 {
-    public function handle(PostWasApproved $event)
+    public function handle(PostWasApproved $event): void
     {
         $post = $event->post;
         $discussion = $post->discussion;

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->getBody()->getContents(), true);
+        $body = json_decode($response->getContent(), true);
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEqualsCanonicalizing([1, 4, 5, 7], Arr::pluck($body['data'], 'id'));
@@ -54,7 +54,7 @@ class ListDiscussionsTest extends TestCase
             $this->request('GET', '/api/discussions', compact('authenticatedAs'))
         );
 
-        $body = json_decode($response->getBody()->getContents(), true);
+        $body = json_decode($response->getContent(), true);
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEqualsCanonicalizing([1, 2, 3, 4, 5, 6, 7], Arr::pluck($body['data'], 'id'));

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

@@ -12,6 +12,7 @@ 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
@@ -35,16 +36,17 @@ class ListPostsTest extends TestCase
     public function can_only_see_approved_if_not_allowed_to_approve(?int $authenticatedAs)
     {
         $response = $this->send(
-            $this
-                ->request('GET', '/api/posts', compact('authenticatedAs'))
-                ->withQueryParams([
+            tap(
+                $this->request('GET', '/api/posts', compact('authenticatedAs')),
+                fn (Request $request) => $request->query->add([
                     'filter' => [
                         'discussion' => 7
                     ]
                 ])
+            )
         );
 
-        $body = json_decode($response->getBody()->getContents(), true);
+        $body = json_decode($response->getContent(), true);
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEqualsCanonicalizing([7, 8, 10], Arr::pluck($body['data'], 'id'));
@@ -57,16 +59,17 @@ class ListPostsTest extends TestCase
     public function can_see_unapproved_if_allowed_to_approve(int $authenticatedAs)
     {
         $response = $this->send(
-            $this
-                ->request('GET', '/api/posts', compact('authenticatedAs'))
-                ->withQueryParams([
+            tap(
+                $this->request('GET', '/api/posts', compact('authenticatedAs')),
+                fn (Request $request) => $request->query->add([
                     'filter' => [
                         'discussion' => 7
                     ]
                 ])
+            )
         );
 
-        $body = json_decode($response->getBody()->getContents(), true);
+        $body = json_decode($response->getContent(), true);
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEqualsCanonicalizing([7, 8, 9, 10, 11], Arr::pluck($body['data'], 'id'));

extensions/approval/tests/integration/setup.php

@@ -7,10 +7,6 @@
  * LICENSE file that was distributed with this source code.
  */
 
-use Flarum\Testing\integration\Setup\SetupScript;
-
-require __DIR__.'/../../vendor/autoload.php';
-
-$setup = new SetupScript();
+$setup = require __DIR__.'/../../../../php-packages/testing/bootstrap/monorepo.php';
 
 $setup->run();

extensions/approval/tests/phpunit.integration.xml

@@ -10,6 +10,7 @@
     convertWarningsToExceptions="true"
     processIsolation="true"
     stopOnFailure="false"
+    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
     <coverage processUncoveredFiles="true">
         <include>

extensions/approval/tests/phpunit.unit.xml

@@ -10,6 +10,7 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
+    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
     <coverage processUncoveredFiles="true">
         <include>

extensions/bbcode/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
         },
         "flarum-extension": {
             "title": "BBCode",

extensions/bbcode/src/Configure.php

@@ -13,7 +13,7 @@ use s9e\TextFormatter\Configurator;
 
 class Configure
 {
-    public function __invoke(Configurator $config)
+    public function __invoke(Configurator $config): void
     {
         $this->addTagsFromRepositories($config);
         $this->adaptHighlightJs($config);

extensions/bbcode/src/Render.php

@@ -9,19 +9,14 @@
 
 namespace Flarum\BBCode;
 
+use Flarum\Locale\TranslatorInterface;
 use s9e\TextFormatter\Renderer;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class Render
 {
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
+    public function __construct(
+        protected TranslatorInterface $translator
+    ) {
     }
 
     public function __invoke(Renderer $renderer, $context, string $xml): string

extensions/embed/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
         },
         "flarum-extension": {
             "title": "Embed",

extensions/embed/extend.php

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

extensions/embed/js/src/forum/index.js

@@ -4,8 +4,6 @@ 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';
 
@@ -13,7 +11,7 @@ import DiscussionPage from 'flarum/forum/components/DiscussionPage';
 
 extend(ForumApplication.prototype, 'mount', function () {
   if (m.route.param('hideFirstPost')) {
-    extend(PostStream.prototype, 'view', (vdom) => {
+    extend('flarum/forum/components/PostStream', 'view', (vdom) => {
       if (vdom.children[0].attrs['data-number'] === 1) {
         vdom.children.splice(0, 1);
       }
@@ -42,7 +40,7 @@ const reposition = function () {
 };
 
 extend(ModalManager.prototype, 'show', reposition);
-extend(Composer.prototype, 'show', reposition);
+extend('flarum/forum/components/Composer', 'show', reposition);
 
 window.iFrameResizer = {
   readyCallback: function () {
@@ -50,7 +48,7 @@ window.iFrameResizer = {
   },
 };
 
-extend(PostStream.prototype, 'goToNumber', function (promise, number) {
+extend('flarum/forum/components/PostStream', '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);

extensions/emoji/composer.json

@@ -19,11 +19,11 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
         },
         "flarum-extension": {
             "title": "Emoji",

extensions/emoji/extend.php

@@ -13,7 +13,8 @@ use s9e\TextFormatter\Configurator;
 return [
     (new Extend\Frontend('forum'))
         ->js(__DIR__.'/js/dist/forum.js')
-        ->css(__DIR__.'/less/forum.less'),
+        ->css(__DIR__.'/less/forum.less')
+        ->jsDirectory(__DIR__.'/js/dist/forum'),
 
     (new Extend\Formatter)
         ->configure(function (Configurator $config) {

extensions/emoji/js/dist/forum/emojiMap.js.map

@@ -0,0 +1 @@
+{"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":""}

extensions/emoji/js/src/forum/addComposerAutocomplete.js

@@ -1,7 +1,4 @@
-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';
 
@@ -10,11 +7,15 @@ 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(TextEditor.prototype, 'oncreate', function () {
+  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 () {
     const $editor = this.$('.TextEditor-editor').wrap('<div class="ComposerBody-emojiWrapper"></div>');
 
     this.navigator = new KeyboardNavigatable();
@@ -29,7 +30,9 @@ export default function addComposerAutocomplete() {
     $editor.after($container);
   });
 
-  extend(TextEditor.prototype, 'buildEditorParams', function (params) {
+  extend('flarum/common/components/TextEditor', 'buildEditorParams', function (params) {
+    const emojiKeys = Object.keys(emojiMap);
+
     let relEmojiStart;
     let absEmojiStart;
     let typed;
@@ -166,7 +169,7 @@ export default function addComposerAutocomplete() {
     });
   });
 
-  extend(TextEditor.prototype, 'toolbarItems', function (items) {
+  extend('flarum/common/components/TextEditor', 'toolbarItems', function (items) {
     items.add(
       'emoji',
       <TextEditorButton onclick={() => this.attrs.composer.editor.insertAtCursor(' :')} icon="far fa-smile">

extensions/emoji/js/src/forum/emojiMap.ts

@@ -0,0 +1,3 @@
+import emojiMap from 'simple-emoji-map';
+
+export default emojiMap;

extensions/flags/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
         },
         "flarum-extension": {
             "title": "Flags",
@@ -75,7 +75,7 @@
     "require-dev": {
         "flarum/core": "*@dev",
         "flarum/tags": "*@dev",
-        "flarum/testing": "^1.0.0"
+        "flarum/testing": "^2.0"
     },
     "repositories": [
         {

extensions/flags/js/dist-typings/forum/compat.d.ts

@@ -1,19 +0,0 @@
-declare const _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";

extensions/flags/js/dist-typings/forum/components/FlagsPage.d.ts

@@ -2,8 +2,9 @@
  * 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 {
+export default class FlagsPage extends Page<import("flarum/common/components/Page").IPageAttrs, undefined> {
+    constructor();
     oninit(vnode: any): void;
-    bodyClass: string | undefined;
     view(): JSX.Element;
 }
+import Page from "flarum/common/components/Page";

extensions/flags/js/dist-typings/forum/forum.d.ts

@@ -0,0 +1,8 @@
+import './addFlagsToPosts';
+import './addFlagControl';
+import './addFlagsDropdown';
+import './models/Flag';
+import './components/FlagList';
+import './components/FlagPostModal';
+import './components/FlagsPage';
+import './components/FlagsDropdown';

extensions/flags/js/dist-typings/forum/index.d.ts

@@ -1 +1,2 @@
 export { default as extend } from './extend';
+import './forum';

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 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})();
+(()=>{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})();
 //# sourceMappingURL=admin.js.map

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,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,GAEN,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":""}
+{"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":""}

extensions/flags/js/src/forum/compat.js

@@ -1,19 +0,0 @@
-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,
-};

extensions/flags/js/src/forum/components/FlagsPage.js

@@ -1,5 +1,5 @@
 import app from 'flarum/forum/app';
-import Page from 'flarum/components/Page';
+import Page from 'flarum/common/components/Page';
 
 import FlagList from './FlagList';
 

extensions/flags/js/src/forum/forum.ts

@@ -0,0 +1,10 @@
+import './addFlagsToPosts';
+import './addFlagControl';
+import './addFlagsDropdown';
+
+import './models/Flag';
+
+import './components/FlagList';
+import './components/FlagPostModal';
+import './components/FlagsPage';
+import './components/FlagsDropdown';

extensions/flags/js/src/forum/index.ts

@@ -15,8 +15,4 @@ app.initializers.add('flarum-flags', () => {
   addFlagsToPosts();
 });
 
-// Expose compat API
-import flagsCompat from './compat';
-import { compat } from '@flarum/core/forum';
-
-Object.assign(compat, flagsCompat);
+import './forum';

extensions/flags/js/tsconfig.json

@@ -9,8 +9,7 @@
     // This will output typings to `dist-typings`
     "declarationDir": "./dist-typings",
     "paths": {
-      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
-      "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"]
+      "flarum/*": ["../../../framework/core/js/dist-typings/*"]
     }
   }
 }

extensions/flags/src/Access/ScopeFlagVisibility.php

@@ -16,17 +16,12 @@ use Illuminate\Database\Eloquent\Builder;
 
 class ScopeFlagVisibility
 {
-    /**
-     * @var ExtensionManager
-     */
-    protected $extensions;
-
-    public function __construct(ExtensionManager $extensions)
-    {
-        $this->extensions = $extensions;
+    public function __construct(
+        protected ExtensionManager $extensions
+    ) {
     }
 
-    public function __invoke(User $actor, Builder $query)
+    public function __invoke(User $actor, Builder $query): void
     {
         if ($this->extensions->isEnabled('flarum-tags')) {
             $query

extensions/flags/src/AddCanFlagAttribute.php

@@ -16,20 +16,12 @@ use Flarum\User\User;
 
 class AddCanFlagAttribute
 {
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    protected $settings;
-
-    /**
-     * @param SettingsRepositoryInterface $settings
-     */
-    public function __construct(SettingsRepositoryInterface $settings)
-    {
-        $this->settings = $settings;
+    public function __construct(
+        protected SettingsRepositoryInterface $settings
+    ) {
     }
 
-    public function __invoke(PostSerializer $serializer, Post $post)
+    public function __invoke(PostSerializer $serializer, Post $post): bool
     {
         return $serializer->getActor()->can('flag', $post) && $this->checkFlagOwnPostSetting($serializer->getActor(), $post);
     }

extensions/flags/src/AddFlagsApiAttributes.php

@@ -15,20 +15,12 @@ use Flarum\User\User;
 
 class AddFlagsApiAttributes
 {
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    protected $settings;
-
-    /**
-     * @param SettingsRepositoryInterface $settings
-     */
-    public function __construct(SettingsRepositoryInterface $settings)
-    {
-        $this->settings = $settings;
+    public function __construct(
+        protected SettingsRepositoryInterface $settings
+    ) {
     }
 
-    public function __invoke(ForumSerializer $serializer)
+    public function __invoke(ForumSerializer $serializer): array
     {
         $attributes = [
             'canViewFlags' => $serializer->getActor()->hasPermissionLike('discussion.viewFlags')
@@ -41,11 +33,7 @@ class AddFlagsApiAttributes
         return $attributes;
     }
 
-    /**
-     * @param User $actor
-     * @return int
-     */
-    protected function getFlagCount(User $actor)
+    protected function getFlagCount(User $actor): int
     {
         return Flag::whereVisibleTo($actor)->distinct()->count('flags.post_id');
     }

extensions/flags/src/AddNewFlagCountAttribute.php

@@ -14,16 +14,12 @@ use Flarum\User\User;
 
 class AddNewFlagCountAttribute
 {
-    public function __invoke(CurrentUserSerializer $serializer, User $user)
+    public function __invoke(CurrentUserSerializer $serializer, User $user): int
     {
-        return (int) $this->getNewFlagCount($user);
+        return $this->getNewFlagCount($user);
     }
 
-    /**
-     * @param User $actor
-     * @return int
-     */
-    protected function getNewFlagCount(User $actor)
+    protected function getNewFlagCount(User $actor): int
     {
         $query = Flag::whereVisibleTo($actor);
 

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

@@ -12,48 +12,31 @@ namespace Flarum\Flags\Api\Controller;
 use Flarum\Api\Controller\AbstractCreateController;
 use Flarum\Flags\Api\Serializer\FlagSerializer;
 use Flarum\Flags\Command\CreateFlag;
+use Flarum\Flags\Flag;
 use Flarum\Http\RequestUtil;
 use Illuminate\Contracts\Bus\Dispatcher;
-use Illuminate\Support\Arr;
-use Psr\Http\Message\ServerRequestInterface;
+use Illuminate\Http\Request;
 use Tobscure\JsonApi\Document;
 
 class CreateFlagController extends AbstractCreateController
 {
-    /**
-     * {@inheritdoc}
-     */
-    public $serializer = FlagSerializer::class;
+    public ?string $serializer = FlagSerializer::class;
 
-    /**
-     * {@inheritdoc}
-     */
-    public $include = [
+    public array $include = [
         'post',
         'post.flags',
         'user'
     ];
 
-    /**
-     * @var Dispatcher
-     */
-    protected $bus;
-
-    /**
-     * @param Dispatcher $bus
-     */
-    public function __construct(Dispatcher $bus)
-    {
-        $this->bus = $bus;
+    public function __construct(
+        protected Dispatcher $bus
+    ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function data(ServerRequestInterface $request, Document $document)
+    protected function data(Request $request, Document $document): Flag
     {
         return $this->bus->dispatch(
-            new CreateFlag(RequestUtil::getActor($request), Arr::get($request->getParsedBody(), 'data', []))
+            new CreateFlag(RequestUtil::getActor($request), $request->json('data', []))
         );
     }
 }

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

@@ -13,31 +13,19 @@ use Flarum\Api\Controller\AbstractDeleteController;
 use Flarum\Flags\Command\DeleteFlags;
 use Flarum\Http\RequestUtil;
 use Illuminate\Contracts\Bus\Dispatcher;
-use Illuminate\Support\Arr;
-use Psr\Http\Message\ServerRequestInterface;
+use Illuminate\Http\Request;
 
 class DeleteFlagsController extends AbstractDeleteController
 {
-    /**
-     * @var Dispatcher
-     */
-    protected $bus;
-
-    /**
-     * @param Dispatcher $bus
-     */
-    public function __construct(Dispatcher $bus)
-    {
-        $this->bus = $bus;
+    public function __construct(
+        protected Dispatcher $bus
+    ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function delete(ServerRequestInterface $request)
+    protected function delete(Request $request): void
     {
         $this->bus->dispatch(
-            new DeleteFlags(Arr::get($request->getQueryParams(), 'id'), RequestUtil::getActor($request), $request->getParsedBody())
+            new DeleteFlags($request->route('id'), RequestUtil::getActor($request), $request->json()->all())
         );
     }
 }

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

@@ -14,30 +14,21 @@ use Flarum\Api\Controller\AbstractListController;
 use Flarum\Flags\Api\Serializer\FlagSerializer;
 use Flarum\Flags\Flag;
 use Flarum\Http\RequestUtil;
-use Psr\Http\Message\ServerRequestInterface;
+use Illuminate\Http\Request;
 use Tobscure\JsonApi\Document;
 
 class ListFlagsController extends AbstractListController
 {
-    /**
-     * {@inheritdoc}
-     */
-    public $serializer = FlagSerializer::class;
+    public ?string $serializer = FlagSerializer::class;
 
-    /**
-     * {@inheritdoc}
-     */
-    public $include = [
+    public array $include = [
         'user',
         'post',
         'post.user',
         'post.discussion'
     ];
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function data(ServerRequestInterface $request, Document $document)
+    protected function data(Request $request, Document $document): iterable
     {
         $actor = RequestUtil::getActor($request);
         $include = $this->extractInclude($request);

extensions/flags/src/Api/Serializer/FlagSerializer.php

@@ -14,42 +14,34 @@ use Flarum\Api\Serializer\BasicUserSerializer;
 use Flarum\Api\Serializer\PostSerializer;
 use Flarum\Flags\Flag;
 use InvalidArgumentException;
+use Tobscure\JsonApi\Relationship;
 
 class FlagSerializer extends AbstractSerializer
 {
-    /**
-     * {@inheritdoc}
-     */
     protected $type = 'flags';
 
-    protected function getDefaultAttributes($flag)
+    protected function getDefaultAttributes(object|array $model): array
     {
-        if (! ($flag instanceof Flag)) {
+        if (! ($model instanceof Flag)) {
             throw new InvalidArgumentException(
                 get_class($this).' can only serialize instances of '.Flag::class
             );
         }
 
         return [
-            'type'         => $flag->type,
-            'reason'       => $flag->reason,
-            'reasonDetail' => $flag->reason_detail,
-            'createdAt'    => $this->formatDate($flag->created_at),
+            'type'         => $model->type,
+            'reason'       => $model->reason,
+            'reasonDetail' => $model->reason_detail,
+            'createdAt'    => $this->formatDate($model->created_at),
         ];
     }
 
-    /**
-     * @return \Tobscure\JsonApi\Relationship
-     */
-    protected function post($flag)
+    protected function post(Flag $flag): ?Relationship
     {
         return $this->hasOne($flag, PostSerializer::class);
     }
 
-    /**
-     * @return \Tobscure\JsonApi\Relationship
-     */
-    protected function user($flag)
+    protected function user(Flag $flag): ?Relationship
     {
         return $this->hasOne($flag, BasicUserSerializer::class);
     }

extensions/flags/src/Command/CreateFlag.php

@@ -13,27 +13,9 @@ use Flarum\User\User;
 
 class CreateFlag
 {
-    /**
-     * The user performing the action.
-     *
-     * @var User
-     */
-    public $actor;
-
-    /**
-     * The attributes of the new flag.
-     *
-     * @var array
-     */
-    public $data;
-
-    /**
-     * @param User $actor The user performing the action.
-     * @param array $data The attributes of the new flag.
-     */
-    public function __construct(User $actor, array $data)
-    {
-        $this->actor = $actor;
-        $this->data = $data;
+    public function __construct(
+        public User $actor,
+        public array $data
+    ) {
     }
 }

extensions/flags/src/Command/CreateFlagHandler.php

@@ -13,58 +13,26 @@ use Carbon\Carbon;
 use Flarum\Flags\Event\Created;
 use Flarum\Flags\Flag;
 use Flarum\Foundation\ValidationException;
+use Flarum\Locale\TranslatorInterface;
 use Flarum\Post\CommentPost;
 use Flarum\Post\PostRepository;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\Exception\PermissionDeniedException;
 use Illuminate\Events\Dispatcher;
 use Illuminate\Support\Arr;
-use Symfony\Contracts\Translation\TranslatorInterface;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
 
 class CreateFlagHandler
 {
-    /**
-     * @var PostRepository
-     */
-    protected $posts;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    protected $settings;
-
-    /**
-     * @var Dispatcher
-     */
-    protected $events;
-
-    /**
-     * @param PostRepository $posts
-     * @param TranslatorInterface $translator
-     * @param SettingsRepositoryInterface $settings
-     * @param Dispatcher $events
-     */
-    public function __construct(PostRepository $posts, TranslatorInterface $translator, SettingsRepositoryInterface $settings, Dispatcher $events)
-    {
-        $this->posts = $posts;
-        $this->translator = $translator;
-        $this->settings = $settings;
-        $this->events = $events;
+    public function __construct(
+        protected PostRepository $posts,
+        protected TranslatorInterface $translator,
+        protected SettingsRepositoryInterface $settings,
+        protected Dispatcher $events
+    ) {
     }
 
-    /**
-     * @param CreateFlag $command
-     * @return Flag
-     * @throws InvalidParameterException
-     * @throws ValidationException
-     */
-    public function handle(CreateFlag $command)
+    public function handle(CreateFlag $command): Flag
     {
         $actor = $command->actor;
         $data = $command->data;

extensions/flags/src/Command/DeleteFlags.php

@@ -13,34 +13,10 @@ use Flarum\User\User;
 
 class DeleteFlags
 {
-    /**
-     * The ID of the post to delete flags for.
-     *
-     * @var int
-     */
-    public $postId;
-
-    /**
-     * The user performing the action.
-     *
-     * @var User
-     */
-    public $actor;
-
-    /**
-     * @var array
-     */
-    public $data;
-
-    /**
-     * @param int $postId The ID of the post to delete flags for.
-     * @param User $actor The user performing the action.
-     * @param array $data
-     */
-    public function __construct($postId, User $actor, array $data = [])
-    {
-        $this->postId = $postId;
-        $this->actor = $actor;
-        $this->data = $data;
+    public function __construct(
+        public int $postId,
+        public User $actor,
+        public array $data = []
+    ) {
     }
 }

extensions/flags/src/Command/DeleteFlagsHandler.php

@@ -17,31 +17,13 @@ use Illuminate\Events\Dispatcher;
 
 class DeleteFlagsHandler
 {
-    /**
-     * @var PostRepository
-     */
-    protected $posts;
-
-    /**
-     * @var Dispatcher
-     */
-    protected $events;
-
-    /**
-     * @param PostRepository $posts
-     * @param Dispatcher $events
-     */
-    public function __construct(PostRepository $posts, Dispatcher $events)
-    {
-        $this->posts = $posts;
-        $this->events = $events;
+    public function __construct(
+        protected PostRepository $posts,
+        protected Dispatcher $events
+    ) {
     }
 
-    /**
-     * @param DeleteFlags $command
-     * @return Post
-     */
-    public function handle(DeleteFlags $command)
+    public function handle(DeleteFlags $command): Post
     {
         $actor = $command->actor;
 

extensions/flags/src/Event/Created.php

@@ -14,30 +14,10 @@ use Flarum\User\User;
 
 class Created
 {
-    /**
-     * @var Flag
-     */
-    public $flag;
-
-    /**
-     * @var User
-     */
-    public $actor;
-
-    /**
-     * @var array
-     */
-    public $data;
-
-    /**
-     * @param Flag $flag
-     * @param User $actor
-     * @param array $data
-     */
-    public function __construct(Flag $flag, User $actor, array $data = [])
-    {
-        $this->flag = $flag;
-        $this->actor = $actor;
-        $this->data = $data;
+    public function __construct(
+        public Flag $flag,
+        public User $actor,
+        public array $data = []
+    ) {
     }
 }