Merge branch 'trunk' into fix/245-typos

WordPress · Aug 29, 2023 · d51f8b0 · d51f8b0
2 parents e55e452 + 389934b
commit d51f8b0
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 145 deletions.
diff --git a/composer.json b/composer.json
@@ -7,9 +7,8 @@
     "php": ">=5.6",
     "composer/installers": "^v1.12.0 || ^2.2",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
-    "wp-coding-standards/wpcs": "dev-develop#fca9d9e as 2.3.0",
-    "automattic/vipwpcs": "2.3.3",
-    "cweagans/composer-patches": "^1.7"
+    "wp-coding-standards/wpcs": "3.0.0",
+    "automattic/vipwpcs": "dev-develop#64aa799 as 2.3.4"
   },
   "require-dev": {
     "wp-phpunit/wp-phpunit": "^6.1",
@@ -39,20 +38,12 @@
       "dealerdirect/phpcodesniffer-composer-installer": true,
       "composer/installers": true,
       "phpstan/extension-installer": true,
-      "cweagans/composer-patches": true
+      "cweagans/composer-patches": false
     },
     "platform": {
       "php": "5.6.20"
     }
   },
-  "extra": {
-    "enable-patching": true,
-    "patches": {
-      "automattic/vipwpcs": {
-        "Fix incompatibility wp-coding-standards/wpcs": "patches/remove-rules.patch"
-      }
-    }
-  },
   "autoload": {
     "psr-4": {
       "WordPress\\Plugin_Check\\": "includes/"