diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..2e7acaf5 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false \ No newline at end of file diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index 81ad84f4..b881bef1 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -51,6 +51,7 @@ jobs: run: | composer create-project --prefer-dist laravel/lumen:${{ matrix.lumen }} --no-progress sample cd sample + composer config minimum-stability dev composer update --prefer-stable --prefer-dist --no-progress - name: Add package from source run: | @@ -105,6 +106,7 @@ jobs: run: | composer create-project --prefer-dist laravel/laravel:${{ matrix.laravel }} --no-progress sample cd sample + composer config minimum-stability dev composer update --prefer-stable --prefer-dist --no-progress - name: Add package from source run: | diff --git a/composer.json b/composer.json index 5e626ee1..5313e1db 100644 --- a/composer.json +++ b/composer.json @@ -52,8 +52,8 @@ } }, "scripts": { - "check-style": "phpcs -p --standard=PSR12 config/ src/ tests/", - "fix-style": "phpcbf -p --standard=PSR12 config/ src/ tests/", + "check-style": "phpcs -p --standard=PSR12 config/ src/ tests/ --ignore=src/Resources/* ", + "fix-style": "phpcbf -p --standard=PSR12 config/ src/ tests/ --ignore=src/Resources*", "test": "phpunit" } } diff --git a/src/DataCollector/QueryCollector.php b/src/DataCollector/QueryCollector.php index f11695c6..153834b8 100644 --- a/src/DataCollector/QueryCollector.php +++ b/src/DataCollector/QueryCollector.php @@ -545,7 +545,7 @@ public function collect() 'params' => [ 'Virtual Machine Instructions' => $vmi, ] - ]; + ]; } else { foreach ($query['explain'] as $explain) { $statements[] = [