From 13612b1618f4620854d75b7c642df8947b696817 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Tue, 14 Nov 2023 19:35:16 +0100 Subject: [PATCH] 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' +