diff --git a/.editorconfig b/.editorconfig
index 9ddd9338a..c0db990d0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 # TS/JS-Files
-[*.{ts,js}]
+[*.{ts,js,mjs}]
 indent_size = 2
 
 # JSON-Files
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index fb28d76d8..0ec50ae89 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -13,6 +13,11 @@
 $config
     ->addRules(
         [
+            'global_namespace_import' => [
+                'import_classes' => true,
+                'import_constants' => false,
+                'import_functions' => true,
+            ],
             'ordered_imports' => [
                 'imports_order' => ['class', 'function', 'const'],
                 'sort_algorithm' => 'alpha'
diff --git a/Build/Test/IntegrationTests.xml b/Build/Test/IntegrationTests.xml
index d3f58e893..ddd75bd14 100644
--- a/Build/Test/IntegrationTests.xml
+++ b/Build/Test/IntegrationTests.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.4/phpunit.xsd"
 	backupGlobals="true"
 	beStrictAboutTestsThatDoNotTestAnything="false"
 	bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
@@ -18,19 +18,18 @@
 	failOnPhpunitDeprecation="true"
 	processIsolation="true"
 >
-	<coverage includeUncoveredFiles="false"/>
-	<source>
-		<include>
-			<directory>../../Classes</directory>
-		</include>
-	</source>
-	<testsuites>
-		<testsuite name="ext-solr-integration-tests">
-			<directory>../../Tests/Integration/</directory>
-		</testsuite>
-	</testsuites>
-	<php>
-		<ini name="display_errors" value="1"/>
-		<env name="TYPO3_CONTEXT" value="Testing"/>
-	</php>
+  <source>
+    <include>
+      <directory>../../Classes</directory>
+    </include>
+  </source>
+  <testsuites>
+    <testsuite name="ext-solr-integration-tests">
+      <directory>../../Tests/Integration/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <ini name="display_errors" value="1"/>
+    <env name="TYPO3_CONTEXT" value="Testing"/>
+  </php>
 </phpunit>
diff --git a/Build/Test/UnitTests.xml b/Build/Test/UnitTests.xml
index e166650ab..1611c6793 100644
--- a/Build/Test/UnitTests.xml
+++ b/Build/Test/UnitTests.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.4/phpunit.xsd"
 	backupGlobals="true"
 	beStrictAboutTestsThatDoNotTestAnything="false"
 	bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
diff --git a/composer.json b/composer.json
index ed2f32058..7a03541e0 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     "ext-libxml": "*",
     "ext-pdo": "*",
     "ext-simplexml": "*",
-    "solarium/solarium": "6.3.2",
+    "solarium/solarium": "6.3.5",
     "typo3/cms-backend": "*",
     "typo3/cms-core": "^v13.1",
     "typo3/cms-extbase": "*",
@@ -39,10 +39,10 @@
   },
   "require-dev": {
     "dg/bypass-finals": "^1.6",
-    "phpunit/phpunit": "^11.2",
+    "phpunit/phpunit": "^11.4",
     "typo3/cms-fluid-styled-content": "*",
-    "typo3/coding-standards": "dev-main#27798dd4b8a15d2178260dbd6aad83fb0d6a017e",
-    "typo3/testing-framework": "dev-main#60f586e8923e48be2e7a2dcd9634e9eac51eab6d",
+    "typo3/coding-standards": "v0.8.0",
+    "typo3/testing-framework": "dev-main#47bf0daab24b4210221f46a1fde59b9c3e245e39",
     "phpstan/phpstan": "^1.11",
     "phpstan/phpstan-phpunit": "^1.3"
   },