From: Philipp Date: Mon, 27 Feb 2023 19:34:46 +0000 (+0100) Subject: Adapt .editorconfig X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ae5fe47c03e51490eb027a00decc07b11c22aa8e;p=friendica.git Adapt .editorconfig - Add .json rule - Add .xml rule --- diff --git a/.editorconfig b/.editorconfig index c4555b0821..0cb6e3e97d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,7 @@ indent_style = tab trim_trailing_whitespace = true insert_final_newline = true quote_type = single +max_line_length = off [*.js] quote_type = double @@ -19,5 +20,13 @@ ij_javascript_use_double_quotes = true indent_style = space indent_size = 2 +[*.xml] +indent_style = space +indent_size = 4 + +[*.json] +indent_style = space +indent_size = 2 + [composer.json] -indent_size = tab +indent_style = tab diff --git a/composer.json b/composer.json index c6746c1231..e4e6aa6f03 100644 --- a/composer.json +++ b/composer.json @@ -132,7 +132,13 @@ "test": "phpunit", "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l", "cs:install": "@composer install --working-dir=bin/dev/php-cs-fixer", - "cs:check": ["@cs:install", "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff"], - "cs:fix": ["@cs:install", "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix"] + "cs:check": [ + "@cs:install", + "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff" + ], + "cs:fix": [ + "@cs:install", + "bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix" + ] } } diff --git a/docblox.dist.xml b/docblox.dist.xml index a2ea8e2cb7..aff0af91a7 100644 --- a/docblox.dist.xml +++ b/docblox.dist.xml @@ -1,13 +1,13 @@ - - data/output - - - data/output - - - . - + + data/output + + + data/output + + + . +