diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-05-09 13:08:57 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-05-09 13:08:57 +0200 |
| commit | 26bc0e0ee9a23631b808e7328252cfb7865b9941 (patch) | |
| tree | dccc0f7a4b18cfe81f61a94ac406fee7e6bb3579 | |
| parent | afacebc3e2ab30c67a59eb6ef5a9351390ab2615 (diff) | |
Minor development config fixes (#5379)
* Add compatibility with MacOS for `paste` command
* Addition to .editorconfig
| -rw-r--r-- | .editorconfig | 3 | ||||
| -rw-r--r-- | composer.json | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig index 8afe6051c..c55fdbab0 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 e54c11050..bd9617dac 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": [ |