Merge branch '1.x' into sm/package-manager-stable

flarum · Dec 14, 2023 · 361f795 · 361f795
2 parents ac4c1f2 + a131132
commit 361f795
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [v1.8.4](https://github.com/flarum/framework/compare/v1.8.3...v1.8.4)
+### Fixed
+* `s9e/textformatter` 2.15 has breaking changes [#3946]
+
 ## [v1.8.3](https://github.com/flarum/framework/compare/v1.8.2...v1.8.3)
 ### Fixed
 * Console extender does not accept ::class [#3900]

diff --git a/composer.json b/composer.json
@@ -127,7 +127,7 @@
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "pusher/pusher-php-server": "^2.2",
-        "s9e/text-formatter": "^2.3.6",
+        "s9e/text-formatter": ">=2.3.6 <2.15",
         "staudenmeir/eloquent-eager-limit": "^1.0",
         "sycho/json-api": "^0.5.0",
         "sycho/sourcemap": "^2.0.0",

diff --git a/framework/core/composer.json b/framework/core/composer.json
@@ -75,7 +75,7 @@
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
-        "s9e/text-formatter": "^2.3.6",
+        "s9e/text-formatter": ">=2.3.6 <2.15",
         "staudenmeir/eloquent-eager-limit": "^1.0",
         "sycho/json-api": "^0.5.0",
         "sycho/sourcemap": "^2.0.0",

diff --git a/framework/core/src/Foundation/Application.php b/framework/core/src/Foundation/Application.php
@@ -21,7 +21,7 @@ class Application
      *
      * @var string
      */
-    const VERSION = '1.8.3';
+    const VERSION = '1.8.4';
 
     /**
      * The IoC container for the Flarum application.