Skip to content

Commit

Permalink
New build
Browse files Browse the repository at this point in the history
  • Loading branch information
@dereksmart
dereksmart committed Jun 2, 2020
1 parent f22f244 commit e0fde56
Show file tree
Hide file tree
Showing 14 changed files with 162 additions and 149 deletions.
120 changes: 60 additions & 60 deletions _inc/jetpack-strings.php
View file

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions class.jetpack-cli.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Automattic\Jetpack\Status;
use Automattic\Jetpack\Sync\Actions;
use Automattic\Jetpack\Sync\Listener;
use Automattic\Jetpack\Sync\Modules;
use Automattic\Jetpack\Sync\Queue;
use Automattic\Jetpack\Sync\Settings;

Expand Down Expand Up @@ -998,11 +997,6 @@ public function sync( $args, $assoc_args ) {
} else {
WP_CLI::log( __( 'Sent more data to WordPress.com', 'jetpack' ) );
}

// Immediate Full Sync does not wait for WP.com to process data so we need to enforce a wait.
if ( false !== strpos( get_class( Modules::get_module( 'full-sync' ) ), 'Full_Sync_Immediately' ) ) {
sleep( 10 );
}
}
$i++;
} while ( $result && ! is_wp_error( $result ) );
Expand Down
6 changes: 5 additions & 1 deletion class.jetpack-twitter-cards.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ static function twitter_cards_tags( $og_tags ) {
);
if ( ! empty( $post_image ) && is_array( $post_image ) ) {
// 4096 is the maximum size for an image per https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/summary .
if ( (int) $post_image['src_width'] <= 4096 && (int) $post_image['src_height'] <= 4096 ) {
if (
isset( $post_image['src_width'], $post_image['src_height'] )
&& (int) $post_image['src_width'] <= 4096
&& (int) $post_image['src_height'] <= 4096
) {
// 300x157 is the minimum size for a summary_large_image per https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/summary-card-with-large-image .
if ( (int) $post_image['src_width'] >= 300 && (int) $post_image['src_height'] >= 157 ) {
$card_type = 'summary_large_image';
Expand Down
21 changes: 20 additions & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,26 @@
"require": {
"ext-fileinfo": "*",
"ext-json": "*",
"ext-openssl": "*"
"ext-openssl": "*",
"automattic/jetpack-abtest": "^1.3",
"automattic/jetpack-assets": "^1.4",
"automattic/jetpack-autoloader": "^1.7",
"automattic/jetpack-backup": "^1.0",
"automattic/jetpack-compat": "^1.2",
"automattic/jetpack-config": "^1.2",
"automattic/jetpack-connection": "^1.13",
"automattic/jetpack-constants": "^1.2",
"automattic/jetpack-error": "^1.0",
"automattic/jetpack-jitm": "^1.6",
"automattic/jetpack-logo": "^1.2",
"automattic/jetpack-options": "^1.5",
"automattic/jetpack-partner": "^1.0",
"automattic/jetpack-redirect": "^1.1",
"automattic/jetpack-roles": "^1.0",
"automattic/jetpack-status": "^1.1",
"automattic/jetpack-sync": "^1.12",
"automattic/jetpack-terms-of-service": "^1.3",
"automattic/jetpack-tracking": "^1.6"

This comment has been minimized.

Sign in to view

Copy link
@LeoColomb

LeoColomb Jun 12, 2020

Contributor

@jeherve @dereksmart Is there a reason for why the cleanup step has been bypassed in the build script?
Maybe technical as my addition is still the latest change to the script file, but hard to say without access to the log... 😉
Ref #14900

Thanks! 🙂

This comment has been minimized.

Sign in to view

Copy link
@jeherve

jeherve Jun 15, 2020 •
edited
Loading

Member

@dereksmart Do you remember how you generated this last build? tools/build-release-branch.sh -u branch-8.6-built includes a cleanup step that didn't happen here.

This comment has been minimized.

Sign in to view

Copy link
@dereksmart

dereksmart Jun 15, 2020

Author Member

I used that script. Lost my terminal history to see the exact commands, but I went through the normal flows.
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "0.6.2",
Expand Down
4 changes: 2 additions & 2 deletions jetpack.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Plugin URI: https://jetpack.com
* Description: Bring the power of the WordPress.com cloud to your self-hosted WordPress. Jetpack enables you to connect your blog to a WordPress.com account to use the powerful features normally only available to WordPress.com users.
* Author: Automattic
* Version: 8.6
* Version: 8.6.1
* Author URI: https://jetpack.com
* License: GPL2+
* Text Domain: jetpack
Expand All @@ -15,7 +15,7 @@

define( 'JETPACK__MINIMUM_WP_VERSION', '5.3' );
define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' );
define( 'JETPACK__VERSION', '8.6' );
define( 'JETPACK__VERSION', '8.6.1' );
define( 'JETPACK_MASTER_USER', true );
define( 'JETPACK__API_VERSION', 1 );
define( 'JETPACK__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
Expand Down
9 changes: 9 additions & 0 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,15 @@ There are opportunities for developers at all levels to contribute. [Learn more

== Changelog ==

= 8.6.1 =

* Release date: June 2, 2020

**Bug Fixes**

* Resolves PHP notice when generating Twitter Cards for posts with images without saved size information.
* Resolves an issue that can lead to excessive SQL queries.

= 8.6 =

* Release date: June 2, 2020
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit70a5da5fb502b46404ec2aa516d71d2b::getLoader();
return ComposerAutoloaderInit1407c3ef871af57ef58a0b6035c3e83c::getLoader();
4 changes: 2 additions & 2 deletions vendor/autoload_packages.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function autoloader( $class_name ) {
/**
* Prepare all the classes for autoloading.
*/
function enqueue_packages_a1b028b4d2789b9ea4bf96651897b7c9() {
function enqueue_packages_cb1a9d651aecb1d49479d7018d3bed65() {
$class_map = require_once dirname( __FILE__ ) . '/composer/autoload_classmap_package.php';
foreach ( $class_map as $class_name => $class_info ) {
enqueue_package_class( $class_name, $class_info['version'], $class_info['path'] );
Expand All @@ -203,4 +203,4 @@ function enqueue_packages_a1b028b4d2789b9ea4bf96651897b7c9() {
file_loader(); // Either WordPress is not loaded or plugin is doing it wrong. Either way we'll load the files so nothing breaks.
}
}
enqueue_packages_a1b028b4d2789b9ea4bf96651897b7c9();
enqueue_packages_cb1a9d651aecb1d49479d7018d3bed65();
14 changes: 2 additions & 12 deletions vendor/automattic/jetpack-sync/src/class-sender.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,24 +256,14 @@ public function set_next_sync_time( $time, $queue_name ) {
* @return boolean|\WP_Error True if this sync sending was successful, error object otherwise.
*/
public function do_full_sync() {
$sync_module = Modules::get_module( 'full-sync' );
if ( ! $sync_module ) {
if ( ! Modules::get_module( 'full-sync' ) ) {
return;
}
if ( ! Settings::get_setting( 'full_sync_sender_enabled' ) ) {
return;
}
$this->continue_full_sync_enqueue();
// immediate full sync sends data in continue_full_sync_enqueue.
if ( false === strpos( get_class( $sync_module ), 'Full_Sync_Immediately' ) ) {
return $this->do_sync_and_set_delays( $this->full_sync_queue );
} else {
if ( $sync_module->get_status()['finished'] ) {
return false;
} else {
return true;
}
}
return $this->do_sync_and_set_delays( $this->full_sync_queue );
}

/**
Expand Down
2 changes: 1 addition & 1 deletion vendor/composer/ClassLoader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public function isClassMapAuthoritative()
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
}

/**
Expand Down
86 changes: 43 additions & 43 deletions vendor/composer/autoload_classmap_package.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,175 +19,175 @@
'path' => $baseDir . '/src/class-tracking.php'
),
'Automattic\\Jetpack\\Sync\\Defaults' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-defaults.php'
),
'Automattic\\Jetpack\\Sync\\Sender' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-sender.php'
),
'Automattic\\Jetpack\\Sync\\Replicastore_Interface' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/interface-replicastore.php'
),
'Automattic\\Jetpack\\Sync\\Replicastore' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-replicastore.php'
),
'Automattic\\Jetpack\\Sync\\Actions' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-actions.php'
),
'Automattic\\Jetpack\\Sync\\Functions' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-functions.php'
),
'Automattic\\Jetpack\\Sync\\Utils' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-utils.php'
),
'Automattic\\Jetpack\\Sync\\Lock' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-lock.php'
),
'Automattic\\Jetpack\\Sync\\Codec_Interface' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/interface-codec.php'
),
'Automattic\\Jetpack\\Sync\\Main' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-main.php'
),
'Automattic\\Jetpack\\Sync\\Queue_Buffer' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-queue-buffer.php'
),
'Automattic\\Jetpack\\Sync\\Users' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-users.php'
),
'Automattic\\Jetpack\\Sync\\Simple_Codec' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-simple-codec.php'
),
'Automattic\\Jetpack\\Sync\\Queue' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-queue.php'
),
'Automattic\\Jetpack\\Sync\\Modules' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-modules.php'
),
'Automattic\\Jetpack\\Sync\\Listener' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-listener.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Posts' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-posts.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Attachments' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-attachments.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Full_Sync_Immediately' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-full-sync-immediately.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\WooCommerce' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-woocommerce.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\WP_Super_Cache' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-wp-super-cache.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Module' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-module.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Plugins' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-plugins.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Menus' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-menus.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Stats' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-stats.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Meta' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-meta.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Users' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-users.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Comments' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-comments.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Options' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-options.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Constants' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-constants.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Term_Relationships' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-term-relationships.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Terms' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-terms.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Themes' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-themes.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Network_Options' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-network-options.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Protect' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-protect.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Import' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-import.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Callables' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-callables.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Full_Sync' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-full-sync.php'
),
'Automattic\\Jetpack\\Sync\\Modules\\Updates' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/modules/class-updates.php'
),
'Automattic\\Jetpack\\Sync\\JSON_Deflate_Array_Codec' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-json-deflate-array-codec.php'
),
'Automattic\\Jetpack\\Sync\\Settings' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-settings.php'
),
'Automattic\\Jetpack\\Sync\\Health' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-health.php'
),
'Automattic\\Jetpack\\Sync\\Server' => array(
'version' => '1.12.3.0',
'version' => '1.12.4.0',
'path' => $vendorDir . '/automattic/jetpack-sync/src/class-server.php'
),
'Automattic\\Jetpack\\JITMS\\Post_Connection_JITM' => array(
Expand Down
Loading

0 comments on commit e0fde56

Please sign in to comment.