Skip to content

Commit d08020c

Browse files
authored
Merge branch 'develop' into issue/1317-cant-edit-a-post-custom-field-set-up-as-a-file-upload-field
2 parents 6c8875a + 64c7d41 commit d08020c

File tree

507 files changed

+14270
-10114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

507 files changed

+14270
-10114
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Gruntfile.js export-ignore
1818
package.json export-ignore
1919
package-lock.json export-ignore
2020
phpcs.ruleset.xml export-ignore
21+
phpcs.xml export-ignore
2122
phpcs.xml.dist export-ignore
2223
phpunit.xml export-ignore
2324
phpunit.xml.dist export-ignore
@@ -29,6 +30,7 @@ translations.pot export-ignore
2930
# Folders
3031
/.circleci export-ignore
3132
/.github export-ignore
33+
/.husky export-ignore
3234
/.idea export-ignore
3335
/.tx export-ignore
3436
/assets/css/scss export-ignore

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ docs/html
5151
docker-compose.yml
5252
docker-unit-tests.sh
5353
phpunit
54+
phpunit.xml
5455
wordpress-51-tests-lib
5556
wordpress-latest-tests-lib
5657

.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
npx lint-staged

composer.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
"codeception/module-filesystem": "^1.0",
3838
"codeception/module-cli": "^1.0",
3939
"codeception/util-universalframework": "^1.0",
40-
"yoast/phpunit-polyfills": "^1.0"
40+
"yoast/phpunit-polyfills": "^1.0",
41+
"squizlabs/php_codesniffer": "*",
42+
"wp-coding-standards/wpcs": "^3.0",
43+
"phpcompatibility/phpcompatibility-wp": "^2.1"
4144
},
4245
"extra": {
4346
"strauss": {
@@ -91,6 +94,9 @@
9194
]
9295
},
9396
"config": {
94-
"platform-check": false
97+
"platform-check": false,
98+
"allow-plugins": {
99+
"dealerdirect/phpcodesniffer-composer-installer": true
100+
}
95101
}
96102
}

0 commit comments

Comments
 (0)