diff --git a/.editorconfig b/.editorconfig
index 8afe6051c0f..c55fdbab052 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,6 +19,9 @@ indent_style = tab
 indent_size = 4
 indent_style = tab
 
+[*.sh]
+indent_style = tab
+
 [*.svg]
 indent_style = tab
 
diff --git a/composer.json b/composer.json
index e54c11050a8..bd9617dac4e 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
         "phpcs": "phpcs . -s",
         "phpcbf": "phpcbf . -p -s",
         "phpstan": "phpstan analyse --memory-limit 512M .",
-        "phpstan-next": "phpstan analyse --level 7 --memory-limit 512M $(find . -type d -name 'vendor' -prune -o -name '*.php' -o -name '*.phtml' | grep -Fxvf ./tests/phpstan-next.txt | sort | paste -s)",
+        "phpstan-next": "phpstan analyse --level 7 --memory-limit 512M $(find . -type d -name 'vendor' -prune -o -name '*.php' -o -name '*.phtml' | grep -Fxvf ./tests/phpstan-next.txt | sort | paste -s -)",
         "phpunit": "phpunit --bootstrap ./tests/bootstrap.php --verbose ./tests",
         "translations": "cli/manipulate.translation.php -a format",
         "test": [