Merge pull request #778 from westonruter/update/phpcs-config

Update phpcs config, bump versions, add wp-env config, fix build, remove PHPCS exclude

.phpcs.xml.dist

@@ -3,9 +3,6 @@
 
 	<rule ref="WordPress-Core">
 		<exclude name="Universal.Arrays.DisallowShortArraySyntax.Found" />
-
-		<!-- Remove once https://github.com/squizlabs/PHP_CodeSniffer/issues/3745 is fixed. -->
-		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed" />
 	</rule>
 	<rule ref="WordPress-Docs">
 		<!--
@@ -17,6 +14,7 @@
 	</rule>
 	<rule ref="WordPress-Extra" />
 
+	<config name="minimum_wp_version" value="6.3"/>
 	<rule ref="WordPress.WP.I18n">
 		<properties>
 			<property name="text_domain" value="syntax-highlighting-code-block" />

.wp-env.json

@@ -0,0 +1,4 @@
+{
+  "core": null,
+  "plugins": [ "." ]
+}

Gruntfile.js

@@ -48,6 +48,7 @@ module.exports = function (grunt) {
 
 			const paths = [
 				'syntax-highlighting-code-block.php',
+				'inc/*',
 				'language-names.php',
 				'editor-styles.css',
 				'style.css',

README.md

@@ -6,11 +6,11 @@ Extending the Code block with syntax highlighting rendered on the server, thus b
 
 **Contributors:** [westonruter](https://profiles.wordpress.org/westonruter), [allejo](https://profiles.wordpress.org/allejo)  
 **Tags:** [block](https://wordpress.org/plugins/tags/block), [code](https://wordpress.org/plugins/tags/code), [code syntax](https://wordpress.org/plugins/tags/code-syntax), [syntax highlight](https://wordpress.org/plugins/tags/syntax-highlight), [code highlighting](https://wordpress.org/plugins/tags/code-highlighting)  
-**Requires at least:** 5.6  
-**Tested up to:** 6.3  
+**Requires at least:** 6.3  
+**Tested up to:** 6.4  
 **Stable tag:** 1.4.0  
 **License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
-**Requires PHP:** 5.6
+**Requires PHP:** 7.4
 
 [![Continuous Integration](https://github.com/westonruter/syntax-highlighting-code-block/actions/workflows/ci.yaml/badge.svg)](https://github.com/westonruter/syntax-highlighting-code-block/actions/workflows/ci.yaml)
 [![Built with Grunt](https://gruntjs.com/cdn/builtwith.svg)](http://gruntjs.com)

composer.json

@@ -8,7 +8,6 @@
   },
   "require-dev": {
     "civicrm/composer-downloads-plugin": "3.0.1",
-    "dealerdirect/phpcodesniffer-composer-installer": "1.0.0",
     "phpcompatibility/php-compatibility": "9.3.5",
     "szepeviktor/phpstan-wordpress": "1.3.2",
     "wp-coding-standards/wpcs": "3.0.1"

inc/functions.php

@@ -586,12 +586,13 @@ function escape( string $content ): string {
  */
 function get_transient_key( string $content, array $attributes, bool $is_feed, array $auto_detect_languages ): ?string {
 	$hash_input = wp_json_encode(
-		array_merge(
-			compact( 'content', 'attributes', 'is_feed', 'auto_detect_languages' ),
-			[
-				'version' => PLUGIN_VERSION,
-			]
-		)
+		[
+			'content'               => $content,
+			'attributes'            => $attributes,
+			'is_feed'               => $is_feed,
+			'auto_detect_languages' => $auto_detect_languages,
+			'version'               => PLUGIN_VERSION,
+		]
 	);
 	if ( ! is_string( $hash_input ) ) {
 		return null;

syntax-highlighting-code-block.php

@@ -3,7 +3,7 @@
  * Plugin Name:  Syntax-highlighting Code Block (with Server-side Rendering)
  * Plugin URI:   https://github.com/westonruter/syntax-highlighting-code-block
  * Description:  Extending the Code block with syntax highlighting rendered on the server, thus being AMP-compatible and having faster frontend performance.
- * Version:      1.4.0
+ * Version:      1.5.0-alpha
  * Author:       Weston Ruter
  * Author URI:   https://weston.ruter.net/
  * License:      GPL2
@@ -16,7 +16,7 @@
 
 namespace Syntax_Highlighting_Code_Block;
 
-const PLUGIN_VERSION = '1.4.0';
+const PLUGIN_VERSION = '1.5.0-alpha';
 
 const PLUGIN_MAIN_FILE = __FILE__;