From 9cdc92448787a31afe55c009910822ce8cec3ef6 Mon Sep 17 00:00:00 2001 From: Stadly Date: Wed, 14 Nov 2018 18:12:28 +0100 Subject: [PATCH] Fix indentation --- .editorconfig | 6 ++++ .scrutinizer.yml | 71 ++++++++++++++++++++--------------------- .travis.yml | 24 +++++++------- docker-compose.yml | 9 +++--- phpstan.neon.dist | 20 ++++++------ phpstan.tests.neon.dist | 14 ++++---- 6 files changed, 73 insertions(+), 71 deletions(-) diff --git a/.editorconfig b/.editorconfig index 86a14ca..f2cd1d8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,3 +6,9 @@ indent_size = 4 indent_style = space insert_final_newline = true trim_trailing_whitespace = true + +[*.yml] +indent_size = 2 + +[*.{neon,neon.dist}] +indent_size = 2 diff --git a/.scrutinizer.yml b/.scrutinizer.yml index c8bcd1c..5b69e44 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,42 +1,39 @@ filter: - excluded_paths: - - tests/ - dependency_paths: - - vendor/ + excluded_paths: + - tests/ + dependency_paths: + - vendor/ checks: - php: - remove_extra_empty_lines: true - remove_php_closing_tag: true - remove_trailing_whitespace: true - fix_use_statements: - remove_unused: true - preserve_multiple: false - preserve_blanklines: true - order_alphabetically: true - fix_php_opening_tag: true - fix_linefeed: true - fix_line_ending: true - fix_identation_4spaces: true - fix_doc_comments: true - -tools: - php_loc: true + php: + remove_extra_empty_lines: true + remove_php_closing_tag: true + remove_trailing_whitespace: true + fix_use_statements: + remove_unused: true + preserve_multiple: false + preserve_blanklines: true + order_alphabetically: true + fix_php_opening_tag: true + fix_linefeed: true + fix_line_ending: true + fix_identation_4spaces: true + fix_doc_comments: true build: - nodes: - analysis: - environment: - php: 7.2 - tests: - override: - - php-scrutinizer-run - coverage: - environment: - php: 7.2 - tests: - override: - - command: composer test - coverage: - file: build/clover.xml - format: clover + nodes: + analysis: + environment: + php: 7.2 + tests: + override: + - php-scrutinizer-run + coverage: + environment: + php: 7.2 + tests: + override: + - command: composer test + coverage: + file: build/clover.xml + format: clover diff --git a/.travis.yml b/.travis.yml index 6f0236a..01385cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,21 @@ language: php php: - - 7.1 - - 7.2 - - 7.3 + - 7.1 + - 7.2 + - 7.3 env: - matrix: - - COMPOSER_FLAGS="--prefer-lowest --prefer-stable" - - COMPOSER_FLAGS="" + matrix: + - COMPOSER_FLAGS="--prefer-lowest --prefer-stable" + - COMPOSER_FLAGS="" before_script: - - travis_retry composer update --no-interaction --prefer-dist $COMPOSER_FLAGS + - travis_retry composer update --no-interaction --prefer-dist $COMPOSER_FLAGS script: - - vendor/bin/parallel-lint . --exclude vendor - - vendor/bin/phpcs src tests - - vendor/bin/phpstan analyse - - vendor/bin/phpstan analyse -c phpstan.tests.neon.dist - - vendor/bin/phpunit + - vendor/bin/parallel-lint . --exclude vendor + - vendor/bin/phpcs src tests + - vendor/bin/phpstan analyse + - vendor/bin/phpstan analyse -c phpstan.tests.neon.dist + - vendor/bin/phpunit diff --git a/docker-compose.yml b/docker-compose.yml index 8a79d3c..8d795f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,7 @@ version: '3.7' services: - - php: - build: .docker/php - volumes: - - .:/var/www/html + php: + build: .docker/php + volumes: + - .:/var/www/html diff --git a/phpstan.neon.dist b/phpstan.neon.dist index f955724..7f23a97 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,13 +1,13 @@ parameters: - level: max - paths: - - src - exceptionRules: - reportUnusedCatchesOfUncheckedExceptions: true - uncheckedExceptions: - - LogicException + level: max + paths: + - src + exceptionRules: + reportUnusedCatchesOfUncheckedExceptions: true + uncheckedExceptions: + - LogicException includes: - - vendor/phpstan/phpstan-strict-rules/rules.neon - - vendor/phpstan/phpstan-deprecation-rules/rules.neon - - vendor/pepakriz/phpstan-exception-rules/extension.neon + - vendor/phpstan/phpstan-strict-rules/rules.neon + - vendor/phpstan/phpstan-deprecation-rules/rules.neon + - vendor/pepakriz/phpstan-exception-rules/extension.neon diff --git a/phpstan.tests.neon.dist b/phpstan.tests.neon.dist index 62a2047..ab8e296 100644 --- a/phpstan.tests.neon.dist +++ b/phpstan.tests.neon.dist @@ -1,10 +1,10 @@ parameters: - level: max - paths: - - tests + level: max + paths: + - tests includes: - - vendor/phpstan/phpstan-strict-rules/rules.neon - - vendor/phpstan/phpstan-deprecation-rules/rules.neon - - vendor/phpstan/phpstan-phpunit/extension.neon - - vendor/phpstan/phpstan-phpunit/rules.neon + - vendor/phpstan/phpstan-strict-rules/rules.neon + - vendor/phpstan/phpstan-deprecation-rules/rules.neon + - vendor/phpstan/phpstan-phpunit/extension.neon + - vendor/phpstan/phpstan-phpunit/rules.neon