Update wpcs to 3.0 (#80)

classes/class-admin.php

@@ -79,7 +79,7 @@ public function admin_enqueue_scripts( $hook_suffix ) {
 		}
 
 		// Enqueue option page scripts.
-		$asset_file = include( CHBE_PATH . '/build/admin.asset.php' );
+		$asset_file = include CHBE_PATH . '/build/admin.asset.php';
 
 		wp_enqueue_style(
 			CHBE_NAMESPACE . '-admin',

classes/class-block-editor.php

@@ -12,7 +12,7 @@ class BlockEditor {
 	/**
 	 * Constructor
 	 */
-	function __construct() {
+	public function __construct() {
 		// Abort the process if the editor isn't allowed to use this extension.
 		$options = Settings::get_options();
 		if ( ! $options['permissionBlockEditor'] ) {
@@ -36,7 +36,7 @@ function __construct() {
 	 * Enqueue block editor scripts
 	 */
 	public function enqueue_editor_scripts() {
-		$asset_file = include( CHBE_PATH . '/build/block-editor.asset.php' );
+		$asset_file = include CHBE_PATH . '/build/block-editor.asset.php';
 
 		// Abort the process if the user role isn't allowed to use this extension.
 		if ( ! Settings::is_allowed_user() ) {

classes/class-init.php

@@ -48,11 +48,11 @@ public function add_action_links( $links ) {
 	 * Load classes
 	 */
 	public function load_classes() {
-		require_once( CHBE_PATH . '/classes/class-settings.php' );
-		require_once( CHBE_PATH . '/classes/class-admin.php' );
-		require_once( CHBE_PATH . '/classes/class-block-editor.php' );
-		require_once( CHBE_PATH . '/classes/class-classic-editor.php' );
-		require_once( CHBE_PATH . '/classes/class-theme-plugin-editor.php' );
-		require_once( CHBE_PATH . '/classes/class-api.php' );
+		require_once CHBE_PATH . '/classes/class-settings.php';
+		require_once CHBE_PATH . '/classes/class-admin.php';
+		require_once CHBE_PATH . '/classes/class-block-editor.php';
+		require_once CHBE_PATH . '/classes/class-classic-editor.php';
+		require_once CHBE_PATH . '/classes/class-theme-plugin-editor.php';
+		require_once CHBE_PATH . '/classes/class-api.php';
 	}
 }

composer.json

@@ -9,10 +9,10 @@
 	],
 	"require-dev": {
 		"squizlabs/php_codesniffer": "*",
-		"wp-coding-standards/wpcs": "*"
+		"wp-coding-standards/wpcs": "^3.0"
 	},
 	"scripts": {
-		"phpcs": "phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs",
+		"phpcs": "phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs,vendor/phpcsstandards/phpcsextra,vendor/phpcsstandards/phpcsutils",
 		"lint": "phpcs ./ --standard=./phpcs.ruleset.xml"
 	}
 }