Merge branch 'master' into update-stylelint

Author: ntwb

.gitignore

@@ -10,3 +10,6 @@ yarn.lock
 # Ignore built files
 archives/
 phpcs-standard/
+
+# OS generated files
+.DS_Store

.travis.yml

@@ -31,30 +31,38 @@ jobs:
         - composer install
       script:
         - vendor/bin/phpunit
-    - language: node_js
-      node_js: 10
+    - language: php
+      php: 8.0
       install:
-        - npm install
-        - cd packages/eslint-config-humanmade
-        - npm install
-        - cd ../..
+        # For PHP 8.0+, we need to ignore platform reqs as PHPUnit 7 is still used.
+        - composer install --ignore-platform-reqs
       script:
-        - npm test:eslint
+        - vendor/bin/phpunit
+    - language: php
+      php: 8.1
+      install:
+        # For PHP 8.0+, we need to ignore platform reqs as PHPUnit 7 is still used.
+        - composer install --ignore-platform-reqs
+      script:
+        # 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.
+        # Instead, we pass all required settings as part of the phpunit command.
+        - vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests tests/AllSniffs.php
+        - vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests tests/FixtureTests.php
     - language: node_js
-      node_js: 12
+      node_js: 16
       install:
         - npm install
         - cd packages/eslint-config-humanmade
-        - npm install
+        - npm install --legacy-peer-deps
         - cd ../..
       script:
         - npm test:eslint
     - language: node_js
-      node_js: 14
+      node_js: 16
       install:
         - npm install
-        - cd packages/eslint-config-humanmade
+        - cd packages/stylelint-config
         - npm install
         - cd ../..
       script:
-        - npm test
+        - npm test:stylelint

CHANGELOG.md

@@ -1,8 +1,18 @@
 # Changelog
 
+## 1.2.0 (September 13, 2022)
+
+- Add new Isset sniff #236
+- Update custom escaping functions for clean_html #264
+- Require spaces in template strings #256
+- Ignore "use" within "class" in OrderSniff #271
+- Add dealerdirect/phpcodesniffer-composer-installer to allow-plugins in composer.json #284
+- Update PHPCS to support PHP 8+ #282
+
 ## 1.1.3 (February 3, 2021)
 
 - Open ESLint peer dependency range to accept ESLint v6 & v7 #222
+
 ## 1.1.2 (December 10, 2020)
 
 ### Removed:

composer.json

@@ -5,15 +5,15 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.1",
-		"wp-coding-standards/wpcs": "2.2.1",
+		"wp-coding-standards/wpcs": "2.3.0",
 		"automattic/vipwpcs": "2.0.0",
 		"fig-r/psr2r-sniffer": "^0.5.0",
 		"phpcompatibility/phpcompatibility-wp": "^2.0.0",
-		"squizlabs/php_codesniffer": "~3.5.0",
+		"squizlabs/php_codesniffer": "~3.5",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^5.7"
+		"phpunit/phpunit": "^7"
 	},
 	"scripts": {
 		"test": "phpunit"

lerna.json

@@ -11,5 +11,5 @@
 	"packages": [
 		"packages/*"
 	],
-	"version": "1.1.3"
+	"version": "1.2.1"
 }