Overly fussy standards fixes

Author: Jonny Bull

flagpole.php

@@ -102,7 +102,7 @@ function flagpole_admin_imports( $hook ) {
 require plugin_dir_path( __FILE__ ) . 'includes/api/api.shortcode.php';
 
 if ( defined( '\WP_CLI' ) && \WP_CLI ) {
-	require plugin_dir_path( __FILE__ ) . 'includes/class-cli.php';
+	require_once( plugin_dir_path( __FILE__ ) . 'includes/class-cli.php' );
 }
 
 /**

includes/class-cli.php

@@ -92,7 +92,7 @@ private function flag_list_data_encode( $data, $bool_type = 'string' ) {
 	 *     wp flagpole list csv
 	 *
 	 */
-	public function flag_list( $args, $assoc_args ) {
+	public function flag_list( $args ) {
 		/**
 		 * @todo switch to associated arguments only.
 		 * @todo filter by group/label.
@@ -101,7 +101,7 @@ public function flag_list( $args, $assoc_args ) {
 		 */
 
 		// We don't support the 'ids' or 'count' types, as there's no real benefit to them here.
-		$supported_render_types = [
+		$render_types = [
 			'table',
 			'csv',
 			'json',
@@ -110,11 +110,11 @@ public function flag_list( $args, $assoc_args ) {
 
 		$render_type = 'table';
 
-		if ( $args !== [] and in_array( $args[0], $supported_render_types, true ) ) {
+		if ( $args !== [] and in_array( $args[0], $render_types, true ) ) {
 			$render_type = $args[0];
 		}
 
-		$flagpole_available_flags = Flagpole::init()->get_flags();
+		$available_flags = Flagpole::init()->get_flags();
 
 		$fields_to_display = [
 			'key',
@@ -133,15 +133,15 @@ public function flag_list( $args, $assoc_args ) {
 			$bool_type = 'string';
 		}
 
-		$flagpole_available_flags = $this->flag_list_data_encode( $flagpole_available_flags, $bool_type );
+		$available_flags = $this->flag_list_data_encode( $available_flags, $bool_type );
 
-		$enabled_flags = array_filter( $flagpole_available_flags, [ $this, 'flag_filter_enabled' ] );
+		$enabled_flags = array_filter( $available_flags, [ $this, 'flag_filter_enabled' ] );
 
-		WP_CLI::line( 'Flags: ' . count( $flagpole_available_flags ) . ' registered. ' . count( $enabled_flags ) . ' enabled.' );
+		WP_CLI::line( 'Flags: ' . count( $available_flags ) . ' registered. ' . count( $enabled_flags ) . ' enabled.' );
 		WP_CLI::line();
 
-		if ( count( $flagpole_available_flags ) > 0 ) {
-			WP_CLI\Utils\format_items( $render_type, $flagpole_available_flags, $fields_to_display );
+		if ( count( $available_flags ) > 0 ) {
+			WP_CLI\Utils\format_items( $render_type, $available_flags, $fields_to_display );
 			WP_CLI::line();
 		}
 	}
@@ -163,7 +163,7 @@ public function flag_list( $args, $assoc_args ) {
 	 *
 	 * @alias on
 	 */
-	public function flag_on( $args, $assoc_args ) {
+	public function flag_on( $args ) {
 		if ( $args == [] ) {
 			WP_CLI::error( 'Flag not provided' );
 			return;
@@ -203,7 +203,7 @@ public function flag_on( $args, $assoc_args ) {
 	 *
 	 * @alias off
 	 */
-	public function flag_off( $args, $assoc_args ) {
+	public function flag_off( $args ) {
 		if ( $args == [] ) {
 			WP_CLI::error( 'Flag not provided' );
 			return;
@@ -239,7 +239,7 @@ public function flag_off( $args, $assoc_args ) {
 	 *     wp flagpole toggle my-example-flag,my-other-example-flag
 	 *
 	 */
-	public function flag_toggle( $args, $assoc_args ) {
+	public function flag_toggle( $args ) {
 		if ( $args == [] ) {
 			WP_CLI::error( 'Flag not provided' );
 			return;