Merge branch '2.x' into fork/blt950/patch-2

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -40,7 +40,7 @@ body:
     validations:
       required: false
   - type: textarea
-    id: enironment
+    id: environment
     attributes:
       label: Environment
       value: |

.github/workflows/REUSABLE_backend.yml

@@ -32,7 +32,7 @@ on:
         type: string
         required: false
         # Keep PHP versions synced with build-install-packages.yml
-        default: '["8.1", "8.2", "8.3"]'
+        default: '["8.2", "8.3"]'
 
       php_extensions:
         description: PHP extensions to install.

.github/workflows/REUSABLE_frontend.yml

@@ -74,7 +74,7 @@ on:
         description: The node version to use for the workflow.
         type: number
         required: false
-        default: 16
+        default: 20
 
       js_package_manager:
         description: "Enable TypeScript?"
@@ -105,6 +105,7 @@ env:
   ci_script: ${{ inputs.js_package_manager == 'yarn' && 'yarn install --immutable' || 'npm ci' }}
   cache_dependency_path: ${{ inputs.cache_dependency_path || format(inputs.js_package_manager == 'yarn' && '{0}/yarn.lock' || '{0}/package-lock.json', inputs.frontend_directory) }}
   COMPOSER_AUTH: ${{ secrets.composer_auth }}
+  DISABLE_V8_COMPILE_CACHE: 1
 
 jobs:
   build:
@@ -116,10 +117,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ inputs.node_version }}
           cache: ${{ inputs.js_package_manager }}
@@ -142,7 +143,7 @@ jobs:
         working-directory: ${{ inputs.frontend_directory }}
 
       - name: JS Checks & Production Build
-        uses: flarum/action-build@v3
+        uses: flarum/action-build@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           build_script: ${{ inputs.build_script }}

.github/workflows/backend.yml

@@ -8,4 +8,4 @@ jobs:
     with:
       enable_backend_testing: true
       backend_directory: .
-      monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags"
+      monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages"

.github/workflows/build-install-packages.yml

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

CHANGELOG.md

@@ -470,7 +470,7 @@ looks rather complex and messy compared to the full list of changes made for thi
 - Pass filter params to getApiDocument (https://github.com/flarum/framework/pull/3037)
 - Use author filter instead of gambit to get a user's discussions (https://github.com/flarum/framework/pull/3068)
 - [A11Y] Accessibility improvements for the Search component (https://github.com/flarum/framework/pull/3017)
-- Add determinsm to extension order resolution (https://github.com/flarum/framework/pull/3076)
+- Add determinism to extension order resolution (https://github.com/flarum/framework/pull/3076)
 - Add cache control headers to the admin area (https://github.com/flarum/framework/pull/3097)
 
 ### Fixed

composer.json

@@ -53,6 +53,7 @@
             "Flarum\\Subscriptions\\": "extensions/subscriptions/src",
             "Flarum\\Suspend\\": "extensions/suspend/src",
             "Flarum\\Tags\\": "extensions/tags/src",
+            "Flarum\\Messages\\": "extensions/messages/src",
             "Flarum\\PHPStan\\": "php-packages/phpstan/src",
             "Flarum\\Testing\\": "php-packages/testing/src"
         },
@@ -77,6 +78,7 @@
             "Flarum\\Subscriptions\\Tests\\": "extensions/subscriptions/tests",
             "Flarum\\Suspend\\Tests\\": "extensions/suspend/tests",
             "Flarum\\Tags\\Tests\\": "extensions/tags/tests",
+            "Flarum\\Messages\\Tests\\": "extensions/messages/tests",
             "Flarum\\Testing\\Tests\\": "php-packages/testing/tests"
         }
     },
@@ -101,36 +103,38 @@
         "flarum/subscriptions": "self.version",
         "flarum/suspend": "self.version",
         "flarum/tags": "self.version",
+        "flarum/messages": "self.version",
         "flarum/phpstan": "self.version",
         "flarum/testing": "self.version"
     },
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-json": "*",
-        "components/font-awesome": "^5.15.0",
+        "components/font-awesome": "^6.5.2",
         "composer/composer": "^2.7",
         "dflydev/fig-cookies": "^3.0",
         "doctrine/dbal": "^3.6.2",
         "dragonmantank/cron-expression": "^3.3",
         "fakerphp/faker": "^1.9.1",
+        "flarum/json-api-server": "^0.1.0",
         "franzl/whoops-middleware": "2.0",
         "guzzlehttp/guzzle": "*",
-        "illuminate/bus": "^10.0",
-        "illuminate/cache": "^10.0",
-        "illuminate/config": "^10.0",
-        "illuminate/console": "^10.0",
-        "illuminate/container": "^10.0",
-        "illuminate/contracts": "^10.0",
-        "illuminate/database": "^10.0",
-        "illuminate/events": "^10.0",
-        "illuminate/filesystem": "^10.0",
-        "illuminate/hashing": "^10.0",
-        "illuminate/mail": "^10.0",
-        "illuminate/queue": "^10.0",
-        "illuminate/session": "^10.0",
-        "illuminate/support": "^10.0",
-        "illuminate/validation": "^10.0",
-        "illuminate/view": "^10.0",
+        "illuminate/bus": "^11.0",
+        "illuminate/cache": "^11.0",
+        "illuminate/config": "^11.0",
+        "illuminate/console": "^11.0",
+        "illuminate/container": "^11.0",
+        "illuminate/contracts": "^11.0",
+        "illuminate/database": "^11.0",
+        "illuminate/events": "^11.0",
+        "illuminate/filesystem": "^11.0",
+        "illuminate/hashing": "^11.0",
+        "illuminate/mail": "^11.0",
+        "illuminate/queue": "^11.0",
+        "illuminate/session": "^11.0",
+        "illuminate/support": "^11.0",
+        "illuminate/validation": "^11.0",
+        "illuminate/view": "^11.0",
         "intervention/image": "^3.2",
         "jenssegers/agent": "^2.6",
         "laminas/laminas-diactoros": "^3.0",
@@ -143,34 +147,32 @@
         "middlewares/base-path-router": "^2.0.1",
         "middlewares/request-handler": "^2.0.2",
         "monolog/monolog": "^3.3",
-        "nesbot/carbon": "^2.66",
+        "nesbot/carbon": "^3.0",
         "nikic/fast-route": "^1.3",
         "psr/http-message": "^1.1",
         "psr/http-server-handler": "^1.0.2",
         "psr/http-server-middleware": "^1.0.2",
         "pusher/pusher-php-server": "^7.2",
         "s9e/text-formatter": "^2.13",
-        "staudenmeir/eloquent-eager-limit": "^1.8.2",
         "sycho/sourcemap": "^2.0.0",
-        "symfony/config": "^6.3",
-        "symfony/console": "^6.3",
-        "symfony/event-dispatcher": "^6.3",
-        "symfony/http-client": "^6.3",
-        "symfony/mailgun-mailer": "^6.3",
-        "symfony/mime": "^6.3",
+        "symfony/config": "^7.0",
+        "symfony/console": "^7.0",
+        "symfony/event-dispatcher": "^7.0",
+        "symfony/http-client": "^7.0",
+        "symfony/mailgun-mailer": "^7.0",
+        "symfony/mime": "^7.0",
         "symfony/polyfill-intl-messageformatter": "^1.27",
-        "symfony/postmark-mailer": "^6.3",
-        "symfony/translation": "^6.3",
-        "symfony/yaml": "^6.3",
-        "flarum/json-api-server": "^0.1.0",
+        "symfony/postmark-mailer": "^7.0",
+        "symfony/translation": "^7.0",
+        "symfony/yaml": "^7.0",
         "wikimedia/less.php": "^4.1"
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^11.0",
         "phpstan/phpstan": "^1.10.0",
         "larastan/larastan": "^2.7",
-        "symfony/var-dumper": "^6.3"
+        "symfony/var-dumper": "^7.0"
     },
     "config": {
         "sort-packages": true
@@ -197,7 +199,8 @@
             "extensions/sticky",
             "extensions/subscriptions",
             "extensions/suspend",
-            "extensions/tags"
+            "extensions/tags",
+            "extensions/messages"
         ],
         "branch-alias": {
             "dev-main": "2.x-dev"

extensions/akismet/.gitignore

@@ -4,6 +4,7 @@ composer.phar
 
 .DS_Store
 Thumbs.db
+tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant

extensions/akismet/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner ([email protected])
 
 Permission is hereby granted, free of charge, to any person obtaining a copy