Address phpcs issues in failed Travis build

The unit tests had been excluded in phpcs.xml
This should fix many issues, but there will still be more to fix.

Author: kienstra

js/blocks/loader/attributes.js

@@ -2,7 +2,7 @@
  * Gets the attributes for a block, based on given fields.
  *
  * @param {Object} fields     The fields to get the attributes from.
- * @return {Array} attributes The attributes for the fields.
+ * @return {Object} attributes The attributes for the fields.
  */
 const getBlockAttributes = ( fields ) => {
 

js/blocks/loader/fields.js

@@ -6,10 +6,12 @@
  * @return {number} Either -1, 0, or 1, depending on the comparison.
  */
 const compare = ( a, b ) => {
-	if ( a.order < b.order )
+	if ( a.order < b.order ) {
 		return -1;
-	if ( a.order > b.order )
+	}
+	if ( a.order > b.order ) {
 		return 1;
+	}
 	return 0;
 }
 
@@ -21,7 +23,7 @@ const compare = ( a, b ) => {
  */
 const simplifiedFields = ( fields ) => {
 
-	let fieldList = []
+	let fieldList = [];
 
 	for ( let fieldName in fields ) {
 		if ( '' === fieldName ) {

js/blocks/loader/index.js

@@ -1,4 +1,3 @@
-
 /**
  * WordPress dependencies
  */
@@ -56,6 +55,6 @@ const registerBlocks = () => {
 			},
 		} )
 	}
-}
+};
 
 export default registerBlocks();

phpcs.xml

@@ -4,6 +4,10 @@
 
     <rule ref="WordPress" />
 
+    <rule ref="WordPress.Files.FileName.InvalidClassFileName">
+        <exclude-pattern>tests/*</exclude-pattern>
+    </rule>
+
     <config name="testVersion" value="5.4-"/>
 
     <arg value="s"/>

tests/bootstrap.php

@@ -13,7 +13,7 @@
 }
 
 if ( ! file_exists( $_tests_dir . '/includes/functions.php' ) ) {
-	echo "Could not find $_tests_dir/includes/functions.php, have you run bin/install-wp-tests.sh ?" . PHP_EOL;
+	echo "Could not find $_tests_dir/includes/functions.php, have you run bin/install-wp-tests.sh ?" . PHP_EOL; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	exit( 1 );
 }
 

tests/php/integration/test-template-output.php

@@ -2,7 +2,7 @@
 /**
  * Test_Template_Output
  *
- * @package Template_Output
+ * @package Block_Lab
  */
 
 use Block_Lab\Post_Types;
@@ -30,7 +30,7 @@ class Test_Template_Output extends \WP_UnitTestCase {
 	public $string_fields;
 
 	/**
-	 * All fields that don't return a string for block_value(), other than the repeater.
+	 * All fields that return either an object or ID for block_value().
 	 *
 	 * @var array
 	 */
@@ -301,7 +301,7 @@ public function get_block_config() {
 	 *
 	 * Every field except the Repeater is tested.
 	 * This sets mock block attributes, like those that would be saved from a block.
-	 * Then, it looks for the mock template in the theme directory's blocks/ directory,
+	 * Then, it loads the mock template in the theme's blocks/ directory,
 	 * and ensures that all of these fields appear correctly in it.
 	 */
 	public function test_block_template() {

tests/php/unit/admin/test-class-import.php

@@ -81,7 +81,7 @@ public function test_register_importer() {
 			array(
 				'Block Lab',
 				'Import custom blocks created with Block Lab.',
-				array( $this->instance, 'render_page' )
+				array( $this->instance, 'render_page' ),
 			),
 			$wp_importers[ $this->instance->slug ]
 		);
@@ -162,16 +162,19 @@ public function test_render_page() {
 			)
 		);
 		$_FILES['import'] = $files_import;
-		add_filter( 'wp_handle_upload', function( $upload ) use ( $file ) {
-			unset( $upload );
-			return array_merge(
-				$file,
-				array(
-					'url'  => 'https://example.com/foo',
-					'type' => 'text/plain',
-				)
-			);
-		} );
+		add_filter(
+			'wp_handle_upload',
+			function( $upload ) use ( $file ) {
+				unset( $upload );
+				return array_merge(
+					$file,
+					array(
+						'url'  => 'https://example.com/foo',
+						'type' => 'text/plain',
+					)
+				);
+			}
+		);
 
 		Monkey\Functions\expect( 'filter_input' )
 			->twice()
@@ -222,16 +225,18 @@ function wp_handle_upload_error( $file, $message ) {
 		$_FILES['import'] = $files_import;
 
 		remove_all_filters( 'wp_handle_upload' );
-		add_filter( 'wp_handle_upload', function( $upload ) use ( $file ) {
-			unset( $upload );
-			return array_merge(
-				$file,
-				array(
-					'url'  => 'https://example.com/foo',
-					'type' => 'text/plain',
-				)
-			);
-		} );
+		add_filter(
+			'wp_handle_upload',
+			function() use ( $file ) {
+				return array_merge(
+					$file,
+					array(
+						'url'  => 'https://example.com/foo',
+						'type' => 'text/plain',
+					)
+				);
+			}
+		);
 
 		Monkey\Functions\expect( 'is_uploaded_file' )
 			->once()
@@ -347,7 +352,7 @@ public function test_validate_upload() {
 		$nonexistent_file = 'does-not-exist.xml';
 
 		ob_start();
-		$this->assertFalse( $this->instance->validate_upload( array( 'file' => $nonexistent_file) ) );
+		$this->assertFalse( $this->instance->validate_upload( array( 'file' => $nonexistent_file ) ) );
 		$output = ob_get_clean();
 
 		// If the file doesn't exist, this should have a message that reflects that.

tests/php/unit/admin/test-class-license.php

@@ -183,7 +183,7 @@ public function test_get_license() {
 		$this->instance->init();
 		$valid_license_transient_value   = array(
 			'license' => 'valid',
-			'expires' => date( 'Y-m-d', time() + DAY_IN_SECONDS )
+			'expires' => date( 'Y-m-d', time() + DAY_IN_SECONDS ),
 		);
 		$invalid_license_transient_value = array(
 			'license' => 'expired',
@@ -206,10 +206,13 @@ public function test_get_license() {
 			'expires' => $expiration_date,
 		);
 
-		add_filter( self::HTTP_FILTER_NAME, function( $response ) use ( $expected_license ) {
-			unset( $response );
-			return array( 'body' => wp_json_encode( $expected_license ) );
-		} );
+		add_filter(
+			self::HTTP_FILTER_NAME,
+			function( $response ) use ( $expected_license ) {
+				unset( $response );
+				return array( 'body' => wp_json_encode( $expected_license ) );
+			}
+		);
 
 		delete_transient( self::LICENSE_TRANSIENT_NAME );
 		$example_valid_license_key = '5134315';
@@ -227,10 +230,12 @@ public function test_get_license() {
 	public function test_activate_license() {
 		$this->instance->init();
 		$license_key = '6234234';
-		add_filter( self::HTTP_FILTER_NAME, function( $response ) {
-			unset( $response );
-			return new WP_Error();
-		} );
+		add_filter(
+			self::HTTP_FILTER_NAME, function( $response ) {
+				unset( $response );
+				return new WP_Error();
+			}
+		);
 
 		// If the POST request returns a wp_error(), this should return false.
 		$this->assertFalse( $this->instance->activate_license( $license_key ) );
@@ -242,10 +247,13 @@ public function test_activate_license() {
 			'expires' => date( 'Y-m-d', time() + DAY_IN_SECONDS ),
 		);
 
-		add_filter( self::HTTP_FILTER_NAME, function( $response ) use ( $expected_license ) {
-			unset( $response );
-			return array( 'body' => wp_json_encode( $expected_license ) );
-		} );
+		add_filter(
+			self::HTTP_FILTER_NAME,
+			function( $response ) use ( $expected_license ) {
+				unset( $response );
+				return array( 'body' => wp_json_encode( $expected_license ) );
+			}
+		);
 		$this->instance->activate_license( $license_key );
 
 		// Having simulated a successful license validation with the filter above, this should activate the license.

tests/php/unit/admin/test-class-settings.php

@@ -209,7 +209,7 @@ public function test_render_page_header() {
 	 * @covers \Block_Lab\Admin\Settings::prepare_notice()
 	 */
 	public function test_prepare_notice() {
-		$notice      = 'There was a problem activating your Block Lab license.';
+		$notice = 'There was a problem activating your Block Lab license.';
 		$this->instance->prepare_notice( $notice );
 
 		$this->assertEquals( array( $notice ), get_option( self::NOTICES_OPTION_NAME ) );

tests/php/unit/blocks/controls/test-class-control-abstract.php

@@ -163,7 +163,7 @@ public function test_render_select() {
 		$options = array(
 			'foo' => 'One',
 			'bar' => 'Two',
-			'baz' => 'Three'
+			'baz' => 'Three',
 		);
 		ob_start();
 		$this->instance->render_select( $this->setting, self::NAME, self::ID, $options );