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 @@
-
-
-
-
- ../../Tests/Integration/
-
-
-
-
-
-
+
+
+
+ ../../Tests/Integration/
+
+
+
+
+
+
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 @@