v1.3.1 release changelog

* chore: subscriptions backend test infrastructure

* test: reply notification

* fix: fix reply notifications not working

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,26 +1,7 @@
 ---
 name: "🚀 Feature Request"
-about: "I have a suggestion (and may want to implement it!)"
+about: "If you have a suggestion please head over to our forum!"
 
 ---
 
-<!--
+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 an issue tracker; for usage and support questions, please check out these resources below. Thanks!
+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!
 
 * Flarum Community: https://discuss.flarum.org/
 * Discord Chat: https://flarum.org/discord/

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

@@ -0,0 +1,15 @@
+name: Package Manager 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: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/package-manager

.gitignore

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

composer.json

@@ -0,0 +1,182 @@
+{
+    "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",
+        "axy/sourcemap": "^0.1.4",
+        "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",
+        "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",
+        "tobscure/json-api": "^0.3.0",
+        "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.2",
+        "flarum/core": "^1.3",
         "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 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})();
+(()=>{var t={n:e=>{var o=e&&e.__esModule?()=>e.default:()=>e;return t.d(o,{a:o}),o},d:(e,o)=>{for(var r in o)t.o(o,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:o[r]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};(()=>{"use strict";t.r(e);const o=flarum.core.compat["common/extend"],r=flarum.core.compat["forum/app"];var a=t.n(r);const n=flarum.core.compat["forum/utils/PostControls"];var m=t.n(n);const s=flarum.core.compat["forum/components/CommentPost"];var l=t.n(s);a().initializers.add("flarum-akismet",(function(){(0,o.extend)(m(),"destructiveControls",(function(t,e){if(t.has("approve")){var o=e.flags();if(o&&o.some((function(t){return"akismet"===(null==t?void 0:t.type())}))){var r=t.get("approve");r&&"object"==typeof r&&"children"in r&&(r.children=a().translator.trans("flarum-akismet.forum.post.not_spam_button"))}}})),(0,o.override)(l().prototype,"flagReason",(function(t,e){return"akismet"===e.type()?a().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):t(e)}))}))})(),module.exports=e})();
 //# sourceMappingURL=forum.js.map

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

extensions/approval/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.2",
+        "flarum/core": "^1.3",
         "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->post_number_index == 0 ? 'startWithoutApproval' : 'replyWithoutApproval';
+            $ability = $post->discussion->first_post_id === null ? '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.2"
+        "flarum/core": "^1.3"
     },
     "extra": {
         "branch-alias": {

extensions/embed/composer.json

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

extensions/emoji/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.2"
+        "flarum/core": "^1.3"
     },
     "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.4.1",
+        "simple-emoji-map": "^0.5.1",
-        "twemoji": "^13.1.0"
+        "twemoji": "^14.0.2"
     },
     "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"
+        "typescript-coverage-report": "^0.6.1",
+        "webpack": "^5.65.0",
+        "webpack-cli": "^4.9.1"
     },
     "scripts": {
         "dev": "webpack --mode development --watch",

extensions/flags/composer.json

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

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

@@ -1,7 +1,5 @@
-export default class FlagList extends Component<import("flarum/common/Component").ComponentAttrs, undefined> {
+export default class FlagList {
-    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,15 +1,12 @@
-/// <reference types="flarum/@types/translator-icu-rich" />
+export default class FlagPostModal {
-export default class FlagPostModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
-    constructor();
     oninit(vnode: any): void;
     success: boolean | undefined;
-    reason: Stream<string> | undefined;
+    reason: any;
-    reasonDetail: Stream<string> | undefined;
+    reasonDetail: any;
-    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    className(): string;
+    title(): any;
     content(): JSX.Element;
-    flagReasons(): ItemList<any>;
+    flagReasons(): 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(): unknown;
+    getNewCount(): any;
 }

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

@@ -1,11 +1,9 @@
 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(): string;
+    type(): any;
-    reason(): string | null;
+    reason(): any;
-    reasonDetail(): string | null;
+    reasonDetail(): any;
-    createdAt(): Date | null | undefined;
+    createdAt(): any;
-    post(): false | Post;
+    post(): any;
-    user(): false | User | null;
+    user(): any;
 }

extensions/flags/js/dist/admin.js

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

extensions/lang-english/composer.json

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

extensions/likes/composer.json

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

extensions/lock/composer.json

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

extensions/markdown/composer.json

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

extensions/mentions/composer.json

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

extensions/mentions/src/ConfigureMentions.php

@@ -125,10 +125,13 @@ class ConfigureMentions
     {
         $post = CommentPost::find($tag->getAttribute('id'));
 
-        if ($post && $post->user) {
+        if ($post) {
             $tag->setAttribute('discussionid', (int) $post->discussion_id);
             $tag->setAttribute('number', (int) $post->number);
-            $tag->setAttribute('displayname', $post->user->display_name);
+
+            if ($post->user) {
+                $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 = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
+            $user = (($context && 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 = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
+            $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
                 ? $context->mentionsUsers->find($attributes['id'])
                 : User::find($attributes['id']);
 

extensions/nicknames/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.2"
+        "flarum/core": "^1.3"
     },
     "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)) {
-                    $this->translator->trans('flarum-nicknames.api.invalid_nickname_message');
+                    $fail($this->translator->trans('flarum-nicknames.api.invalid_nickname_message'));
                 }
             },
             'min:'.$this->settings->get('flarum-nicknames.min'),

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

@@ -74,4 +74,48 @@ 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.0"
+        "composer/composer": "^2.3"
     },
     "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 && composer install"
+            "cd ${FLARUM_TEST_TMP_DIR_LOCAL:-${FLARUM_TEST_TMP_DIR:-./tests/integration/tmp}} && composer install"
         ]
     },
     "scripts-descriptions": {

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

@@ -1,4 +1,3 @@
-/// <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 {
@@ -8,7 +7,7 @@ export default class WhyNotModal<Attrs extends WhyNotModalAttrs = WhyNotModalAtt
     loading: boolean;
     whyNot: string | null;
     className(): string;
-    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    title(): any;
     oncreate(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     content(): JSX.Element;
     requestWhyNot(): void;

extensions/package-manager/src/Command/CheckForUpdatesHandler.php

@@ -58,7 +58,7 @@ class CheckForUpdatesHandler
         $actor->assertAdmin();
 
         $firstOutput = $this->runComposerCommand(false);
-        $firstOutput = json_decode($firstOutput, true);
+        $firstOutput = json_decode($this->cleanJson($firstOutput), true);
 
         $majorUpdates = false;
 
@@ -71,7 +71,7 @@ class CheckForUpdatesHandler
 
         if ($majorUpdates) {
             $secondOutput = $this->runComposerCommand(true);
-            $secondOutput = json_decode($secondOutput, true);
+            $secondOutput = json_decode($this->cleanJson($secondOutput), true);
         }
 
         if (! isset($secondOutput)) {
@@ -101,6 +101,15 @@ class CheckForUpdatesHandler
             ->save();
     }
 
+    /**
+     * Composer can sometimes return text above the JSON.
+     * This method tries to remove such occurences.
+     */
+    protected function cleanJson(string $composerOutput): string
+    {
+        return preg_replace('/^[^{]+\n({.*)/ms', '$1', $composerOutput);
+    }
+
     /**
      * @throws ComposerCommandFailedException
      */

extensions/package-manager/tests/integration/SetupComposer.php

@@ -15,27 +15,11 @@ class SetupComposer
 {
     use UsesTmpDir;
 
-    private $config = [
+    private $config;
-        'require' => [
-            'flarum/core' => '1.0.0',
-            'flarum/tags' => '1.0.3',
-            'flarum/lang-english' => '*',
-        ],
-        'config' => [
-            'preferred-install' => 'dist',
-            'sort-packages' => true,
-        ],
-        'repositories' => [
-            [
-                'type' => 'path',
-                'url' => __DIR__.'/tmp/packages/*',
-            ]
-        ]
-    ];
 
     public function __construct(array $config = null)
     {
-        $this->config = array_merge($this->config, $config ?? []);
+        $this->config = $config;
     }
 
     public function run()
@@ -44,7 +28,7 @@ class SetupComposer
         $composerLock = $this->tmpDir().'/composer.lock';
         $packages = $this->tmpDir().'/packages';
 
-        file_put_contents($composerJson, json_encode($this->config, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+        file_put_contents($composerJson, json_encode($this->getConfig(), JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 
         if (! file_exists($packages)) {
             mkdir($packages);
@@ -53,5 +37,28 @@ class SetupComposer
         if (file_exists($composerLock)) {
             unlink($composerLock);
         }
+
+        echo 'composer.json created with testing packages directory.';
+    }
+
+    private function getConfig(): array
+    {
+        return array_merge([
+            'require' => [
+                'flarum/core' => '1.0.0',
+                'flarum/tags' => '1.0.3',
+                'flarum/lang-english' => '*',
+            ],
+            'config' => [
+                'preferred-install' => 'dist',
+                'sort-packages' => true,
+            ],
+            'repositories' => [
+                [
+                    'type' => 'path',
+                    'url' => realpath($this->tmpDir()).'/packages/*',
+                ]
+            ]
+        ], $this->config ?? []);
     }
 }

extensions/package-manager/tests/phpunit.integration.xml

@@ -19,10 +19,7 @@
     <testsuites>
         <testsuite name="Flarum Integration Tests">
             <directory suffix="Test.php">./integration</directory>
-             <exclude>./integration/tmp</exclude>
+            <exclude>./integration/tmp</exclude>
         </testsuite>
     </testsuites>
-    <php>
-        <env name="FLARUM_TEST_TMP_DIR_LOCAL" value="tests/integration/tmp" force="true" />
-    </php>
 </phpunit>

extensions/pusher/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.2",
+        "flarum/core": "^1.3",
         "pusher/pusher-php-server": "^2.2"
     },
     "require-dev": {

extensions/statistics/composer.json

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

extensions/sticky/composer.json

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

extensions/subscriptions/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.2"
+        "flarum/core": "^1.3"
     },
     "autoload": {
         "psr-4": {
@@ -51,7 +51,7 @@
                 "prettier": true,
                 "typescript": false,
                 "bundlewatch": false,
-                "backendTesting": false,
+                "backendTesting": true,
                 "editorConfig": true,
                 "styleci": true
             }
@@ -64,5 +64,28 @@
         }
     ],
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "autoload-dev": {
+        "psr-4": {
+            "Flarum\\Subscriptions\\Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": [
+            "@test:unit",
+            "@test:integration"
+        ],
+        "test:unit": "phpunit -c tests/phpunit.unit.xml",
+        "test:integration": "phpunit -c tests/phpunit.integration.xml",
+        "test:setup": "@php tests/integration/setup.php"
+    },
+    "scripts-descriptions": {
+        "test": "Runs all tests.",
+        "test:unit": "Runs all unit tests.",
+        "test:integration": "Runs all integration tests.",
+        "test:setup": "Sets up a database for use with integration tests. Execute this only once."
+    },
+    "require-dev": {
+        "flarum/testing": "^1.0.0"
+    }
 }

extensions/subscriptions/js/src/forum/addSubscriptionFilter.js

@@ -38,7 +38,13 @@ export default function addSubscriptionFilter() {
 
   extend(DiscussionListState.prototype, 'requestParams', function (params) {
     if (this.params.onFollowing) {
-      params.filter.subscription = 'following';
+      params.filter ||= {};
+
+      if (params.filter.q) {
+        params.filter.q += ' is:following';
+      } else {
+        params.filter.subscription = 'following';
+      }
     }
   });
 }

extensions/subscriptions/src/Job/SendReplyNotification.php

@@ -49,7 +49,7 @@ class SendReplyNotification implements ShouldQueue
         $notify = $discussion->readers()
             ->where('users.id', '!=', $post->user_id)
             ->where('discussion_user.subscription', 'follow')
-            ->where('discussion_user.last_read_post_number', $this->lastPostNumber)
+            ->where('discussion_user.last_read_post_number', $this->lastPostNumber - 1)
             ->get();
 
         $notifications->sync(

extensions/subscriptions/tests/integration/api/discussions/ReplyNotificationTest.php

@@ -0,0 +1,142 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Subscriptions\tests\integration\api\discussions;
+
+use Carbon\Carbon;
+use Flarum\Testing\integration\RetrievesAuthorizedUsers;
+use Flarum\Testing\integration\TestCase;
+use Flarum\User\User;
+
+class ReplyNotificationTest extends TestCase
+{
+    use RetrievesAuthorizedUsers;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->extension('flarum-subscriptions');
+
+        $this->prepareDatabase([
+            'users' => [
+                $this->normalUser(),
+            ],
+            'discussions' => [
+                ['id' => 1, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 1, 'first_post_id' => 1, 'comment_count' => 1, 'last_post_number' => 1, 'last_post_id' => 1],
+                ['id' => 2, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 1, 'first_post_id' => 2, 'comment_count' => 1, 'last_post_number' => 1, 'last_post_id' => 2],
+            ],
+            'posts' => [
+                ['id' => 1, 'discussion_id' => 1, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 1],
+                ['id' => 2, 'discussion_id' => 2, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 1],
+            ],
+            'discussion_user' => [
+                ['discussion_id' => 1, 'user_id' => 1, 'last_read_post_number' => 1, 'subscription' => 'follow'],
+                ['discussion_id' => 2, 'user_id' => 1, 'last_read_post_number' => 1, 'subscription' => 'follow'],
+            ]
+        ]);
+    }
+
+    /** @test */
+    public function replying_to_a_discussion_with_comment_post_as_last_post_sends_reply_notification()
+    {
+        $this->app();
+
+        /** @var User $mainUser */
+        $mainUser = User::query()->find(1);
+
+        $this->assertEquals(0, $this->getUnreadNotificationCount($mainUser));
+
+        $this->send(
+            $this->request('POST', '/api/posts', [
+                'authenticatedAs' => 2,
+                'json' => [
+                    'data' => [
+                        'attributes' => [
+                            'content' => 'reply with predetermined content for automated testing - too-obscure',
+                        ],
+                        'relationships' => [
+                            'discussion' => ['data' => ['id' => 1]],
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        $this->assertEquals(1, $this->getUnreadNotificationCount($mainUser));
+    }
+
+    /** @test */
+    public function replying_to_a_discussion_with_event_post_as_last_post_sends_reply_notification()
+    {
+        $this->app();
+
+        /** @var User $mainUser */
+        $mainUser = User::query()->find(1);
+
+        // Rename the discussion to trigger an event post.
+        $this->send(
+            $this->request('POST', '/api/discussions/2', [
+                'authenticatedAs' => 1,
+                'json' => [
+                    'data' => [
+                        'attributes' => [
+                            'title' => 'ACME',
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        // Mark as read
+        $this->send(
+            $this->request('POST', '/api/discussions/2', [
+                'authenticatedAs' => 1,
+                'json' => [
+                    'data' => [
+                        'attributes' => [
+                            'lastReadPostNumber' => 2,
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        $this->assertEquals(0, $this->getUnreadNotificationCount($mainUser));
+
+        $this->send(
+            $this->request('POST', '/api/posts', [
+                'authenticatedAs' => 2,
+                'json' => [
+                    'data' => [
+                        'attributes' => [
+                            'content' => 'reply with predetermined content for automated testing - too-obscure',
+                        ],
+                        'relationships' => [
+                            'discussion' => ['data' => ['id' => 2]],
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        $this->assertEquals(1, $this->getUnreadNotificationCount($mainUser));
+    }
+
+    /** @todo change after core no longer statically caches unread notification in the User class */
+    protected function getUnreadNotificationCount(User $user)
+    {
+        return $user->notifications()
+            ->where('type', 'newPost')
+            ->whereNull('read_at')
+            ->where('is_deleted', false)
+            ->whereSubjectVisibleTo($user)
+            ->count();
+    }
+}

extensions/subscriptions/tests/integration/setup.php

@@ -0,0 +1,16 @@
+<?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 Flarum\Testing\integration\Setup\SetupScript;
+
+require __DIR__.'/../../vendor/autoload.php';
+
+$setup = new SetupScript();
+
+$setup->run();

extensions/subscriptions/tests/phpunit.integration.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="true"
+    stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">../src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Flarum Integration Tests">
+            <directory suffix="Test.php">./integration</directory>
+             <exclude>./integration/tmp</exclude>
+        </testsuite>
+    </testsuites>
+</phpunit>

extensions/subscriptions/tests/phpunit.unit.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">../src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Flarum Unit Tests">
+            <directory suffix="Test.php">./unit</directory>
+        </testsuite>
+    </testsuites>
+    <listeners>
+        <listener class="\Mockery\Adapter\Phpunit\TestListener" />
+    </listeners>
+</phpunit>

extensions/suspend/composer.json

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

extensions/suspend/locale/en.yml

@@ -49,6 +49,7 @@ flarum-suspend:
 
   # Translations in this namespace are used by suspension email notifications
   email:
+    no_reason_given: No reason was given for this suspension.
     suspended:
       subject: Your account has been suspended
       body: |

extensions/suspend/views/emails/suspended.blade.php

@@ -1,4 +1,4 @@
 {!! $translator->trans('flarum-suspend.email.suspended.body', [
 '{recipient_display_name}' => $user->display_name,
-'{suspension_message}' => $blueprint->user->suspend_message,
+'{suspension_message}' => $blueprint->user->suspend_message ?? $translator->trans('flarum-suspend.email.no_reason_given'),
 ]) !!}

extensions/tags/composer.json

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

extensions/tags/js/dist-typings/@types/shims.d.ts

@@ -19,3 +19,20 @@ declare module 'flarum/common/models/Discussion' {
     canTag: () => boolean | undefined;
   }
 }
+
+declare module 'flarum/forum/components/IndexPage' {
+  export default interface IndexPage {
+    currentActiveTag?: Tag;
+    currentTagLoading?: boolean;
+    currentTag: () => Tag | undefined;
+  }
+}
+
+declare module 'flarum/admin/components/PermissionGrid' {
+  export interface PermissionConfig {
+    tagScoped?: boolean;
+  }
+  export default interface PermissionGrid {
+    loading?: boolean;
+  }
+}

extensions/tags/js/dist-typings/admin/addTagsPermissionScope.d.ts

@@ -1 +1 @@
-export default function _default(): void;
+export default function (): void;

extensions/tags/js/dist-typings/admin/components/EditTagModal.d.ts

@@ -1,22 +1,29 @@
-/// <reference types="flarum/@types/translator-icu-rich" />
+import Modal, { IInternalModalAttrs } from 'flarum/common/components/Modal';
+import Stream from 'flarum/common/utils/Stream';
+import type Mithril from 'mithril';
+import type Tag from '../../common/models/Tag';
+export interface EditTagModalAttrs extends IInternalModalAttrs {
+    primary?: boolean;
+    model?: Tag;
+}
 /**
  * The `EditTagModal` component shows a modal dialog which allows the user
  * to create or edit a tag.
  */
-export default class EditTagModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
+export default class EditTagModal extends Modal<EditTagModalAttrs> {
-    constructor();
+    tag: Tag;
-    oninit(vnode: any): void;
+    name: Stream<string>;
-    tag: any;
+    slug: Stream<string>;
-    name: Stream<any> | undefined;
+    description: Stream<string>;
-    slug: Stream<any> | undefined;
+    color: Stream<string>;
-    description: Stream<any> | undefined;
+    icon: Stream<string>;
-    color: Stream<any> | undefined;
+    isHidden: Stream<boolean>;
-    icon: Stream<any> | undefined;
+    primary: Stream<boolean>;
-    isHidden: Stream<any> | undefined;
+    oninit(vnode: Mithril.Vnode<EditTagModalAttrs, this>): void;
-    primary: Stream<any> | undefined;
+    className(): string;
-    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray | import("mithril").Vnode<any, any>;
+    title(): any;
     content(): JSX.Element;
-    fields(): ItemList<any>;
+    fields(): any;
     submitData(): {
         name: any;
         slug: any;
@@ -26,9 +33,6 @@ export default class EditTagModal extends Modal<import("flarum/common/components
         isHidden: any;
         primary: any;
     };
-    onsubmit(e: any): void;
+    onsubmit(e: SubmitEvent): void;
     delete(): void;
 }
-import Modal from "flarum/common/components/Modal";
-import Stream from "flarum/common/utils/Stream";
-import ItemList from "flarum/common/utils/ItemList";

extensions/tags/js/dist-typings/admin/components/TagsPage.d.ts

@@ -1,10 +1,9 @@
-export default class TagsPage extends ExtensionPage<import("flarum/admin/components/ExtensionPage").ExtensionPageAttrs> {
+export default class TagsPage {
-    constructor();
     oninit(vnode: any): void;
     forcedRefreshKey: number | undefined;
+    loading: boolean | undefined;
     content(): JSX.Element;
     onListOnCreate(vnode: any): void;
     setMinTags(minTags: any, maxTags: any, value: any): void;
     onSortUpdate(e: any): void;
 }
-import ExtensionPage from "flarum/admin/components/ExtensionPage";

extensions/tags/js/dist-typings/common/helpers/tagLabel.d.ts

@@ -1 +1 @@
-export default function tagLabel(tag: any, attrs?: {}): import("mithril").Vnode<any, any>;
+export default function tagLabel(tag: any, attrs?: {}): any;

extensions/tags/js/dist-typings/common/models/Tag.d.ts

@@ -1,24 +1,23 @@
 import Model from 'flarum/common/Model';
-import Discussion from 'flarum/common/models/Discussion';
 export default class Tag extends Model {
-    name(): string;
+    name(): any;
-    slug(): string;
+    slug(): any;
-    description(): string | null;
+    description(): any;
-    color(): string | null;
+    color(): any;
-    backgroundUrl(): string | null;
+    backgroundUrl(): any;
-    backgroundMode(): string | null;
+    backgroundMode(): any;
-    icon(): string | null;
+    icon(): any;
-    position(): number | null;
+    position(): any;
-    parent(): false | Tag | null;
+    parent(): any;
-    children(): false | (Tag | undefined)[];
+    children(): any;
-    defaultSort(): string | null;
+    defaultSort(): any;
-    isChild(): boolean;
+    isChild(): any;
-    isHidden(): boolean;
+    isHidden(): any;
-    discussionCount(): number;
+    discussionCount(): any;
-    lastPostedAt(): Date | null | undefined;
+    lastPostedAt(): any;
-    lastPostedDiscussion(): false | Discussion | null;
+    lastPostedDiscussion(): any;
-    isRestricted(): boolean;
+    isRestricted(): any;
-    canStartDiscussion(): boolean;
+    canStartDiscussion(): any;
-    canAddToDiscussion(): boolean;
+    canAddToDiscussion(): any;
-    isPrimary(): boolean;
+    isPrimary(): any;
 }

extensions/tags/js/dist-typings/common/utils/sortTags.d.ts

@@ -1 +1,2 @@
-export default function sortTags(tags: any): any;
+import Tag from "../models/Tag";
+export default function sortTags(tags: Tag[]): Tag[];

extensions/tags/js/dist-typings/forum/addTagFilter.d.ts

@@ -1 +1 @@
-export default function _default(): void;
+export default function (): void;

extensions/tags/js/dist-typings/forum/components/DiscussionTaggedPost.d.ts

@@ -1,9 +1,9 @@
-export default class DiscussionTaggedPost extends EventPost {
+export default class DiscussionTaggedPost {
     static initAttrs(attrs: any): void;
+    icon(): string;
     descriptionKey(): "flarum-tags.forum.post_stream.added_and_removed_tags_text" | "flarum-tags.forum.post_stream.added_tags_text" | "flarum-tags.forum.post_stream.removed_tags_text";
     descriptionData(): {
         tagsAdded: any;
         tagsRemoved: any;
     };
 }
-import EventPost from "flarum/forum/components/EventPost";

extensions/tags/js/dist-typings/forum/components/TagDiscussionModal.d.ts

@@ -1,44 +1,46 @@
-export default class TagDiscussionModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
+import type Mithril from 'mithril';
-    constructor();
+import Modal, { IInternalModalAttrs } from 'flarum/common/components/Modal';
-    oninit(vnode: any): void;
+import Discussion from 'flarum/common/models/Discussion';
-    tagsLoading: boolean | undefined;
+import Tag from '../../common/models/Tag';
-    selected: any[] | undefined;
+export interface TagDiscussionModalAttrs extends IInternalModalAttrs {
-    filter: Stream<string> | undefined;
+    discussion?: Discussion;
-    focused: boolean | undefined;
+    selectedTags?: Tag[];
+    onsubmit?: (tags: Tag[]) => {};
+}
+export default class TagDiscussionModal extends Modal<TagDiscussionModalAttrs> {
+    tagsLoading: boolean;
+    selected: Tag[];
+    filter: any;
+    focused: boolean;
     minPrimary: any;
     maxPrimary: any;
     minSecondary: any;
     maxSecondary: any;
-    bypassReqs: any;
+    bypassReqs: boolean;
-    navigator: KeyboardNavigatable | undefined;
+    navigator: any;
-    tags: any;
+    tags?: Tag[];
-    index: any;
+    selectedTag?: Tag;
+    oninit(vnode: Mithril.Vnode<TagDiscussionModalAttrs, this>): void;
     primaryCount(): number;
     secondaryCount(): number;
     /**
      * Add the given tag to the list of selected tags.
-     *
-     * @param {Tag} tag
      */
     addTag(tag: Tag): void;
     /**
      * Remove the given tag from the list of selected tags.
-     *
-     * @param {Tag} tag
      */
     removeTag(tag: Tag): void;
+    className(): string;
     title(): any;
-    getInstruction(primaryCount: any, secondaryCount: any): any;
+    getInstruction(primaryCount: number, secondaryCount: number): any;
     content(): JSX.Element | JSX.Element[];
-    meetsRequirements(primaryCount: any, secondaryCount: any): boolean;
+    meetsRequirements(primaryCount: number, secondaryCount: number): boolean;
-    toggleTag(tag: any): void;
+    toggleTag(tag: Tag): void;
-    select(e: any): void;
+    select(e: KeyboardEvent): void;
-    selectableItems(): JQuery<HTMLElement>;
+    selectableItems(): any;
-    getCurrentNumericIndex(): number;
+    getCurrentNumericIndex(): any;
-    getItem(index: any): JQuery<HTMLElement>;
+    getItem(selectedTag: Tag): any;
-    setIndex(index: any, scrollToItem: any): void;
+    setIndex(index: number, scrollToItem: boolean): void;
-    onsubmit(e: any): void;
+    onsubmit(e: SubmitEvent): void;
 }
-import Modal from "flarum/common/components/Modal";
-import Stream from "flarum/common/utils/Stream";
-import KeyboardNavigatable from "flarum/forum/utils/KeyboardNavigatable";

extensions/tags/js/dist-typings/forum/components/TagHero.d.ts

@@ -1,5 +1,3 @@
-export default class TagHero extends Component<import("flarum/common/Component").ComponentAttrs, undefined> {
+export default class TagHero {
-    constructor();
     view(): JSX.Element;
 }
-import Component from "flarum/common/Component";

extensions/tags/js/dist-typings/forum/components/TagLinkButton.d.ts

@@ -1,5 +1,4 @@
-export default class TagLinkButton extends LinkButton {
+export default class TagLinkButton {
     static initAttrs(attrs: any): void;
     view(vnode: any): JSX.Element;
 }
-import LinkButton from "flarum/common/components/LinkButton";

extensions/tags/js/dist-typings/forum/components/TagsPage.d.ts

@@ -1,9 +1,7 @@
-export default class TagsPage extends Page<import("flarum/common/components/Page").IPageAttrs> {
+export default class TagsPage {
-    constructor();
     oninit(vnode: any): void;
-    tags: any;
+    tags: any[] | undefined;
     loading: boolean | undefined;
     view(): JSX.Element;
     oncreate(vnode: any): void;
 }
-import Page from "flarum/common/components/Page";

extensions/tags/js/dist-typings/forum/components/ToggleButton.d.ts

@@ -1,8 +1,6 @@
 /**
  * @TODO move to core
  */
-export default class ToggleButton extends Component<import("flarum/common/Component").ComponentAttrs, undefined> {
+export default class ToggleButton {
-    constructor();
     view(vnode: any): JSX.Element;
 }
-import Component from "flarum/common/Component";

extensions/tags/js/dist-typings/forum/states/TagListState.d.ts

@@ -1,5 +1,5 @@
-import Tag from "../../common/models/Tag";
+import type Tag from "../../common/models/Tag";
 export default class TagListState {
     loadedIncludes: Set<unknown>;
-    load(includes?: never[]): Promise<Tag[]>;
+    load(includes?: string[]): Promise<Tag[]>;
 }

extensions/tags/js/src/forum/components/TagDiscussionModal.tsx

@@ -322,7 +322,7 @@ export default class TagDiscussionModal extends Modal<TagDiscussionModalAttrs> {
 
     m.redraw();
 
-    if (scrollToItem) {
+    if (scrollToItem && this.selectedTag) {
       const dropdownScroll = $dropdown.scrollTop()!;
       const dropdownTop = $dropdown.offset()!.top;
       const dropdownBottom = dropdownTop + $dropdown.outerHeight()!;

extensions/tags/less/forum/TagDiscussionModal.less

@@ -44,6 +44,7 @@
   }
 }
 .TagsInput {
+  .add-keyboard-focus-ring(":focus-within");
   padding-top: 0;
   padding-bottom: 0;
   overflow: hidden;
@@ -57,6 +58,7 @@
     border: 0 !important;
     padding: 0;
     max-width: 100%;
+    min-width: 1ch;
     margin-right: -100%;
     background: transparent !important;
   }
@@ -66,6 +68,7 @@
 }
 .TagsInput-selected {
   .TagsInput-tag {
+    display: inline-flex;
     margin-right: 5px;
 
     &:last-child {

flarum-monorepo.json

@@ -4,132 +4,132 @@
       {
         "name": "akismet",
         "gitRemote": "git@github.com:flarum/akismet.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "approval",
         "gitRemote": "git@github.com:flarum/approval.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "bbcode",
         "gitRemote": "git@github.com:flarum/bbcode.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "embed",
         "gitRemote": "git@github.com:flarum/embed.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "emoji",
         "gitRemote": "git@github.com:flarum/emoji.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "flags",
         "gitRemote": "git@github.com:flarum/flags.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "lang-english",
         "gitRemote": "git@github.com:flarum/lang-english.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "likes",
         "gitRemote": "git@github.com:flarum/likes.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "lock",
         "gitRemote": "git@github.com:flarum/lock.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "markdown",
         "gitRemote": "git@github.com:flarum/markdown.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "mentions",
         "gitRemote": "git@github.com:flarum/mentions.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "nicknames",
         "gitRemote": "git@github.com:flarum/nicknames.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "package-manager",
         "gitRemote": "git@github.com:flarum/package-manager.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "pusher",
         "gitRemote": "git@github.com:flarum/pusher.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "statistics",
         "gitRemote": "git@github.com:flarum/statistics.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "sticky",
         "gitRemote": "git@github.com:flarum/sticky.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "subscriptions",
         "gitRemote": "git@github.com:flarum/subscriptions.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "suspend",
         "gitRemote": "git@github.com:flarum/suspend.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "tags",
         "gitRemote": "git@github.com:flarum/tags.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       }
     ],
     "composer": [
       {
         "name": "testing",
         "gitRemote": "git@github.com:flarum/testing.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "phpstan",
         "gitRemote": "git@github.com:flarum/phpstan.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       }
     ],
     "npm": [
       {
         "name": "prettier-config",
         "gitRemote": "git@github.com:flarum/prettier-config.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "webpack-config",
         "gitRemote": "git@github.com:flarum/flarum-webpack-config.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       },
       {
         "name": "tsconfig",
         "gitRemote": "git@github.com:flarum/flarum-tsconfig.git",
-        "mainBranch": "master"
+        "mainBranch": "main"
       }
     ],
     "core": {
       "name": "core",
-      "gitRemote": "git@github.com:flarum/core.git",
+      "gitRemote": "git@github.com:flarum/flarum-core.git",
-      "mainBranch": "master"
+      "mainBranch": "main"
     }
   }
 }

framework/core/composer.json

@@ -37,7 +37,6 @@
     },
     "require": {
         "php": ">=7.3",
-        "axy/sourcemap": "^0.1.4",
         "components/font-awesome": "^5.14.0",
         "dflydev/fig-cookies": "^3.0.0",
         "doctrine/dbal": "^2.7",
@@ -75,6 +74,8 @@
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "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",
@@ -82,7 +83,6 @@
         "symfony/polyfill-intl-messageformatter": "^1.22.0",
         "symfony/translation": "^5.1.5",
         "symfony/yaml": "^5.2.2",
-        "tobscure/json-api": "^0.3.0",
         "wikimedia/less.php": "^3.0"
     },
     "require-dev": {

framework/core/js/dist-typings/admin/components/AdminPage.d.ts

@@ -40,7 +40,7 @@ export interface HTMLInputSettingsComponentOptions extends CommonSettingsItemOpt
 declare const BooleanSettingTypes: readonly ["bool", "checkbox", "switch", "boolean"];
 declare const SelectSettingTypes: readonly ["select", "dropdown", "selectdropdown"];
 declare const TextareaSettingTypes: readonly ["textarea"];
-declare const ColorPreviewSettingType = "color-preview";
+declare const ColorPreviewSettingType: "color-preview";
 /**
  * Valid options for the setting component builder to generate a Switch.
  */

framework/core/js/dist-typings/admin/components/DashboardPage.d.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../@types/translator-icu-rich.d.ts" />
 import ItemList from '../../common/utils/ItemList';
 import AdminPage from './AdminPage';
-import { Children } from 'mithril';
+import type { Children } from 'mithril';
 export default class DashboardPage extends AdminPage {
     headerInfo(): {
         className: string;