Apply fixes from StyleCI

[ci skip] [skip ci]

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,7 +1,26 @@
 ---
 name: "🚀 Feature Request"
-about: "If you have a suggestion please head over to our forum!"
+about: "I have a suggestion (and may want to implement it!)"
 
 ---
 
-We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future. For feature requests, ideas and feedback please post in the Flarum Community: https://discuss.flarum.org/t/proposals. Feature requests are added to GitHub only when they have been accepted by the development team and implementation details have been laid out.
+<!--
+IMPORTANT: Feature requests on this GitHub issue tracker are only accepted in case they have been approved by a core developer or contain extensive argumentation and directions for implementation. For all other feature requests, ideas and feedback please post in the Flarum Community: https://discuss.flarum.org/t/feedback.
+-->
+
+## Feature Request
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. eg. I have an issue when [...]
+
+**Describe the solution you'd like**
+A detailed description of your proposed solution. Include:
+- How the feature would work/behave
+- Any potential drawbacks
+- Maybe a screenshot, design, or example code
+
+**Justify why this feature belongs in Flarum's core, rather than in a third-party extension**
+Consider who this change will be useful to – most Flarum forums, or just a few?
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.

.github/ISSUE_TEMPLATE/support-question.md

@@ -4,7 +4,7 @@ about: "If you have a question, please check out our forum or Discord!"
 
 ---
 
-We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future; for usage and support questions, please check out these resources below. Thanks!
+We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks!
 
 * Flarum Community: https://discuss.flarum.org/
 * Discord Chat: https://flarum.org/discord/

.github/workflows/REUSABLE_backend.yml

@@ -1,112 +0,0 @@
-name: Flarum Backend Jobs
-
-on:
-  workflow_call:
-    inputs:
-      enable_backend_testing:
-        description: "Enable Backend Testing?"
-        type: boolean
-        default: true
-        required: false
-
-      backend_directory:
-        description: The directory of the project where backend code is located. This should contain a `composer.json` file, and is generally the root directory of the repo.
-        type: string
-        required: false
-        default: '.'
-
-      php_versions:
-        description: Versions of PHP to test with. Should be array of strings encoded as JSON array
-        type: string
-        required: false
-        default: '["7.4", "8.0", "8.1"]'
-      db_versions:
-        description: Versions of databases to test with. Should be array of strings encoded as JSON array
-        type: string
-        required: false
-        default: '["mysql:5.7", "mariadb"]'
-
-      php_ini_values:
-        description: PHP ini values
-        type: string
-        required: false
-        default: error_reporting=E_ALL
-
-env:
-  COMPOSER_ROOT_VERSION: dev-main
-  FLARUM_TEST_TMP_DIR_LOCAL: tests/integration/tmp
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php: ${{ fromJSON(inputs.php_versions) }}
-        service: ${{ fromJSON(inputs.db_versions) }}
-        prefix: ['', flarum_]
-
-        include:
-          - service: 'mysql:5.7'
-            db: MySQL
-          - service: mariadb
-            db: MariaDB
-          - prefix: flarum_
-            prefixStr: (prefix)
-
-        exclude:
-          - php: 8.0
-            service: 'mysql:5.7'
-            prefix: flarum_
-          - php: 8.0
-            service: mariadb
-            prefix: flarum_
-
-    services:
-      mysql:
-        image: ${{ matrix.service }}
-        ports:
-          - 13306:3306
-
-    name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'
-
-    if: inputs.enable_backend_testing
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          coverage: xdebug
-          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
-          tools: phpunit, composer:v2
-          ini-values: ${{ inputs.php_ini_values }}
-
-      # The authentication alter is necessary because newer mysql versions use the `caching_sha2_password` driver,
-      # which isn't supported prior to PHP7.4
-      # When we drop support for PHP7.3, we should remove this from the setup.
-      - name: Create MySQL Database
-        run: |
-          sudo systemctl start mysql
-          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
-          mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';" --port 13306
-
-      - name: Install Composer dependencies
-        run: composer install
-        working-directory: ${{ inputs.backend_directory }}
-
-      - name: Setup Composer tests
-        run: composer test:setup
-        working-directory: ${{ inputs.backend_directory }}
-        env:
-          DB_PORT: 13306
-          DB_PASSWORD: root
-          DB_PREFIX: ${{ matrix.prefix }}
-
-      - name: Run Composer tests
-        run: composer test
-        working-directory: ${{ inputs.backend_directory }}
-        env:
-          COMPOSER_PROCESS_TIMEOUT: 600

.github/workflows/REUSABLE_frontend.yml

@@ -1,220 +0,0 @@
-name: Flarum Frontend Jobs
-
-on:
-  workflow_call:
-    inputs:
-      enable_bundlewatch:
-        description: "Enable Bundlewatch?"
-        type: boolean
-        default: false
-        required: false
-      enable_prettier:
-        description: "Enable Prettier?"
-        type: boolean
-        default: true
-        required: false
-      enable_typescript:
-        description: "Enable TypeScript?"
-        type: boolean
-        default: true
-        required: false
-
-      backend_directory:
-        description: The directory of the project where backend code is located. This should contain a `composer.json` file, and is generally the root directory of the repo.
-        type: string
-        required: false
-        default: '.'
-      frontend_directory:
-        description: The directory of the project where frontend code is located. This should contain a `package.json` file.
-        type: string
-        required: false
-        default: './js'
-      main_git_branch:
-        description: The main git branch to use for the workflow.
-        type: string
-        required: false
-        default: main
-      node_version:
-        description: The node version to use for the workflow.
-        type: number
-        required: false
-        default: 16
-
-      js_package_manager:
-        description: "Enable TypeScript?"
-        type: string
-        default: yarn
-        required: false
-      cache_dependency_path:
-        description: "The path to the cache dependency file."
-        type: string
-        required: false
-
-    secrets:
-      bundlewatch_github_token:
-        description: The GitHub token to use for Bundlewatch.
-        required: false
-
-env:
-  COMPOSER_ROOT_VERSION: dev-main
-  ci_script: ${{ inputs.js_package_manager == 'yarn' && 'yarn install --immutable' || 'npm ci' }}
-  cache_dependency_path: ${{ inputs.cache_dependency_path || format(inputs.js_package_manager == 'yarn' && '{0}/yarn.lock' || '{0}/package-lock.json', inputs.frontend_directory) }}
-
-jobs:
-  bundlewatch:
-    name: Bundlewatch
-    runs-on: ubuntu-latest
-    if: inputs.enable_bundlewatch
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ inputs.node_version }}
-          cache: ${{ inputs.js_package_manager }}
-          cache-dependency-path: ${{ env.cache_dependency_path }}
-
-      - name: Build production assets
-        uses: flarum/action-build@2
-        with:
-          github_token: ${{ secrets.github_token }}
-          build_script: build
-          package_manager: ${{ inputs.js_package_manager }}
-          js_path: ${{ inputs.frontend_directory }}
-          do_not_commit: true
-
-      - name: Check bundle size change
-        run: node_modules/.bin/bundlewatch --config .bundlewatch.config.json
-        working-directory: ${{ inputs.frontend_directory }}
-        env:
-          BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.bundlewatch_github_token }}
-          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
-
-  prettier:
-    name: Prettier
-    runs-on: ubuntu-latest
-    if: inputs.enable_prettier
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ inputs.node_version }}
-          cache: ${{ inputs.js_package_manager }}
-          cache-dependency-path: ${{ env.cache_dependency_path }}
-
-      - name: Install JS dependencies
-        run: ${{ env.ci_script }}
-        working-directory: ${{ inputs.frontend_directory }}
-
-      - name: Check JS formatting
-        run: ${{ inputs.js_package_manager }} run format-check
-        working-directory: ${{ inputs.frontend_directory }}
-
-  typecheck:
-    name: Typecheck
-    runs-on: ubuntu-latest
-    if: inputs.enable_typescript
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ inputs.node_version }}
-          cache: ${{ inputs.js_package_manager }}
-          cache-dependency-path: ${{ env.cache_dependency_path }}
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.0'
-          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
-          tools: composer:v2
-
-      # Needed since tsconfig draws typings from vendor folder.
-      - name: Install Composer dependencies
-        run: composer install
-        working-directory: ${{ inputs.backend_directory }}
-
-      - name: Install JS dependencies
-        run: ${{ env.ci_script }}
-        working-directory: ${{ inputs.frontend_directory }}
-
-      - name: Typecheck
-        run: ${{ inputs.js_package_manager }} run check-typings
-        working-directory: ${{ inputs.frontend_directory }}
-
-  type-coverage:
-    name: Type Coverage
-    runs-on: ubuntu-latest
-    if: inputs.enable_typescript
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ inputs.node_version }}
-          cache: ${{ inputs.js_package_manager }}
-          cache-dependency-path: ${{ env.cache_dependency_path }}
-
-      - name: Install JS dependencies
-        run: ${{ env.ci_script }}
-        working-directory: ${{ inputs.frontend_directory }}
-
-      - name: Check type coverage
-        run: ${{ inputs.js_package_manager }} run check-typings-coverage
-        working-directory: ${{ inputs.frontend_directory }}
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    if: "always() && !contains(needs.*.result, 'failed') && !contains(needs.*.result, 'cancelled')"
-    needs: [bundlewatch, prettier, typecheck, type-coverage]
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ inputs.node_version }}
-          cache: ${{ inputs.js_package_manager }}
-          cache-dependency-path: ${{ env.cache_dependency_path }}
-
-      # Our action will install npm/yarn, cd into `${{ inputs.frontend_directory }}`, build dist JS and typings,
-      # then commit and upload any changes iff we are on the main branch and have just pushed.
-      - name: Build production JS
-        if: inputs.enable_typescript
-        uses: flarum/action-build@2
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          build_script: build
-          package_manager: ${{ inputs.js_package_manager }}
-          typings_script: build-typings
-          js_path: ${{ inputs.frontend_directory }}
-          do_not_commit: ${{ github.ref != format('refs/heads/{0}', inputs.main_git_branch) || github.event_name != 'push' }}
-
-      # Our action will install npm/yarn, cd into `${{ inputs.frontend_directory }}`, build dist JS and typings,
-      # then commit and upload any changes iff we are on the main branch and have just pushed.
-      - name: Build production JS
-        if: "! inputs.enable_typescript"
-        uses: flarum/action-build@2
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          build_script: build
-          package_manager: ${{ inputs.js_package_manager }}
-          js_path: ${{ inputs.frontend_directory }}
-          do_not_commit: ${{ github.ref != format('refs/heads/{0}', inputs.main_git_branch) || github.event_name != 'push' }}

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

@@ -2,9 +2,13 @@ name: Akismet PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: true
 

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

@@ -2,9 +2,13 @@ name: Akismet JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/akismet/js
       backend_directory: ./extensions/akismet
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Approval PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Approval JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/approval/js
       backend_directory: ./extensions/approval
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Core PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: true
 

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

@@ -2,9 +2,13 @@ name: Core JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: true
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./framework/core/js
       backend_directory: ./framework/core
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Embed PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Embed JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/embed/js
       backend_directory: ./extensions/embed
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Emoji PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Emoji JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/emoji/js
       backend_directory: ./extensions/emoji
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Flags PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: true
 

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

@@ -2,9 +2,13 @@ name: Flags JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/flags/js
       backend_directory: ./extensions/flags
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Likes PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Likes JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/likes/js
       backend_directory: ./extensions/likes
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Lock PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Lock JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/lock/js
       backend_directory: ./extensions/lock
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Markdown PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Markdown JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/markdown/js
       backend_directory: ./extensions/markdown
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Mentions PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: true
 

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

@@ -2,9 +2,13 @@ name: Mentions JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/mentions/js
       backend_directory: ./extensions/mentions
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Nicknames PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: true
 

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

@@ -2,9 +2,13 @@ name: Nicknames JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/nicknames/js
       backend_directory: ./extensions/nicknames
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

.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: true
-
-      backend_directory: ./extensions/package-manager

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

@@ -2,9 +2,13 @@ name: Package Manager JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/package-manager/js
       backend_directory: ./extensions/package-manager
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Pusher PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Pusher JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/pusher/js
       backend_directory: ./extensions/pusher
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Statistics PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: true
 

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

@@ -2,9 +2,13 @@ name: Statistics JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/statistics/js
       backend_directory: ./extensions/statistics
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,10 +2,14 @@ name: Sticky PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
-      enable_backend_testing: true
+      enable_backend_testing: false
 
       backend_directory: ./extensions/sticky

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

@@ -2,9 +2,13 @@ name: Sticky JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/sticky/js
       backend_directory: ./extensions/sticky
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Subscriptions PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Subscriptions JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/subscriptions/js
       backend_directory: ./extensions/subscriptions
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Suspend PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: false
 

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

@@ -2,9 +2,13 @@ name: Suspend JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
       enable_prettier: true
@@ -13,7 +17,6 @@ jobs:
       frontend_directory: ./extensions/suspend/js
       backend_directory: ./extensions/suspend
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
 
     secrets:

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

@@ -2,9 +2,13 @@ name: Tags PHP
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
     with:
       enable_backend_testing: true
 

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

@@ -2,18 +2,21 @@ name: Tags JS
 
 on: [workflow_dispatch, push, pull_request]
 
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
 jobs:
   run:
-    uses: ./.github/workflows/REUSABLE_frontend.yml
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
     with:
       enable_bundlewatch: false
-      enable_prettier: true
+      enable_prettier: false
       enable_typescript: true
 
       frontend_directory: ./extensions/tags/js
       backend_directory: ./extensions/tags
       js_package_manager: yarn
-      cache_dependency_path: ./yarn.lock
       main_git_branch: main
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.gitignore

@@ -1,3 +1 @@
-node_modules
-vendor
-composer.lock
+node_modules

composer.json

@@ -1,182 +0,0 @@
-{
-    "name": "flarum/framework",
-    "description": "Delightfully simple forum software.",
-    "keywords": [
-        "forum",
-        "discussion"
-    ],
-    "homepage": "https://flarum.org/",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Flarum",
-            "email": "info@flarum.org",
-            "homepage": "https://flarum.org/team"
-        }
-    ],
-    "funding": [
-        {
-            "type": "opencollective",
-            "url": "https://opencollective.com/flarum"
-        },
-        {
-            "type": "github",
-            "url": "https://github.com/sponsors/flarum"
-        },
-        {
-            "type": "other",
-            "url": "https://flarum.org/donate"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/flarum/core/issues",
-        "source": "https://github.com/flarum/core",
-        "docs": "https://docs.flarum.org",
-        "forum": "https://discuss.flarum.org",
-        "chat": "https://flarum.org/chat"
-    },
-    "autoload": {
-        "psr-4": {
-            "Flarum\\": "framework/core/src",
-            "Flarum\\Akismet\\": "extensions/akismet/src",
-            "Flarum\\Approval\\": "extensions/approval/src",
-            "Flarum\\Flags\\": "extensions/flags/src",
-            "Flarum\\Likes\\": "extensions/likes/src",
-            "Flarum\\Lock\\": "extensions/lock/src",
-            "Flarum\\Mentions\\": "extensions/mentions/src",
-            "Flarum\\Nicknames\\": "extensions/nicknames/src",
-            "Flarum\\PackageManager\\": "extensions/package-manager/src",
-            "Flarum\\Pusher\\": "extensions/pusher/src",
-            "Flarum\\Statistics\\": "extensions/statistics/src",
-            "Flarum\\Sticky\\": "extensions/sticky/src",
-            "Flarum\\Subscriptions\\": "extensions/subscriptions/src",
-            "Flarum\\Suspend\\": "extensions/suspend/src",
-            "Flarum\\Tags\\": "extensions/tags/src",
-            "Flarum\\PHPStan\\": "php-packages/phpstan/src",
-            "Flarum\\Testing\\": "php-packages/testing/src"
-        },
-        "files": [
-            "framework/core/src/helpers.php"
-        ]
-    },
-    "replace": {
-        "flarum/core": "self.version",
-        "flarum/akismet": "self.version",
-        "flarum/approval": "self.version",
-        "flarum/bbcode": "self.version",
-        "flarum/embed": "self.version",
-        "flarum/emoji": "self.version",
-        "flarum/flags": "self.version",
-        "flarum/lang-english": "self.version",
-        "flarum/likes": "self.version",
-        "flarum/lock": "self.version",
-        "flarum/markdown": "self.version",
-        "flarum/mentions": "self.version",
-        "flarum/nicknames": "self.version",
-        "flarum/package-manager": "self.version",
-        "flarum/pusher": "self.version",
-        "flarum/statistics": "self.version",
-        "flarum/sticky": "self.version",
-        "flarum/subscriptions": "self.version",
-        "flarum/suspend": "self.version",
-        "flarum/tags": "self.version",
-        "flarum/phpstan": "self.version",
-        "flarum/testing": "self.version"
-    },
-    "require": {
-        "ext-json": "*",
-        "php": ">=7.3",
-        "components/font-awesome": "^5.14.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": "^7.4",
-        "illuminate/bus": "^8.0",
-        "illuminate/cache": "^8.0",
-        "illuminate/config": "^8.0",
-        "illuminate/console": "^8.0",
-        "illuminate/container": "^8.0",
-        "illuminate/contracts": "^8.0",
-        "illuminate/database": "^8.0",
-        "illuminate/events": "^8.0",
-        "illuminate/filesystem": "^8.0",
-        "illuminate/hashing": "^8.0",
-        "illuminate/mail": "^8.0",
-        "illuminate/queue": "^8.0",
-        "illuminate/session": "^8.0",
-        "illuminate/support": "^8.0",
-        "illuminate/validation": "^8.0",
-        "illuminate/view": "^8.0",
-        "intervention/image": "2.5.* || ^2.6.1",
-        "laminas/laminas-diactoros": "^2.4.1",
-        "laminas/laminas-httphandlerrunner": "^1.2.0",
-        "laminas/laminas-stratigility": "^3.2.2",
-        "league/flysystem": "^1.0.11",
-        "matthiasmullie/minify": "^1.3",
-        "middlewares/base-path": "^2.0.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",
-        "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"
-    },
-    "require-dev": {
-        "mockery/mockery": "^1.4",
-        "phpunit/phpunit": "^9.0",
-        "phpstan/phpstan-php-parser": "^1.0",
-        "phpstan/phpstan": "^1.2"
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "flarum-subextensions": [
-            "extensions/akismet",
-            "extensions/approval",
-            "extensions/bbcode",
-            "extensions/embed",
-            "extensions/emoji",
-            "extensions/flags",
-            "extensions/lang-english",
-            "extensions/likes",
-            "extensions/lock",
-            "extensions/markdown",
-            "extensions/mentions",
-            "extensions/nicknames",
-            "extensions/package-manager",
-            "extensions/pusher",
-            "extensions/statistics",
-            "extensions/sticky",
-            "extensions/subscriptions",
-            "extensions/suspend",
-            "extensions/tags"
-        ],
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        },
-        "phpstan": {
-            "includes": [
-                "extension.neon"
-            ]
-        }
-    }
-}

extensions/akismet/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3",
+        "flarum/core": "^1.2",
         "flarum/approval": "^1.2",
         "guzzlehttp/guzzle": "^7.4"
     },

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 m=t.n(n);const s=flarum.core.compat["forum/components/CommentPost"];var l=t.n(s);a().initializers.add("flarum-akismet",(function(){(0,o.extend)(m(),"destructiveControls",(function(t,e){if(t.has("approve")){var o=e.flags();if(o&&o.some((function(t){return"akismet"===(null==t?void 0:t.type())}))){var r=t.get("approve");r&&"object"==typeof r&&"children"in r&&(r.children=a().translator.trans("flarum-akismet.forum.post.not_spam_button"))}}})),(0,o.override)(l().prototype,"flagReason",(function(t,e){return"akismet"===e.type()?a().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):t(e)}))}))})(),module.exports=e})();
+(()=>{var t={n:e=>{var o=e&&e.__esModule?()=>e.default:()=>e;return t.d(o,{a:o}),o},d:(e,o)=>{for(var r in o)t.o(o,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:o[r]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};(()=>{"use strict";t.r(e);const o=flarum.core.compat["common/extend"],r=flarum.core.compat["forum/app"];var a=t.n(r);const n=flarum.core.compat["forum/utils/PostControls"];var m=t.n(n);const s=flarum.core.compat["forum/components/CommentPost"];var u=t.n(s);a().initializers.add("flarum-akismet",(function(){(0,o.extend)(m(),"destructiveControls",(function(t,e){if(t.has("approve")){var o=e.flags();o&&o.some((function(t){return"akismet"===t.type()}))&&(t.get("approve").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})();
 //# 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,GCLRF,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,MCJ3ER,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,M,+BCLvD,MAAM,EAA+BC,OAAOC,KAAKC,OAAO,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,4B,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,gC,aCSxDC,IAAAA,aAAAA,IAAqB,kBAAkB,YACrCC,EAAAA,EAAAA,QAAOC,IAAc,uBAAuB,SAAUC,EAAmCC,GACvF,GAAID,EAAME,IAAI,WAAY,CACxB,IAAMC,EAAQF,EAAKE,QAEnB,GAAIA,GAASA,EAAMC,MAAK,SAACC,GAAD,MAA2B,aAAb,MAAJA,OAAA,EAAAA,EAAMC,WAAuB,CAC7D,IAAMC,EAAcP,EAAMf,IAAI,WAC1BsB,GAAsC,iBAAhBA,GAA4B,aAAcA,IAClEA,EAAYC,SAAWX,IAAAA,WAAAA,MAAqB,oDAMpDY,EAAAA,EAAAA,UAASC,IAAAA,UAAuB,cAAc,SAAUC,EAAUN,GAChE,MAAoB,YAAhBA,EAAKC,OACAT,IAAAA,WAAAA,MAAqB,kDAGvBc,EAASN,U","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/webpack/runtime/make namespace object","webpack://@flarum/akismet/external root \"flarum.core.compat['common/extend']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/app']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/utils/PostControls']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/components/CommentPost']\"","webpack://@flarum/akismet/./src/forum/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['common/extend'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/app'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/utils/PostControls'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/components/CommentPost'];","import { extend, override } from 'flarum/common/extend';\nimport app from 'flarum/forum/app';\nimport type Post from 'flarum/common/models/Post';\nimport type ItemList from 'flarum/common/utils/ItemList';\n\nimport PostControls from 'flarum/forum/utils/PostControls';\nimport CommentPost from 'flarum/forum/components/CommentPost';\nimport type Mithril from 'mithril';\n\napp.initializers.add('flarum-akismet', () => {\n  extend(PostControls, 'destructiveControls', function (items: ItemList<Mithril.Children>, post: Post) {\n    if (items.has('approve')) {\n      const flags = post.flags();\n\n      if (flags && flags.some((flag) => flag?.type() === 'akismet')) {\n        const approveItem = items.get('approve');\n        if (approveItem && typeof approveItem === 'object' && 'children' in approveItem) {\n          approveItem.children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');\n        }\n      }\n    }\n  });\n\n  override(CommentPost.prototype, 'flagReason', function (original, flag) {\n    if (flag.type() === 'akismet') {\n      return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');\n    }\n\n    return original(flag);\n  });\n});\n"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","core","compat","app","extend","PostControls","items","post","has","flags","some","flag","type","approveItem","children","override","CommentPost","original"],"sourceRoot":""}
+{"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,GCLRF,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,MCJ3ER,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,M,+BCLvD,MAAM,EAA+BC,OAAOC,KAAKC,OAAO,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,4B,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,gC,aCQxDC,IAAAA,aAAAA,IAAqB,kBAAkB,YACrCC,EAAAA,EAAAA,QAAOC,IAAc,uBAAuB,SAAUC,EAAiBC,GACrE,GAAID,EAAME,IAAI,WAAY,CACxB,IAAMC,EAAQF,EAAKE,QAEfA,GAASA,EAAMC,MAAK,SAACC,GAAD,MAA0B,YAAhBA,EAAKC,YACrCN,EAAMf,IAAI,WAAWsB,SAAWV,IAAAA,WAAAA,MAAqB,mDAK3DW,EAAAA,EAAAA,UAASC,IAAAA,UAAuB,cAAc,SAAUC,EAAUL,GAChE,MAAoB,YAAhBA,EAAKC,OACAT,IAAAA,WAAAA,MAAqB,kDAGvBa,EAASL,U","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/webpack/runtime/make namespace object","webpack://@flarum/akismet/external root \"flarum.core.compat['common/extend']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/app']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/utils/PostControls']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/components/CommentPost']\"","webpack://@flarum/akismet/./src/forum/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['common/extend'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/app'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/utils/PostControls'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/components/CommentPost'];","import { extend, override } from 'flarum/common/extend';\nimport app from 'flarum/forum/app';\n\nimport PostControls from 'flarum/forum/utils/PostControls';\nimport CommentPost from 'flarum/forum/components/CommentPost';\nimport ItemList from 'flarum/common/utils/ItemList';\nimport Post from 'flarum/common/models/Post';\n\napp.initializers.add('flarum-akismet', () => {\n  extend(PostControls, 'destructiveControls', function (items: ItemList, post: Post) {\n    if (items.has('approve')) {\n      const flags = post.flags();\n\n      if (flags && flags.some((flag) => flag.type() === 'akismet')) {\n        items.get('approve').children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');\n      }\n    }\n  });\n\n  override(CommentPost.prototype, 'flagReason', function (original, flag) {\n    if (flag.type() === 'akismet') {\n      return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');\n    }\n\n    return original(flag);\n  });\n});\n"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","core","compat","app","extend","PostControls","items","post","has","flags","some","flag","type","children","override","CommentPost","original"],"sourceRoot":""}

extensions/approval/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3",
+        "flarum/core": "^1.2",
         "flarum/flags": "^1.2"
     },
     "autoload": {

extensions/approval/src/Listener/UnapproveNewContent.php

@@ -24,7 +24,7 @@ class UnapproveNewContent
         $post = $event->post;
 
         if (! $post->exists) {
-            $ability = $post->discussion->first_post_id === null ? 'startWithoutApproval' : 'replyWithoutApproval';
+            $ability = $post->discussion->post_number_index == 0 ? 'startWithoutApproval' : 'replyWithoutApproval';
 
             if ($event->actor->can($ability, $post->discussion)) {
                 if ($post->is_approved === null) {

extensions/bbcode/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "extra": {
         "branch-alias": {

extensions/embed/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "autoload": {
         "psr-4": {

extensions/emoji/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "extra": {
         "branch-alias": {

extensions/emoji/js/package.json

@@ -4,18 +4,18 @@
     "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "dependencies": {
-        "simple-emoji-map": "^0.5.1",
-        "twemoji": "^14.0.2"
+        "simple-emoji-map": "^0.4.1",
+        "twemoji": "^13.1.0"
     },
     "devDependencies": {
+        "prettier": "^2.5.1",
+        "flarum-webpack-config": "^2.0.0",
+        "webpack": "^5.65.0",
+        "webpack-cli": "^4.9.1",
         "@flarum/prettier-config": "^1.0.0",
         "flarum-tsconfig": "^1.0.2",
-        "flarum-webpack-config": "^2.0.0",
-        "prettier": "^2.5.1",
         "typescript": "^4.5.4",
-        "typescript-coverage-report": "^0.6.1",
-        "webpack": "^5.65.0",
-        "webpack-cli": "^4.9.1"
+        "typescript-coverage-report": "^0.6.1"
     },
     "scripts": {
         "dev": "webpack --mode development --watch",

extensions/flags/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "autoload": {
         "psr-4": {

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

@@ -1,5 +1,7 @@
-export default class FlagList {
+export default class FlagList extends Component<import("flarum/common/Component").ComponentAttrs, undefined> {
+    constructor();
     oninit(vnode: any): void;
     state: any;
     view(): JSX.Element;
 }
+import Component from "flarum/common/Component";

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

@@ -1,12 +1,15 @@
-export default class FlagPostModal {
+/// <reference types="flarum/@types/translator-icu-rich" />
+export default class FlagPostModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
+    constructor();
     oninit(vnode: any): void;
     success: boolean | undefined;
-    reason: any;
-    reasonDetail: any;
-    className(): string;
-    title(): any;
+    reason: Stream<string> | undefined;
+    reasonDetail: Stream<string> | undefined;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
     content(): JSX.Element;
-    flagReasons(): any;
+    flagReasons(): ItemList<any>;
     onsubmit(e: any): void;
-    loading: boolean | undefined;
 }
+import Modal from "flarum/common/components/Modal";
+import Stream from "flarum/common/utils/Stream";
+import ItemList from "flarum/common/utils/ItemList";

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

@@ -3,5 +3,5 @@ export default class FlagsDropdown {
     getMenu(): JSX.Element;
     goToRoute(): void;
     getUnreadCount(): any;
-    getNewCount(): any;
+    getNewCount(): unknown;
 }

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

@@ -1,9 +1,11 @@
 import Model from 'flarum/common/Model';
+import Post from 'flarum/common/models/Post';
+import User from 'flarum/common/models/User';
 export default class Flag extends Model {
-    type(): any;
-    reason(): any;
-    reasonDetail(): any;
-    createdAt(): any;
-    post(): any;
-    user(): any;
+    type(): string;
+    reason(): string | null;
+    reasonDetail(): string | null;
+    createdAt(): Date | null | undefined;
+    post(): false | Post;
+    user(): false | User | null;
 }

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})();
+module.exports=function(e){var t={};function r(n){if(t[n])return t[n].exports;var a=t[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,r),a.l=!0,a.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var a in e)r.d(n,a,function(t){return e[t]}.bind(null,a));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=24)}({24:function(e,t,r){"use strict";r.r(t);var n=r(5),a=r.n(n);a.a.initializers.add("flarum-flags",(function(){a.a.extensionData.for("flarum-flags").registerSetting({setting:"flarum-flags.guidelines_url",type:"text",label:a.a.translator.trans("flarum-flags.admin.settings.guidelines_url_label")},15).registerSetting({setting:"flarum-flags.can_flag_own",type:"boolean",label:a.a.translator.trans("flarum-flags.admin.settings.flag_own_posts_label")}).registerPermission({icon:"fas fa-flag",label:a.a.translator.trans("flarum-flags.admin.permissions.view_flags_label"),permission:"discussion.viewFlags"},"moderate",65).registerPermission({icon:"fas fa-flag",label:a.a.translator.trans("flarum-flags.admin.permissions.flag_posts_label"),permission:"discussion.flagPosts"},"reply",65)}))},5:function(e,t){e.exports=flarum.core.compat["admin/app"]}});
 //# sourceMappingURL=admin.js.map

extensions/lang-english/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "extra": {
         "branch-alias": {

extensions/likes/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "autoload": {
         "psr-4": {

extensions/lock/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "autoload": {
         "psr-4": {

extensions/markdown/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "extra": {
         "branch-alias": {

extensions/mentions/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "autoload": {
         "psr-4": {

extensions/mentions/js/src/forum/components/PostMentionedNotification.js

@@ -23,6 +23,6 @@ export default class PostMentionedNotification extends Notification {
   }
 
   excerpt() {
-    return truncate(this.attrs.notification.subject().contentPlain() || '', 200);
+    return truncate(this.attrs.notification.subject().contentPlain(), 200);
   }
 }

extensions/mentions/migrations/2022_05_20_000005_add_created_at_to_post_mentions_post_table.php

@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Schema\Builder;
-
-return [
-    'up' => function (Builder $schema) {
-        $schema->table('post_mentions_post', function (Blueprint $table) {
-            $table->timestamp('created_at')->nullable();
-        });
-
-        // do this manually because dbal doesn't recognize timestamp columns
-        $connection = $schema->getConnection();
-        $prefix = $connection->getTablePrefix();
-        $connection->statement("ALTER TABLE `${prefix}post_mentions_post` MODIFY created_at TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP");
-    },
-
-    'down' => function (Builder $schema) {
-        $schema->table('post_mentions_post', function (Blueprint $table) {
-            $table->dropColumn('created_at');
-        });
-    }
-];

extensions/mentions/migrations/2022_05_20_000006_add_created_at_to_post_mentions_user_table.php

@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Schema\Builder;
-
-return [
-    'up' => function (Builder $schema) {
-        $schema->table('post_mentions_user', function (Blueprint $table) {
-            $table->timestamp('created_at')->nullable();
-        });
-
-        // do this manually because dbal doesn't recognize timestamp columns
-        $connection = $schema->getConnection();
-        $prefix = $connection->getTablePrefix();
-        $connection->statement("ALTER TABLE `${prefix}post_mentions_user` MODIFY created_at TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP");
-    },
-
-    'down' => function (Builder $schema) {
-        $schema->table('post_mentions_user', function (Blueprint $table) {
-            $table->dropColumn('created_at');
-        });
-    }
-];

extensions/mentions/src/ConfigureMentions.php

@@ -125,13 +125,10 @@ class ConfigureMentions
     {
         $post = CommentPost::find($tag->getAttribute('id'));
 
-        if ($post) {
+        if ($post && $post->user) {
             $tag->setAttribute('discussionid', (int) $post->discussion_id);
             $tag->setAttribute('number', (int) $post->number);
-
-            if ($post->user) {
-                $tag->setAttribute('displayname', $post->user->display_name);
-            }
+            $tag->setAttribute('displayname', $post->user->display_name);
 
             return true;
         }

extensions/mentions/src/Formatter/FormatUserMentions.php

@@ -45,7 +45,7 @@ class FormatUserMentions
     public function __invoke(Renderer $renderer, $context, string $xml)
     {
         return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
-            $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
+            $user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
                 ? $context->mentionsUsers->find($attributes['id'])
                 : User::find($attributes['id']);
 

extensions/mentions/src/Formatter/UnparseUserMentions.php

@@ -51,7 +51,7 @@ class UnparseUserMentions
     protected function updateUserMentionTags($context, string $xml): string
     {
         return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
-            $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
+            $user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
                 ? $context->mentionsUsers->find($attributes['id'])
                 : User::find($attributes['id']);
 

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

@@ -14,7 +14,7 @@ use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Illuminate\Support\Arr;
 
-class ListPostsTest extends TestCase
+class ListTest extends TestCase
 {
     use RetrievesAuthorizedUsers;
 
@@ -85,26 +85,4 @@ class ListPostsTest extends TestCase
         $ids = Arr::pluck($data, 'id');
         $this->assertEqualsCanonicalizing(['4'], $ids, 'IDs do not match');
     }
-
-    /**
-     * @test
-     */
-    public function mentioned_filter_works_with_sort()
-    {
-        $response = $this->send(
-            $this->request('GET', '/api/posts')
-                ->withQueryParams([
-                    'filter' => ['mentioned' => 1],
-                    'sort' => '-createdAt'
-                ])
-        );
-
-        $data = json_decode($response->getBody()->getContents(), true)['data'];
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        // Order-independent comparison
-        $ids = Arr::pluck($data, 'id');
-        $this->assertEqualsCanonicalizing(['2', '3'], $ids, 'IDs do not match');
-    }
 }

extensions/nicknames/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "autoload": {
         "psr-4": {

extensions/nicknames/src/AddNicknameValidation.php

@@ -40,7 +40,7 @@ class AddNicknameValidation
             function ($attribute, $value, $fail) {
                 $regex = $this->settings->get('flarum-nicknames.regex');
                 if ($regex && ! preg_match_all("/$regex/", $value)) {
-                    $fail($this->translator->trans('flarum-nicknames.api.invalid_nickname_message'));
+                    $this->translator->trans('flarum-nicknames.api.invalid_nickname_message');
                 }
             },
             'min:'.$this->settings->get('flarum-nicknames.min'),

extensions/nicknames/tests/integration/api/RegisterTest.php

@@ -74,48 +74,4 @@ class RegisterTest extends TestCase
 
         $this->assertEquals(403, $response->getStatusCode());
     }
-
-    /**
-     * @test
-     */
-    public function cant_register_with_nickname_if_invalid_regex()
-    {
-        $this->setting('flarum-nicknames.set_on_registration', true);
-        $this->setting('flarum-nicknames.regex', '^[A-z]+$');
-
-        $response = $this->send(
-            $this->request('POST', '/register', [
-                'json' => [
-                    'nickname' => '007',
-                    'username' => 'test',
-                    'password' => 'too-obscure',
-                    'email' => 'test@machine.local',
-                ]
-            ])
-        );
-
-        $this->assertEquals(422, $response->getStatusCode());
-    }
-
-    /**
-     * @test
-     */
-    public function can_register_with_nickname_if_valid_regex()
-    {
-        $this->setting('flarum-nicknames.set_on_registration', true);
-        $this->setting('flarum-nicknames.regex', '^[A-z]+$');
-
-        $response = $this->send(
-            $this->request('POST', '/register', [
-                'json' => [
-                    'nickname' => 'Acme',
-                    'username' => 'test',
-                    'password' => 'too-obscure',
-                    'email' => 'test@machine.local',
-                ]
-            ])
-        );
-
-        $this->assertEquals(201, $response->getStatusCode());
-    }
 }

extensions/package-manager/composer.json

@@ -23,7 +23,7 @@
     },
     "require": {
         "flarum/core": "^1.0.0",
-        "composer/composer": "^2.3"
+        "composer/composer": "^2.0"
     },
     "require-dev": {
         "flarum/testing": "^1.0.0",
@@ -86,7 +86,7 @@
         "test:integration": "phpunit -c tests/phpunit.integration.xml",
         "test:setup": [
             "@php tests/integration/setup.php",
-            "cd ${FLARUM_TEST_TMP_DIR_LOCAL:-${FLARUM_TEST_TMP_DIR:-./tests/integration/tmp}} && composer install"
+            "cd $FLARUM_TEST_TMP_DIR_LOCAL && composer install"
         ]
     },
     "scripts-descriptions": {

extensions/package-manager/js/dist-typings/components/WhyNotModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference path="../../../vendor/flarum/core/js/src/common/translator-icu-rich.d.ts" />
 import Mithril from 'mithril';
 import Modal, { IInternalModalAttrs } from 'flarum/common/components/Modal';
 export interface WhyNotModalAttrs extends IInternalModalAttrs {
@@ -7,7 +8,7 @@ export default class WhyNotModal<Attrs extends WhyNotModalAttrs = WhyNotModalAtt
     loading: boolean;
     whyNot: string | null;
     className(): string;
-    title(): any;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
     oncreate(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     content(): JSX.Element;
     requestWhyNot(): void;