From 49ebf5f65f95c94bd1c22f6e631c07601f0dc765 Mon Sep 17 00:00:00 2001 From: anomiex Date: Tue, 21 Nov 2023 09:47:27 +0000 Subject: [PATCH] codesniffer: Enable and fix `Modernize.FunctionCalls.Dirname.Nested` sniff (#34218) The WordPress-Extra ruleset turns this off. Now that we've dropped PHP 5.6, we can turn it on. Then, of course, we have to fix all the existing instances of the problem. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6941880745 --- composer.json | 2 +- composer.lock | 10 +++++----- vendor/automattic/jetpack-mu-wpcom/composer.json | 2 +- vendor/composer/installed.json | 4 ++-- vendor/composer/installed.php | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index ff11c401..54367112 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", - "automattic/jetpack-changelogger": "^4.0.0" + "automattic/jetpack-changelogger": "^4.0.1-alpha" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 87e65b0b..a7236ff6 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": "35a4c784c4b4cb22280f12b921267d53", + "content-hash": "3a0d6b8e05979fe2626e185a75887c23", "packages": [ { "name": "automattic/jetpack-mu-wpcom", @@ -12,13 +12,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "7b041508f9673b84f548e1905a6119cded8298ba" + "reference": "954576bec7c7932cf68370e8d5366e60b64fdbbc" }, "require": { "php": ">=7.0" }, "require-dev": { - "automattic/jetpack-changelogger": "^4.0.0", + "automattic/jetpack-changelogger": "^4.0.1-alpha", "automattic/wordbless": "0.4.2", "yoast/phpunit-polyfills": "1.1.0" }, @@ -77,11 +77,11 @@ "packages-dev": [ { "name": "automattic/jetpack-changelogger", - "version": "4.0.0", + "version": "4.0.1-alpha.1700559279", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "3b921cfa560c5249a39be5a304f8620c211a0727" + "reference": "c294cc07c8fcb92351d79d79ef529f88de7d2fdc" }, "require": { "php": ">=7.0", diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json index 97f8afd5..0699a2dd 100644 --- a/vendor/automattic/jetpack-mu-wpcom/composer.json +++ b/vendor/automattic/jetpack-mu-wpcom/composer.json @@ -8,7 +8,7 @@ }, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", - "automattic/jetpack-changelogger": "^4.0.0", + "automattic/jetpack-changelogger": "^4.0.1-alpha", "automattic/wordbless": "0.4.2" }, "suggest": { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 2cb56f6c..19412649 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -7,13 +7,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "7b041508f9673b84f548e1905a6119cded8298ba" + "reference": "954576bec7c7932cf68370e8d5366e60b64fdbbc" }, "require": { "php": ">=7.0" }, "require-dev": { - "automattic/jetpack-changelogger": "^4.0.0", + "automattic/jetpack-changelogger": "^4.0.1-alpha", "automattic/wordbless": "0.4.2", "yoast/phpunit-polyfills": "1.1.0" }, diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index e10b744d..af430faa 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'automattic/jetpack-mu-wpcom' => array( 'pretty_version' => '5.0.0', 'version' => '5.0.0.0', - 'reference' => '7b041508f9673b84f548e1905a6119cded8298ba', + 'reference' => '954576bec7c7932cf68370e8d5366e60b64fdbbc', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(),