Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:ampproject/amp-wp into update/67…
Browse files Browse the repository at this point in the history
…98-local-env

* 'develop' of github.com:ampproject/amp-wp:
  Update Jest snapshots (npm run test:js -- --updateSnapshot)
  Update Gutenberg package dependencies
  Bump tested up to WP 6.0
  Try to fix E2E test cases
  Update unit test case
  Update test cases
  Add 'data-amp-auto-lightbox-disable' attribute to HTML tag instead of body tag to disable auto-lightbox
  Merge pull request #7095 from ampproject/dependabot/npm_and_yarn/grunt-1.5.3
  Bump eslint from 8.14.0 to 8.15.0 (#7093)
  Reset package-lock.json to state in develop
  Remove PHP 5.6 feature tests
  Update composer.lock
  Fix issue of restricted keyword 'match' in PHP 8.0 for phpunit
  Remove non-existing function from @cover and @use
  Update the patch file of phpunit-mock-objects
  Update composer.lock file
  Update package-lock.json
  Rollback memory-limit changes
  Bump PHP version from 5.6 to 7.0
  • Loading branch information
westonruter committed May 12, 2022
2 parents 8b9aa70 + ef632e9 commit 37fee18
Show file tree
Hide file tree
Showing 16 changed files with 2,037 additions and 1,918 deletions.
15 changes: 3 additions & 12 deletions .github/workflows/build-test-measure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -399,13 +399,12 @@ jobs:
- php: '7.0'
wp: '5.1'

- php: '5.6'
- php: '7.0'
wp: '5.0'

- php: '5.6'
- php: '7.0'
wp: '4.9'
external-http: true
install-pwa-plugin: false

steps:
# Note: The repeated `needs.pre-run.outputs.changed-php-count > 0` checks would be avoided if a step could short-
Expand Down Expand Up @@ -576,14 +575,6 @@ jobs:
wp: '5.1'
coverage: false

- php: '5.6'
wp: '5.0'
coverage: false

- php: '5.6'
wp: '4.9'
coverage: false

steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -703,7 +694,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '5.6'
php-version: '7.0'

- name: Setup Node
uses: actions/setup-node@v3.1.1
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ An easier path to great Page Experience for everyone. Powered by AMP.
**Contributors:** [google](https://profiles.wordpress.org/google), [xwp](https://profiles.wordpress.org/xwp), [rtcamp](https://profiles.wordpress.org/rtcamp), [automattic](https://profiles.wordpress.org/automattic), [westonruter](https://profiles.wordpress.org/westonruter), [albertomedina](https://profiles.wordpress.org/albertomedina), [schlessera](https://profiles.wordpress.org/schlessera), [delawski](https://profiles.wordpress.org/delawski/), [swissspidy](https://profiles.wordpress.org/swissspidy), [pierlo](https://profiles.wordpress.org/pierlo), [joshuawold](https://profiles.wordpress.org/joshuawold)
**Tags:** [page experience](https://wordpress.org/plugins/tags/page-experience), [performance](https://wordpress.org/plugins/tags/performance), [amp](https://wordpress.org/plugins/tags/amp), [mobile](https://wordpress.org/plugins/tags/mobile), [optimization](https://wordpress.org/plugins/tags/optimization), [accelerated mobile pages](https://wordpress.org/plugins/tags/accelerated-mobile-pages)
**Requires at least:** 4.9
**Tested up to:** 5.9
**Tested up to:** 6.0
**Stable tag:** 2.2.4
**License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)
**Requires PHP:** 5.6
**Requires PHP:** 7.0

[![Build Status](https://github.com/ampproject/amp-wp/workflows/Build,%20test%20&%20measure/badge.svg)](https://github.com/ampproject/amp-wp/actions?query=branch%3Adevelop+workflow%3A%22Build%2C+test+%26+measure%22)
[![Coverage Status](https://img.shields.io/codecov/c/github/ampproject/amp-wp/develop.svg)](https://codecov.io/gh/ampproject/amp-wp)
Expand Down
6 changes: 3 additions & 3 deletions amp.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Version: 2.3.0-alpha
* License: GPLv2 or later
* Requires at least: 4.9
* Requires PHP: 5.6
* Requires PHP: 7.0
*
* @package AMP
*/
Expand All @@ -28,13 +28,13 @@

$_amp_load_errors = new WP_Error();

if ( version_compare( phpversion(), '5.6', '<' ) ) {
if ( version_compare( phpversion(), '7.0', '<' ) ) {
$_amp_load_errors->add(
'insufficient_php_version',
sprintf(
/* translators: %s: required PHP version */
__( 'The AMP plugin requires PHP %s. Please contact your host to update your PHP version.', 'amp' ),
'5.6+'
'7.0+'
)
);
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "wordpress-plugin",
"homepage": "https://github.com/ampproject/amp-wp",
"require": {
"php": "^5.6 || ^7.0 || ^8.0",
"php": "^7.0 || ^8.0",
"ext-curl": "*",
"ext-date": "*",
"ext-dom": "*",
Expand Down Expand Up @@ -75,7 +75,7 @@
"dealerdirect/phpcodesniffer-composer-installer": true
},
"platform": {
"php": "5.6.20"
"php": "7.0.8"
},
"sort-packages": true
},
Expand All @@ -90,7 +90,8 @@
},
"patches": {
"phpunit/phpunit-mock-objects": {
"Fix ReflectionParameter warnings on PHP 8": "patches/phpunit-mock-objects.patch"
"Fix ReflectionParameter warnings on PHP 8": "patches/phpunit-mock-objects.patch",
"Remove 'match' keyword from uses <https://github.com/sebastianbergmann/phpunit/issues/4373>": "patches/remove-match-keyword.patch"
},
"sabberworm/php-css-parser": {
"1. Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/350>": "https://github.com/westonruter/PHP-CSS-Parser/commit/5b1d6a4abe43f4311d9b4674913ca665ed8c43aa.diff",
Expand Down
Loading

0 comments on commit 37fee18

Please sign in to comment.