Update PHPCS (#21680)

* Update composer packages

* Fix Array syntax

* Update current_time() to time()

* Fix short ternary

composer.json

@@ -11,11 +11,11 @@
 		"issues": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"require-dev": {
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-		"squizlabs/php_codesniffer": "^3.4.2",
-		"phpcompatibility/php-compatibility": "^9.2.0",
-		"wp-coding-standards/wpcs": "^2.1.1",
-		"sirbrillig/phpcs-variable-analysis": "^2.7"
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.6",
+		"squizlabs/php_codesniffer": "^3.5",
+		"phpcompatibility/php-compatibility": "^9.3",
+		"wp-coding-standards/wpcs": "^2.2",
+		"sirbrillig/phpcs-variable-analysis": "^2.8"
 	},
 	"require": {
 		"composer/installers": "~1.0"

lib/class-wp-rest-block-directory-controller.php

@@ -303,7 +303,7 @@ private static function parse_block_metadata( $plugin ) {
 		$block->humanized_updated = sprintf(
 			/* translators: %s: Human-readable time difference. */
 			__( '%s ago', 'gutenberg' ),
-			human_time_diff( strtotime( $plugin['last_updated'] ), current_time( 'timestamp' ) )
+			human_time_diff( strtotime( $plugin['last_updated'] ), time() )
 		);
 
 		return $block;

lib/client-assets.php

@@ -644,7 +644,7 @@ function gutenberg_load_block_pattern( $name ) {
  */
 function gutenberg_extend_settings_block_patterns( $settings ) {
 	if ( empty( $settings['__experimentalBlockPatterns'] ) ) {
-		$settings['__experimentalBlockPatterns'] = [];
+		$settings['__experimentalBlockPatterns'] = array();
 	}
 
 	$settings['__experimentalBlockPatterns'] = array_merge(

lib/template-loader.php

@@ -167,12 +167,17 @@ function gutenberg_find_template( $template_file ) {
 	// See if there is a theme block template with higher priority than the resolved template post.
 	$higher_priority_block_template_path     = null;
 	$higher_priority_block_template_priority = PHP_INT_MAX;
-	$block_template_files                    = glob( get_stylesheet_directory() . '/block-templates/*.html' ) ?: array();
+	$block_template_files                    = glob( get_stylesheet_directory() . '/block-templates/*.html' );
+	$block_template_files                    = is_array( $block_template_files ) ? $block_template_files : array();
 	if ( is_child_theme() ) {
-		$block_template_files = array_merge( $block_template_files, glob( get_template_directory() . '/block-templates/*.html' ) ?: array() );
+		$child_block_template_files = glob( get_template_directory() . '/block-templates/*.html' );
+		$child_block_template_files = is_array( $child_block_template_files ) ? $child_block_template_files : array();
+		$block_template_files       = array_merge( $block_template_files, $child_block_template_files );
 	}
 	if ( gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing-demo' ) ) {
-		$block_template_files = array_merge( $block_template_files, glob( dirname( __FILE__ ) . '/demo-block-templates/*.html' ) ?: array() );
+		$demo_block_template_files = glob( dirname( __FILE__ ) . '/demo-block-templates/*.html' );
+		$demo_block_template_files = is_array( $demo_block_template_files ) ? $demo_block_template_files : array();
+		$block_template_files      = array_merge( $block_template_files, $demo_block_template_files );
 	}
 	foreach ( $block_template_files as $path ) {
 		if ( ! isset( $slug_priorities[ basename( $path, '.html' ) ] ) ) {