Minor development config fixes (FreshRSS#5379)

* Add compatibility with MacOS for `paste` command * Addition to .editorconfig
Frenzie · May 9, 2023 · 26bc0e0 · 26bc0e0
1 parent afacebc
commit 26bc0e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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": [