[ticket/17135] Upgrade Symfony to 6.4, fix rebasing issues

PHPBB-17135

phpBB/composer.json

@@ -42,23 +42,23 @@
 		"marc1706/fast-image-size": "^1.1",
 		"minishlink/web-push": "^8.0",
 		"s9e/text-formatter": "^2.0",
-		"symfony/config": "^6.3",
-		"symfony/console": "^6.3",
-		"symfony/dependency-injection": "^6.3",
-		"symfony/error-handler": "^6.3",
-		"symfony/event-dispatcher": "^6.3",
-		"symfony/filesystem": "^6.3",
-		"symfony/finder": "^6.3",
-		"symfony/http-foundation": "^6.3",
-		"symfony/http-kernel": "^6.3",
+		"symfony/config": "^6.4",
+		"symfony/console": "^6.4",
+		"symfony/dependency-injection": "^6.4",
+		"symfony/error-handler": "^6.4",
+		"symfony/event-dispatcher": "^6.4",
+		"symfony/filesystem": "^6.4",
+		"symfony/finder": "^6.4",
+		"symfony/http-foundation": "^6.4",
+		"symfony/http-kernel": "^6.4",
 		"symfony/polyfill-mbstring": "^1.23",
-		"symfony/mailer": "^6.3",
-		"symfony/mime": "^6.3",
-		"symfony/process": "^6.3",
-		"symfony/proxy-manager-bridge": "^6.3",
-		"symfony/routing": "^6.3",
-		"symfony/twig-bridge": "^6.3",
-		"symfony/yaml": "^6.3",
+		"symfony/mailer": "^6.4",
+		"symfony/mime": "^6.4",
+		"symfony/process": "^6.4",
+		"symfony/proxy-manager-bridge": "^6.4",
+		"symfony/routing": "^6.4",
+		"symfony/twig-bridge": "^6.4",
+		"symfony/yaml": "^6.4",
 		"twig/twig": "^3.0"
 	},
 	"require-dev": {
@@ -67,10 +67,10 @@
 		"phing/phing": "~2.4",
 		"phpunit/phpunit": "^9.0",
 		"squizlabs/php_codesniffer": "~3.4",
-		"symfony/browser-kit": "^6.3",
-		"symfony/css-selector": "^6.3",
-		"symfony/dom-crawler": "^6.3",
-		"symfony/http-client": "^6.3",
+		"symfony/browser-kit": "^6.4",
+		"symfony/css-selector": "^6.4",
+		"symfony/dom-crawler": "^6.4",
+		"symfony/http-client": "^6.4",
 		"vimeo/psalm": "^5.18.0",
 		"psalm/plugin-symfony": "^v5.1.0"
 	},