Update wp-env and some ETK PHP fixes

.gitignore

@@ -119,3 +119,7 @@ yarn-json-output.json
 
 # Storybook
 storybook-static
+
+# PHPUnit cache
+.phpunit.result.cache
+.phpunit.cache

apps/editing-toolkit/.wp-env.json

@@ -3,6 +3,7 @@
 	"themes": [ "../../../themes/varia", "../../../themes/maywood" ],
 	"port": 4013,
 	"testsPort": 4005,
+	"phpVersion": "8.2",
 	"mappings": {
 		"wp-content/plugins/editing-toolkit-plugin/vendor": "../../vendor"
 	}

apps/editing-toolkit/editing-toolkit-plugin/block-patterns/class-block-patterns-from-api.php

@@ -76,7 +76,7 @@ public function register_patterns() {
 			foreach ( (array) $block_patterns as $pattern ) {
 				foreach ( (array) $pattern['categories'] as $slug => $category ) {
 					// Register categories from first pattern in each category.
-					if ( ! $pattern_categories[ $slug ] ) {
+					if ( ! isset( $pattern_categories[ $slug ] ) ) {
 						$pattern_categories[ $slug ] = array(
 							'label'       => $category['title'],
 							'description' => $category['description'],

apps/editing-toolkit/editing-toolkit-plugin/block-patterns/test/class-block-patterns-from-api-test.php

@@ -29,7 +29,7 @@ class Block_Patterns_From_Api_Test extends TestCase {
 	/**
 	 * Pre-test setup.
 	 */
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->pattern_mock_object = array(
 			'ID'            => '1',
@@ -41,8 +41,9 @@ public function setUp() {
 			'source_url'    => 'http;//test',
 			'modified_date' => 'dd:mm:YY',
 			'categories'    => array(
-				array(
-					'title' => 'test-category',
+				'test_slug' => array(
+					'title'       => 'category title',
+					'description' => 'category description',
 				),
 			),
 		);

apps/editing-toolkit/editing-toolkit-plugin/block-patterns/test/class-block-patterns-utils-test.php

@@ -28,7 +28,7 @@ class Block_Patterns_Utils_Test extends TestCase {
 	/**
 	 * Pre-test setup.
 	 */
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->utils = new Block_Patterns_Utils();
 	}

apps/editing-toolkit/editing-toolkit-plugin/full-site-editing-plugin.php

@@ -203,7 +203,7 @@ function load_blog_posts_block() {
 	$disable_block = (
 		( defined( 'WP_CLI' ) && WP_CLI ) ||
 		/* phpcs:ignore WordPress.Security.NonceVerification */
-		( isset( $_GET['action'], $_GET['plugin'] ) && 'activate' === $_GET['action'] && preg_match( $slug_regex, sanitize_text_field( wp_unslash( $_GET['plugin'] ) ) ) ) ||
+		( isset( $_GET['action'] ) && isset( $_GET['plugin'] ) && 'activate' === $_GET['action'] && preg_match( $slug_regex, sanitize_text_field( wp_unslash( $_GET['plugin'] ) ) ) ) ||
 		preg_grep( $slug_regex, (array) get_option( 'active_plugins' ) ) ||
 		preg_grep( $slug_regex, (array) get_site_option( 'active_sitewide_plugins' ) )
 	);

apps/editing-toolkit/editing-toolkit-plugin/global-styles/class-global-styles.php

@@ -134,7 +134,7 @@ class Global_Styles {
 	 * @return \Automattic\Jetpack\Global_Styles\Global_Styles
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 

apps/editing-toolkit/editing-toolkit-plugin/help-center/class-help-center.php

@@ -57,7 +57,7 @@ public function __construct() {
 	 * @return \A8C\FSE\Help_Center
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;

apps/editing-toolkit/editing-toolkit-plugin/help-center/test/class-help-center-test.php

@@ -23,7 +23,7 @@ class WPCOM_Help_Center_Test extends WP_UnitTestCase {
 	/**
 	 * Pre-test setup.
 	 */
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->help_center = $this->createPartialMock(

apps/editing-toolkit/editing-toolkit-plugin/phpunit.xml.dist

@@ -1,14 +1,17 @@
+<?xml version="1.0"?>
 <phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	bootstrap="phpunit/bootstrap.php"
 	backupGlobals="false"
 	colors="true"
 	convertErrorsToExceptions="true"
 	convertNoticesToExceptions="true"
 	convertWarningsToExceptions="true"
 	>
-    <php>
-        <const name="WP_TESTS_MULTISITE" value="1" />
-    </php>
+	<php>
+		<env name="WORDPRESS_TABLE_PREFIX" value="wptests_"/>
+		<const name="WP_TESTS_MULTISITE" value="1"/>
+	</php>
 	<testsuites>
 		<testsuite name="default">
 			<directory suffix="-test.php">./phpunit/</directory>
@@ -19,9 +22,6 @@
 		<testsuite name="help-center">
 			<directory suffix="-test.php">./help-center/test/</directory>
 		</testsuite>
-		<testsuite name="tutorials">
-			<directory suffix="-test.php">./tutorials/test/</directory>
-		</testsuite>
 		<testsuite name="wpcom-global-styles">
 			<directory suffix="-test.php">./wpcom-global-styles/test/</directory>
 		</testsuite>

apps/editing-toolkit/editing-toolkit-plugin/phpunit/bootstrap.php

@@ -3,14 +3,12 @@
  * PHPUnit bootstrap file
  *
  * @see https://github.com/WordPress/gutenberg/blob/HEAD/phpunit/bootstrap.php
- *
- * @package FullSiteEditing
  */
 
 // Require composer dependencies.
 require_once dirname( __DIR__ ) . '/vendor/autoload.php';
 
-$_tests_dir = getenv( 'WP_PHPUNIT__DIR' );
+$_tests_dir = getenv( 'WP_TESTS_DIR' );
 
 if ( ! $_tests_dir ) {
 	throw new Exception( 'Could not find the WordPress test lib.' );
@@ -59,9 +57,6 @@ function fail_if_died( $message ) {
 // Use existing behavior for wp_die during actual test execution.
 remove_filter( 'wp_die_handler', 'fail_if_died' );
 
-// Don't let deprecation notices cause tests to fail.
-PHPUnit\Framework\Error\Deprecated::$enabled = false;
-
 // Global function stubs that might be needed by all tests.
 
 /**

apps/editing-toolkit/editing-toolkit-plugin/phpunit/class-newspack-test.php

@@ -21,7 +21,8 @@ public function test_carousel_assets_enqueued() {
 		ob_start();
 		newspack_blocks_render_block_carousel(
 			array(
-				'postsToShow' => 3,
+				'postsToShow'   => 3,
+				'slidesPerView' => 2,
 			)
 		);
 		ob_end_flush();
@@ -44,6 +45,8 @@ public function test_blog_posts_assets_enqueued() {
 				'showImage'       => false,
 				'specificMode'    => 0,
 				'textColor'       => '',
+				'slidesPerView'   => false,
+				'textAlign'       => false,
 			)
 		);
 		ob_end_flush();

apps/editing-toolkit/editing-toolkit-plugin/tags-education/class-tags-education.php

@@ -31,7 +31,7 @@ public function __construct() {
 	 * @return \A8C\FSE\Tags_Education
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;

apps/editing-toolkit/editing-toolkit-plugin/whats-new/class-whats-new.php

@@ -34,7 +34,7 @@ public function __construct() {
 	 * @return \A8C\FSE\Whats_New
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;

apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-description-links/class-wpcom-block-description-links.php

@@ -31,7 +31,7 @@ public function __construct() {
 	 * @return \A8C\FSE\WPCOM_Block_Description_Links
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;

apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nav-sidebar/class-wpcom-block-editor-nav-sidebar.php

@@ -31,7 +31,7 @@ public function __construct() {
 	 * @return \A8C\FSE\WPCOM_Block_Editor_Nav_Sidebar
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;

apps/editing-toolkit/editing-toolkit-plugin/wpcom-block-editor-nux/class-wpcom-block-editor-nux.php

@@ -32,7 +32,7 @@ public function __construct() {
 	 * @return \A8C\FSE\WPCOM_Block_Editor_NUX
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;

apps/editing-toolkit/editing-toolkit-plugin/wpcom-documentation-links/class-wpcom-documentation-links.php

@@ -31,7 +31,7 @@ public function __construct() {
 	 * @return \A8C\FSE\WPCOM_Documentation_Links
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;

apps/editing-toolkit/editing-toolkit-plugin/wpcom-domain-upsell-callout/class-wpcom-domain-upsell-callout.php

@@ -31,7 +31,7 @@ public function __construct() {
 	 * @return \A8C\FSE\WPCOM_Domain_Upsell_Callout
 	 */
 	public static function init() {
-		if ( is_null( self::$instance ) ) {
+		if ( self::$instance === null ) {
 			self::$instance = new self();
 		}
 		return self::$instance;

apps/editing-toolkit/editing-toolkit-plugin/wpcom-global-styles/test/class-wpcom-global-styles-test.php

@@ -28,7 +28,7 @@ public function test_wpcom_block_global_styles_frontend() {
 		// Check that the custom color is blocked when Global Styles are limited.
 		add_filter( 'wpcom_force_limit_global_styles', '__return_true' );
 		$theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data( $user_data, 'custom' ) );
-		$this->assertEmpty( $theme_json->get_data()['styles']['color']['background'] );
+		$this->assertFalse( isset( $theme_json->get_data()['styles'] ) );
 		remove_filter( 'wpcom_force_limit_global_styles', '__return_true' );
 	}
 }

apps/editing-toolkit/package.json

@@ -42,7 +42,7 @@
 		"sync:newspack-blocks": "./bin/sync-newspack-blocks.sh",
 		"test:js": "yarn run -T test-apps apps/editing-toolkit",
 		"test:js:watch": "yarn test:js --watch",
-		"test:php": "npx wp-env run phpunit 'phpunit -c /var/www/html/wp-content/plugins/editing-toolkit-plugin/phpunit.xml.dist'",
+		"test:php": "wp-env run --env-cwd='wp-content/plugins/editing-toolkit-plugin' tests-wordpress vendor/bin/phpunit -c phpunit.xml.dist",
 		"wpcom-sync": "./bin/wpcom-watch-and-sync.sh"
 	},
 	"dependencies": {
@@ -82,7 +82,7 @@
 		"@wordpress/dom-ready": "^3.23.0",
 		"@wordpress/edit-post": "^7.0.0",
 		"@wordpress/element": "^5.0.0",
-		"@wordpress/env": "^4.7.0",
+		"@wordpress/env": "^8.3.0",
 		"@wordpress/escape-html": "^2.23.0",
 		"@wordpress/hooks": "^3.23.0",
 		"@wordpress/html-entities": "^3.23.0",

apps/phpcs.xml

@@ -11,6 +11,13 @@
 	<ini name="error_reporting" value="E_ALL &#38; ~E_DEPRECATED" />
 
 	<rule ref="Jetpack"/>
+
+	<rule ref="Jetpack.Functions.I18n">
+		<properties>
+			<property name="text_domain" value="full-site-editing" />
+		</properties>
+	</rule>
+
 	<rule ref="WordPress.Utils.I18nTextDomainFixer">
 		<properties>
 			<property name="old_text_domain" type="array">
@@ -40,6 +47,13 @@
 	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable" >
 		<exclude-pattern>editing-toolkit/editing-toolkit-plugin/newspack-blocks/synced-newspack-blocks</exclude-pattern>
 	</rule>
+	<rule ref="MediaWiki.Usage.ForbiddenFunctions.isset">
+		<exclude-pattern>editing-toolkit/editing-toolkit-plugin/newspack-blocks/synced-newspack-blocks</exclude-pattern>
+	</rule>
+
+	<rule ref="Squiz.Commenting.FileComment.MissingPackageTag">
+		<severity>0</severity>
+	</rule>
 
 	<!-- Ignore assset files and undeployed files. -->
 	<exclude-pattern>*.asset.php</exclude-pattern>

composer.json

@@ -1,12 +1,17 @@
 {
 	"name": "automattic/wp-calypso",
-	"require": {
-		"wp-phpunit/wp-phpunit": "^5.4",
-		"automattic/jetpack-codesniffer": "^2.1"
-	},
 	"config": {
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true
+		},
+		"platform": {
+			"php": "8.2"
 		}
+	},
+	"require-dev": {
+		"automattic/jetpack-codesniffer": "^2.1",
+		"phpunit/phpunit": "^9",
+		"yoast/phpunit-polyfills": "^1.0",
+		"phpcsstandards/phpcsextra": "^1.0"
 	}
 }