Skip to content

Commit f1c2be6

Browse files
committed
Merge branch 'main' into apache
2 parents d8790ea + 535db1b commit f1c2be6

File tree

3 files changed

+30
-33
lines changed

3 files changed

+30
-33
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ trim_trailing_whitespace = false
2020
ij_php_space_before_short_closure_left_parenthesis = false
2121
ij_php_space_after_type_cast = true
2222

23+
[*.yaml]
24+
indent_size = 2
25+
2326
[*.yml]
2427
indent_size = 2
2528

.gitignore

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,47 @@
1-
#c3 codeception
2-
c3.php
3-
4-
# composer itself is not needed
5-
composer.phar
1+
# codecoverage (if present)
2+
code_coverage
63

7-
# composer vendor dir
8-
/vendor
9-
10-
# config plugin
11-
/config/.merge-plan.php
4+
# codeception (if present)
5+
c3.php
126

13-
#copilot
14-
copilot
7+
# composer
8+
composer.lock
159

16-
# local phpunit config
17-
/phpunit.xml
10+
# gitHub copilot config (if present)
11+
.copilot/
12+
.github/copilot/**
1813

19-
# Mac DS_Store Files
14+
# mac ds_store (if present)
2015
.DS_Store
2116

22-
# netbeans project files
17+
# netbeans project (if present)
2318
nbproject
2419

25-
#node_modules
26-
/node_modules
27-
28-
# package json lock
20+
# node_modules (if present)
21+
node_modules
2922
package-lock.json
3023

31-
# phpstorm project files
24+
# phpstorm project (if present)
3225
.idea
3326

34-
# phpunit itself is not needed
35-
phpunit.phar
27+
# phpunit (if present)
28+
.phpunit.cache
29+
.phpunit.result.cache
30+
phpunit.xml*
31+
32+
# vagrant (if present)
33+
.vagrant
3634

37-
# vagrant runtime
38-
/.vagrant
35+
# vendor
36+
vendor
3937

40-
# vscode
38+
# vscode project (if present)
4139
.vscode
4240

43-
# windows thumbnail cache
41+
# windows thumbnail cache (if present)
4442
Thumbs.db
4543

46-
# yii console commands
47-
requirements.php
48-
/yii_test
49-
/yii_test.bat
50-
51-
# zend studio for eclipse project files
44+
# zend studio for eclipse project (if present)
5245
.buildpath
5346
.project
5447
.settings

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## 0.1.3 Under development
44

55
- Bug #204: Add YAML front matter to configuration files for consistency (@terabytesoftw)
6+
- Bug #210: Update `.editorconfig` and `.gitignore` for improved consistency and clarity (@terabytesoftw)
67

78
## 0.1.2 October 8, 2025
89

0 commit comments

Comments
 (0)