WordPress 6.7 compat: Removes early i18n calls to fix notices. (#40474)

* Move admin menu initialization to the init hook. * Changelogs. * Added Config callbacks for package options. * Removed the i18n call from deprecation notices for early calls. * Changelog. * Update projects/plugins/jetpack/functions.global.php Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> --------- Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12236132999 Upstream-Ref: Automattic/jetpack@c2f3354
Automattic · Dec 9, 2024 · 9c209b8 · 9c209b8
1 parent 0120d32
commit 9c209b8
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 113 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 This is an alpha version! The changes listed here are not final.
 
 ### Added
+- Added a mechanism to use callbacks for package options.
 - REST user provisioning with an app password.
 
 ## [6.1.1] - 2024-12-04

diff --git a/jetpack_vendor/automattic/jetpack-connection/src/identity-crisis/class-ui.php b/jetpack_vendor/automattic/jetpack-connection/src/identity-crisis/class-ui.php
@@ -168,6 +168,10 @@ function ( $c1, $c2 ) {
 				continue;
 			}
 
+			if ( isset( $consumer['customContent'] ) && is_callable( $consumer['customContent'] ) ) {
+				$consumer['customContent'] = call_user_func( $consumer['customContent'] );
+			}
+
 			if ( isset( $_SERVER['REQUEST_URI'] ) && str_starts_with( filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ) ), $consumer['admin_page'] ) && strlen( $consumer['admin_page'] ) > $consumer_url_length ) {
 				$consumer_chosen     = $consumer;
 				$consumer_url_length = strlen( $consumer['admin_page'] );

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -26,7 +26,7 @@
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '6.2.0-alpha1733428152',
+      'ver' => '6.2.0-alpha1733749108',
     ),
     'jetpack-explat' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-explat',

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "7d6486a81bcd4035bcb57e91a9bb6e119b23ec34"
+                "reference": "2d0aa5bff87d13652d3bc58e1ef386a618f448a7"
             },
             "require": {
                 "php": ">=7.2"
@@ -63,7 +63,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "795c083c60e3137eb045b508dd3e96c81f1eb49c"
+                "reference": "4d84fc95f6e86ef52bfc5dae005c35ef439ef4d9"
             },
             "require": {
                 "php": ">=7.2"
@@ -131,7 +131,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "0006bca205801a349edb96a6c8133bcb782d5274"
+                "reference": "13c18adce684690990329bd5a2099af2819c0179"
             },
             "require": {
                 "automattic/jetpack-constants": "^3.0.1",
@@ -203,7 +203,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "d5d50b56e632c68527c8ee2bc9910f56a508aa19"
+                "reference": "1e19a3f3549132d9ed0dce8fb00125f5b1865277"
             },
             "require": {
                 "composer-plugin-api": "^2.2",
@@ -274,7 +274,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
-                "reference": "82913a3ab3710fae79e77c47dc29c439dd7bd840"
+                "reference": "ec05c4301a55252d40b1f23440f7b006c4c1167b"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.0-alpha",
@@ -345,7 +345,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
-                "reference": "6933878a33b52a7c7a83053452c44191f5786a4c"
+                "reference": "25aca116171e21432ae048129dc960b59ea8ca2f"
             },
             "require": {
                 "automattic/jetpack-boost-core": "^0.3.2",
@@ -424,7 +424,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "bcaf34a9c9c9fa07a84ab64fa727f43d8d7429c5"
+                "reference": "8f7ac2cf07bc71fd313ea967dfbfcbcbfa092d51"
             },
             "require": {
                 "composer-plugin-api": "^2.2",
@@ -487,7 +487,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "4a2689d4581a22a055fa5653dd983bcc50a258eb"
+                "reference": "b272d3c4564f424f7767ff67375cd780f1a7a393"
             },
             "require": {
                 "php": ">=7.2"
@@ -557,12 +557,12 @@
         },
         {
             "name": "automattic/jetpack-connection",
-            "version": "6.2.0-alpha.1733428152",
-            "version_normalized": "6.2.0.0-alpha1733428152",
+            "version": "6.2.0-alpha.1733749108",
+            "version_normalized": "6.2.0.0-alpha1733749108",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "7423e3ca5cc30428f80b8867aedebfe120203da2"
+                "reference": "b74914f90efa3e2b2dfe37f8c23d23b9961d174f"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -655,7 +655,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "214fbe9e09576ca0acc71a4095069de6dec8fcb4"
+                "reference": "83bc0a68dc5c4a05aac9c6be97a229411a248fd2"
             },
             "require": {
                 "php": ">=7.2"
@@ -712,7 +712,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "a17a1ec6fbaacf9d2c915f4e482e8cca37a11f14"
+                "reference": "b14bffc944186a8de9c38a9ad84bfda283f115e2"
             },
             "require": {
                 "php": ">=7.2"
@@ -768,7 +768,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-explat",
-                "reference": "4bdf99840f4951cd1be8375750236d8d7b297e51"
+                "reference": "4f043e032dbad319715d52a6aaf99ed00834429f"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.0-alpha",
@@ -846,7 +846,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-image-cdn",
-                "reference": "e2e11dff6861833810e66767fcee2f6bd9e16ff8"
+                "reference": "51b2bcad364d71ca8b1a7bedaf550491e38e358d"
             },
             "require": {
                 "automattic/jetpack-assets": "^4.0.1",
@@ -915,7 +915,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "7933c6bd031996c31b2fcda984685300b4fa5b27"
+                "reference": "7acc4175717423dfb7f618b55c0edda985b8dfae"
             },
             "require": {
                 "php": ">=7.2"
@@ -976,7 +976,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "cd202e0bf5eb6684b31df328a30c599dd98215d7"
+                "reference": "fec4c146497a6080bfe8d2cc44555a196f50ba81"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1054,7 +1054,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "0e8ca22d9668e078fd0f57cabdfd3a3c8c6cbf16"
+                "reference": "b3f9fad1679c2be578e848191fe51f0541ee438b"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.0-alpha",
@@ -1119,7 +1119,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "badfcd71ff3c9c8d1c16274d6155bb3d0ddd9ad2"
+                "reference": "fe94c0778d707768525b348bb1da05b0a629f2aa"
             },
             "require": {
                 "php": ">=7.2"
@@ -1175,7 +1175,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "f085a8bcd89f319c3d3c331191abade1cd4621f8"
+                "reference": "4ba002ac7949ef9feee4e90680e8faa000d7ec46"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.5.1",
@@ -1280,7 +1280,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "d31c6f43238868fb9efa7706bb5940116e04edde"
+                "reference": "0ee0959268e325eec0e06af1b0a4dfd064c8ecfb"
             },
             "require": {
                 "php": ">=7.2"
@@ -1344,7 +1344,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "24337f9093dfbdd353ac36d49d3829454474237c"
+                "reference": "b864f755b740f53a526847f7936a066e732ab15e"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.0-alpha",
@@ -1415,7 +1415,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugin-deactivation",
-                "reference": "8880eeed8e35308b882903f7390e370632333fea"
+                "reference": "8546e1899c27e917e47be26af18dd65db126a409"
             },
             "require": {
                 "automattic/jetpack-assets": "^4.0.1",
@@ -1486,7 +1486,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "3aa1a5a94a2932bd9578e3c184d2680800454fce"
+                "reference": "4edf97eb2f0e9d52f1df226b95f9e2ca2466809b"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1545,7 +1545,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
-                "reference": "4e30e1dfb673e73583099cc88a867831376b33aa"
+                "reference": "65f85efea5e788c723c61ad9892880231fd68c10"
             },
             "require": {
                 "php": ">=7.2"
@@ -1618,7 +1618,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
-                "reference": "68221eb96cbe67b9ea6087c077b9a58bac7f8071"
+                "reference": "6515be05c9df9a94071ddb11c0eb443f1aa1c49e"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.0-alpha",
@@ -1696,7 +1696,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "c974f76a967e1c97f3e62f74c511020987ce4d0a"
+                "reference": "ed895f303230b14a286661562aa51f81c6f71bac"
             },
             "require": {
                 "automattic/jetpack-status": "^5.0.1",
@@ -1754,7 +1754,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "beda10e99534e999bd1726cacf3875c88c43ec2d"
+                "reference": "0045046951529fa4cc5752ae39a21050f212cc13"
             },
             "require": {
                 "php": ">=7.2"
@@ -1811,7 +1811,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-schema",
-                "reference": "ea5520290314ddc1224c45ebe1ba518ab93273bf"
+                "reference": "8c5bfdb0276f9dad69e51c8d30c317f1f3e2e637"
             },
             "require": {
                 "php": ">=7.2"
@@ -1884,7 +1884,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "eccfec11f977483c9e7f8171866a367e6530f608"
+                "reference": "c8784ef7778f890ec8b4f180d38f4292968f6265"
             },
             "require": {
                 "automattic/jetpack-constants": "^3.0.1",
@@ -1951,7 +1951,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "1298938f81c190aeb9f6eaab3e77d7a443efc056"
+                "reference": "b335617253166ddb8201a1d8dd25c84b344bea81"
             },
             "require": {
                 "automattic/jetpack-connection": "^6.2.0-alpha",
@@ -2032,7 +2032,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-wp-js-data-sync",
-                "reference": "f6ecca1f3c11de35f4efaa5e43680a8568f1e959"
+                "reference": "ef37d7c1b0deecac04e9e25270c12c9a9e128edf"
             },
             "require": {
                 "automattic/jetpack-schema": "^0.2.0",