Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General: Basic updates to prepare for WP 5.8 #20040

Merged
merged 5 commits into from
Jun 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/files/setup-wordpress-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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::"
Expand Down
2 changes: 1 addition & 1 deletion .phpcs.config.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<ruleset>
<config name="minimum_supported_wp_version" value="5.6" />
<config name="minimum_supported_wp_version" value="5.7" />
<config name="testVersion" value="5.6-"/>

<!-- Check all PHP files in directory tree by default. -->
Expand Down
5 changes: 5 additions & 0 deletions projects/plugins/backup/changelog/bump-to-5.7
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Bump to 5.7 minimum WP supported version


4 changes: 2 additions & 2 deletions projects/plugins/backup/readme.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,

/**
Expand Down
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/bump-to-5.7
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions projects/plugins/jetpack/jetpack.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' );

Expand Down
12 changes: 0 additions & 12 deletions projects/plugins/jetpack/modules/shortcodes/instagram.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand Down
4 changes: 2 additions & 2 deletions projects/plugins/jetpack/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.1
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

Expand Down
4 changes: 2 additions & 2 deletions tools/cli/commands/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' +
Expand Down