Skip to content

Commit a67e03c

Browse files
authored
Add editorconfig, fix style, skip resources (#1385)
* Add editorconfig, fix style, skip resources * Minimum dev
1 parent 6e92268 commit a67e03c

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

.editorconfig

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
indent_style = space
8+
indent_size = 4
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false

.github/workflows/run-integration-tests.yml

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
run: |
5252
composer create-project --prefer-dist laravel/lumen:${{ matrix.lumen }} --no-progress sample
5353
cd sample
54+
composer config minimum-stability dev
5455
composer update --prefer-stable --prefer-dist --no-progress
5556
- name: Add package from source
5657
run: |
@@ -105,6 +106,7 @@ jobs:
105106
run: |
106107
composer create-project --prefer-dist laravel/laravel:${{ matrix.laravel }} --no-progress sample
107108
cd sample
109+
composer config minimum-stability dev
108110
composer update --prefer-stable --prefer-dist --no-progress
109111
- name: Add package from source
110112
run: |

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
}
5353
},
5454
"scripts": {
55-
"check-style": "phpcs -p --standard=PSR12 config/ src/ tests/",
56-
"fix-style": "phpcbf -p --standard=PSR12 config/ src/ tests/",
55+
"check-style": "phpcs -p --standard=PSR12 config/ src/ tests/ --ignore=src/Resources/* ",
56+
"fix-style": "phpcbf -p --standard=PSR12 config/ src/ tests/ --ignore=src/Resources*",
5757
"test": "phpunit"
5858
}
5959
}

src/DataCollector/QueryCollector.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ public function collect()
545545
'params' => [
546546
'Virtual Machine Instructions' => $vmi,
547547
]
548-
];
548+
];
549549
} else {
550550
foreach ($query['explain'] as $explain) {
551551
$statements[] = [

0 commit comments

Comments
 (0)