From c6a189cbecbd681a765d2d5b142a6cd956637cd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Dec 2020 13:46:42 +0000 Subject: [PATCH 1/2] Bump wp-coding-standards/wpcs from 1.2.1 to 2.3.0 Bumps [wp-coding-standards/wpcs](https://github.com/WordPress/WordPress-Coding-Standards) from 1.2.1 to 2.3.0. - [Release notes](https://github.com/WordPress/WordPress-Coding-Standards/releases) - [Changelog](https://github.com/WordPress/WordPress-Coding-Standards/blob/develop/CHANGELOG.md) - [Commits](https://github.com/WordPress/WordPress-Coding-Standards/compare/1.2.1...2.3.0) Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 93ad6db..4c564f5 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "behat/mink-extension": "^2.2", "behat/mink-goutte-driver": "^1.2", "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master", - "wp-coding-standards/wpcs": "^1", + "wp-coding-standards/wpcs": "^2", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "phpunit/phpunit": "^7", "phpcompatibility/php-compatibility": "^9.3" diff --git a/composer.lock b/composer.lock index d64aa18..42c913b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "78ab5f9e0e3aa71cc72facd3f6dc12e1", + "content-hash": "96f944ff852531c8295ad8a80cfdc381", "packages": [], "packages-dev": [ { @@ -4482,27 +4482,30 @@ }, { "name": "wp-coding-standards/wpcs", - "version": "1.2.1", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", - "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c" + "reference": "7da1894633f168fe244afc6de00d141f27517b62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c", - "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c", + "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/7da1894633f168fe244afc6de00d141f27517b62", + "reference": "7da1894633f168fe244afc6de00d141f27517b62", "shasum": "" }, "require": { - "php": ">=5.3", - "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2" + "php": ">=5.4", + "squizlabs/php_codesniffer": "^3.3.1" }, "require-dev": { - "phpcompatibility/php-compatibility": "^9.0" + "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6", + "phpcompatibility/php-compatibility": "^9.0", + "phpcsstandards/phpcsdevtools": "^1.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically." + "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically." }, "type": "phpcodesniffer-standard", "notification-url": "https://packagist.org/downloads/", @@ -4512,7 +4515,7 @@ "authors": [ { "name": "Contributors", - "homepage": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/graphs/contributors" + "homepage": "https://github.com/WordPress/WordPress-Coding-Standards/graphs/contributors" } ], "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions", @@ -4522,11 +4525,11 @@ "wordpress" ], "support": { - "issues": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues", - "source": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards", - "wiki": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/wiki" + "issues": "https://github.com/WordPress/WordPress-Coding-Standards/issues", + "source": "https://github.com/WordPress/WordPress-Coding-Standards", + "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki" }, - "time": "2018-12-18T09:43:51+00:00" + "time": "2020-05-13T23:57:56+00:00" } ], "aliases": [], From a394afe7d85075db147b559b8556ccfe9750c386 Mon Sep 17 00:00:00 2001 From: Daniel Bachhuber Date: Thu, 17 Dec 2020 06:07:37 -0800 Subject: [PATCH 2/2] Allow `error_log()` in the bootstrap file; remove VIP sniff reference --- phpcs.xml.dist | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 48a0aa3..6ca9ae0 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -19,26 +19,14 @@ */vendor/* */node_modules/* - - - - - - - - - - - - - - - + + */tests/phpunit/bootstrap.php +