Skip to content

Commit 4ebffa3

Browse files
authored
Merge branch 'master' into stylelint-package-update-v20
2 parents f536a48 + d4f9058 commit 4ebffa3

File tree

16 files changed

+14749
-3375
lines changed

16 files changed

+14749
-3375
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ yarn.lock
1010
# Ignore built files
1111
archives/
1212
phpcs-standard/
13+
14+
# OS generated files
15+
.DS_Store

.travis.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,29 @@ jobs:
3131
- composer install
3232
script:
3333
- vendor/bin/phpunit
34-
- language: node_js
35-
node_js: 10
34+
- language: php
35+
php: 8.0
3636
install:
37-
- npm install
38-
- cd packages/eslint-config-humanmade
39-
- npm install
40-
- cd ../..
37+
# For PHP 8.0+, we need to ignore platform reqs as PHPUnit 7 is still used.
38+
- composer install --ignore-platform-reqs
4139
script:
42-
- npm test
43-
- language: node_js
44-
node_js: 12
40+
- vendor/bin/phpunit
41+
- language: php
42+
php: 8.1
4543
install:
46-
- npm install
47-
- cd packages/eslint-config-humanmade
48-
- npm install
49-
- cd ../..
44+
# For PHP 8.0+, we need to ignore platform reqs as PHPUnit 7 is still used.
45+
- composer install --ignore-platform-reqs
5046
script:
51-
- npm test
47+
# For PHP 8.1+, we need to ignore the config file so that PHPUnit 7 doesn't try to read it and cause an error.
48+
# Instead, we pass all required settings as part of the phpunit command.
49+
- vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests tests/AllSniffs.php
50+
- vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests tests/FixtureTests.php
5251
- language: node_js
53-
node_js: 14
52+
node_js: 16
5453
install:
5554
- npm install
5655
- cd packages/eslint-config-humanmade
57-
- npm install
56+
- npm install --legacy-peer-deps
5857
- cd ../..
5958
script:
6059
- npm test

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
# Changelog
22

3+
## 1.2.0 (September 13, 2022)
4+
5+
- Add new Isset sniff #236
6+
- Update custom escaping functions for clean_html #264
7+
- Require spaces in template strings #256
8+
- Ignore "use" within "class" in OrderSniff #271
9+
- Add dealerdirect/phpcodesniffer-composer-installer to allow-plugins in composer.json #284
10+
- Update PHPCS to support PHP 8+ #282
11+
312
## 1.1.3 (February 3, 2021)
413

514
- Open ESLint peer dependency range to accept ESLint v6 & v7 #222
15+
616
## 1.1.2 (December 10, 2020)
717

818
### Removed:

composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,22 @@
55
"license": "GPL-2.0-or-later",
66
"require": {
77
"php": ">=7.1",
8-
"wp-coding-standards/wpcs": "2.2.1",
8+
"wp-coding-standards/wpcs": "2.3.0",
99
"automattic/vipwpcs": "2.0.0",
1010
"fig-r/psr2r-sniffer": "^0.5.0",
1111
"phpcompatibility/phpcompatibility-wp": "^2.0.0",
12-
"squizlabs/php_codesniffer": "~3.5.0",
12+
"squizlabs/php_codesniffer": "~3.5",
1313
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0"
1414
},
1515
"require-dev": {
16-
"phpunit/phpunit": "^5.7"
16+
"phpunit/phpunit": "^7"
1717
},
1818
"scripts": {
1919
"test": "phpunit"
20+
},
21+
"config": {
22+
"allow-plugins": {
23+
"dealerdirect/phpcodesniffer-composer-installer": true
24+
}
2025
}
2126
}

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
"packages": [
1212
"packages/*"
1313
],
14-
"version": "1.1.3"
14+
"version": "1.2.1"
1515
}

0 commit comments

Comments
 (0)