From e9988f93f581c57c3f0d57753795ddccec0222d6 Mon Sep 17 00:00:00 2001 From: Brandon Kraft Date: Tue, 8 Jun 2021 09:59:27 -0500 Subject: [PATCH 1/4] Bump minimum supported/tested version to 5.7/5.8 --- projects/plugins/backup/changelog/bump-to-5.7 | 5 +++++ projects/plugins/backup/readme.txt | 4 ++-- projects/plugins/jetpack/changelog/bump-to-5.7 | 4 ++++ projects/plugins/jetpack/jetpack.php | 2 +- projects/plugins/jetpack/readme.txt | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 projects/plugins/backup/changelog/bump-to-5.7 create mode 100644 projects/plugins/jetpack/changelog/bump-to-5.7 diff --git a/projects/plugins/backup/changelog/bump-to-5.7 b/projects/plugins/backup/changelog/bump-to-5.7 new file mode 100644 index 0000000000000..6ccaff6ec4257 --- /dev/null +++ b/projects/plugins/backup/changelog/bump-to-5.7 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Bump to 5.7 minimum WP supported version + + diff --git a/projects/plugins/backup/readme.txt b/projects/plugins/backup/readme.txt index 2c079c465c49d..d0c78411a10a1 100644 --- a/projects/plugins/backup/readme.txt +++ b/projects/plugins/backup/readme.txt @@ -1,9 +1,9 @@ === Jetpack Backup === Contributors: automattic, Tags: jetpack, stuff -Requires at least: 5.5 +Requires at least: 5.7 Requires PHP: 5.6 -Tested up to: 5.6 +Tested up to: 5.8 Stable tag: 1.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/projects/plugins/jetpack/changelog/bump-to-5.7 b/projects/plugins/jetpack/changelog/bump-to-5.7 new file mode 100644 index 0000000000000..e0cb4edb53054 --- /dev/null +++ b/projects/plugins/jetpack/changelog/bump-to-5.7 @@ -0,0 +1,4 @@ +Significance: patch +Type: compat + +Updated minimum supported WordPress to 5.7 in anticipation for WordPress 5.8 coming later this month. diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php index 9968748efb733..b21929a327bac 100644 --- a/projects/plugins/jetpack/jetpack.php +++ b/projects/plugins/jetpack/jetpack.php @@ -8,7 +8,7 @@ * Author URI: https://jetpack.com * License: GPL2+ * Text Domain: jetpack - * Requires at least: 5.6 + * Requires at least: 5.7 * Requires PHP: 5.6 * * @package automattic/jetpack diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt index 10938b1f50d90..8f769fa51c410 100644 --- a/projects/plugins/jetpack/readme.txt +++ b/projects/plugins/jetpack/readme.txt @@ -2,9 +2,9 @@ Contributors: automattic, adamkheckler, aduth, akirk, allendav, alternatekev, andy, annezazu, apeatling, azaozz, batmoo, barry, beaulebens, biskobe, blobaugh, brbrr, cainm, cena, cfinke, chaselivingston, chellycat, clickysteve, csonnek, danielbachhuber, davoraltman, daniloercoli, delawski, designsimply, dllh, drawmyface, dsmart, dzver, ebinnion, egregor, eliorivero, enej, eoigal, erania-pinnera, ethitter, fgiannar, gcorne, georgestephanis, gibrown, goldsounds, hew, hugobaeta, hypertextranch, iammattthomas, iandunn, jblz, jasmussen, jeffgolenski, jeherve, jenhooks, jenia, jessefriedman, jgs, jkudish, jmdodd, joanrho, johnjamesjacoby, jshreve, kbrownkd, keoshi, koke, kraftbj, lancewillett, leogermani, lschuyler, macmanx, martinremy, matt, matveb, mattwiebe, maverick3x6, mcsf, mdawaffe, mdbitz, MichaelArestad, migueluy, mikeyarce, mkaz, nancythanki, nickmomrik, obenland, oskosk, pento, professor44, rachelsquirrel, rdcoll, ryancowles, richardmuscat, richardmtl, robertbpugh, roccotripaldi, samhotchkiss, scarstocea, scottsweb, sdquirk, sermitr, simison, stephdau, tmoorewp, tyxla, Viper007Bond, westi, yoavf, zinigor Tags: WP, backup, social, AMP, WooCommerce, malware, scan, spam, CDN, social Stable tag: 9.6 -Requires at least: 5.6 +Requires at least: 5.7 Requires PHP: 5.6 -Tested up to: 5.7 +Tested up to: 5.8 The best WP plugin for backup, anti spam, malware scan, CDN, AMP, social, search, contact form, and integrations with Woo, Facebook, Instagram, Google From 167c625cf41641c39f24b2e36563b91e6ebba208 Mon Sep 17 00:00:00 2001 From: Brandon Kraft Date: Tue, 8 Jun 2021 10:20:54 -0500 Subject: [PATCH 2/4] Remove Instagram oembed removal. Ref #19736 --- .../plugins/jetpack/modules/shortcodes/instagram.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/projects/plugins/jetpack/modules/shortcodes/instagram.php b/projects/plugins/jetpack/modules/shortcodes/instagram.php index 1ee5363a670af..2a4758fabd9c2 100644 --- a/projects/plugins/jetpack/modules/shortcodes/instagram.php +++ b/projects/plugins/jetpack/modules/shortcodes/instagram.php @@ -30,18 +30,6 @@ * @since 9.1.0 */ function jetpack_instagram_enable_embeds() { - - /** - * Instagram's custom Embed provider. - * We first remove the embed provider that's registered by Core; then, we declare our own. - * - * We can drop the `wp_oembed_remove_provider` line once Core stops adding its own Instagram provider: - * https://core.trac.wordpress.org/ticket/50861. - * - * @todo Remove once 5.6 is our minimum version. (Technically WP dropped their provider in 5.5.2). - */ - wp_oembed_remove_provider( '#https?://(www\.)?instagr(\.am|am\.com)/(p|tv)/.*#i' ); - wp_oembed_add_provider( '#https?://(www\.)?instagr(\.am|am\.com)/(p|tv|reel)/.*#i', 'https://graph.facebook.com/v5.0/instagram_oembed/', From a51073f430a15e6986eeded398f5bcfb0e912cd0 Mon Sep 17 00:00:00 2001 From: Brandon Kraft Date: Tue, 8 Jun 2021 11:04:16 -0500 Subject: [PATCH 3/4] A few other places to bump the versions --- .github/files/setup-wordpress-env.sh | 2 +- .phpcs.config.xml | 2 +- projects/plugins/jetpack/jetpack.php | 2 +- tools/cli/commands/generate.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/files/setup-wordpress-env.sh b/.github/files/setup-wordpress-env.sh index 822f2a0926319..881f7c94f56c4 100755 --- a/.github/files/setup-wordpress-env.sh +++ b/.github/files/setup-wordpress-env.sh @@ -56,7 +56,7 @@ case "$WP_BRANCH" in previous) # We hard-code the version here because there's a time near WP releases where # we've dropped the old 'previous' but WP hasn't actually released the new 'latest' - git clone --depth=1 --branch 5.6 git://develop.git.wordpress.org/ /tmp/wordpress-previous + git clone --depth=1 --branch 5.7 git://develop.git.wordpress.org/ /tmp/wordpress-previous ;; esac echo "::endgroup::" diff --git a/.phpcs.config.xml b/.phpcs.config.xml index 0a30c1176dc4d..b0425e8542095 100644 --- a/.phpcs.config.xml +++ b/.phpcs.config.xml @@ -1,6 +1,6 @@ - + diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php index b21929a327bac..f21aed1348fda 100644 --- a/projects/plugins/jetpack/jetpack.php +++ b/projects/plugins/jetpack/jetpack.php @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -define( 'JETPACK__MINIMUM_WP_VERSION', '5.6' ); +define( 'JETPACK__MINIMUM_WP_VERSION', '5.7' ); define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' ); define( 'JETPACK__VERSION', '9.9-alpha' ); diff --git a/tools/cli/commands/generate.js b/tools/cli/commands/generate.js index 34242a3bcfb04..c76e5b17db297 100644 --- a/tools/cli/commands/generate.js +++ b/tools/cli/commands/generate.js @@ -514,9 +514,9 @@ function createReadMeTxt( answers ) { `=== Jetpack ${ answers.name } ===\n` + 'Contributors: automattic,\n' + 'Tags: jetpack, stuff\n' + - 'Requires at least: 5.5\n' + + 'Requires at least: 5.7\n' + 'Requires PHP: 5.6\n' + - 'Tested up to: 5.6\n' + + 'Tested up to: 5.8\n' + 'Stable tag: 1.0\n' + 'License: GPLv2 or later\n' + 'License URI: http://www.gnu.org/licenses/gpl-2.0.html\n' + From 6b3c462ee14a4c92084388732a69a6ba3b934465 Mon Sep 17 00:00:00 2001 From: Brandon Kraft Date: Wed, 9 Jun 2021 14:59:51 -0500 Subject: [PATCH 4/4] Fix deprecation error --- .../_inc/lib/admin-pages/class-jetpack-redux-state-helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php index 44653fa5cbcb2..cd43e8f6e8980 100644 --- a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php +++ b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php @@ -10,6 +10,7 @@ use Automattic\Jetpack\Connection\REST_Connector; use Automattic\Jetpack\Constants; use Automattic\Jetpack\Device_Detection\User_Agent_Info; +use Automattic\Jetpack\Identity_Crisis; use Automattic\Jetpack\Licensing; use Automattic\Jetpack\Partner; use Automattic\Jetpack\Status; @@ -76,7 +77,7 @@ public static function get_initial_state() { * Adds information to the `connectionStatus` API field that is unique to the Jetpack React dashboard. */ $connection_status = array( - 'isInIdentityCrisis' => Jetpack::validate_sync_error_idc_option(), + 'isInIdentityCrisis' => Identity_Crisis::validate_sync_error_idc_option(), 'sandboxDomain' => JETPACK__SANDBOX_DOMAIN, /**