From 1160f9fee1480faf966e2d2109f280c16bb519c6 Mon Sep 17 00:00:00 2001 From: ice9js Date: Thu, 25 Jan 2024 12:18:32 +0000 Subject: [PATCH] Updated package versions for automattic/jetpack-mu-wpcom-plugin Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/7654287697 --- CHANGELOG.md | 6 +- composer.json | 5 +- composer.lock | 95 +++++++------------ mu-wpcom-plugin.php | 2 +- package.json | 2 +- vendor/autoload.php | 2 +- .../automattic/jetpack-mu-wpcom/CHANGELOG.md | 9 +- .../src/class-jetpack-mu-wpcom.php | 18 +--- vendor/composer/autoload_real.php | 8 +- vendor/composer/autoload_static.php | 4 +- vendor/composer/installed.json | 42 +++----- vendor/composer/installed.php | 6 +- 12 files changed, 75 insertions(+), 124 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af80d209..533bdadc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,9 @@ 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.16-alpha - unreleased - -This is an alpha version! The changes listed here are not final. +## 2.0.16 - 2024-01-25 +### Changed +- Internal updates. ## 2.0.15 - 2024-01-23 ### Changed diff --git a/composer.json b/composer.json index 82f122a2..54264f06 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "wordpress-plugin", "license": "GPL-2.0-or-later", "require": { - "automattic/jetpack-mu-wpcom": "^5.10.0-alpha" + "automattic/jetpack-mu-wpcom": "^5.10.0" }, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", @@ -23,6 +23,7 @@ "@composer phpunit" ] }, + "repositories": [], "minimum-stability": "dev", "prefer-stable": true, "extra": { @@ -37,6 +38,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16_alpha" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16" } } diff --git a/composer.lock b/composer.lock index e38f4af5..5b1ed2d2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,15 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2b003e513e19b11fd56ed38ce2e6e705", + "content-hash": "c69fc3d64c1205553a55a42b75695379", "packages": [ { "name": "automattic/jetpack-mu-wpcom", - "version": "5.10.0-alpha.1706104310", + "version": "v5.10.0", + "source": { + "type": "git", + "url": "https://github.com/Automattic/jetpack-mu-wpcom.git", + "reference": "fe200e568ac0de2ad143bd61a9bd9906bad14e81" + }, "dist": { - "type": "path", - "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "e415f08d02b4b89b9d8e3a0d24de6a5d35d383e4" + "type": "zip", + "url": "https://api.github.com/repos/Automattic/jetpack-mu-wpcom/zipball/fe200e568ac0de2ad143bd61a9bd9906bad14e81", + "reference": "fe200e568ac0de2ad143bd61a9bd9906bad14e81", + "shasum": "" }, "require": { "php": ">=7.0" @@ -45,43 +51,31 @@ "src/" ] }, - "scripts": { - "phpunit": [ - "./vendor/phpunit/phpunit/phpunit --colors=always" - ], - "test-php": [ - "@composer phpunit" - ], - "build-production": [ - "pnpm run build-production-js" - ], - "build-development": [ - "pnpm run build-js" - ], - "post-install-cmd": [ - "WorDBless\\Composer\\InstallDropin::copy" - ], - "post-update-cmd": [ - "WorDBless\\Composer\\InstallDropin::copy" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], "description": "Enhances your site with features powered by WordPress.com", - "transport-options": { - "relative": false - } + "support": { + "source": "https://github.com/Automattic/jetpack-mu-wpcom/tree/v5.10.0" + }, + "time": "2024-01-23T13:40:08+00:00" } ], "packages-dev": [ { "name": "automattic/jetpack-changelogger", - "version": "4.1.0", + "version": "v4.1.0", + "source": { + "type": "git", + "url": "https://github.com/Automattic/jetpack-changelogger.git", + "reference": "c6f2013bb78551ca0f6340ba38ea54c5f3e5254b" + }, "dist": { - "type": "path", - "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "acf8dcfd04e6500cac3db5e3d654e83610055820" + "type": "zip", + "url": "https://api.github.com/repos/Automattic/jetpack-changelogger/zipball/c6f2013bb78551ca0f6340ba38ea54c5f3e5254b", + "reference": "c6f2013bb78551ca0f6340ba38ea54c5f3e5254b", + "shasum": "" }, "require": { "php": ">=7.0", @@ -111,30 +105,11 @@ }, "autoload": { "psr-4": { - "Automattic\\Jetpack\\Changelogger\\": "src", - "Automattic\\Jetpack\\Changelog\\": "lib" + "Automattic\\Jetpack\\Changelog\\": "lib", + "Automattic\\Jetpack\\Changelogger\\": "src" } }, - "autoload-dev": { - "psr-4": { - "Automattic\\Jetpack\\Changelogger\\Tests\\": "tests/php/includes/src", - "Automattic\\Jetpack\\Changelog\\Tests\\": "tests/php/includes/lib" - } - }, - "scripts": { - "phpunit": [ - "./vendor/phpunit/phpunit/phpunit --colors=always" - ], - "test-php": [ - "@composer phpunit" - ], - "post-install-cmd": [ - "[ -e vendor/bin/changelogger ] || { cd vendor/bin && ln -s ../../bin/changelogger; }" - ], - "post-update-cmd": [ - "[ -e vendor/bin/changelogger ] || { cd vendor/bin && ln -s ../../bin/changelogger; }" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], @@ -145,9 +120,10 @@ "dev", "keepachangelog" ], - "transport-options": { - "relative": false - } + "support": { + "source": "https://github.com/Automattic/jetpack-changelogger/tree/v4.1.0" + }, + "time": "2024-01-22T17:55:25+00:00" }, { "name": "doctrine/instantiator", @@ -2719,10 +2695,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "automattic/jetpack-mu-wpcom": 20, - "automattic/jetpack-changelogger": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": [], diff --git a/mu-wpcom-plugin.php b/mu-wpcom-plugin.php index 605975b7..803f7ca3 100644 --- a/mu-wpcom-plugin.php +++ b/mu-wpcom-plugin.php @@ -3,7 +3,7 @@ * * Plugin Name: WordPress.com Features * Description: Test plugin for the jetpack-mu-wpcom package - * Version: 2.0.16-alpha + * Version: 2.0.16 * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/package.json b/package.json index ef6c451d..3acbba5d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "2.0.16-alpha", + "version": "2.0.16", "description": "Test plugin for the jetpack-mu-wpcom package", "homepage": "https://jetpack.com", "bugs": { diff --git a/vendor/autoload.php b/vendor/autoload.php index 5e80ec70..503207c6 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16_alpha::getLoader(); +return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16::getLoader(); diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md index 2ba80a28..6c982c3c 100644 --- a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md +++ b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md @@ -5,12 +5,9 @@ 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). -## [5.10.0-alpha] - unreleased - -This is an alpha version! The changes listed here are not final. - +## [5.10.0] - 2024-01-23 ### Added -- Add Verbum Comments in jetpack-mu-wpcom plugin +- Add Verbum Comments in jetpack-mu-wpcom plugin [#34993] ## [5.9.0] - 2024-01-22 ### Added @@ -544,7 +541,7 @@ This is an alpha version! The changes listed here are not final. - Testing initial package release. -[5.10.0-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.9.0...v5.10.0-alpha +[5.10.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.9.0...v5.10.0 [5.9.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.8.2...v5.9.0 [5.8.2]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.8.1...v5.8.2 [5.8.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.8.0...v5.8.1 diff --git a/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index 28a8c38b..b6124647 100644 --- a/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -13,7 +13,7 @@ * Jetpack_Mu_Wpcom main class. */ class Jetpack_Mu_Wpcom { - const PACKAGE_VERSION = '5.10.0-alpha'; + const PACKAGE_VERSION = '5.10.0'; const PKG_DIR = __DIR__ . '/../'; const BASE_DIR = __DIR__ . '/'; const BASE_FILE = __FILE__; @@ -42,10 +42,7 @@ public static function init() { add_action( 'plugins_loaded', array( __CLASS__, 'load_first_posts_stream_helpers' ) ); - // This feature runs only on simple sites - if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) { - add_action( 'plugins_loaded', array( __CLASS__, 'load_verbum_comments' ) ); - } + add_action( 'plugins_loaded', array( __CLASS__, 'load_verbum_comments' ) ); // Unified navigation fix for changes in WordPress 6.2. add_action( 'admin_enqueue_scripts', array( __CLASS__, 'unbind_focusout_on_wp_admin_bar_menu_toggle' ) ); @@ -230,13 +227,8 @@ public static function load_first_posts_stream_helpers() { * @param int $blog_id The blog ID. * @return boolean */ - private static function should_disable_comment_experience( $blog_id ) { - $path_wp_for_teams = WP_CONTENT_DIR . '/lib/wpforteams/functions.php'; - - if ( file_exists( $path_wp_for_teams ) ) { - require_once $path_wp_for_teams; - } - + private function should_disable_comment_experience( $blog_id ) { + require_once WP_CONTENT_DIR . '/lib/wpforteams/functions.php'; // This covers both P2 and P2020 themes. $is_p2 = str_contains( get_stylesheet(), 'pub/p2' ) || function_exists( '\WPForTeams\is_wpforteams_site' ) && is_wpforteams_site( $blog_id ); $is_forums = str_contains( get_stylesheet(), 'a8c/supportforums' ); // Not in /forums @@ -259,7 +251,7 @@ public static function load_verbum_comments() { if ( isset( $_GET['blogid'] ) ) { $blog_id = intval( $_GET['blogid'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended } - if ( self::should_disable_comment_experience( $blog_id ) ) { + if ( should_disable_comment_experience( $blog_id ) ) { return false; } require_once __DIR__ . '/build/verbum-comments/class-verbum-comments.php'; diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 4706d3db..69572ea2 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16_alpha +class ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16 { private static $loader; @@ -24,12 +24,12 @@ public static function getLoader() require __DIR__ . '/platform_check.php'; - spl_autoload_register(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16_alpha', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16_alpha', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16_alpha::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 736067a3..1c5d224a 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16_alpha +class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16 { public static $classMap = array ( 'Automattic\\Jetpack\\Jetpack_Mu_Wpcom' => __DIR__ . '/..' . '/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php', @@ -24,7 +24,7 @@ class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_plugin public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->classMap = ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16_alpha::$classMap; + $loader->classMap = ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_16::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 26ff5084..9bca2fd1 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,12 +2,18 @@ "packages": [ { "name": "automattic/jetpack-mu-wpcom", - "version": "5.10.0-alpha.1706104310", - "version_normalized": "5.10.0.0-alpha1706104310", + "version": "v5.10.0", + "version_normalized": "5.10.0.0", + "source": { + "type": "git", + "url": "https://github.com/Automattic/jetpack-mu-wpcom.git", + "reference": "fe200e568ac0de2ad143bd61a9bd9906bad14e81" + }, "dist": { - "type": "path", - "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "e415f08d02b4b89b9d8e3a0d24de6a5d35d383e4" + "type": "zip", + "url": "https://api.github.com/repos/Automattic/jetpack-mu-wpcom/zipball/fe200e568ac0de2ad143bd61a9bd9906bad14e81", + "reference": "fe200e568ac0de2ad143bd61a9bd9906bad14e81", + "shasum": "" }, "require": { "php": ">=7.0" @@ -20,6 +26,7 @@ "suggest": { "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package." }, + "time": "2024-01-23T13:40:08+00:00", "type": "jetpack-library", "extra": { "mirror-repo": "Automattic/jetpack-mu-wpcom", @@ -41,32 +48,13 @@ "src/" ] }, - "scripts": { - "phpunit": [ - "./vendor/phpunit/phpunit/phpunit --colors=always" - ], - "test-php": [ - "@composer phpunit" - ], - "build-production": [ - "pnpm run build-production-js" - ], - "build-development": [ - "pnpm run build-js" - ], - "post-install-cmd": [ - "WorDBless\\Composer\\InstallDropin::copy" - ], - "post-update-cmd": [ - "WorDBless\\Composer\\InstallDropin::copy" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], "description": "Enhances your site with features powered by WordPress.com", - "transport-options": { - "relative": false + "support": { + "source": "https://github.com/Automattic/jetpack-mu-wpcom/tree/v5.10.0" }, "install-path": "../automattic/jetpack-mu-wpcom" } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 77c1c093..b44a5c23 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -11,9 +11,9 @@ ), 'versions' => array( 'automattic/jetpack-mu-wpcom' => array( - 'pretty_version' => '5.10.0-alpha.1706104310', - 'version' => '5.10.0.0-alpha1706104310', - 'reference' => 'e415f08d02b4b89b9d8e3a0d24de6a5d35d383e4', + 'pretty_version' => 'v5.10.0', + 'version' => '5.10.0.0', + 'reference' => 'fe200e568ac0de2ad143bd61a9bd9906bad14e81', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(),