Update composer packages; Bump PHP to 7.4 and WP to 5.3 by thelovekesh · Pull Request #7613 · ampproject/amp-wp

thelovekesh · 2023-09-03T07:45:42Z

Summary

Update composer dev packages to the latest version.
Bump PHP to 7.4
Bump minimum WP version to 5.3
Update workflows to use globally installed PHPUnit.

Checklist

My code is tested and passes existing tests.
My code follows the Engineering Guidelines (updates are often made to the guidelines, check it out periodically).

composer.json

thelovekesh · 2023-09-07T16:48:24Z

tests/php/src/Validation/ScannableURLProviderTest.php


+			$post = self::factory()->post->create();
+
+			// `wp_pattern_category` is a special taxonomy that is registered for categorizing patterns.


Added in recent GB release - WordPress/gutenberg#53163

github-actions · 2023-09-07T16:50:50Z

Plugin builds for 3eb015a are ready 🛎️!

Download development build
Download production build

composer.json

westonruter · 2023-09-07T17:44:30Z

tests/php/src/Validation/ScannableURLProviderTest.php

+			// `wp_pattern_category` is a special taxonomy that is registered for categorizing patterns.
+			// It is only associated with the `wp_block` post type, so we need to create a `wp_block` post.
+			if ( 'wp_pattern_category' === $taxonomy ) {
+				$post = self::factory()->post->create(


This post is overriding the $post created just before. Should the above $post creation be put in an else?

Done in 9b700ff

tests/php/validation/test-class-amp-validation-manager.php

westonruter · 2023-09-07T17:48:54Z

tests/php/validation/test-class-amp-validation-manager.php


 			'wp_editor_has_scripts_attributed'           => [
 				function () {
-					if ( version_compare( get_bloginfo( 'version' ), '5.2', '<=' ) ) {


Strange that 5.2 was the version here when 5.5 is the version it was introduced in.

Co-authored-by: Weston Ruter <westonruter@google.com>

westonruter · 2023-09-08T22:45:06Z

src/Validation/ScannableURLProvider.php

 		$query = new WP_Query( $args );

-		return $this->get_posts_that_support_amp( $query->posts );
+		return $this->get_posts_that_support_amp( $query->posts, $posts_to_exclude );


Instead of updating the get_posts_that_support_amp method with this new parameter, it would seem better to me to just do the filtering here in this method:

Suggested change

return $this->get_posts_that_support_amp( $query->posts, $posts_to_exclude );

$posts = array_values(

array_filter(

$query->posts,

static function ( $post ) use ( $posts_to_exclude ) {

return ! in_array( $post->ID, $posts_to_exclude, true );

}

)

);

return $this->get_posts_that_support_amp( $posts );

Hold on, this can be simplified further since we're getting IDs:

Suggested change

return $this->get_posts_that_support_amp( $query->posts, $posts_to_exclude );

return $this->get_posts_that_support_amp( array_diff( $query->posts, $posts_to_exclude ) );

I thought since we already filter these post IDs and array_diff is considered slow, completing the task in a single run would be performant. However, any performance impact should be negligible here as the array size will be 100 only.

So we can go with array_diff() instead? It's less code and doens't change the resulting API.

westonruter · 2023-09-09T00:27:05Z

I just had a concerning thought that this would cause problems for Web Stories. But I see that it already requires PHP 7.4. So we're all good there.

Ref: https://docs.wpvip.com/technical-references/code-quality-and-best-practices/using-post__not_in/

westonruter

Awesome!

westonruter reviewed Sep 5, 2023

View reviewed changes

composer.json Outdated Show resolved Hide resolved

thelovekesh added 8 commits September 5, 2023 23:20

Bump yoast/wp-test-utils from 1.0.5 to 1.1.0

45a72f2

Update composer dev packages to latest versions

2e61c07

Update composer lockfile

1d0474b

Update sniffs as per latest WPCS version

ce53dca

Remove errors from phpstan baseline which are fixed upstream

00ea890

Add ecosystem-data to be ignored by phpcs

c146468

Bump platform PHP version from 7.0.8 to 7.2

39176c1

Bump automattic/vipwpcs from ^2.0 to ^3.0

273e95f

thelovekesh force-pushed the update/composer-packages branch from 5499f6f to 65c5e6f Compare September 5, 2023 17:53

thelovekesh added 9 commits September 6, 2023 00:33

Bump minimum required PHP version to 7.4

5372062

Bump google/cloud-storage to ^1.0

f8645b1

Update composer lockfile

9d2b4d1

Bump PHP to 7.4 and minimum WP version to 5.3

2c9fd1e

Bump PHP to 7.4

f282d63

Remove support for PHP 5.6 from SimpleInjector

f3e5b60

Remove samesite cookies workaround as we have bumped to PHP 7.4

67e89f5

Remove PHPUnit patches as they are fixed upstream

d5b7cdc

Remove workflows for PHP < 7.4

49e829c

thelovekesh force-pushed the update/composer-packages branch from 7e30db2 to 49e829c Compare September 5, 2023 20:11

thelovekesh added 3 commits September 6, 2023 01:44

Update composer lockfile

2436565

Fix PHPUnit version in workflows matrix

c02c4c4

Restore composer install step

06d5930

thelovekesh force-pushed the update/composer-packages branch from 3e4498e to 06d5930 Compare September 5, 2023 20:42

thelovekesh added 2 commits September 6, 2023 11:24

Update phpunit bootstrap file to autoload early before WP CLI logger

cead962

Update workflow to remove locally installed PHPUnit

3a668b4

thelovekesh changed the title ~~Update composer packages; Fix PHPCS errors raised by latest WPCS~~ Update composer packages; Bump PHP to 7.4 and WP to 5.3 Sep 6, 2023

thelovekesh added 3 commits September 6, 2023 12:10

Update PHPUnit version for PHP 7.4 and WP 5.3

15f5a46

Fix PHPUnit external testsuite command

5c35b03

Merge branch 'develop' into update/composer-packages

ff8cfc4

thelovekesh marked this pull request as ready for review September 7, 2023 16:46

thelovekesh commented Sep 7, 2023

View reviewed changes

thelovekesh added 3 commits September 7, 2023 22:30

Remove duplicate test matrix and add PHP 8.3 in tests matrix

9c60ad6

Increase navigation timeout for e2e tests to 30000 ms

c1b1971

Remove experimental from unit tests with PHP 8.2 and WP trunk

108049c

thelovekesh requested a review from westonruter September 7, 2023 17:32

westonruter added this to the v2.4.3 milestone Sep 7, 2023

westonruter reviewed Sep 7, 2023

View reviewed changes

composer.json Show resolved Hide resolved

westonruter reviewed Sep 7, 2023

View reviewed changes

composer.json Show resolved Hide resolved

westonruter reviewed Sep 7, 2023

View reviewed changes

tests/php/validation/test-class-amp-validation-manager.php Outdated Show resolved Hide resolved

westonruter reviewed Sep 7, 2023

View reviewed changes

Fix code comment formatting; Remove duplicated LOC

056f613

Co-authored-by: Weston Ruter <westonruter@google.com>

thelovekesh force-pushed the update/composer-packages branch from efbdb82 to 056f613 Compare September 8, 2023 03:47

thelovekesh added 3 commits September 8, 2023 19:43

Update var override with ternary operator

9b700ff

Disable PHPCS errors due to latest WPCS

6925bef

Fix PHPCS errors due to CS updates

aed0343

thelovekesh requested a review from westonruter September 8, 2023 16:50

westonruter reviewed Sep 8, 2023

View reviewed changes

thelovekesh added 2 commits September 12, 2023 02:15

Update get_posts_by_type to avoid post__not_in with WP_Query

a2904df

Ref: https://docs.wpvip.com/technical-references/code-quality-and-best-practices/using-post__not_in/

Update e2e tests artifacts to GitHub in case of failure

3eb015a

thelovekesh force-pushed the update/composer-packages branch from 5659947 to 3eb015a Compare September 11, 2023 20:46

thelovekesh requested a review from westonruter September 11, 2023 21:02

westonruter approved these changes Sep 11, 2023

View reviewed changes

westonruter merged commit 828f229 into develop Sep 11, 2023

westonruter deleted the update/composer-packages branch September 11, 2023 21:06

thelovekesh mentioned this pull request Oct 11, 2023

Fix PHPCS errors/warnings #7638

Merged

2 tasks

westonruter added the Changelogged Whether the issue/PR has been added to release notes. label Nov 6, 2023


		$post = self::factory()->post->create();

		// `wp_pattern_category` is a special taxonomy that is registered for categorizing patterns.

-		return $this->get_posts_that_support_amp( $query->posts, $posts_to_exclude );
+		$posts = array_values(
+			array_filter(
+				$query->posts,
+				static function ( $post ) use ( $posts_to_exclude ) {
+					return ! in_array( $post->ID, $posts_to_exclude, true );
+				}
+			)
+		);
+		return $this->get_posts_that_support_amp( $posts );

	return $this->get_posts_that_support_amp( $query->posts, $posts_to_exclude );
	return $this->get_posts_that_support_amp( array_diff( $query->posts, $posts_to_exclude ) );

Conversation

thelovekesh commented Sep 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

Uh oh!

thelovekesh Sep 7, 2023

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

westonruter Sep 7, 2023

Choose a reason for hiding this comment

Uh oh!

thelovekesh Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

westonruter Sep 7, 2023

Choose a reason for hiding this comment

Uh oh!

westonruter Sep 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

westonruter Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

thelovekesh Sep 9, 2023

Choose a reason for hiding this comment

Uh oh!

westonruter Sep 11, 2023

Choose a reason for hiding this comment

Uh oh!

westonruter commented Sep 9, 2023

Uh oh!

westonruter left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

thelovekesh commented Sep 3, 2023 •

edited

Loading

github-actions bot commented Sep 7, 2023 •

edited

Loading

westonruter Sep 8, 2023 •

edited

Loading