Skip to content

Commit

Permalink
Fix indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Stadly committed Nov 14, 2018

Verified

This commit was signed with the committer’s verified signature. The key has expired.
tvdeyen Thomas von Deyen
1 parent 9cacd22 commit 9cdc924
Showing 6 changed files with 73 additions and 71 deletions.
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
71 changes: 34 additions & 37 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -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
24 changes: 12 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 4 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: '3.7'

services:

php:
build: .docker/php
volumes:
- .:/var/www/html
php:
build: .docker/php
volumes:
- .:/var/www/html
20 changes: 10 additions & 10 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions phpstan.tests.neon.dist
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 9cdc924

Please sign in to comment.