Merge branch 'trunk' into add/converge-wpcomsh

.github/files/setup-wordpress-env.sh

@@ -70,6 +70,12 @@ for PLUGIN in projects/plugins/*/composer.json; do
 
 	echo "::group::Installing plugin $NAME into WordPress"
 
+	if php -r 'exit( preg_match( "/^>=\\s*(\\d+\\.\\d+)$/", $argv[1], $m ) && version_compare( PHP_VERSION, $m[1], "<" ) ? 0 : 1 );' "$( jq -r '.require.php // ""' "$DIR/composer.json" )"; then
+		echo "::endgroup::"
+		echo "Skipping install of plugin $NAME, requires PHP $( jq -r '.require.php // ""' "$DIR/composer.json" )"
+		continue
+	fi
+
 	if jq --arg script "skip-$TEST_SCRIPT" -e '.scripts[$script] // false' "$DIR/composer.json" > /dev/null; then
 		{ composer --working-dir="$DIR" run "skip-$TEST_SCRIPT"; CODE=$?; } || true
 		if [[ $CODE -eq 3 ]]; then

projects/plugins/crm/changelog/update-skip-plugin-setup-by-composer-require-php

@@ -0,0 +1,4 @@
+Significance: patch
+Type: removed
+
+Remove obsolete PHP version check in `tests/action-skip-test-php.sh`. No change to the plugin itself.

projects/plugins/crm/tests/action-skip-test-php.sh

@@ -1,10 +1,5 @@
 #!/bin/bash
 
-if php -r 'exit( version_compare( PHP_VERSION, "7.4.0", "<" ) ? 0 : 1 );'; then
-	echo "PHP version is too old to run tests. 7.4 is required, but $(php -r 'echo PHP_VERSION;') is installed. Skipping.";
-	exit 3
-fi
-
 # Uncomment the below snippet to disable tests on WP trunk
 # if [[ "$WP_BRANCH" == 'trunk' ]]; then
 # 	echo "Codeception tests against WP trunk are temporarily disabled."

projects/plugins/inspect/changelog/update-skip-plugin-setup-by-composer-require-php

@@ -0,0 +1,4 @@
+Significance: patch
+Type: removed
+
+Remove obsolete `skip-test-php` composer script. No change to the plugin itself.

projects/plugins/inspect/composer.json

@@ -38,7 +38,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"skip-test-php": "tests/action-skip-test-php.sh",
 		"test-php": [
 			"@composer phpunit"
 		],

projects/plugins/jetpack/changelog/update-jetpack-ai-image-create-general-purpose-generator-first-draft

@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Jetpack AI Image: create first draft of the General Purpose image generator.

projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx

@@ -14,7 +14,7 @@ import React from 'react';
 import useAICheckout from '../../../../blocks/ai-assistant/hooks/use-ai-checkout';
 import useAiFeature from '../../../../blocks/ai-assistant/hooks/use-ai-feature';
 import JetpackPluginSidebar from '../../../../shared/jetpack-plugin-sidebar';
-import FeaturedImage from '../featured-image';
+import { FeaturedImage } from '../ai-image';
 import Proofread from '../proofread';
 import TitleOptimization from '../title-optimization';
 import UsagePanel from '../usage-panel';