From e9445bfeb529ab78cc19bf92ee42ae1627c0e22b Mon Sep 17 00:00:00 2001
From: Ruben Calvo <rubencm@gmail.com>
Date: Sat, 23 Sep 2023 13:35:17 +0200
Subject: [PATCH] [ticket/16923] Fix composer.json dependencies

PHPBB3-16923
---
 phpBB/composer.json | 6 +++++-
 phpBB/composer.lock | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/phpBB/composer.json b/phpBB/composer.json
index 64657daab5..b5947836c4 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -28,8 +28,8 @@
 	"require": {
 		"php": "^8.1",
 		"ext-json": "*",
-		"ext-mbstring": "*",
 		"ext-pdo": "*",
+		"ext-zlib": "*",
 		"bantu/ini-get-wrapper": "~1.0",
 		"chita/topological_sort": "^3.0",
 		"composer/composer": "^2.0",
@@ -50,6 +50,7 @@
 		"symfony/finder": "^6.3",
 		"symfony/http-foundation": "^6.3",
 		"symfony/http-kernel": "^6.3",
+		"symfony/polyfill-mbstring": "^1.23",
 		"symfony/mime": "^6.3",
 		"symfony/process": "^6.3",
 		"symfony/proxy-manager-bridge": "^6.3",
@@ -71,6 +72,9 @@
 		"vimeo/psalm": "^4.14",
 		"psalm/plugin-symfony": "^3.1"
 	},
+	"suggest": {
+		"ext-mbstring": "Better performance in search"
+	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "4.0.x-dev"
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 7d4997d6ca..9bd22e456c 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fec6e6e713d3e0d587befaede71cc570",
+    "content-hash": "1b3c23af9540af5f573e31c7a9e715c1",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -8985,12 +8985,12 @@
     "platform": {
         "php": "^8.1",
         "ext-json": "*",
-        "ext-mbstring": "*",
-        "ext-pdo": "*"
+        "ext-pdo": "*",
+        "ext-zlib": "*"
     },
     "platform-dev": [],
     "platform-overrides": {
         "php": "8.1.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }