From ce1c19522f836a6b9ff3c46de72824fce2add419 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 11 Sep 2024 07:28:31 -0400
Subject: [PATCH] Update composer.json so symfony mbstring polyfill doesn't
 clash with php extension

---
 composer.json       | 5 +++--
 tools/composer.json | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 525d7126..23ef33fc 100644
--- a/composer.json
+++ b/composer.json
@@ -48,11 +48,12 @@
 	"monolog/monolog": "^3.0.0",
 	"php": ">= 8.2.0",
 	"psr/http-message": "^1.0.1 || ^2.0.0",
-	"symfony/polyfill-mbstring": "^1.0.0",
-	"symfony/polyfill-util": "^1.0.0",
 	"tracy/tracy": "^2.8.0",
 	"yosymfony/toml": "^1.0.4"
   },
+  "replace": {
+  	"symfony/polyfill-mbstring": "*"
+  },
   "require-dev": {
 	"phpstan/phpstan": "^1.2.0",
 	"phpunit/phpunit": "^10.0.0",
diff --git a/tools/composer.json b/tools/composer.json
index d6a58ef1..71d7e315 100644
--- a/tools/composer.json
+++ b/tools/composer.json
@@ -1,6 +1,6 @@
 {
   "require": {
-	"friendsofphp/php-cs-fixer": "^3.6",
-	"rector/rector": "^0.16.0"
+	"friendsofphp/php-cs-fixer": "^3.52.1",
+	"rector/rector": "^1.0.3"
   }
 }