From 13612b1618f4620854d75b7c642df8947b696817 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Tue, 14 Nov 2023 19:35:16 +0100 Subject: [PATCH 01/22] General: update our PHP version requirements to PHP 7.0 Fixes #31714 --- .github/actions/tool-setup/action.yml | 2 +- .github/files/generate-ci-matrix.php | 11 +- .github/renovate.json5 | 2 +- .github/versions.sh | 2 +- .github/workflows/linting.yml | 2 +- .phpcs.config.xml | 2 +- docs/coding-guidelines.md | 2 +- docs/development-environment.md | 4 +- docs/monorepo.md | 6 +- .../regression-checklist.md | 2 +- .../changelog/update-php-requirements | 4 + projects/packages/changelogger/composer.json | 4 +- .../packages/changelogger/src/Application.php | 2 +- .../changelogger/src/CommandLoader.php | 8 +- .../changelogger/src/php5/CommandLoader.php | 47 ------ .../src/php7/.phpcs.dir.phpcompatibility.xml | 2 +- .../codesniffer/Jetpack-Compat-70/ruleset.xml | 150 ------------------ .../codesniffer/Jetpack-Compat-71/ruleset.xml | 2 +- .../codesniffer/Jetpack-Compat-72/ruleset.xml | 2 +- .../codesniffer/Jetpack-Compat-73/ruleset.xml | 2 +- .../codesniffer/Jetpack-Compat-74/ruleset.xml | 2 +- .../codesniffer/Jetpack-Compat-80/ruleset.xml | 2 +- .../codesniffer/Jetpack-Compat-81/ruleset.xml | 2 +- .../codesniffer/Jetpack-Compat-82/ruleset.xml | 2 +- .../packages/codesniffer/Jetpack/ruleset.xml | 2 +- projects/packages/codesniffer/README.md | 6 +- .../codesniffer/build-compat-rulesets.sh | 4 +- .../changelog/update-php-requirements | 4 + .../tests/php/tests/files/default.xml | 2 +- .../i18n-text_domain-default.php.ruleset.xml | 2 +- .../i18n-text_domain-not-set.php.ruleset.xml | 2 +- .../changelog/update-php-requirements | 4 + projects/packages/my-jetpack/composer.json | 2 +- projects/packages/my-jetpack/package.json | 2 +- .../my-jetpack/src/class-initializer.php | 2 +- .../tests/php/test-backup-product.php | 6 - .../tests/php/test-hybrid-product.php | 5 - .../tests/php/test-module-product.php | 6 - .../php/test-product-multiple-filenames.php | 6 - .../tests/php/test-products-rest.php | 6 - .../my-jetpack/tests/php/test-products.php | 14 -- .../tests/php/test-search-product.php | 6 - .../tests/php/test-social-product.php | 6 - .../tests/php/test-videopress-product.php | 6 - .../tests/php/test-wpcom-products.php | 6 - .../backup/changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/backup/composer.lock | 10 +- projects/plugins/backup/readme.txt | 2 +- .../beta/changelog/update-php-requirements | 5 + projects/plugins/beta/composer.lock | 6 +- .../boost/changelog/update-php-requirements | 4 + .../boost/changelog/update-php-requirements#2 | 5 + projects/plugins/boost/composer.lock | 10 +- .../plugins/boost/docs/DEVELOPEMENT_GUIDE.md | 2 +- .../crm/changelog/update-php-requirements | 5 + projects/plugins/crm/composer.lock | 6 +- .../changelog/update-php-requirements | 5 + projects/plugins/debug-helper/composer.lock | 6 +- .../inspect/changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/inspect/composer.lock | 6 +- projects/plugins/inspect/readme.txt | 2 +- .../jetpack/changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/jetpack/composer.lock | 10 +- projects/plugins/jetpack/jetpack.php | 4 +- projects/plugins/jetpack/readme.txt | 4 +- .../changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/migration/composer.json | 2 +- projects/plugins/migration/composer.lock | 10 +- projects/plugins/migration/readme.txt | 2 +- .../plugins/migration/wpcom-migration.php | 2 +- .../changelog/update-php-requirements | 5 + .../plugins/mu-wpcom-plugin/composer.lock | 6 +- .../protect/changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/protect/composer.json | 2 +- projects/plugins/protect/composer.lock | 10 +- projects/plugins/protect/jetpack-protect.php | 4 +- projects/plugins/protect/readme.txt | 2 +- .../search/changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/search/composer.lock | 10 +- projects/plugins/search/readme.txt | 2 +- .../social/changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/social/composer.lock | 10 +- projects/plugins/social/readme.txt | 2 +- .../changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/starter-plugin/composer.json | 2 +- projects/plugins/starter-plugin/composer.lock | 10 +- .../starter-plugin/jetpack-starter-plugin.php | 2 +- projects/plugins/starter-plugin/readme.txt | 2 +- .../changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/super-cache/composer.json | 2 +- projects/plugins/super-cache/composer.lock | 6 +- projects/plugins/super-cache/package.json | 2 +- projects/plugins/super-cache/readme.txt | 2 +- projects/plugins/super-cache/wp-cache.php | 2 +- .../changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/vaultpress/composer.json | 2 +- projects/plugins/vaultpress/composer.lock | 6 +- projects/plugins/vaultpress/readme.txt | 2 +- projects/plugins/vaultpress/vaultpress.php | 4 +- .../changelog/update-php-requirements | 4 + .../changelog/update-php-requirements#2 | 5 + projects/plugins/videopress/composer.lock | 10 +- projects/plugins/videopress/readme.txt | 2 +- tools/cli/commands/generate.js | 2 +- 114 files changed, 273 insertions(+), 410 deletions(-) create mode 100644 projects/packages/changelogger/changelog/update-php-requirements delete mode 100644 projects/packages/changelogger/src/php5/CommandLoader.php delete mode 100644 projects/packages/codesniffer/Jetpack-Compat-70/ruleset.xml create mode 100644 projects/packages/codesniffer/changelog/update-php-requirements create mode 100644 projects/packages/my-jetpack/changelog/update-php-requirements create mode 100644 projects/plugins/backup/changelog/update-php-requirements create mode 100644 projects/plugins/backup/changelog/update-php-requirements#2 create mode 100644 projects/plugins/beta/changelog/update-php-requirements create mode 100644 projects/plugins/boost/changelog/update-php-requirements create mode 100644 projects/plugins/boost/changelog/update-php-requirements#2 create mode 100644 projects/plugins/crm/changelog/update-php-requirements create mode 100644 projects/plugins/debug-helper/changelog/update-php-requirements create mode 100644 projects/plugins/inspect/changelog/update-php-requirements create mode 100644 projects/plugins/inspect/changelog/update-php-requirements#2 create mode 100644 projects/plugins/jetpack/changelog/update-php-requirements create mode 100644 projects/plugins/jetpack/changelog/update-php-requirements#2 create mode 100644 projects/plugins/migration/changelog/update-php-requirements create mode 100644 projects/plugins/migration/changelog/update-php-requirements#2 create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/update-php-requirements create mode 100644 projects/plugins/protect/changelog/update-php-requirements create mode 100644 projects/plugins/protect/changelog/update-php-requirements#2 create mode 100644 projects/plugins/search/changelog/update-php-requirements create mode 100644 projects/plugins/search/changelog/update-php-requirements#2 create mode 100644 projects/plugins/social/changelog/update-php-requirements create mode 100644 projects/plugins/social/changelog/update-php-requirements#2 create mode 100644 projects/plugins/starter-plugin/changelog/update-php-requirements create mode 100644 projects/plugins/starter-plugin/changelog/update-php-requirements#2 create mode 100644 projects/plugins/super-cache/changelog/update-php-requirements create mode 100644 projects/plugins/super-cache/changelog/update-php-requirements#2 create mode 100644 projects/plugins/vaultpress/changelog/update-php-requirements create mode 100644 projects/plugins/vaultpress/changelog/update-php-requirements#2 create mode 100644 projects/plugins/videopress/changelog/update-php-requirements create mode 100644 projects/plugins/videopress/changelog/update-php-requirements#2 diff --git a/.github/actions/tool-setup/action.yml b/.github/actions/tool-setup/action.yml index 22067adc6cdba..194af359db178 100644 --- a/.github/actions/tool-setup/action.yml +++ b/.github/actions/tool-setup/action.yml @@ -18,7 +18,7 @@ runs: # Read tool versions . .github/versions.sh - if [[ "${INPUT_PHP:-$PHP_VERSION}" == 5.6 || "${INPUT_PHP:-$PHP_VERSION}" == 7.[01] ]]; then + if [[ "${INPUT_PHP:-$PHP_VERSION}" == 7.[01] ]]; then printf "Downgrading composer for PHP %s\n\n" "${INPUT_PHP:-$PHP_VERSION}" COMPOSER_VERSION=2.2.12 fi diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php index 7a3e735c5354d..b1c337e349e35 100755 --- a/.github/files/generate-ci-matrix.php +++ b/.github/files/generate-ci-matrix.php @@ -68,15 +68,6 @@ ); } -// PHP 5.6 support was dropped in WP 6.3. Remove this (and everything elsewhere related to PHP 5.6) when we drop support for earlier versions. -$matrix[] = array( - 'name' => 'PHP tests: PHP 5.6 WP previous', - 'script' => 'test-php', - 'php' => '5.6', - 'wp' => 'previous', - 'timeout' => 20, // 2022-01-25: 5.6 tests have started timing out at 15 minutes. Previously: Successful runs seem to take ~8 minutes for PHP 5.6 and for the 7.4 trunk run, ~5.5-6 for 7.x and 8.0. -); - foreach ( array( 'previous', 'trunk' ) as $wp ) { $phpver = $versions['PHP_VERSION']; $matrix[] = array( @@ -84,7 +75,7 @@ 'script' => 'test-php', 'php' => $phpver, 'wp' => $wp, - 'timeout' => 15, // 2021-01-18: Successful runs seem to take ~8 minutes for PHP 5.6 and for the 7.4 trunk run, ~5.5-6 for 7.x and 8.0. + 'timeout' => 15, // 2021-01-18: Successful runs seem to take ~8 minutes for the 7.4 trunk run, ~5.5-6 for 7.x and 8.0. ); } diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 3eb1ceb8cbb98..74886ed23305e 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -26,7 +26,7 @@ // Monorepo packages are excluded in renovate-config.js, where we can read // the list of them in code. - // We need to keep a wide version range to support PHP 5.6. + // We need to keep a wide version range to support PHP 7.0. // Note for libraries used in plugins this will only work right for require-dev deps, not require. { matchPackageNames: [ diff --git a/.github/versions.sh b/.github/versions.sh index 7fb68b9c0317c..7c3ae874a8041 100644 --- a/.github/versions.sh +++ b/.github/versions.sh @@ -5,5 +5,5 @@ NODE_VERSION=20.8.1 PNPM_VERSION=8.6.8 # Other useful version numbers. -MIN_PHP_VERSION=5.6 +MIN_PHP_VERSION=7.0 MAX_PHP_VERSION=8.2 diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index a532e41e09248..006818e36e2cc 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -171,7 +171,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: [ '5.6', '7.0', '7.2', '7.4', '8.0', '8.1', '8.2' ] + php-versions: [ '7.0', '7.2', '7.4', '8.0', '8.1', '8.2' ] experimental: [ false ] steps: diff --git a/.phpcs.config.xml b/.phpcs.config.xml index fdd5fe831bdf6..76c220208fe41 100644 --- a/.phpcs.config.xml +++ b/.phpcs.config.xml @@ -3,7 +3,7 @@ - + diff --git a/docs/coding-guidelines.md b/docs/coding-guidelines.md index 1207c4a62f7a3..169c78292da87 100644 --- a/docs/coding-guidelines.md +++ b/docs/coding-guidelines.md @@ -4,7 +4,7 @@ These are some things to keep in mind when writing code for Jetpack plugin. Plea ## Versions supported -- Jetpack supports PHP 5.6, as per WordPress' own requirements. Keep that in mind when developing for Jetpack. +- Jetpack supports PHP 7.0, as per WordPress' own requirements. Keep that in mind when developing for Jetpack. - Jetpack follows [WordPress Core's standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/), with a few additions. The best way to ensure that you adhere to those standards is to set up your IDE [as per the recommendations here](./development-environment.md#use-php-codesniffer-and-eslint-to-make-sure-your-code-respects-coding-standards). - Jetpack supports the WP current version and the immediate previous version. So if WP version is 4.6, Jetpack will support it, as well as 4.5. It's desirable that when Jetpack is installed in older versions, it doesn't fail in a severe way. - We support the latest two versions of all major browsers, except IE, where we currently only support 11 and Edge. (see [Browse Happy](http://browsehappy.com) for current latest versions). diff --git a/docs/development-environment.md b/docs/development-environment.md index 5d096ed2ed7af..3930888f39120 100644 --- a/docs/development-environment.md +++ b/docs/development-environment.md @@ -375,9 +375,9 @@ We strongly recommend that you install tools to review your code in your IDE. It composer phpcs:lint ``` -* ### Checking Jetpack's PHP for compatibility with different versions of PHP since 5.6 +* ### Checking Jetpack's PHP for compatibility with different versions of PHP since 7.0 - We have a handy `composer` script that will just run the PHP CodeSniffer `PHPCompatibilityWP` ruleset checking for code not compatible with PHP 5.6 + We have a handy `composer` script that will just run the PHP CodeSniffer `PHPCompatibilityWP` ruleset checking for code not compatible with PHP 7.0 ```sh composer phpcs:compatibility diff --git a/docs/monorepo.md b/docs/monorepo.md index eecec36b13ec4..0619bef25983a 100644 --- a/docs/monorepo.md +++ b/docs/monorepo.md @@ -42,7 +42,7 @@ All GitHub Actions configuration for the monorepo, including CI, lives in `.gith ## Compatibility -All projects should be compatible with PHP versions WordPress supports. That's currently PHP 5.6 to 8.0. +All projects should be compatible with PHP versions WordPress supports. That's currently PHP 7.0 to 8.2. ## First Time @@ -210,7 +210,7 @@ If a project contains PHP tests (typically PHPUnit), it must define `.scripts.te A MySQL database is available if needed; credentials may be found in `~/.my.cnf`. Note that the host must be specified as `127.0.0.1`, as when passed `localhost` PHP will try to connect via a Unix domain socket which is not available in the Actions environment. -Tests are run with a variety of supported PHP versions from 5.6 to 8.0. If you have tests that only need to be run once, run them when `PHP_VERSION` matches that in `.github/versions.sh`. +Tests are run with a variety of supported PHP versions from 7.0 to 8.2. If you have tests that only need to be run once, run them when `PHP_VERSION` matches that in `.github/versions.sh`. #### PHP tests for non-plugins @@ -218,7 +218,7 @@ For all project types other than WordPress plugins, the necessary version of PHP We currently make use of the following packages in testing; it's encouraged to use these rather than introducing other tools that serve the same purpose. -* [yoast/phpunit-polyfills](https://packagist.org/packages/yoast/phpunit-polyfills) supplies polyfills for compatibility with PHPUnit 5.7 to 9.0, to support PHP 5.6 to 8.0. +* [yoast/phpunit-polyfills](https://packagist.org/packages/yoast/phpunit-polyfills) supplies polyfills for compatibility with PHPUnit 5.7 to 9.0, to support PHP 7.0 to 8.2. * Do not use `Yoast\PHPUnitPolyfills\TestCases\TestCase` or `Yoast\PHPUnitPolyfills\TestCases\XTestCase`. Just use the `@before`, `@after`, `@beforeClass`, and `@afterClass` annotations directly. * PHPUnit's built-in mocking is used for class mocks. * [brain/monkey](https://packagist.org/packages/brain/monkey) is used for mocking functions, and can also provide some functions for minimal WordPress compatibility. diff --git a/docs/testing/regression-checklist/regression-checklist.md b/docs/testing/regression-checklist/regression-checklist.md index 2492290646cc5..73ac25801ec83 100644 --- a/docs/testing/regression-checklist/regression-checklist.md +++ b/docs/testing/regression-checklist/regression-checklist.md @@ -21,7 +21,7 @@ NOTE: it might become outdated, so it could be a good idea to generate this file ### PHP versions(Low) -- 5.6 - current +- 7.0 - current ### Hosting providers(High) diff --git a/projects/packages/changelogger/changelog/update-php-requirements b/projects/packages/changelogger/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/packages/changelogger/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/packages/changelogger/composer.json b/projects/packages/changelogger/composer.json index addb7a1558d5d..fe8301c51efcd 100644 --- a/projects/packages/changelogger/composer.json +++ b/projects/packages/changelogger/composer.json @@ -10,7 +10,7 @@ "dev" ], "require": { - "php": ">=5.6", + "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" @@ -58,7 +58,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/packages/changelogger/src/Application.php b/projects/packages/changelogger/src/Application.php index c4f886570c098..f70f32658e4e4 100644 --- a/projects/packages/changelogger/src/Application.php +++ b/projects/packages/changelogger/src/Application.php @@ -18,7 +18,7 @@ */ class Application extends SymfonyApplication { - const VERSION = '3.3.11'; + const VERSION = '3.4.0-alpha'; /** * Constructor. diff --git a/projects/packages/changelogger/src/CommandLoader.php b/projects/packages/changelogger/src/CommandLoader.php index a1b634fa04890..2b82457a48979 100644 --- a/projects/packages/changelogger/src/CommandLoader.php +++ b/projects/packages/changelogger/src/CommandLoader.php @@ -2,7 +2,7 @@ /** * Compatibility stub for Symfony 6 changes. * - * Symfony 6 (for PHP 8.0+) added return type hints to its interface. But we still support PHP 5.6, which doesn't recognize that syntax. + * Symfony 6 (for PHP 8.0+) added return type hints to its interface. But we still support PHP 7.0, which doesn't recognize that syntax. * Since specifying a return type when the interface doesn't is ok, use the version that always does that for PHP 7+ instead of figuring * out how to check the actual symfony version. * @@ -11,8 +11,4 @@ namespace Automattic\Jetpack\Changelogger; -if ( PHP_VERSION_ID >= 70000 ) { - class_alias( php7\CommandLoader::class, CommandLoader::class ); -} else { - class_alias( php5\CommandLoader::class, CommandLoader::class ); -} +class_alias( php7\CommandLoader::class, CommandLoader::class ); diff --git a/projects/packages/changelogger/src/php5/CommandLoader.php b/projects/packages/changelogger/src/php5/CommandLoader.php deleted file mode 100644 index 9d5857e18cac5..0000000000000 --- a/projects/packages/changelogger/src/php5/CommandLoader.php +++ /dev/null @@ -1,47 +0,0 @@ -doHas( $name ); - } - - /** - * Loads a command. - * - * @param string $name Command name. - * @return Command - * @throws CommandNotFoundException If the command is not found. - */ - public function get( $name ) { - return $this->doGet( $name ); - } - - /** - * Return all command names. - * - * @return string[] All registered command names - */ - public function getNames() { - return $this->doGetNames(); - } -} diff --git a/projects/packages/changelogger/src/php7/.phpcs.dir.phpcompatibility.xml b/projects/packages/changelogger/src/php7/.phpcs.dir.phpcompatibility.xml index 09591b7d44e92..a341a2ae9fd81 100644 --- a/projects/packages/changelogger/src/php7/.phpcs.dir.phpcompatibility.xml +++ b/projects/packages/changelogger/src/php7/.phpcs.dir.phpcompatibility.xml @@ -1,4 +1,4 @@ - + diff --git a/projects/packages/codesniffer/Jetpack-Compat-70/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-70/ruleset.xml deleted file mode 100644 index c39cfc5390e3d..0000000000000 --- a/projects/packages/codesniffer/Jetpack-Compat-70/ruleset.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - Standard to disable PHPCompatibility rules that trigger with 5.6 but not 7.0. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml index 47425d0f1ab7f..6bfdaa2766741 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml @@ -1,6 +1,6 @@ - Standard to disable PHPCompatibility rules that trigger with 5.6 but not 7.1. + Standard to disable PHPCompatibility rules that trigger with 7.0 but not 7.1. diff --git a/projects/packages/codesniffer/Jetpack-Compat-72/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-72/ruleset.xml index 29d4bf84d9512..90cddfb05c681 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-72/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-72/ruleset.xml @@ -1,6 +1,6 @@ - Standard to disable PHPCompatibility rules that trigger with 5.6 but not 7.2. + Standard to disable PHPCompatibility rules that trigger with 7.0 but not 7.2. diff --git a/projects/packages/codesniffer/Jetpack-Compat-73/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-73/ruleset.xml index f9864e8239a07..852632df01036 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-73/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-73/ruleset.xml @@ -1,6 +1,6 @@ - Standard to disable PHPCompatibility rules that trigger with 5.6 but not 7.3. + Standard to disable PHPCompatibility rules that trigger with 7.0 but not 7.3. diff --git a/projects/packages/codesniffer/Jetpack-Compat-74/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-74/ruleset.xml index 9bdef23458a07..21d6e1cc7999e 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-74/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-74/ruleset.xml @@ -1,6 +1,6 @@ - Standard to disable PHPCompatibility rules that trigger with 5.6 but not 7.4. + Standard to disable PHPCompatibility rules that trigger with 7.0 but not 7.4. diff --git a/projects/packages/codesniffer/Jetpack-Compat-80/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-80/ruleset.xml index 26fa0e85cf2bb..e9e495f31666b 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-80/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-80/ruleset.xml @@ -1,6 +1,6 @@ - Standard to disable PHPCompatibility rules that trigger with 5.6 but not 8.0. + Standard to disable PHPCompatibility rules that trigger with 7.0 but not 8.0. diff --git a/projects/packages/codesniffer/Jetpack-Compat-81/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-81/ruleset.xml index 456c5c3f337e3..71849ceb1b709 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-81/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-81/ruleset.xml @@ -1,6 +1,6 @@ - Standard to disable PHPCompatibility rules that trigger with 5.6 but not 8.1. + Standard to disable PHPCompatibility rules that trigger with 7.0 but not 8.1. diff --git a/projects/packages/codesniffer/Jetpack-Compat-82/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-82/ruleset.xml index f8c04b7279710..2488fa58bf48d 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-82/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-82/ruleset.xml @@ -1,6 +1,6 @@ - Standard to disable PHPCompatibility rules that trigger with 5.6 but not 8.2. + Standard to disable PHPCompatibility rules that trigger with 7.0 but not 8.2. diff --git a/projects/packages/codesniffer/Jetpack/ruleset.xml b/projects/packages/codesniffer/Jetpack/ruleset.xml index 67342cd72a92c..bcd23f8e8d90e 100644 --- a/projects/packages/codesniffer/Jetpack/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack/ruleset.xml @@ -111,7 +111,7 @@ - + diff --git a/projects/packages/codesniffer/README.md b/projects/packages/codesniffer/README.md index 9396f4c7c7fda..45dc446136fd4 100644 --- a/projects/packages/codesniffer/README.md +++ b/projects/packages/codesniffer/README.md @@ -28,7 +28,7 @@ You should then include the Jetpack rules in your `.phpcs.xml.dist`, like You will also likely want to set some configuration for other included rulesets: ```xml - + ``` Included Standards @@ -44,7 +44,7 @@ The Jetpack standard includes the following other standards: Per-dir Compatibility --------------------- -This ruleset is intended to be used with PHPCompatibiity's `testVersion` set to `5.6-`. +This ruleset is intended to be used with PHPCompatibiity's `testVersion` set to `7.0-`. If used with [automattic/jetpack-phpcs-filter](https://github.com/Automattic/jetpack/blob/trunk/projects/packages/phpcs-filter/)'s per-directory configuration, you may run into a situation where a subdir wants to be compatible down to a later version, but as PHPCompatibiity uses `` for `testVersion` the setting cannot be directly altered per directory. @@ -59,7 +59,7 @@ To assist with this case, we provide additional rulesets that disable PHPCompati * `` will disable rules detecting issues that only apply to PHP < 8.1. * `` will disable rules detecting issues that only apply to PHP < 8.2. -Note this isn't a perfect replacement for raising `testVersion`, as it cannot _add_ PHPCompatibility rules that do not trigger when `testVersion` indicates support for PHP 5.6. +Note this isn't a perfect replacement for raising `testVersion`, as it cannot _add_ PHPCompatibility rules that do not trigger when `testVersion` indicates support for PHP 7.0. For example, `Jetpack-Compat-74` disables the `PHPCompatibility.Classes.NewTypedProperties.Found` rule ("Typed properties are not supported in PHP 7.3 or earlier") but cannot enable more specific rules like `PHPCompatibility.Classes.NewTypedProperties.UnionTypeFound` ("Union types are not present in PHP version 7.4 or earlier") that would be triggered if `testVersion` were set to `7.4-`. You may also run into cases where certain subdirectories contain code that is not intended to run under WordPress. We provide additional rulesets to help with this situation as well: diff --git a/projects/packages/codesniffer/build-compat-rulesets.sh b/projects/packages/codesniffer/build-compat-rulesets.sh index cf1f725e50b1d..f8dfb72c58192 100755 --- a/projects/packages/codesniffer/build-compat-rulesets.sh +++ b/projects/packages/codesniffer/build-compat-rulesets.sh @@ -9,7 +9,7 @@ DIR="$(mktemp -d "${TMPDIR%/}/codesniffer-build-compat-rulesets.XXXXXXXX")" trap 'rm -rf "$DIR"' EXIT cd "$DIR" -PHP_VERSIONS=( 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 ) +PHP_VERSIONS=( 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 ) function info { printf '\n\e[1m%s\e[0m\n' "$*" @@ -93,7 +93,7 @@ for V in "${PHP_VERSIONS[@]:1}"; do cat > "Jetpack-Compat-$VV/ruleset.xml" < - Standard to disable PHPCompatibility rules that trigger with 5.6 but not $V. + Standard to disable PHPCompatibility rules that trigger with 7.0 but not $V. $P diff --git a/projects/packages/codesniffer/changelog/update-php-requirements b/projects/packages/codesniffer/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/packages/codesniffer/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/packages/codesniffer/tests/php/tests/files/default.xml b/projects/packages/codesniffer/tests/php/tests/files/default.xml index 3f59e2c9ac772..11c3366fa087d 100644 --- a/projects/packages/codesniffer/tests/php/tests/files/default.xml +++ b/projects/packages/codesniffer/tests/php/tests/files/default.xml @@ -2,7 +2,7 @@ - + diff --git a/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-default.php.ruleset.xml b/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-default.php.ruleset.xml index 539dd4e030682..a8fb765d64d92 100644 --- a/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-default.php.ruleset.xml +++ b/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-default.php.ruleset.xml @@ -2,7 +2,7 @@ - + diff --git a/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml b/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml index e102ef2263f80..0f88584176efd 100644 --- a/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml +++ b/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml @@ -2,7 +2,7 @@ - + diff --git a/projects/packages/my-jetpack/changelog/update-php-requirements b/projects/packages/my-jetpack/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/packages/my-jetpack/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json index f28e415e1e322..15f9d2ca6505d 100644 --- a/projects/packages/my-jetpack/composer.json +++ b/projects/packages/my-jetpack/composer.json @@ -75,7 +75,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json index e80de6be26f03..2b17f6433a1d9 100644 --- a/projects/packages/my-jetpack/package.json +++ b/projects/packages/my-jetpack/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-my-jetpack", - "version": "3.12.2-alpha", + "version": "3.13.0-alpha", "description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme", "bugs": { diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php index 13bd90dc0e3ed..95704e43d35bb 100644 --- a/projects/packages/my-jetpack/src/class-initializer.php +++ b/projects/packages/my-jetpack/src/class-initializer.php @@ -32,7 +32,7 @@ class Initializer { * * @var string */ - const PACKAGE_VERSION = '3.12.2-alpha'; + const PACKAGE_VERSION = '3.13.0-alpha'; /** * HTML container ID for the IDC screen on My Jetpack page. diff --git a/projects/packages/my-jetpack/tests/php/test-backup-product.php b/projects/packages/my-jetpack/tests/php/test-backup-product.php index 781c96a2a88a8..8140fe35bd43a 100644 --- a/projects/packages/my-jetpack/tests/php/test-backup-product.php +++ b/projects/packages/my-jetpack/tests/php/test-backup-product.php @@ -31,12 +31,6 @@ class Test_Backup_Product extends TestCase { * @before */ public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - $this->install_mock_plugins(); wp_cache_delete( 'plugins', 'plugins' ); diff --git a/projects/packages/my-jetpack/tests/php/test-hybrid-product.php b/projects/packages/my-jetpack/tests/php/test-hybrid-product.php index 4a7217eea7dde..733ee1bb24079 100644 --- a/projects/packages/my-jetpack/tests/php/test-hybrid-product.php +++ b/projects/packages/my-jetpack/tests/php/test-hybrid-product.php @@ -30,11 +30,6 @@ class Test_Hybrid_Product extends TestCase { * @before */ public function set_up() { - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - $this->install_mock_plugins(); wp_cache_delete( 'plugins', 'plugins' ); diff --git a/projects/packages/my-jetpack/tests/php/test-module-product.php b/projects/packages/my-jetpack/tests/php/test-module-product.php index 7454c9c98d3b5..85046a2b32d72 100644 --- a/projects/packages/my-jetpack/tests/php/test-module-product.php +++ b/projects/packages/my-jetpack/tests/php/test-module-product.php @@ -38,12 +38,6 @@ class Test_Module_Product extends TestCase { * @before */ public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - $this->install_mock_plugins(); wp_cache_delete( 'plugins', 'plugins' ); diff --git a/projects/packages/my-jetpack/tests/php/test-product-multiple-filenames.php b/projects/packages/my-jetpack/tests/php/test-product-multiple-filenames.php index 32ffdd753963f..26d7db8092d3d 100644 --- a/projects/packages/my-jetpack/tests/php/test-product-multiple-filenames.php +++ b/projects/packages/my-jetpack/tests/php/test-product-multiple-filenames.php @@ -45,12 +45,6 @@ class Test_Product_Multiple_Filenames extends TestCase { * @before */ public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - if ( file_exists( WP_PLUGIN_DIR . '/jetpack/jetpack.php' ) ) { unlink( WP_PLUGIN_DIR . '/jetpack/jetpack.php' ); rmdir( WP_PLUGIN_DIR . '/jetpack' ); diff --git a/projects/packages/my-jetpack/tests/php/test-products-rest.php b/projects/packages/my-jetpack/tests/php/test-products-rest.php index 3c811e1ab9ad4..4d76df7854b64 100644 --- a/projects/packages/my-jetpack/tests/php/test-products-rest.php +++ b/projects/packages/my-jetpack/tests/php/test-products-rest.php @@ -59,12 +59,6 @@ class Test_Products_Rest extends TestCase { * @before */ public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - $this->install_mock_plugin(); wp_cache_delete( 'plugins', 'plugins' ); diff --git a/projects/packages/my-jetpack/tests/php/test-products.php b/projects/packages/my-jetpack/tests/php/test-products.php index 37ed0346deaa0..0626b00ae99da 100644 --- a/projects/packages/my-jetpack/tests/php/test-products.php +++ b/projects/packages/my-jetpack/tests/php/test-products.php @@ -13,20 +13,6 @@ * @see \Automattic\Jetpack\My_Jetpack\Rest_Products */ class Test_Products extends TestCase { - - /** - * Setting up the test. - * - * @before - */ - public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - } - /** * Cleaning up after the test. * diff --git a/projects/packages/my-jetpack/tests/php/test-search-product.php b/projects/packages/my-jetpack/tests/php/test-search-product.php index d6c53c54e6a38..5485015cf344e 100644 --- a/projects/packages/my-jetpack/tests/php/test-search-product.php +++ b/projects/packages/my-jetpack/tests/php/test-search-product.php @@ -30,12 +30,6 @@ class Test_Search_Product extends TestCase { * @before */ public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - $this->install_mock_plugins(); wp_cache_delete( 'plugins', 'plugins' ); diff --git a/projects/packages/my-jetpack/tests/php/test-social-product.php b/projects/packages/my-jetpack/tests/php/test-social-product.php index deb2504349c53..f0e8188521ed7 100644 --- a/projects/packages/my-jetpack/tests/php/test-social-product.php +++ b/projects/packages/my-jetpack/tests/php/test-social-product.php @@ -30,12 +30,6 @@ class Test_Social_Product extends TestCase { * @before */ public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - $this->install_mock_plugins(); wp_cache_delete( 'plugins', 'plugins' ); diff --git a/projects/packages/my-jetpack/tests/php/test-videopress-product.php b/projects/packages/my-jetpack/tests/php/test-videopress-product.php index 3fe64996c4441..4fc554dd8b6bb 100644 --- a/projects/packages/my-jetpack/tests/php/test-videopress-product.php +++ b/projects/packages/my-jetpack/tests/php/test-videopress-product.php @@ -30,12 +30,6 @@ class Test_Videopress_Product extends TestCase { * @before */ public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - $this->install_mock_plugins(); wp_cache_delete( 'plugins', 'plugins' ); diff --git a/projects/packages/my-jetpack/tests/php/test-wpcom-products.php b/projects/packages/my-jetpack/tests/php/test-wpcom-products.php index 4fba525b40f8f..307bc9c6da166 100644 --- a/projects/packages/my-jetpack/tests/php/test-wpcom-products.php +++ b/projects/packages/my-jetpack/tests/php/test-wpcom-products.php @@ -30,12 +30,6 @@ class Test_Wpcom_Products extends TestCase { * @before */ public function set_up() { - - // See https://stackoverflow.com/a/41611876. - if ( version_compare( phpversion(), '5.7', '<=' ) ) { - $this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' ); - } - // Mock site connection. ( new Tokens() )->update_blog_token( 'test.test' ); Jetpack_Options::update_option( 'id', 123 ); diff --git a/projects/plugins/backup/changelog/update-php-requirements b/projects/plugins/backup/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/backup/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/backup/changelog/update-php-requirements#2 b/projects/plugins/backup/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index d02a69b51d3fd..303b27c008bab 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -899,7 +899,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -930,7 +930,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1436,10 +1436,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -1455,7 +1455,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/backup/readme.txt b/projects/plugins/backup/readme.txt index d7ddc033eeff6..db70bc820802b 100644 --- a/projects/plugins/backup/readme.txt +++ b/projects/plugins/backup/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, bjorsch, fgiannar, initsogar, jeherve, jwebbdev, kraftbj, macbre, samiff, sermitr, williamvianas Tags: jetpack, backup, restore Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 Stable tag: 2.2 License: GPLv2 or later diff --git a/projects/plugins/beta/changelog/update-php-requirements b/projects/plugins/beta/changelog/update-php-requirements new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/beta/changelog/update-php-requirements @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/beta/composer.lock b/projects/plugins/beta/composer.lock index cfddaddb1fbb9..6ff473c328028 100644 --- a/projects/plugins/beta/composer.lock +++ b/projects/plugins/beta/composer.lock @@ -266,10 +266,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -285,7 +285,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/boost/changelog/update-php-requirements b/projects/plugins/boost/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/boost/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/boost/changelog/update-php-requirements#2 b/projects/plugins/boost/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index 6b05d7b1f9169..b74a6cb1b3bbc 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -954,7 +954,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -985,7 +985,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1658,10 +1658,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -1677,7 +1677,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/boost/docs/DEVELOPEMENT_GUIDE.md b/projects/plugins/boost/docs/DEVELOPEMENT_GUIDE.md index 25214505679b3..2e3e23e175062 100644 --- a/projects/plugins/boost/docs/DEVELOPEMENT_GUIDE.md +++ b/projects/plugins/boost/docs/DEVELOPEMENT_GUIDE.md @@ -78,7 +78,7 @@ To automatically fix some coding standards issues on the Jetpack Boost PHP code composer phpcs:fix ./projects/plugins/boost ``` -To check for PHP 5.6 code compatibility run: +To check for PHP code compatibility run: ```sh composer phpcs:compatibility ./projects/plugins/boost diff --git a/projects/plugins/crm/changelog/update-php-requirements b/projects/plugins/crm/changelog/update-php-requirements new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/crm/changelog/update-php-requirements @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock index 524941e99b315..858db99636062 100644 --- a/projects/plugins/crm/composer.lock +++ b/projects/plugins/crm/composer.lock @@ -570,10 +570,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -589,7 +589,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/debug-helper/changelog/update-php-requirements b/projects/plugins/debug-helper/changelog/update-php-requirements new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/debug-helper/changelog/update-php-requirements @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/debug-helper/composer.lock b/projects/plugins/debug-helper/composer.lock index f70bc40bfc759..3d10ddbf0638b 100644 --- a/projects/plugins/debug-helper/composer.lock +++ b/projects/plugins/debug-helper/composer.lock @@ -13,10 +13,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -32,7 +32,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/inspect/changelog/update-php-requirements b/projects/plugins/inspect/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/inspect/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/inspect/changelog/update-php-requirements#2 b/projects/plugins/inspect/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/inspect/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/inspect/composer.lock b/projects/plugins/inspect/composer.lock index c98f5f107c434..bb6f2645df92b 100644 --- a/projects/plugins/inspect/composer.lock +++ b/projects/plugins/inspect/composer.lock @@ -616,10 +616,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -635,7 +635,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/inspect/readme.txt b/projects/plugins/inspect/readme.txt index 1dbb8d171ab80..5bfb874e2b25c 100644 --- a/projects/plugins/inspect/readme.txt +++ b/projects/plugins/inspect/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, Tags: jetpack, stuff Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 Stable tag: 1.0.0-alpha License: GPLv2 or later diff --git a/projects/plugins/jetpack/changelog/update-php-requirements b/projects/plugins/jetpack/changelog/update-php-requirements new file mode 100644 index 0000000000000..9c10e4c06a9d8 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: patch +Type: compat + +General: the plugin now requires PHP 7.0 and above. diff --git a/projects/plugins/jetpack/changelog/update-php-requirements#2 b/projects/plugins/jetpack/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..a1c1831fa1ef7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Updated composer.lock. + + diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 31b99fc301972..608645de96b05 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -1638,7 +1638,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1669,7 +1669,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -2997,10 +2997,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -3016,7 +3016,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php index 78dc6591fceaf..0655c3a07ebd9 100644 --- a/projects/plugins/jetpack/jetpack.php +++ b/projects/plugins/jetpack/jetpack.php @@ -9,7 +9,7 @@ * License: GPL2+ * Text Domain: jetpack * Requires at least: 6.2 - * Requires PHP: 5.6 + * Requires PHP: 7.0 * * @package automattic/jetpack */ @@ -33,7 +33,7 @@ */ define( 'JETPACK__MINIMUM_WP_VERSION', '6.2' ); -define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' ); +define( 'JETPACK__MINIMUM_PHP_VERSION', '7.0' ); define( 'JETPACK__VERSION', '12.9-a.4' ); /** diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt index 99ea1eb896b6e..439f4d51558ce 100644 --- a/projects/plugins/jetpack/readme.txt +++ b/projects/plugins/jetpack/readme.txt @@ -3,7 +3,7 @@ Contributors: automattic, adamkheckler, adrianmoldovanwp, aduth, akirk, allendav Tags: Security, backup, Woo, malware, scan, spam, CDN, search, social Stable tag: 12.7 Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -270,7 +270,7 @@ Jetpack has an image CDN that works by caching and serving your WordPress images = What version of PHP do I need? = -Sites must be built on PHP 5.6 or greater, but Jetpack always supports the latest version of PHP. +Sites must be built on PHP 7.0 or greater, but Jetpack always supports the latest version of PHP. = Can Jetpack help my site comply with GDPR? = diff --git a/projects/plugins/migration/changelog/update-php-requirements b/projects/plugins/migration/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/migration/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/migration/changelog/update-php-requirements#2 b/projects/plugins/migration/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/migration/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/migration/composer.json b/projects/plugins/migration/composer.json index f1671666826e7..57c9c182da781 100644 --- a/projects/plugins/migration/composer.json +++ b/projects/plugins/migration/composer.json @@ -72,6 +72,6 @@ "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true }, - "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_migrationⓥ1_0_2_alpha" + "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_migrationⓥ1_1_0_alpha" } } diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock index c116209246252..b2e906bdbb965 100644 --- a/projects/plugins/migration/composer.lock +++ b/projects/plugins/migration/composer.lock @@ -899,7 +899,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -930,7 +930,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1436,10 +1436,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -1455,7 +1455,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/migration/readme.txt b/projects/plugins/migration/readme.txt index 95c86495ea117..32682477643d3 100644 --- a/projects/plugins/migration/readme.txt +++ b/projects/plugins/migration/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic Tags: migrate, migration, backup, restore, transfer, move, copy, wordpress.com, automattic, import, importer, hosting Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 Stable tag: 1.0.0 License: GPLv2 or later diff --git a/projects/plugins/migration/wpcom-migration.php b/projects/plugins/migration/wpcom-migration.php index 9a9849e2637bb..97a1d821126f7 100644 --- a/projects/plugins/migration/wpcom-migration.php +++ b/projects/plugins/migration/wpcom-migration.php @@ -4,7 +4,7 @@ * Plugin Name: Move to WordPress.com * Plugin URI: https://wordpress.org/plugins/wpcom-migration * Description: A WordPress plugin that helps users to migrate their sites to WordPress.com. - * Version: 1.0.2-alpha + * Version: 1.1.0-alpha * Author: Automattic * Author URI: https://wordpress.com/ * License: GPLv2 or later diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-php-requirements b/projects/plugins/mu-wpcom-plugin/changelog/update-php-requirements new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/update-php-requirements @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index 2e8186e9f9021..8c93882fa511b 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -78,10 +78,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -97,7 +97,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/protect/changelog/update-php-requirements b/projects/plugins/protect/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/protect/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/protect/changelog/update-php-requirements#2 b/projects/plugins/protect/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/composer.json b/projects/plugins/protect/composer.json index 016dfda2d1379..eb09b3591e0e6 100644 --- a/projects/plugins/protect/composer.json +++ b/projects/plugins/protect/composer.json @@ -79,6 +79,6 @@ "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true }, - "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_protectⓥ1_4_3_alpha" + "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_protectⓥ1_5_0_alpha" } } diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index b971178c9208a..8b77f4f099f49 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1542,10 +1542,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -1561,7 +1561,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/protect/jetpack-protect.php b/projects/plugins/protect/jetpack-protect.php index b88b5d8571d82..295f1f8449bd0 100644 --- a/projects/plugins/protect/jetpack-protect.php +++ b/projects/plugins/protect/jetpack-protect.php @@ -3,7 +3,7 @@ * Plugin Name: Jetpack Protect * Plugin URI: https://wordpress.org/plugins/jetpack-protect * Description: Security tools that keep your site safe and sound, from posts to plugins. - * Version: 1.4.3-alpha + * Version: 1.5.0-alpha * Author: Automattic - Jetpack Security team * Author URI: https://jetpack.com/protect/ * License: GPLv2 or later @@ -32,7 +32,7 @@ exit; } -define( 'JETPACK_PROTECT_VERSION', '1.4.3-alpha' ); +define( 'JETPACK_PROTECT_VERSION', '1.5.0-alpha' ); define( 'JETPACK_PROTECT_DIR', plugin_dir_path( __FILE__ ) ); define( 'JETPACK_PROTECT_ROOT_FILE', __FILE__ ); define( 'JETPACK_PROTECT_ROOT_FILE_RELATIVE_PATH', plugin_basename( __FILE__ ) ); diff --git a/projects/plugins/protect/readme.txt b/projects/plugins/protect/readme.txt index c81ee475f1d5c..27d1fa68809d7 100644 --- a/projects/plugins/protect/readme.txt +++ b/projects/plugins/protect/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, retrofox, leogermani, renatoagds, bjorsch, ebinnion, fgiannar, zinigor, miguelxavierpenha, dsmart, jeherve, manzoorwanijk, njweller, oskosk, samiff, siddarthan, wpkaren, arsihasi, kraftbj, kev, sermitr, kangzj, pabline, dkmyta Tags: jetpack, protect, security, malware, scan Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 Stable tag: 1.4.1 License: GPLv2 or later diff --git a/projects/plugins/search/changelog/update-php-requirements b/projects/plugins/search/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/search/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/search/changelog/update-php-requirements#2 b/projects/plugins/search/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index 4f948e4fb9869..4bb214754daca 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1495,10 +1495,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -1514,7 +1514,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/search/readme.txt b/projects/plugins/search/readme.txt index dd41208f18582..c91dff8daf77b 100644 --- a/projects/plugins/search/readme.txt +++ b/projects/plugins/search/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, annamcphee, bluefuton, kangzj, jsnmoon, robfelty, gibrown, trakos, dognose24, a8ck3n Tags: search, filter, woocommerce search, ajax search, product search, free cloud-based search Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 Stable tag: 1.4.0 License: GPLv2 or later diff --git a/projects/plugins/social/changelog/update-php-requirements b/projects/plugins/social/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/social/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/social/changelog/update-php-requirements#2 b/projects/plugins/social/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index ca7327e3cd3d6..51da301c5f4c8 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1475,10 +1475,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -1494,7 +1494,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/social/readme.txt b/projects/plugins/social/readme.txt index d0bd0db538410..832d2f0aa5739 100644 --- a/projects/plugins/social/readme.txt +++ b/projects/plugins/social/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, pabline, siddarthan, gmjuhasz, manzoorwanijk, danielpost Tags: social-media, publicize, social-media-manager, social-networking, social marketing, social, social share, social media scheduling, social media automation, auto post, auto- publish, social share Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 Stable tag: 2.3.0 License: GPLv2 or later diff --git a/projects/plugins/starter-plugin/changelog/update-php-requirements b/projects/plugins/starter-plugin/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/starter-plugin/changelog/update-php-requirements#2 b/projects/plugins/starter-plugin/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/composer.json b/projects/plugins/starter-plugin/composer.json index 1a9559789f4f4..325992826e714 100644 --- a/projects/plugins/starter-plugin/composer.json +++ b/projects/plugins/starter-plugin/composer.json @@ -68,6 +68,6 @@ "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true }, - "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_starter_pluginⓥ0_3_1_alpha" + "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_starter_pluginⓥ0_4_0_alpha" } } diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index f5e7a5d76d6c7..7bb37632651ce 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1399,10 +1399,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -1418,7 +1418,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/starter-plugin/jetpack-starter-plugin.php b/projects/plugins/starter-plugin/jetpack-starter-plugin.php index a6c6f39840ef6..23a7683f48250 100644 --- a/projects/plugins/starter-plugin/jetpack-starter-plugin.php +++ b/projects/plugins/starter-plugin/jetpack-starter-plugin.php @@ -4,7 +4,7 @@ * Plugin Name: Jetpack Starter Plugin * Plugin URI: https://wordpress.org/plugins/jetpack-starter-plugin * Description: plugin--description. - * Version: 0.3.1-alpha + * Version: 0.4.0-alpha * Author: Automattic * Author URI: https://jetpack.com/ * License: GPLv2 or later diff --git a/projects/plugins/starter-plugin/readme.txt b/projects/plugins/starter-plugin/readme.txt index be0bf6f361f77..00218fc24d5ac 100644 --- a/projects/plugins/starter-plugin/readme.txt +++ b/projects/plugins/starter-plugin/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, Tags: jetpack, stuff Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 Stable tag: 0.1.0-alpha License: GPLv2 or later diff --git a/projects/plugins/super-cache/changelog/update-php-requirements b/projects/plugins/super-cache/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/super-cache/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/super-cache/changelog/update-php-requirements#2 b/projects/plugins/super-cache/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/super-cache/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/super-cache/composer.json b/projects/plugins/super-cache/composer.json index 4f2d7cd7c176f..978e5b1a28a08 100644 --- a/projects/plugins/super-cache/composer.json +++ b/projects/plugins/super-cache/composer.json @@ -51,6 +51,6 @@ "wp-svn-autopublish": true }, "config": { - "autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ1_11_1_alpha" + "autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ1_12_0_alpha" } } diff --git a/projects/plugins/super-cache/composer.lock b/projects/plugins/super-cache/composer.lock index 28328a7a0ab17..8502a991fddff 100644 --- a/projects/plugins/super-cache/composer.lock +++ b/projects/plugins/super-cache/composer.lock @@ -61,10 +61,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -80,7 +80,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/super-cache/package.json b/projects/plugins/super-cache/package.json index 99d5f42a76afc..2c473202c4734 100644 --- a/projects/plugins/super-cache/package.json +++ b/projects/plugins/super-cache/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-super-cache", - "version": "1.11.1-alpha", + "version": "1.12.0-alpha", "description": "A very fast caching engine for WordPress that produces static html files.", "homepage": "https://jetpack.com", "bugs": { diff --git a/projects/plugins/super-cache/readme.txt b/projects/plugins/super-cache/readme.txt index 8a0e5dd4ce464..bfad3674b8f32 100644 --- a/projects/plugins/super-cache/readme.txt +++ b/projects/plugins/super-cache/readme.txt @@ -2,7 +2,7 @@ Contributors: donncha, automattic, adnan007, dilirity, mikemayhem3030, pyronaur, thingalon Tags: performance, caching, wp-cache, wp-super-cache, cache Requires at least: 6.2 -Requires PHP: 5.6 +Requires PHP: 7.0 Tested up to: 6.4 Stable tag: 1.10.0 License: GPLv2 or later diff --git a/projects/plugins/super-cache/wp-cache.php b/projects/plugins/super-cache/wp-cache.php index 29c8ad7763e97..6927f35eb33eb 100644 --- a/projects/plugins/super-cache/wp-cache.php +++ b/projects/plugins/super-cache/wp-cache.php @@ -3,7 +3,7 @@ * Plugin Name: WP Super Cache * Plugin URI: https://wordpress.org/plugins/wp-super-cache/ * Description: Very fast caching plugin for WordPress. - * Version: 1.11.1-alpha + * Version: 1.12.0-alpha * Author: Automattic * Author URI: https://automattic.com/ * License: GPL2+ diff --git a/projects/plugins/vaultpress/changelog/update-php-requirements b/projects/plugins/vaultpress/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/vaultpress/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/vaultpress/changelog/update-php-requirements#2 b/projects/plugins/vaultpress/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/vaultpress/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/vaultpress/composer.json b/projects/plugins/vaultpress/composer.json index 5c376b2cb9a48..cf1d6733ae45c 100644 --- a/projects/plugins/vaultpress/composer.json +++ b/projects/plugins/vaultpress/composer.json @@ -35,7 +35,7 @@ "minimum-stability": "dev", "prefer-stable": true, "config": { - "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ2_2_5_alpha", + "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ2_3_0_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true } diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock index 0724d5b1ed305..44c3e26689ca0 100644 --- a/projects/plugins/vaultpress/composer.lock +++ b/projects/plugins/vaultpress/composer.lock @@ -123,10 +123,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -142,7 +142,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/vaultpress/readme.txt b/projects/plugins/vaultpress/readme.txt index 47ad76bb75468..7838d92a3eb65 100644 --- a/projects/plugins/vaultpress/readme.txt +++ b/projects/plugins/vaultpress/readme.txt @@ -4,7 +4,7 @@ Tags: security, malware, virus, archive, back up, back ups, backup, backups, sca Requires at least: 5.2 Tested up to: 6.4 Stable tag: 2.2.4 -Requires PHP: 5.6 +Requires PHP: 7.0 License: GPLv2 (DEPRECATED: Please install "Jetpack VaultPress Backup" instead) Jetpack VaultPress offers real-time backups, one-click restores, and premium support from WordPress experts. diff --git a/projects/plugins/vaultpress/vaultpress.php b/projects/plugins/vaultpress/vaultpress.php index a87ca21739459..62ab671d569c8 100644 --- a/projects/plugins/vaultpress/vaultpress.php +++ b/projects/plugins/vaultpress/vaultpress.php @@ -3,7 +3,7 @@ * Plugin Name: VaultPress * Plugin URI: http://vaultpress.com/?utm_source=plugin-uri&utm_medium=plugin-description&utm_campaign=1.0 * Description: Protect your content, themes, plugins, and settings with realtime backup and automated security scanning from VaultPress. Activate, enter your registration key, and never worry again. Need some help? - * Version: 2.2.5-alpha + * Version: 2.3.0-alpha * Author: Automattic * Author URI: http://vaultpress.com/?utm_source=author-uri&utm_medium=plugin-description&utm_campaign=1.0 * License: GPL2+ @@ -17,7 +17,7 @@ defined( 'ABSPATH' ) || die(); define( 'VAULTPRESS__MINIMUM_PHP_VERSION', '5.6' ); -define( 'VAULTPRESS__VERSION', '2.2.5-alpha' ); +define( 'VAULTPRESS__VERSION', '2.3.0-alpha' ); define( 'VAULTPRESS__PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); /** diff --git a/projects/plugins/videopress/changelog/update-php-requirements b/projects/plugins/videopress/changelog/update-php-requirements new file mode 100644 index 0000000000000..65234c6475cba --- /dev/null +++ b/projects/plugins/videopress/changelog/update-php-requirements @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/videopress/changelog/update-php-requirements#2 b/projects/plugins/videopress/changelog/update-php-requirements#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/update-php-requirements#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index 26a63c6928a1a..cefe1ab4643ac 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "e57d5539d4458fa476194c0364c59df998a5b383" + "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.12.x-dev" + "dev-trunk": "3.13.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1429,10 +1429,10 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "7e70d6d91c99ca7224e3fe409f998b039ddc91f1" + "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" }, "require": { - "php": ">=5.6", + "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" @@ -1448,7 +1448,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/videopress/readme.txt b/projects/plugins/videopress/readme.txt index 3baaca85e2f00..377fc89371bfc 100644 --- a/projects/plugins/videopress/readme.txt +++ b/projects/plugins/videopress/readme.txt @@ -5,7 +5,7 @@ Tags: video, video-hosting, video-player, cdn, vimeo, youtube, video-streaming, Requires at least: 6.2 Tested up to: 6.4 Stable tag: 1.5 -Requires PHP: 5.6 +Requires PHP: 7.0 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html The finest video hosting for WordPress. Stunning-quality video with none of the hassle. Drag and drop videos through the WordPress editor and keep the focus on your content, not the ads. diff --git a/tools/cli/commands/generate.js b/tools/cli/commands/generate.js index dec9a7e0331d7..bf409dc4bb421 100644 --- a/tools/cli/commands/generate.js +++ b/tools/cli/commands/generate.js @@ -751,7 +751,7 @@ function createReadMeTxt( answers ) { 'Contributors: automattic,\n' + 'Tags: jetpack, stuff\n' + 'Requires at least: 6.2\n' + - 'Requires PHP: 5.6\n' + + 'Requires PHP: 7.0\n' + 'Tested up to: 6.4\n' + `Stable tag: ${ answers.version }\n` + 'License: GPLv2 or later\n' + From 81a2fc3674538b76b33b11f543567d6a3dfc9a94 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Tue, 14 Nov 2023 19:48:59 +0100 Subject: [PATCH 02/22] Update reference ruleset --- projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml index 6bfdaa2766741..cc15edfcfede3 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-71/ruleset.xml @@ -3,7 +3,7 @@ Standard to disable PHPCompatibility rules that trigger with 7.0 but not 7.1. - + From fd09274e90b5bada3919a6e7ee286e4f04415203 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Tue, 14 Nov 2023 19:49:42 +0100 Subject: [PATCH 03/22] Update lock file --- projects/plugins/jetpack/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 608645de96b05..7008d4ba238dd 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -2812,16 +2812,16 @@ }, { "name": "scssphp/scssphp", - "version": "v1.11.1", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "ace2503684bab0dcc817d7614c8a54b865122414" + "reference": "a6b20c170ddb95f116b3d148a466a7bed1e85c35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/ace2503684bab0dcc817d7614c8a54b865122414", - "reference": "ace2503684bab0dcc817d7614c8a54b865122414", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/a6b20c170ddb95f116b3d148a466a7bed1e85c35", + "reference": "a6b20c170ddb95f116b3d148a466a7bed1e85c35", "shasum": "" }, "require": { @@ -2886,9 +2886,9 @@ ], "support": { "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.11.1" + "source": "https://github.com/scssphp/scssphp/tree/v1.12.0" }, - "time": "2023-09-24T13:38:17+00:00" + "time": "2023-11-14T14:56:09+00:00" }, { "name": "wikimedia/aho-corasick", From 3b7b7def46ffe72364de2c078708ae4a8cd9446c Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Tue, 14 Nov 2023 20:18:14 +0100 Subject: [PATCH 04/22] Update tests --- .../codesniffer/tests/php/tests/test-jetpack-compat.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/packages/codesniffer/tests/php/tests/test-jetpack-compat.php b/projects/packages/codesniffer/tests/php/tests/test-jetpack-compat.php index ee10b734e901f..3cdce5a8ad848 100644 --- a/projects/packages/codesniffer/tests/php/tests/test-jetpack-compat.php +++ b/projects/packages/codesniffer/tests/php/tests/test-jetpack-compat.php @@ -110,7 +110,6 @@ public function provide_standards() { ); yield array( 'Jetpack', self::SRC1, $lines1 ); - yield array( 'Jetpack-Compat-70', self::SRC1, array_slice( $lines1, 1 ) ); yield array( 'Jetpack-Compat-71', self::SRC1, array_slice( $lines1, 2 ) ); yield array( 'Jetpack-Compat-72', self::SRC1, array_slice( $lines1, 3 ) ); yield array( 'Jetpack-Compat-73', self::SRC1, array_slice( $lines1, 4 ) ); @@ -129,7 +128,6 @@ public function provide_standards() { ); yield array( 'Jetpack', self::SRC2, $lines2 ); - yield array( 'Jetpack-Compat-70', self::SRC2, array_slice( $lines2, 1 ) ); yield array( 'Jetpack-Compat-71', self::SRC2, array_slice( $lines2, 2 ) ); yield array( 'Jetpack-Compat-72', self::SRC2, array_slice( $lines2, 3 ) ); yield array( 'Jetpack-Compat-73', self::SRC2, array_slice( $lines2, 4 ) ); From fce9617c27bd83bdf18ec73aac54c50a40693e7e Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Wed, 15 Nov 2023 11:58:14 +0100 Subject: [PATCH 05/22] Update tests --- .../tests/php/tests/files/i18n.php.report | 2 - .../tests/php/tests/test-jetpack-compat.php | 41 +++++++++---------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report b/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report index 14fb9851c5c33..06d234ca856e7 100644 --- a/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report +++ b/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report @@ -1,5 +1,3 @@ - 14 | ERROR | [ ] Unicode codepoint escape sequences are not supported in PHP 5.6 or earlier. Found: \u{0061} - | | (PHPCompatibility.TextStrings.NewUnicodeEscapeSequence.Found) 17 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch) 18 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch) 21 | ERROR | [x] Missing domain arg. (Jetpack.Functions.I18n.MissingDomain) diff --git a/projects/packages/codesniffer/tests/php/tests/test-jetpack-compat.php b/projects/packages/codesniffer/tests/php/tests/test-jetpack-compat.php index 3cdce5a8ad848..d5f459e565b0e 100644 --- a/projects/packages/codesniffer/tests/php/tests/test-jetpack-compat.php +++ b/projects/packages/codesniffer/tests/php/tests/test-jetpack-compat.php @@ -21,7 +21,6 @@ class JetpackCompatTest extends TestCase { const SRC1 = <<<'EOF' Date: Wed, 15 Nov 2023 14:41:57 +0100 Subject: [PATCH 06/22] Update tests --- .../codesniffer/tests/php/tests/files/i18n.php.report | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report b/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report index 06d234ca856e7..db390251a1fa5 100644 --- a/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report +++ b/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report @@ -4,8 +4,10 @@ 22 | ERROR | [x] Missing domain arg. (Jetpack.Functions.I18n.MissingDomain) 25 | ERROR | [ ] Missing domain arg. (Jetpack.Functions.I18n.MissingDomain) 26 | ERROR | [ ] Domain is not a string literal. (Jetpack.Functions.I18n.DomainNotLiteral) - 29 | ERROR | [ ] The domain must not contain interpolated variables. Found $domain. (Jetpack.Functions.I18n.InterpolatedVariable) - 30 | ERROR | [ ] The domain must not contain interpolated variables. Found $domain. (Jetpack.Functions.I18n.InterpolatedVariable) + 29 | ERROR | [ ] The domain must not contain interpolated variables. Found $domain. + | | (Jetpack.Functions.I18n.InterpolatedVariable) + 30 | ERROR | [ ] The domain must not contain interpolated variables. Found $domain. + | | (Jetpack.Functions.I18n.InterpolatedVariable) 33 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'a $domain'. (Jetpack.Functions.I18n.TextDomainMismatch) 44 | ERROR | [x] Short array syntax is not allowed (Universal.Arrays.DisallowShortArraySyntax.Found) 45 | ERROR | [x] Short array syntax is not allowed (Universal.Arrays.DisallowShortArraySyntax.Found) @@ -20,4 +22,5 @@ 64 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch) 65 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch) 72 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch) - 77 | ERROR | [ ] The domain must not contain interpolated variables. Found $domain. (Jetpack.Functions.I18n.InterpolatedVariable) + 77 | ERROR | [ ] The domain must not contain interpolated variables. Found $domain. + | | (Jetpack.Functions.I18n.InterpolatedVariable) From a9a507252fb9607b49b9528f215b6d1b58c2c548 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Thu, 16 Nov 2023 19:40:28 +0100 Subject: [PATCH 07/22] Update PHPUnit version in docs. Co-authored-by: Brad Jorsch --- docs/monorepo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/monorepo.md b/docs/monorepo.md index 0619bef25983a..33943fd5ae238 100644 --- a/docs/monorepo.md +++ b/docs/monorepo.md @@ -218,7 +218,7 @@ For all project types other than WordPress plugins, the necessary version of PHP We currently make use of the following packages in testing; it's encouraged to use these rather than introducing other tools that serve the same purpose. -* [yoast/phpunit-polyfills](https://packagist.org/packages/yoast/phpunit-polyfills) supplies polyfills for compatibility with PHPUnit 5.7 to 9.0, to support PHP 7.0 to 8.2. +* [yoast/phpunit-polyfills](https://packagist.org/packages/yoast/phpunit-polyfills) supplies polyfills for compatibility with PHPUnit 6.5 to 9.0, to support PHP 7.0 to 8.2. * Do not use `Yoast\PHPUnitPolyfills\TestCases\TestCase` or `Yoast\PHPUnitPolyfills\TestCases\XTestCase`. Just use the `@before`, `@after`, `@beforeClass`, and `@afterClass` annotations directly. * PHPUnit's built-in mocking is used for class mocks. * [brain/monkey](https://packagist.org/packages/brain/monkey) is used for mocking functions, and can also provide some functions for minimal WordPress compatibility. From 6caa55c72efd1f4cd8352fb39b30055590d6efbc Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Thu, 16 Nov 2023 19:50:51 +0100 Subject: [PATCH 08/22] Bump to major version bump Co-authored-by: anomiex --- .../changelogger/changelog/update-php-requirements | 2 +- projects/packages/changelogger/composer.json | 2 +- projects/packages/changelogger/src/Application.php | 2 +- .../codesniffer/changelog/update-php-requirements | 4 ++-- .../my-jetpack/changelog/update-php-requirements | 2 +- projects/packages/my-jetpack/composer.json | 2 +- projects/packages/my-jetpack/package.json | 2 +- projects/packages/my-jetpack/src/class-initializer.php | 2 +- .../plugins/backup/changelog/update-php-requirements | 2 +- projects/plugins/backup/composer.lock | 8 ++++---- projects/plugins/beta/composer.lock | 4 ++-- .../plugins/boost/changelog/update-php-requirements | 2 +- projects/plugins/boost/composer.json | 4 ++-- projects/plugins/boost/composer.lock | 10 +++++----- projects/plugins/boost/jetpack-boost.php | 4 ++-- projects/plugins/boost/package.json | 2 +- projects/plugins/crm/composer.lock | 4 ++-- projects/plugins/debug-helper/composer.lock | 4 ++-- .../plugins/inspect/changelog/update-php-requirements | 2 +- projects/plugins/inspect/composer.lock | 4 ++-- projects/plugins/jetpack/composer.lock | 8 ++++---- .../migration/changelog/update-php-requirements | 2 +- projects/plugins/migration/composer.json | 2 +- projects/plugins/migration/composer.lock | 8 ++++---- projects/plugins/migration/wpcom-migration.php | 2 +- projects/plugins/mu-wpcom-plugin/composer.lock | 4 ++-- .../plugins/protect/changelog/update-php-requirements | 2 +- projects/plugins/protect/composer.json | 2 +- projects/plugins/protect/composer.lock | 8 ++++---- projects/plugins/protect/jetpack-protect.php | 4 ++-- .../plugins/search/changelog/update-php-requirements | 2 +- projects/plugins/search/composer.json | 2 +- projects/plugins/search/composer.lock | 8 ++++---- projects/plugins/search/jetpack-search.php | 4 ++-- .../plugins/social/changelog/update-php-requirements | 2 +- projects/plugins/social/composer.json | 2 +- projects/plugins/social/composer.lock | 8 ++++---- projects/plugins/social/jetpack-social.php | 2 +- .../starter-plugin/changelog/update-php-requirements | 2 +- projects/plugins/starter-plugin/composer.lock | 8 ++++---- .../super-cache/changelog/update-php-requirements | 2 +- projects/plugins/super-cache/composer.json | 2 +- projects/plugins/super-cache/composer.lock | 4 ++-- projects/plugins/super-cache/package.json | 2 +- projects/plugins/super-cache/wp-cache.php | 2 +- .../vaultpress/changelog/update-php-requirements | 2 +- projects/plugins/vaultpress/composer.json | 2 +- projects/plugins/vaultpress/composer.lock | 4 ++-- projects/plugins/vaultpress/vaultpress.php | 4 ++-- .../videopress/changelog/update-php-requirements | 2 +- projects/plugins/videopress/composer.lock | 8 ++++---- 51 files changed, 92 insertions(+), 92 deletions(-) diff --git a/projects/packages/changelogger/changelog/update-php-requirements b/projects/packages/changelogger/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/packages/changelogger/changelog/update-php-requirements +++ b/projects/packages/changelogger/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/packages/changelogger/composer.json b/projects/packages/changelogger/composer.json index fe8301c51efcd..c832de8a1b47f 100644 --- a/projects/packages/changelogger/composer.json +++ b/projects/packages/changelogger/composer.json @@ -58,7 +58,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/packages/changelogger/src/Application.php b/projects/packages/changelogger/src/Application.php index f70f32658e4e4..6ec4091ea18af 100644 --- a/projects/packages/changelogger/src/Application.php +++ b/projects/packages/changelogger/src/Application.php @@ -18,7 +18,7 @@ */ class Application extends SymfonyApplication { - const VERSION = '3.4.0-alpha'; + const VERSION = '4.0.0-alpha'; /** * Constructor. diff --git a/projects/packages/codesniffer/changelog/update-php-requirements b/projects/packages/codesniffer/changelog/update-php-requirements index 65234c6475cba..d66d943d68da7 100644 --- a/projects/packages/codesniffer/changelog/update-php-requirements +++ b/projects/packages/codesniffer/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed -General: updated PHP requirement to PHP 7.0+ +BREAKING: Drop support for PHP 5.6. `testVersion` should be set to `7.0-`. diff --git a/projects/packages/my-jetpack/changelog/update-php-requirements b/projects/packages/my-jetpack/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/packages/my-jetpack/changelog/update-php-requirements +++ b/projects/packages/my-jetpack/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json index 15f9d2ca6505d..e5fb629033045 100644 --- a/projects/packages/my-jetpack/composer.json +++ b/projects/packages/my-jetpack/composer.json @@ -75,7 +75,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json index 2b17f6433a1d9..c3561e803c41a 100644 --- a/projects/packages/my-jetpack/package.json +++ b/projects/packages/my-jetpack/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-my-jetpack", - "version": "3.13.0-alpha", + "version": "4.0.0-alpha", "description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme", "bugs": { diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php index 95704e43d35bb..677a691f7cdee 100644 --- a/projects/packages/my-jetpack/src/class-initializer.php +++ b/projects/packages/my-jetpack/src/class-initializer.php @@ -32,7 +32,7 @@ class Initializer { * * @var string */ - const PACKAGE_VERSION = '3.13.0-alpha'; + const PACKAGE_VERSION = '4.0.0-alpha'; /** * HTML container ID for the IDC screen on My Jetpack page. diff --git a/projects/plugins/backup/changelog/update-php-requirements b/projects/plugins/backup/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/backup/changelog/update-php-requirements +++ b/projects/plugins/backup/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index 303b27c008bab..bff547481ee96 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -899,7 +899,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -930,7 +930,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1436,7 +1436,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -1455,7 +1455,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/beta/composer.lock b/projects/plugins/beta/composer.lock index 6ff473c328028..c622b996fa54c 100644 --- a/projects/plugins/beta/composer.lock +++ b/projects/plugins/beta/composer.lock @@ -266,7 +266,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -285,7 +285,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/boost/changelog/update-php-requirements b/projects/plugins/boost/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/boost/changelog/update-php-requirements +++ b/projects/plugins/boost/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json index 066ff056c478c..f360faffc24eb 100644 --- a/projects/plugins/boost/composer.json +++ b/projects/plugins/boost/composer.json @@ -3,7 +3,7 @@ "description": "Boost your WordPress site's performance, from the creators of Jetpack", "type": "library", "license": "GPL-2.0-or-later", - "version": "2.3.0-alpha", + "version": "3.0.0-alpha", "authors": [ { "name": "Automattic, Inc.", @@ -73,7 +73,7 @@ "platform": { "ext-intl": "0.0.0" }, - "autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ2_3_0_alpha", + "autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ3_0_0_alpha", "allow-plugins": { "roots/wordpress-core-installer": true, "automattic/jetpack-autoloader": true, diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index b74a6cb1b3bbc..938836dce8dcf 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/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": "9c78e3c648ff9c7884020bd259797002", + "content-hash": "8ca7ad762e54f05b32b4726f018572c2", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -954,7 +954,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -985,7 +985,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1658,7 +1658,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -1677,7 +1677,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/boost/jetpack-boost.php b/projects/plugins/boost/jetpack-boost.php index 90159e8196578..c9f0a3253abf4 100644 --- a/projects/plugins/boost/jetpack-boost.php +++ b/projects/plugins/boost/jetpack-boost.php @@ -9,7 +9,7 @@ * Plugin Name: Jetpack Boost * Plugin URI: https://jetpack.com/boost * Description: Boost your WordPress site's performance, from the creators of Jetpack - * Version: 2.3.0-alpha + * Version: 3.0.0-alpha * Author: Automattic - Jetpack Site Speed team * Author URI: https://jetpack.com/boost/ * License: GPL-2.0+ @@ -29,7 +29,7 @@ die; } -define( 'JETPACK_BOOST_VERSION', '2.3.0-alpha' ); +define( 'JETPACK_BOOST_VERSION', '3.0.0-alpha' ); define( 'JETPACK_BOOST_SLUG', 'jetpack-boost' ); if ( ! defined( 'JETPACK_BOOST_CLIENT_NAME' ) ) { diff --git a/projects/plugins/boost/package.json b/projects/plugins/boost/package.json index bc51a82d29a78..0183cceb98866 100644 --- a/projects/plugins/boost/package.json +++ b/projects/plugins/boost/package.json @@ -1,6 +1,6 @@ { "name": "jetpack-boost", - "version": "2.3.0-alpha", + "version": "3.0.0-alpha", "description": "Boost your WordPress site's performance, from the creators of Jetpack", "directories": { "test": "tests" diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock index 858db99636062..935d42f0b46c7 100644 --- a/projects/plugins/crm/composer.lock +++ b/projects/plugins/crm/composer.lock @@ -570,7 +570,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -589,7 +589,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/debug-helper/composer.lock b/projects/plugins/debug-helper/composer.lock index 3d10ddbf0638b..886b4288b56dd 100644 --- a/projects/plugins/debug-helper/composer.lock +++ b/projects/plugins/debug-helper/composer.lock @@ -13,7 +13,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -32,7 +32,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/inspect/changelog/update-php-requirements b/projects/plugins/inspect/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/inspect/changelog/update-php-requirements +++ b/projects/plugins/inspect/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/inspect/composer.lock b/projects/plugins/inspect/composer.lock index bb6f2645df92b..cd41a83dad31b 100644 --- a/projects/plugins/inspect/composer.lock +++ b/projects/plugins/inspect/composer.lock @@ -616,7 +616,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -635,7 +635,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index bede68bdb1afb..4aeadb3ba63ef 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -1638,7 +1638,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1669,7 +1669,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -2997,7 +2997,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -3016,7 +3016,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/migration/changelog/update-php-requirements b/projects/plugins/migration/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/migration/changelog/update-php-requirements +++ b/projects/plugins/migration/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/migration/composer.json b/projects/plugins/migration/composer.json index 57c9c182da781..d34c3c684ecb4 100644 --- a/projects/plugins/migration/composer.json +++ b/projects/plugins/migration/composer.json @@ -72,6 +72,6 @@ "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true }, - "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_migrationⓥ1_1_0_alpha" + "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_migrationⓥ2_0_0_alpha" } } diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock index b2e906bdbb965..8e85e08ae4b89 100644 --- a/projects/plugins/migration/composer.lock +++ b/projects/plugins/migration/composer.lock @@ -899,7 +899,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -930,7 +930,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1436,7 +1436,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -1455,7 +1455,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/migration/wpcom-migration.php b/projects/plugins/migration/wpcom-migration.php index 97a1d821126f7..204d0af8b209a 100644 --- a/projects/plugins/migration/wpcom-migration.php +++ b/projects/plugins/migration/wpcom-migration.php @@ -4,7 +4,7 @@ * Plugin Name: Move to WordPress.com * Plugin URI: https://wordpress.org/plugins/wpcom-migration * Description: A WordPress plugin that helps users to migrate their sites to WordPress.com. - * Version: 1.1.0-alpha + * Version: 2.0.0-alpha * Author: Automattic * Author URI: https://wordpress.com/ * License: GPLv2 or later diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index 8c93882fa511b..557ac101be92b 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -78,7 +78,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -97,7 +97,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/protect/changelog/update-php-requirements b/projects/plugins/protect/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/protect/changelog/update-php-requirements +++ b/projects/plugins/protect/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/protect/composer.json b/projects/plugins/protect/composer.json index eb09b3591e0e6..f5b42623c5f19 100644 --- a/projects/plugins/protect/composer.json +++ b/projects/plugins/protect/composer.json @@ -79,6 +79,6 @@ "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true }, - "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_protectⓥ1_5_0_alpha" + "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_protectⓥ2_0_0_alpha" } } diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index 8b77f4f099f49..0bc7a066f71ec 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1542,7 +1542,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -1561,7 +1561,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/protect/jetpack-protect.php b/projects/plugins/protect/jetpack-protect.php index 295f1f8449bd0..24f30cc8b1f7d 100644 --- a/projects/plugins/protect/jetpack-protect.php +++ b/projects/plugins/protect/jetpack-protect.php @@ -3,7 +3,7 @@ * Plugin Name: Jetpack Protect * Plugin URI: https://wordpress.org/plugins/jetpack-protect * Description: Security tools that keep your site safe and sound, from posts to plugins. - * Version: 1.5.0-alpha + * Version: 2.0.0-alpha * Author: Automattic - Jetpack Security team * Author URI: https://jetpack.com/protect/ * License: GPLv2 or later @@ -32,7 +32,7 @@ exit; } -define( 'JETPACK_PROTECT_VERSION', '1.5.0-alpha' ); +define( 'JETPACK_PROTECT_VERSION', '2.0.0-alpha' ); define( 'JETPACK_PROTECT_DIR', plugin_dir_path( __FILE__ ) ); define( 'JETPACK_PROTECT_ROOT_FILE', __FILE__ ); define( 'JETPACK_PROTECT_ROOT_FILE_RELATIVE_PATH', plugin_basename( __FILE__ ) ); diff --git a/projects/plugins/search/changelog/update-php-requirements b/projects/plugins/search/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/search/changelog/update-php-requirements +++ b/projects/plugins/search/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/search/composer.json b/projects/plugins/search/composer.json index 41c70fcd518ab..8c199800076b1 100644 --- a/projects/plugins/search/composer.json +++ b/projects/plugins/search/composer.json @@ -64,7 +64,7 @@ }, "config": { "sort-packages": true, - "autoloader-suffix": "b462338fb66be23595d68a93345c9e3d_jetpack_searchⓥ1_5_0_alpha", + "autoloader-suffix": "b462338fb66be23595d68a93345c9e3d_jetpack_searchⓥ2_0_0_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true, diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index 4bb214754daca..8b78b64398bed 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1495,7 +1495,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -1514,7 +1514,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/search/jetpack-search.php b/projects/plugins/search/jetpack-search.php index e3b53c39de6aa..5ffdd6f886670 100644 --- a/projects/plugins/search/jetpack-search.php +++ b/projects/plugins/search/jetpack-search.php @@ -4,7 +4,7 @@ * Plugin Name: Jetpack Search * Plugin URI: https://jetpack.com/search/ * Description: Easily add cloud-powered instant search and filters to your website or WooCommerce store with advanced algorithms that boost your search results based on traffic to your site. - * Version: 1.5.0-alpha + * Version: 2.0.0-alpha * Author: Automattic - Jetpack Search team * Author URI: https://jetpack.com/ * License: GPLv2 or later @@ -26,7 +26,7 @@ define( 'JETPACK_SEARCH_PLUGIN__FILE', __FILE__ ); define( 'JETPACK_SEARCH_PLUGIN__FILE_RELATIVE_PATH', plugin_basename( __FILE__ ) ); define( 'JETPACK_SEARCH_PLUGIN__SLUG', 'jetpack-search' ); -define( 'JETPACK_SEARCH_PLUGIN__VERSION', '1.5.0-alpha' ); +define( 'JETPACK_SEARCH_PLUGIN__VERSION', '2.0.0-alpha' ); defined( 'JETPACK_CLIENT__AUTH_LOCATION' ) || define( 'JETPACK_CLIENT__AUTH_LOCATION', 'header' ); diff --git a/projects/plugins/social/changelog/update-php-requirements b/projects/plugins/social/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/social/changelog/update-php-requirements +++ b/projects/plugins/social/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json index 873deef997194..f6b27b2a4bca9 100644 --- a/projects/plugins/social/composer.json +++ b/projects/plugins/social/composer.json @@ -81,6 +81,6 @@ "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true }, - "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ2_4_0_alpha" + "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ3_0_0_alpha" } } diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index 51da301c5f4c8..cdc84a787cb34 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1475,7 +1475,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -1494,7 +1494,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/social/jetpack-social.php b/projects/plugins/social/jetpack-social.php index 7f1aca73b7662..33376815d21fa 100644 --- a/projects/plugins/social/jetpack-social.php +++ b/projects/plugins/social/jetpack-social.php @@ -4,7 +4,7 @@ * Plugin Name: Jetpack Social * Plugin URI: https://wordpress.org/plugins/jetpack-social * Description: Share your site’s posts on several social media networks automatically when you publish a new post. - * Version: 2.4.0-alpha + * Version: 3.0.0-alpha * Author: Automattic - Jetpack Social team * Author URI: https://jetpack.com/social/ * License: GPLv2 or later diff --git a/projects/plugins/starter-plugin/changelog/update-php-requirements b/projects/plugins/starter-plugin/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/starter-plugin/changelog/update-php-requirements +++ b/projects/plugins/starter-plugin/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index 7bb37632651ce..f6712af6ad16a 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1399,7 +1399,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -1418,7 +1418,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/super-cache/changelog/update-php-requirements b/projects/plugins/super-cache/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/super-cache/changelog/update-php-requirements +++ b/projects/plugins/super-cache/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/super-cache/composer.json b/projects/plugins/super-cache/composer.json index 978e5b1a28a08..e11388a9a7205 100644 --- a/projects/plugins/super-cache/composer.json +++ b/projects/plugins/super-cache/composer.json @@ -51,6 +51,6 @@ "wp-svn-autopublish": true }, "config": { - "autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ1_12_0_alpha" + "autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ2_0_0_alpha" } } diff --git a/projects/plugins/super-cache/composer.lock b/projects/plugins/super-cache/composer.lock index 8502a991fddff..45c33cfe15a57 100644 --- a/projects/plugins/super-cache/composer.lock +++ b/projects/plugins/super-cache/composer.lock @@ -61,7 +61,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -80,7 +80,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/super-cache/package.json b/projects/plugins/super-cache/package.json index 2c473202c4734..e0bcd6ccc7621 100644 --- a/projects/plugins/super-cache/package.json +++ b/projects/plugins/super-cache/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-super-cache", - "version": "1.12.0-alpha", + "version": "2.0.0-alpha", "description": "A very fast caching engine for WordPress that produces static html files.", "homepage": "https://jetpack.com", "bugs": { diff --git a/projects/plugins/super-cache/wp-cache.php b/projects/plugins/super-cache/wp-cache.php index 6927f35eb33eb..f19a35609eab0 100644 --- a/projects/plugins/super-cache/wp-cache.php +++ b/projects/plugins/super-cache/wp-cache.php @@ -3,7 +3,7 @@ * Plugin Name: WP Super Cache * Plugin URI: https://wordpress.org/plugins/wp-super-cache/ * Description: Very fast caching plugin for WordPress. - * Version: 1.12.0-alpha + * Version: 2.0.0-alpha * Author: Automattic * Author URI: https://automattic.com/ * License: GPL2+ diff --git a/projects/plugins/vaultpress/changelog/update-php-requirements b/projects/plugins/vaultpress/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/vaultpress/changelog/update-php-requirements +++ b/projects/plugins/vaultpress/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/vaultpress/composer.json b/projects/plugins/vaultpress/composer.json index cf1d6733ae45c..be1af9d9597b0 100644 --- a/projects/plugins/vaultpress/composer.json +++ b/projects/plugins/vaultpress/composer.json @@ -35,7 +35,7 @@ "minimum-stability": "dev", "prefer-stable": true, "config": { - "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ2_3_0_alpha", + "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ3_0_0_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true } diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock index 44c3e26689ca0..56f1430ca254b 100644 --- a/projects/plugins/vaultpress/composer.lock +++ b/projects/plugins/vaultpress/composer.lock @@ -123,7 +123,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -142,7 +142,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/projects/plugins/vaultpress/vaultpress.php b/projects/plugins/vaultpress/vaultpress.php index 62ab671d569c8..c23f79c2e4f6e 100644 --- a/projects/plugins/vaultpress/vaultpress.php +++ b/projects/plugins/vaultpress/vaultpress.php @@ -3,7 +3,7 @@ * Plugin Name: VaultPress * Plugin URI: http://vaultpress.com/?utm_source=plugin-uri&utm_medium=plugin-description&utm_campaign=1.0 * Description: Protect your content, themes, plugins, and settings with realtime backup and automated security scanning from VaultPress. Activate, enter your registration key, and never worry again. Need some help? - * Version: 2.3.0-alpha + * Version: 3.0.0-alpha * Author: Automattic * Author URI: http://vaultpress.com/?utm_source=author-uri&utm_medium=plugin-description&utm_campaign=1.0 * License: GPL2+ @@ -17,7 +17,7 @@ defined( 'ABSPATH' ) || die(); define( 'VAULTPRESS__MINIMUM_PHP_VERSION', '5.6' ); -define( 'VAULTPRESS__VERSION', '2.3.0-alpha' ); +define( 'VAULTPRESS__VERSION', '3.0.0-alpha' ); define( 'VAULTPRESS__PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); /** diff --git a/projects/plugins/videopress/changelog/update-php-requirements b/projects/plugins/videopress/changelog/update-php-requirements index 65234c6475cba..e91743c9e6518 100644 --- a/projects/plugins/videopress/changelog/update-php-requirements +++ b/projects/plugins/videopress/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: minor +Significance: major Type: changed General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index cefe1ab4643ac..fe9f0843fa648 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "3eb2f21243cf091284e6a9f9819be6a62230057a" + "reference": "c04832a49208b4be80843624afb3ac41ed5c269f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -845,7 +845,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.13.x-dev" + "dev-trunk": "4.0.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" @@ -1429,7 +1429,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "6f5693b8a7a73598e3af8010ffbee44cd23eb2fc" + "reference": "56a217920dd8542c690d4d6aa9a9dda9c7acf40f" }, "require": { "php": ">=7.0", @@ -1448,7 +1448,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "3.4.x-dev" + "dev-trunk": "4.0.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { From c59548eb338e3f76d0a4473d5f2158e4d62ca8a5 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Thu, 16 Nov 2023 20:10:21 +0100 Subject: [PATCH 09/22] Remove stub that was previously used for PHP < 7 See https://github.com/Automattic/jetpack/pull/34126/files#r1394337839 --- .../changelogger/src/CommandLoader.php | 98 +++++++++++++++++-- .../changelogger/src/CommandLoaderBase.php | 60 +----------- .../src/php7/.phpcs.dir.phpcompatibility.xml | 4 - .../changelogger/src/php7/.phpcs.dir.xml | 6 -- .../changelogger/src/php7/CommandLoader.php | 48 --------- 5 files changed, 96 insertions(+), 120 deletions(-) delete mode 100644 projects/packages/changelogger/src/php7/.phpcs.dir.phpcompatibility.xml delete mode 100644 projects/packages/changelogger/src/php7/.phpcs.dir.xml delete mode 100644 projects/packages/changelogger/src/php7/CommandLoader.php diff --git a/projects/packages/changelogger/src/CommandLoader.php b/projects/packages/changelogger/src/CommandLoader.php index 2b82457a48979..ce84c8f45fa56 100644 --- a/projects/packages/changelogger/src/CommandLoader.php +++ b/projects/packages/changelogger/src/CommandLoader.php @@ -1,14 +1,98 @@ get_class_name( $name ) ); + } + + /** + * Loads a command. + * + * @param string $name Command name. + * @return Command + * @throws CommandNotFoundException If the command is not found. + */ + protected function doGet( $name ) { + $class = $this->get_class_name( $name ); + if ( ! class_exists( $class ) ) { + throw new CommandNotFoundException( "Command \"$name\" does not exist." ); + } + return new $class(); + } + + /** + * Return all command names. + * + * @return string[] All registered command names + */ + protected function doGetNames() { + $names = array(); + foreach ( new \DirectoryIterator( __DIR__ ) as $file ) { + if ( substr( $file->getBasename(), -11 ) === 'Command.php' ) { + $names[] = lcfirst( substr( $file->getBasename(), 0, -11 ) ); + } + } + sort( $names ); + return $names; + } + + /** + * Checks if a command exists. + * + * @param string $name Command name. + * @return bool + */ + public function has( $name ): bool { + return $this->doHas( $name ); + } + + /** + * Loads a command. + * + * @param string $name Command name. + * @return Command + * @throws CommandNotFoundException If the command is not found. + */ + public function get( $name ): Command { + return $this->doGet( $name ); + } -class_alias( php7\CommandLoader::class, CommandLoader::class ); + /** + * Return all command names. + * + * @return string[] All registered command names + */ + public function getNames(): array { + return $this->doGetNames(); + } +} diff --git a/projects/packages/changelogger/src/CommandLoaderBase.php b/projects/packages/changelogger/src/CommandLoaderBase.php index afb7ad15af065..4f81887809884 100644 --- a/projects/packages/changelogger/src/CommandLoaderBase.php +++ b/projects/packages/changelogger/src/CommandLoaderBase.php @@ -5,66 +5,16 @@ * For compatibility with both PHP 5.6 and Symfony 6, this class doesn't implement CommandLoaderInterface. * Instead, CommandLoader.php aliases one of php5/CommandLoader or php7/CommandLoader depending on the PHP version. * + * @deprecated Use CommandLoader class instead. + * * @package automattic/jetpack-changelogger */ namespace Automattic\Jetpack\Changelogger; -use Symfony\Component\Console\Exception\CommandNotFoundException; - /** * Command loader for the changelogger tool CLI. + * + * @deprecated Use CommandLoader class instead. */ -class CommandLoaderBase { - - /** - * Get the class name for a command. - * - * @param string $name Command name. - * @return string Class name. - */ - private function get_class_name( $name ) { - return __NAMESPACE__ . '\\' . ucfirst( $name ) . 'Command'; - } - - /** - * Checks if a command exists. - * - * @param string $name Command name. - * @return bool - */ - protected function doHas( $name ) { - return class_exists( $this->get_class_name( $name ) ); - } - - /** - * Loads a command. - * - * @param string $name Command name. - * @return Command - * @throws CommandNotFoundException If the command is not found. - */ - protected function doGet( $name ) { - $class = $this->get_class_name( $name ); - if ( ! class_exists( $class ) ) { - throw new CommandNotFoundException( "Command \"$name\" does not exist." ); - } - return new $class(); - } - - /** - * Return all command names. - * - * @return string[] All registered command names - */ - protected function doGetNames() { - $names = array(); - foreach ( new \DirectoryIterator( __DIR__ ) as $file ) { - if ( substr( $file->getBasename(), -11 ) === 'Command.php' ) { - $names[] = lcfirst( substr( $file->getBasename(), 0, -11 ) ); - } - } - sort( $names ); - return $names; - } -} +class CommandLoaderBase {} diff --git a/projects/packages/changelogger/src/php7/.phpcs.dir.phpcompatibility.xml b/projects/packages/changelogger/src/php7/.phpcs.dir.phpcompatibility.xml deleted file mode 100644 index a341a2ae9fd81..0000000000000 --- a/projects/packages/changelogger/src/php7/.phpcs.dir.phpcompatibility.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/projects/packages/changelogger/src/php7/.phpcs.dir.xml b/projects/packages/changelogger/src/php7/.phpcs.dir.xml deleted file mode 100644 index 699de1295ae65..0000000000000 --- a/projects/packages/changelogger/src/php7/.phpcs.dir.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/projects/packages/changelogger/src/php7/CommandLoader.php b/projects/packages/changelogger/src/php7/CommandLoader.php deleted file mode 100644 index 50f96fec7101b..0000000000000 --- a/projects/packages/changelogger/src/php7/CommandLoader.php +++ /dev/null @@ -1,48 +0,0 @@ -doHas( $name ); - } - - /** - * Loads a command. - * - * @param string $name Command name. - * @return Command - * @throws CommandNotFoundException If the command is not found. - */ - public function get( $name ): Command { - return $this->doGet( $name ); - } - - /** - * Return all command names. - * - * @return string[] All registered command names - */ - public function getNames(): array { - return $this->doGetNames(); - } -} From 51746059f9565019d372d6bcfe6dce647076ea8e Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Thu, 16 Nov 2023 20:13:10 +0100 Subject: [PATCH 10/22] Bump tested up to version See: - https://github.com/Automattic/jetpack/pull/34126#discussion_r1394347092 - https://github.com/Automattic/jetpack/pull/34126#discussion_r1394340062 --- projects/packages/codesniffer/README.md | 2 +- projects/packages/codesniffer/tests/php/tests/files/default.xml | 2 +- .../php/tests/files/i18n-text_domain-default.php.ruleset.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/packages/codesniffer/README.md b/projects/packages/codesniffer/README.md index 45dc446136fd4..410529d7cdfb8 100644 --- a/projects/packages/codesniffer/README.md +++ b/projects/packages/codesniffer/README.md @@ -27,7 +27,7 @@ You should then include the Jetpack rules in your `.phpcs.xml.dist`, like ``` You will also likely want to set some configuration for other included rulesets: ```xml - + ``` diff --git a/projects/packages/codesniffer/tests/php/tests/files/default.xml b/projects/packages/codesniffer/tests/php/tests/files/default.xml index 11c3366fa087d..ec31198705779 100644 --- a/projects/packages/codesniffer/tests/php/tests/files/default.xml +++ b/projects/packages/codesniffer/tests/php/tests/files/default.xml @@ -1,7 +1,7 @@ - + diff --git a/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-default.php.ruleset.xml b/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-default.php.ruleset.xml index a8fb765d64d92..d73f7c4cb178c 100644 --- a/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-default.php.ruleset.xml +++ b/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-default.php.ruleset.xml @@ -1,7 +1,7 @@ - + From 61da843a203421222199d217ca12ae0047d3459f Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Thu, 16 Nov 2023 20:14:14 +0100 Subject: [PATCH 11/22] Update projects/packages/codesniffer/build-compat-rulesets.sh Co-authored-by: Brad Jorsch --- projects/packages/codesniffer/build-compat-rulesets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/packages/codesniffer/build-compat-rulesets.sh b/projects/packages/codesniffer/build-compat-rulesets.sh index f8dfb72c58192..613d80ee4b7ce 100755 --- a/projects/packages/codesniffer/build-compat-rulesets.sh +++ b/projects/packages/codesniffer/build-compat-rulesets.sh @@ -93,7 +93,7 @@ for V in "${PHP_VERSIONS[@]:1}"; do cat > "Jetpack-Compat-$VV/ruleset.xml" < - Standard to disable PHPCompatibility rules that trigger with 7.0 but not $V. + Standard to disable PHPCompatibility rules that trigger with $V0 but not $V. $P From 695714f019c25dc4f055bb1513c43e73866bc4ea Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Thu, 16 Nov 2023 20:15:05 +0100 Subject: [PATCH 12/22] Remove old reference See https://github.com/Automattic/jetpack/pull/34126#discussion_r1394340970 --- projects/packages/codesniffer/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/packages/codesniffer/README.md b/projects/packages/codesniffer/README.md index 410529d7cdfb8..8953962f1c6b2 100644 --- a/projects/packages/codesniffer/README.md +++ b/projects/packages/codesniffer/README.md @@ -50,7 +50,6 @@ you may run into a situation where a subdir wants to be compatible down to a lat To assist with this case, we provide additional rulesets that disable PHPCompatibility rules detecting issues that only apply to older versions: -* `` will disable rules detecting issues that only apply to PHP < 7.0. * `` will disable rules detecting issues that only apply to PHP < 7.1. * `` will disable rules detecting issues that only apply to PHP < 7.2. * `` will disable rules detecting issues that only apply to PHP < 7.3. From c0c3b2aed65a6c75baf9fa2699f15cabe058b257 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 15:16:43 +0100 Subject: [PATCH 13/22] Update projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml Co-authored-by: Brad Jorsch --- .../php/tests/files/i18n-text_domain-not-set.php.ruleset.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml b/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml index 0f88584176efd..82e4149fdbafa 100644 --- a/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml +++ b/projects/packages/codesniffer/tests/php/tests/files/i18n-text_domain-not-set.php.ruleset.xml @@ -1,7 +1,7 @@ - + From e3b87aad19e64f4cdeb991ca3e7cf5423e38e03a Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 15:16:52 +0100 Subject: [PATCH 14/22] Update projects/packages/changelogger/src/CommandLoader.php Co-authored-by: Brad Jorsch --- projects/packages/changelogger/src/CommandLoader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/packages/changelogger/src/CommandLoader.php b/projects/packages/changelogger/src/CommandLoader.php index ce84c8f45fa56..a707fd74b3aa8 100644 --- a/projects/packages/changelogger/src/CommandLoader.php +++ b/projects/packages/changelogger/src/CommandLoader.php @@ -5,7 +5,7 @@ * @package automattic/jetpack-changelogger */ -namespace Automattic\Jetpack\Changelogger\php7; +namespace Automattic\Jetpack\Changelogger; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\CommandLoader\CommandLoaderInterface; From 3ba3819bdf08e98685445e7e3527e313a17af0df Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 15:17:00 +0100 Subject: [PATCH 15/22] Update projects/plugins/jetpack/changelog/update-php-requirements Co-authored-by: Brad Jorsch --- projects/plugins/jetpack/changelog/update-php-requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/plugins/jetpack/changelog/update-php-requirements b/projects/plugins/jetpack/changelog/update-php-requirements index 9c10e4c06a9d8..215c630b19f59 100644 --- a/projects/plugins/jetpack/changelog/update-php-requirements +++ b/projects/plugins/jetpack/changelog/update-php-requirements @@ -1,4 +1,4 @@ -Significance: patch +Significance: major Type: compat General: the plugin now requires PHP 7.0 and above. From dfd024f1218c576e931fe46324c7e3e034123132 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 15:48:02 +0100 Subject: [PATCH 16/22] Delete deprecated class See https://github.com/Automattic/jetpack/pull/34126#discussion_r1396232869 --- .../changelogger/src/CommandLoaderBase.php | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 projects/packages/changelogger/src/CommandLoaderBase.php diff --git a/projects/packages/changelogger/src/CommandLoaderBase.php b/projects/packages/changelogger/src/CommandLoaderBase.php deleted file mode 100644 index 4f81887809884..0000000000000 --- a/projects/packages/changelogger/src/CommandLoaderBase.php +++ /dev/null @@ -1,20 +0,0 @@ - Date: Fri, 17 Nov 2023 15:49:09 +0100 Subject: [PATCH 17/22] Update ruleset See https://github.com/Automattic/jetpack/pull/34126#discussion_r1396237223 --- .../packages/codesniffer/Jetpack-Compat-NoWP/ruleset.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/packages/codesniffer/Jetpack-Compat-NoWP/ruleset.xml b/projects/packages/codesniffer/Jetpack-Compat-NoWP/ruleset.xml index ca06e0e2cde25..d7f39c71191b1 100644 --- a/projects/packages/codesniffer/Jetpack-Compat-NoWP/ruleset.xml +++ b/projects/packages/codesniffer/Jetpack-Compat-NoWP/ruleset.xml @@ -3,11 +3,8 @@ Standard to re-enable PHPCompatibility rules disabled by PHPCompatibilityWP. - - - @@ -96,8 +93,6 @@ - - From 3c6a8241b71f5e4f994fb1e6a6cb3e95700c2784 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 15:51:02 +0100 Subject: [PATCH 18/22] Update changelog See: - https://github.com/Automattic/jetpack/pull/34126#discussion_r1396218514 - https://github.com/Automattic/jetpack/pull/34126#discussion_r1396218623 - https://github.com/Automattic/jetpack/pull/34126#discussion_r1396218707 - https://github.com/Automattic/jetpack/pull/34126#discussion_r1396218867 Co-authored-by: anomiex --- projects/plugins/beta/changelog/update-php-requirements | 5 ++--- projects/plugins/crm/changelog/update-php-requirements | 5 ++--- .../plugins/debug-helper/changelog/update-php-requirements | 5 ++--- .../mu-wpcom-plugin/changelog/update-php-requirements | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/projects/plugins/beta/changelog/update-php-requirements b/projects/plugins/beta/changelog/update-php-requirements index 9aa70e3ec1f75..e91743c9e6518 100644 --- a/projects/plugins/beta/changelog/update-php-requirements +++ b/projects/plugins/beta/changelog/update-php-requirements @@ -1,5 +1,4 @@ -Significance: patch +Significance: major Type: changed -Comment: Updated composer.lock. - +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/crm/changelog/update-php-requirements b/projects/plugins/crm/changelog/update-php-requirements index 9aa70e3ec1f75..e91743c9e6518 100644 --- a/projects/plugins/crm/changelog/update-php-requirements +++ b/projects/plugins/crm/changelog/update-php-requirements @@ -1,5 +1,4 @@ -Significance: patch +Significance: major Type: changed -Comment: Updated composer.lock. - +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/debug-helper/changelog/update-php-requirements b/projects/plugins/debug-helper/changelog/update-php-requirements index 9aa70e3ec1f75..e91743c9e6518 100644 --- a/projects/plugins/debug-helper/changelog/update-php-requirements +++ b/projects/plugins/debug-helper/changelog/update-php-requirements @@ -1,5 +1,4 @@ -Significance: patch +Significance: major Type: changed -Comment: Updated composer.lock. - +General: updated PHP requirement to PHP 7.0+ diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-php-requirements b/projects/plugins/mu-wpcom-plugin/changelog/update-php-requirements index 9aa70e3ec1f75..e91743c9e6518 100644 --- a/projects/plugins/mu-wpcom-plugin/changelog/update-php-requirements +++ b/projects/plugins/mu-wpcom-plugin/changelog/update-php-requirements @@ -1,5 +1,4 @@ -Significance: patch +Significance: major Type: changed -Comment: Updated composer.lock. - +General: updated PHP requirement to PHP 7.0+ From 5519f4c49591715b27c0a9b9be24b435e7104a2e Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 16:04:28 +0100 Subject: [PATCH 19/22] Bump version to match changelog --- projects/plugins/beta/composer.json | 2 +- projects/plugins/beta/jetpack-beta.php | 4 ++-- projects/plugins/crm/ZeroBSCRM.php | 2 +- projects/plugins/crm/composer.json | 2 +- projects/plugins/crm/package.json | 2 +- projects/plugins/debug-helper/plugin.php | 4 ++-- projects/plugins/mu-wpcom-plugin/composer.json | 2 +- projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php | 2 +- projects/plugins/mu-wpcom-plugin/package.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/plugins/beta/composer.json b/projects/plugins/beta/composer.json index 0d6a9fdd119d0..fe09e9eb3fa74 100644 --- a/projects/plugins/beta/composer.json +++ b/projects/plugins/beta/composer.json @@ -35,7 +35,7 @@ "prefer-stable": true, "config": { "sort-packages": true, - "autoloader-suffix": "567fa3f555de8fd218dfdc1688bb97b5_betaⓥ3_1_7_alpha", + "autoloader-suffix": "567fa3f555de8fd218dfdc1688bb97b5_betaⓥ4_0_0_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true } diff --git a/projects/plugins/beta/jetpack-beta.php b/projects/plugins/beta/jetpack-beta.php index d4ab242e7e835..af56e1578d3f6 100644 --- a/projects/plugins/beta/jetpack-beta.php +++ b/projects/plugins/beta/jetpack-beta.php @@ -3,7 +3,7 @@ * Plugin Name: Jetpack Beta Tester * Plugin URI: https://jetpack.com/beta/ * Description: Use the Beta plugin to get a sneak peek at new features and test them on your site. - * Version: 3.1.7-alpha + * Version: 4.0.0-alpha * Author: Automattic * Author URI: https://jetpack.com/ * Update URI: https://jetpack.com/download-jetpack-beta/ @@ -35,7 +35,7 @@ } define( 'JPBETA__PLUGIN_FOLDER', dirname( plugin_basename( __FILE__ ) ) ); -define( 'JPBETA_VERSION', '3.1.7-alpha' ); +define( 'JPBETA_VERSION', '4.0.0-alpha' ); define( 'JETPACK_BETA_PLUGINS_URL', 'https://betadownload.jetpack.me/plugins.json' ); diff --git a/projects/plugins/crm/ZeroBSCRM.php b/projects/plugins/crm/ZeroBSCRM.php index 90e4f9bbe1604..3673a70620a70 100644 --- a/projects/plugins/crm/ZeroBSCRM.php +++ b/projects/plugins/crm/ZeroBSCRM.php @@ -3,7 +3,7 @@ * Plugin Name: Jetpack CRM * Plugin URI: https://jetpackcrm.com * Description: Jetpack CRM is the simplest CRM for WordPress. Self host your own Customer Relationship Manager using WP. - * Version: 6.3.1-alpha + * Version: 7.0.0-alpha * Author: Automattic - Jetpack CRM team * Author URI: https://jetpackcrm.com * Text Domain: zero-bs-crm diff --git a/projects/plugins/crm/composer.json b/projects/plugins/crm/composer.json index 5c740f7c9e14d..ff9abb26e7605 100644 --- a/projects/plugins/crm/composer.json +++ b/projects/plugins/crm/composer.json @@ -42,7 +42,7 @@ ] }, "config": { - "autoloader-suffix": "06c775433a83ed276f0a1d8ac25f93ba_crmⓥ6_3_1_alpha", + "autoloader-suffix": "06c775433a83ed276f0a1d8ac25f93ba_crmⓥ7_0_0_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true, diff --git a/projects/plugins/crm/package.json b/projects/plugins/crm/package.json index 066987d838404..e65df903606c7 100644 --- a/projects/plugins/crm/package.json +++ b/projects/plugins/crm/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/jetpack-crm", - "version": "6.3.1-alpha", + "version": "7.0.0-alpha", "description": "The CRM for WordPress", "author": "Automattic", "license": "GPL-2.0", diff --git a/projects/plugins/debug-helper/plugin.php b/projects/plugins/debug-helper/plugin.php index fceae1d0fb534..edb9c4b0e284c 100644 --- a/projects/plugins/debug-helper/plugin.php +++ b/projects/plugins/debug-helper/plugin.php @@ -3,7 +3,7 @@ * Plugin Name: Jetpack Debug Tools * Description: Give me a Jetpack connection, and I'll break it every way possible. * Author: Automattic - Jetpack Crew - * Version: 1.7.0-alpha + * Version: 2.0.0-alpha * Text Domain: jetpack * * @package automattic/jetpack-debug-helper. @@ -33,7 +33,7 @@ * The plugin version. * Increase that if you do any edits to ensure refreshing the cached assets. */ -define( 'JETPACK_DEBUG_HELPER_VERSION', '1.7.0-alpha' ); +define( 'JETPACK_DEBUG_HELPER_VERSION', '2.0.0-alpha' ); /** * Include file names from the modules directory here. diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json index eb33ff06e6973..6c01966b5bd22 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.json +++ b/projects/plugins/mu-wpcom-plugin/composer.json @@ -46,6 +46,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_7_12_alpha" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_0_0_alpha" } } diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php index 038ddffdf2d3d..ed0c44cebba88 100644 --- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php +++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php @@ -3,7 +3,7 @@ * * Plugin Name: WordPress.com Features * Description: Test plugin for the jetpack-mu-wpcom package - * Version: 1.7.12-alpha + * Version: 2.0.0-alpha * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json index d9c39c5f3f6fb..962ad8201d26f 100644 --- a/projects/plugins/mu-wpcom-plugin/package.json +++ b/projects/plugins/mu-wpcom-plugin/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "1.7.12-alpha", + "version": "2.0.0-alpha", "description": "Test plugin for the jetpack-mu-wpcom package", "homepage": "https://jetpack.com", "bugs": { From 82cbf5098d87f179e7dc6f37d49e4f43ae4abb50 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 16:09:31 +0100 Subject: [PATCH 20/22] Move PHP requirement back to 5.6 See https://github.com/Automattic/jetpack/pull/34126#issuecomment-1816597056 --- projects/plugins/vaultpress/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/plugins/vaultpress/readme.txt b/projects/plugins/vaultpress/readme.txt index 7838d92a3eb65..47ad76bb75468 100644 --- a/projects/plugins/vaultpress/readme.txt +++ b/projects/plugins/vaultpress/readme.txt @@ -4,7 +4,7 @@ Tags: security, malware, virus, archive, back up, back ups, backup, backups, sca Requires at least: 5.2 Tested up to: 6.4 Stable tag: 2.2.4 -Requires PHP: 7.0 +Requires PHP: 5.6 License: GPLv2 (DEPRECATED: Please install "Jetpack VaultPress Backup" instead) Jetpack VaultPress offers real-time backups, one-click restores, and premium support from WordPress experts. From c5bb8ddeecd7ce9043816e4170e05c4c9325a51a Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 16:12:27 +0100 Subject: [PATCH 21/22] Delete unnecessary changelog entry --- projects/plugins/vaultpress/changelog/update-php-requirements | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 projects/plugins/vaultpress/changelog/update-php-requirements diff --git a/projects/plugins/vaultpress/changelog/update-php-requirements b/projects/plugins/vaultpress/changelog/update-php-requirements deleted file mode 100644 index e91743c9e6518..0000000000000 --- a/projects/plugins/vaultpress/changelog/update-php-requirements +++ /dev/null @@ -1,4 +0,0 @@ -Significance: major -Type: changed - -General: updated PHP requirement to PHP 7.0+ From 1e6c0d55ee2522b4e24bef19ae4679465ca0b8a2 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Fri, 17 Nov 2023 16:14:28 +0100 Subject: [PATCH 22/22] Update version back to match changelog entries --- projects/plugins/vaultpress/composer.json | 2 +- projects/plugins/vaultpress/vaultpress.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/plugins/vaultpress/composer.json b/projects/plugins/vaultpress/composer.json index be1af9d9597b0..5c376b2cb9a48 100644 --- a/projects/plugins/vaultpress/composer.json +++ b/projects/plugins/vaultpress/composer.json @@ -35,7 +35,7 @@ "minimum-stability": "dev", "prefer-stable": true, "config": { - "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ3_0_0_alpha", + "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ2_2_5_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true } diff --git a/projects/plugins/vaultpress/vaultpress.php b/projects/plugins/vaultpress/vaultpress.php index c23f79c2e4f6e..a87ca21739459 100644 --- a/projects/plugins/vaultpress/vaultpress.php +++ b/projects/plugins/vaultpress/vaultpress.php @@ -3,7 +3,7 @@ * Plugin Name: VaultPress * Plugin URI: http://vaultpress.com/?utm_source=plugin-uri&utm_medium=plugin-description&utm_campaign=1.0 * Description: Protect your content, themes, plugins, and settings with realtime backup and automated security scanning from VaultPress. Activate, enter your registration key, and never worry again. Need some help? - * Version: 3.0.0-alpha + * Version: 2.2.5-alpha * Author: Automattic * Author URI: http://vaultpress.com/?utm_source=author-uri&utm_medium=plugin-description&utm_campaign=1.0 * License: GPL2+ @@ -17,7 +17,7 @@ defined( 'ABSPATH' ) || die(); define( 'VAULTPRESS__MINIMUM_PHP_VERSION', '5.6' ); -define( 'VAULTPRESS__VERSION', '3.0.0-alpha' ); +define( 'VAULTPRESS__VERSION', '2.2.5-alpha' ); define( 'VAULTPRESS__PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); /**