From 29715267762c266d9c5e8419987c4c18cbcc0820 Mon Sep 17 00:00:00 2001 From: anomiex Date: Tue, 21 Nov 2023 09:49:36 +0000 Subject: [PATCH] Clean up Composer deps now that we dropped PHP 5.6 (#34217) * `johnkary/phpunit-speedtrap` option for version 1.1.0 is no longer needed, PHP 7.0 uses 2.0. * `symfony/console` and `symfony/process` still need 3.4 for PHP 7.0, but when I was checking I noticed that 7.1 can use 4.4 so added that as an option. * [Wikimedia stopped using `wikimedia/at-ease`][1] since PHP 7 improved the behavior of the `@` operator. So let's drop it too. [1]: https://phabricator.wikimedia.org/T253461 Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6941896544 --- CHANGELOG.md | 4 ++ composer.json | 2 +- composer.lock | 68 +++-------------------------- mu-wpcom-plugin.php | 2 +- package.json | 2 +- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 8 ++-- vendor/composer/autoload_static.php | 4 +- vendor/composer/installed.json | 2 +- vendor/composer/installed.php | 2 +- 10 files changed, 22 insertions(+), 74 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b05e6a34..9eaef330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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.1-alpha - unreleased + +This is an alpha version! The changes listed here are not final. + ## 2.0.0 - 2023-11-20 ### Changed - Updated the required PHP version to >= 7.0. [#34126] diff --git a/composer.json b/composer.json index 54367112..fedd5983 100644 --- a/composer.json +++ b/composer.json @@ -37,6 +37,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_0" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_1_alpha" } } diff --git a/composer.lock b/composer.lock index a7236ff6..73cf7bab 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3a0d6b8e05979fe2626e185a75887c23", + "content-hash": "e6e0d13f731cdf0eb571b069e01b5d31", "packages": [ { "name": "automattic/jetpack-mu-wpcom", @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "954576bec7c7932cf68370e8d5366e60b64fdbbc" + "reference": "2a97bdb5cb24ef43b4d082b1583b4bdeec27c5ca" }, "require": { "php": ">=7.0" @@ -77,17 +77,16 @@ "packages-dev": [ { "name": "automattic/jetpack-changelogger", - "version": "4.0.1-alpha.1700559279", + "version": "4.0.1-alpha.1700559364", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "c294cc07c8fcb92351d79d79ef529f88de7d2fdc" + "reference": "a4b87f650850ddf5666c173a76e1df18b4d5914d" }, "require": { "php": ">=7.0", - "symfony/console": "^3.4 || ^5.2 || ^6.0", - "symfony/process": "^3.4 || ^5.2 || ^6.0", - "wikimedia/at-ease": "^1.2 || ^2.0" + "symfony/console": "^3.4 || ^4.4 || ^5.2 || ^6.0", + "symfony/process": "^3.4 || ^4.4 || ^5.2 || ^6.0" }, "require-dev": { "wikimedia/testing-access-wrapper": "^1.0 || ^2.0", @@ -2651,61 +2650,6 @@ ], "time": "2021-07-28T10:34:58+00:00" }, - { - "name": "wikimedia/at-ease", - "version": "v2.1.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/at-ease.git", - "reference": "e8ebaa7bb7c8a8395481a05f6dc4deaceab11c33" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/at-ease/zipball/e8ebaa7bb7c8a8395481a05f6dc4deaceab11c33", - "reference": "e8ebaa7bb7c8a8395481a05f6dc4deaceab11c33", - "shasum": "" - }, - "require": { - "php": ">=7.2.9" - }, - "require-dev": { - "mediawiki/mediawiki-codesniffer": "35.0.0", - "mediawiki/minus-x": "1.1.1", - "ockcyp/covers-validator": "1.3.3", - "php-parallel-lint/php-console-highlighter": "0.5.0", - "php-parallel-lint/php-parallel-lint": "1.2.0", - "phpunit/phpunit": "^8.5" - }, - "type": "library", - "autoload": { - "files": [ - "src/Wikimedia/Functions.php" - ], - "psr-4": { - "Wikimedia\\AtEase\\": "src/Wikimedia/AtEase/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Tim Starling", - "email": "tstarling@wikimedia.org" - }, - { - "name": "MediaWiki developers", - "email": "wikitech-l@lists.wikimedia.org" - } - ], - "description": "Safe replacement to @ for suppressing warnings.", - "homepage": "https://www.mediawiki.org/wiki/at-ease", - "support": { - "source": "https://github.com/wikimedia/at-ease/tree/v2.1.0" - }, - "time": "2021-02-27T15:53:37+00:00" - }, { "name": "yoast/phpunit-polyfills", "version": "1.1.0", diff --git a/mu-wpcom-plugin.php b/mu-wpcom-plugin.php index ed98d896..11bcfef8 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.0 + * Version: 2.0.1-alpha * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/package.json b/package.json index f7b126ce..165dd553 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "2.0.0", + "version": "2.0.1-alpha", "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 459a5b58..404e66b7 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_0::getLoader(); +return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_1_alpha::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index e437a201..3147f8d1 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_0 +class ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_1_alpha { 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_0', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_1_alpha', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_0', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_1_alpha', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_0::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_1_alpha::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 9ebc234a..4522e09a 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_0 +class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_1_alpha { public static $classMap = array ( 'Automattic\\Jetpack\\Jetpack_Mu_Wpcom' => __DIR__ . '/..' . '/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php', @@ -18,7 +18,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_0::$classMap; + $loader->classMap = ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_1_alpha::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 19412649..c775cf1a 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -7,7 +7,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "954576bec7c7932cf68370e8d5366e60b64fdbbc" + "reference": "2a97bdb5cb24ef43b4d082b1583b4bdeec27c5ca" }, "require": { "php": ">=7.0" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index af430faa..56584744 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'automattic/jetpack-mu-wpcom' => array( 'pretty_version' => '5.0.0', 'version' => '5.0.0.0', - 'reference' => '954576bec7c7932cf68370e8d5366e60b64fdbbc', + 'reference' => '2a97bdb5cb24ef43b4d082b1583b4bdeec27c5ca', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(),