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
Automattic · Nov 21, 2023 · 3ade406 · 3ade406
1 parent aa23761
commit 3ade406
Show file tree

Hide file tree

Showing 46 changed files with 221 additions and 211 deletions.
diff --git a/composer.json b/composer.json
@@ -4,10 +4,10 @@
 	"type": "wordpress-plugin",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-autoloader": "^3.0.0",
+		"automattic/jetpack-autoloader": "^3.0.1-alpha",
 		"automattic/jetpack-composer-plugin": "^2.0.0",
 		"automattic/jetpack-config": "^2.0.0",
-		"automattic/jetpack-connection": "^2.0.0",
+		"automattic/jetpack-connection": "^2.0.1-alpha",
 		"automattic/jetpack-identity-crisis": "^0.12.0",
 		"automattic/jetpack-my-jetpack": "^4.0.1-alpha",
 		"automattic/jetpack-search": "^0.40.0",
@@ -17,7 +17,7 @@
 		"automattic/jetpack-plugins-installer": "^0.3.0"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"yoast/phpunit-polyfills": "1.1.0"
 	},
 	"autoload": {

diff --git a/jetpack_vendor/automattic/jetpack-a8c-mc-stats/composer.json b/jetpack_vendor/automattic/jetpack-a8c-mc-stats/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"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-admin-ui/composer.json b/jetpack_vendor/automattic/jetpack-admin-ui/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/jetpack-logo": "^2.0.0",
 		"automattic/wordbless": "dev-master"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-assets/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-assets/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.1-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## [2.0.0] - 2023-11-20
 ### Changed
 - Updated required PHP version to >= 7.0. [#34192]
@@ -382,6 +386,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Statically access asset tools
 
+[2.0.1-alpha]: https://github.com/Automattic/jetpack-assets/compare/v2.0.0...v2.0.1-alpha
 [2.0.0]: https://github.com/Automattic/jetpack-assets/compare/v1.18.15...v2.0.0
 [1.18.15]: https://github.com/Automattic/jetpack-assets/compare/v1.18.14...v1.18.15
 [1.18.14]: https://github.com/Automattic/jetpack-assets/compare/v1.18.13...v1.18.14

diff --git a/jetpack_vendor/automattic/jetpack-assets/composer.json b/jetpack_vendor/automattic/jetpack-assets/composer.json
@@ -10,7 +10,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"wikimedia/testing-access-wrapper": "^1.0 || ^2.0"
 	},
 	"suggest": {

diff --git a/jetpack_vendor/automattic/jetpack-config/composer.json b/jetpack_vendor/automattic/jetpack-config/composer.json
@@ -7,7 +7,7 @@
 		"php": ">=7.0"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.1-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
 ## [2.0.0] - 2023-11-20
 ### Added
 - Confirm blog ID and access token were saved before proceeding with connection flow. [#34136]
@@ -923,6 +927,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[2.0.1-alpha]: https://github.com/Automattic/jetpack-connection/compare/v2.0.0...v2.0.1-alpha
 [2.0.0]: https://github.com/Automattic/jetpack-connection/compare/v1.60.1...v2.0.0
 [1.60.1]: https://github.com/Automattic/jetpack-connection/compare/v1.60.0...v1.60.1
 [1.60.0]: https://github.com/Automattic/jetpack-connection/compare/v1.59.0...v1.60.0

diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -16,7 +16,7 @@
 		"automattic/wordbless": "@dev",
 		"yoast/phpunit-polyfills": "1.1.0",
 		"brain/monkey": "2.6.1",
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-connection/src/class-package-version.php b/jetpack_vendor/automattic/jetpack-connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '2.0.0';
+	const PACKAGE_VERSION = '2.0.1-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

diff --git a/jetpack_vendor/automattic/jetpack-constants/composer.json b/jetpack_vendor/automattic/jetpack-constants/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-device-detection/composer.json b/jetpack_vendor/automattic/jetpack-device-detection/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"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-identity-crisis/composer.json b/jetpack_vendor/automattic/jetpack-identity-crisis/composer.json
@@ -5,14 +5,14 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.0.0",
+		"automattic/jetpack-connection": "^2.0.1-alpha",
 		"automattic/jetpack-constants": "^2.0.0",
 		"automattic/jetpack-status": "^2.0.0",
 		"automattic/jetpack-logo": "^2.0.0",
-		"automattic/jetpack-assets": "^2.0.0"
+		"automattic/jetpack-assets": "^2.0.1-alpha"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"yoast/phpunit-polyfills": "1.1.0",
 		"automattic/wordbless": "@dev"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-ip/composer.json b/jetpack_vendor/automattic/jetpack-ip/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-jitm/composer.json b/jetpack_vendor/automattic/jetpack-jitm/composer.json
@@ -6,8 +6,8 @@
 	"require": {
 		"php": ">=7.0",
 		"automattic/jetpack-a8c-mc-stats": "^2.0.0",
-		"automattic/jetpack-assets": "^2.0.0",
-		"automattic/jetpack-connection": "^2.0.0",
+		"automattic/jetpack-assets": "^2.0.1-alpha",
+		"automattic/jetpack-connection": "^2.0.1-alpha",
 		"automattic/jetpack-device-detection": "^2.0.0",
 		"automattic/jetpack-logo": "^2.0.0",
 		"automattic/jetpack-redirect": "^2.0.0",
@@ -16,7 +16,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-licensing/composer.json b/jetpack_vendor/automattic/jetpack-licensing/composer.json
@@ -5,12 +5,12 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.0.0"
+		"automattic/jetpack-connection": "^2.0.1-alpha"
 	},
 	"require-dev": {
 		"automattic/wordbless": "@dev",
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-logo/composer.json b/jetpack_vendor/automattic/jetpack-logo/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"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json b/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
@@ -6,8 +6,8 @@
 	"require": {
 		"php": ">=7.0",
 		"automattic/jetpack-admin-ui": "^0.3.0",
-		"automattic/jetpack-assets": "^2.0.0",
-		"automattic/jetpack-connection": "^2.0.0",
+		"automattic/jetpack-assets": "^2.0.1-alpha",
+		"automattic/jetpack-connection": "^2.0.1-alpha",
 		"automattic/jetpack-jitm": "^3.0.0",
 		"automattic/jetpack-licensing": "^2.0.1-alpha",
 		"automattic/jetpack-plugins-installer": "^0.3.0",
@@ -17,7 +17,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"automattic/wordbless": "@dev",
 		"automattic/jetpack-videopress": "^0.21.0"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-password-checker/composer.json b/jetpack_vendor/automattic/jetpack-password-checker/composer.json
@@ -7,7 +7,7 @@
 		"php": ">=7.0"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"automattic/wordbless": "@dev",
 		"yoast/phpunit-polyfills": "1.1.0"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-plugins-installer/composer.json b/jetpack_vendor/automattic/jetpack-plugins-installer/composer.json
@@ -9,7 +9,7 @@
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-redirect/composer.json b/jetpack_vendor/automattic/jetpack-redirect/composer.json
@@ -10,7 +10,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-roles/composer.json b/jetpack_vendor/automattic/jetpack-roles/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0"
+		"automattic/jetpack-changelogger": "^4.0.1-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/jetpack_vendor/automattic/jetpack-search/composer.json b/jetpack_vendor/automattic/jetpack-search/composer.json
@@ -5,15 +5,15 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.0.0",
-		"automattic/jetpack-assets": "^2.0.0",
+		"automattic/jetpack-connection": "^2.0.1-alpha",
+		"automattic/jetpack-assets": "^2.0.1-alpha",
 		"automattic/jetpack-constants": "^2.0.0",
 		"automattic/jetpack-status": "^2.0.0",
 		"automattic/jetpack-config": "^2.0.0",
 		"automattic/jetpack-my-jetpack": "^4.0.1-alpha"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"yoast/phpunit-polyfills": "1.1.0",
 		"automattic/wordbless": "0.4.2"
 	},

diff --git a/jetpack_vendor/automattic/jetpack-stats/composer.json b/jetpack_vendor/automattic/jetpack-stats/composer.json
@@ -5,14 +5,14 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-assets": "^2.0.0",
-		"automattic/jetpack-connection": "^2.0.0",
+		"automattic/jetpack-assets": "^2.0.1-alpha",
+		"automattic/jetpack-connection": "^2.0.1-alpha",
 		"automattic/jetpack-constants": "^2.0.0",
 		"automattic/jetpack-status": "^2.0.0"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"automattic/wordbless": "dev-master"
 	},
 	"suggest": {

diff --git a/jetpack_vendor/automattic/jetpack-status/composer.json b/jetpack_vendor/automattic/jetpack-status/composer.json
@@ -10,7 +10,7 @@
 	"require-dev": {
 		"brain/monkey": "2.6.1",
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"automattic/jetpack-ip": "^0.2.0"
 	},
 	"suggest": {

diff --git a/jetpack_vendor/automattic/jetpack-sync/composer.json b/jetpack_vendor/automattic/jetpack-sync/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.0.0",
+		"automattic/jetpack-connection": "^2.0.1-alpha",
 		"automattic/jetpack-constants": "^2.0.0",
 		"automattic/jetpack-identity-crisis": "^0.12.0",
 		"automattic/jetpack-password-checker": "^0.3.0",
@@ -14,7 +14,7 @@
 		"automattic/jetpack-status": "^2.0.0"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"yoast/phpunit-polyfills": "1.1.0",
 		"automattic/wordbless": "@dev"
 	},

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -10,15 +10,15 @@
     ),
     'jetpack-assets' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-assets',
-      'ver' => '2.0.0',
+      'ver' => '2.0.1-alpha1700559279',
     ),
     'jetpack-config' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-config',
       'ver' => '2.0.0',
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '2.0.0',
+      'ver' => '2.0.1-alpha1700559279',
     ),
     'jetpack-idc' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-identity-crisis',

diff --git a/vendor/autoload_packages.php b/vendor/autoload_packages.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jpb462338fb66be23595d68a93345c9e3d_jetpack_searchⓥ2_0_0_alpha\al3_0_0;
+namespace Automattic\Jetpack\Autoloader\jpb462338fb66be23595d68a93345c9e3d_jetpack_searchⓥ2_0_0_alpha\al3_0_1_alpha;
 
  // phpcs:ignore
 

diff --git a/vendor/automattic/jetpack-plans/composer.json b/vendor/automattic/jetpack-plans/composer.json
@@ -5,11 +5,11 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.0.0"
+		"automattic/jetpack-connection": "^2.0.1-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^4.0.0",
+		"automattic/jetpack-changelogger": "^4.0.1-alpha",
 		"automattic/jetpack-status": "^2.0.0",
 		"automattic/wordbless": "@dev"
 	},