Merge branch 'master' into dsstore-gitignore

Author: tfrommen

.travis.yml

@@ -31,6 +31,23 @@ jobs:
         - composer install
       script:
         - vendor/bin/phpunit
+    - language: php
+      php: 8.0
+      install:
+        # For PHP 8.0+, we need to ignore platform reqs as PHPUnit 7 is still used.
+        - composer install --ignore-platform-reqs
+      script:
+        - 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: 16
       install:

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"
 }

packages/eslint-config-humanmade/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@humanmade/eslint-config",
-	"version": "1.1.3",
+	"version": "1.2.1",
 	"description": "Human Made Coding Standards for JavaScript.",
 	"author": "Human Made",
 	"license": "GPL-2.0-or-later",
@@ -22,9 +22,9 @@
 	"bugs": {
 		"url": "https://github.com/humanmade/coding-standards/issues"
 	},
-	"engines" : {
-		"npm" : ">=7.0.0",
-		"node" : ">=16.0.0"
+	"engines": {
+		"npm": ">=7.0.0",
+		"node": ">=16.0.0"
 	},
 	"files": [
 		".eslintrc",

packages/eslint-config-humanmade/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@humanmade/stylelint-config",
-	"version": "1.1.2",
+	"version": "1.2.1",
 	"description": "Human Made Coding Standards for CSS and SCSS.",
 	"author": "Human Made",
 	"license": "GPL-2.0-or-later",
@@ -22,9 +22,9 @@
 	"bugs": {
 		"url": "https://github.com/humanmade/coding-standards/issues"
 	},
-	"engines" : {
-		"npm" : ">=7.0.0",
-		"node" : ">=16.0.0"
+	"engines": {
+		"npm": ">=7.0.0",
+		"node": ">=16.0.0"
 	},
 	"main": ".stylelintrc.json",
 	"dependencies": {

packages/stylelint-config/package-lock.json

@@ -1,4 +1,5 @@
 <phpunit
+	beStrictAboutTestsThatDoNotTestAnything="false"
 	bootstrap="tests/bootstrap.php"
 	colors="true"
 	convertErrorsToExceptions="true"
@@ -7,7 +8,7 @@
 >
 	<testsuites>
 		<!-- Default test suite to run all tests -->
-		<testsuite>
+		<testsuite name="all">
 			<file>tests/AllSniffs.php</file>
 			<file>tests/FixtureTests.php</file>
 		</testsuite>

packages/stylelint-config/package.json

@@ -42,6 +42,7 @@ public static function main() {
 	public static function suite() {
 		$GLOBALS['PHP_CODESNIFFER_SNIFF_CODES']   = array();
 		$GLOBALS['PHP_CODESNIFFER_FIXABLE_CODES'] = array();
+		$GLOBALS['PHP_CODESNIFFER_SNIFF_CASE_FILES'] = array();
 
 		$suite = new TestSuite( 'HM Standards' );