From 46392385a06d605e1cccba9572b6d81acbedf639 Mon Sep 17 00:00:00 2001 From: Lindsey Olson Date: Fri, 13 Oct 2023 09:59:00 -0500 Subject: [PATCH] Updates (#11) * Remove deprecated sniff & replace with new dependency * Remove patch that is no longer needed * Set minimum vipwpcs version, remove composer patching lib --------- Co-authored-by: Justin Frydman --- composer.json | 14 ++------------ lib/ModernTribe/ruleset.xml | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 5239549..190a698 100644 --- a/composer.json +++ b/composer.json @@ -18,9 +18,8 @@ "license": "MIT", "require": { "php": ">=8.0", - "automattic/vipwpcs": "*", + "automattic/vipwpcs": "^3.0", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1 | ^1.0", - "cweagans/composer-patches": "^1.7", "phpcompatibility/phpcompatibility-wp": "^2.1", "slevomat/coding-standard": "^8.0", "squizlabs/php_codesniffer": "^3.6" @@ -30,16 +29,7 @@ "config": { "sort-packages": true, "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true, - "cweagans/composer-patches": true + "dealerdirect/phpcodesniffer-composer-installer": true } - }, - "extra": { - "enable-patching": true, - "patches": { - "wp-coding-standards/wpcs": { - "Add PHP 8 support until WordPress releases a new version": "https://github.com/WordPress/WordPress-Coding-Standards/commit/7cd46bed1e6a7a2af3fe24c7f4a044da3076d8f4.patch" - } - } } } diff --git a/lib/ModernTribe/ruleset.xml b/lib/ModernTribe/ruleset.xml index 0748ed6..c2d23f4 100644 --- a/lib/ModernTribe/ruleset.xml +++ b/lib/ModernTribe/ruleset.xml @@ -53,7 +53,7 @@ 3 - +