#156 Fix PHPCS errors/warnings

wp-cli · May 12, 2019 · d101e43 · d101e43
1 parent 40fc69a
commit d101e43
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/inc/class-command.php b/inc/class-command.php
@@ -415,7 +415,7 @@ private static function profile_eval_ish( $assoc_args, $profile_callback, $order
 	 * @param string $file
 	 */
 	private static function include_file( $file ) {
-		include( $file );
+		include $file;
 	}
 
 	/**

diff --git a/inc/class-formatter.php b/inc/class-formatter.php
@@ -28,7 +28,7 @@ public function __construct( &$assoc_args, $fields = null, $prefix = false ) {
 		}
 
 		if ( 'time' !== $fields[0] ) {
-			$this->total_cell_index = array_search( $fields[0], $format_args['fields'] );
+			$this->total_cell_index = array_search( $fields[0], $format_args['fields'], true );
 		}
 
 		$format_args['fields'] = array_map( 'trim', $format_args['fields'] );
@@ -104,7 +104,7 @@ function( $a, $b ) use ( $order, $orderby ) {
 			);
 		}
 
-		$location_index = array_search( 'location', $fields );
+		$location_index = array_search( 'location', $fields, true );
 		foreach ( $items as $item ) {
 			$values = array_values( \WP_CLI\Utils\pick_fields( $item, $fields ) );
 			foreach ( $values as $i => $value ) {

diff --git a/inc/class-logger.php b/inc/class-logger.php
@@ -38,7 +38,9 @@ public function start() {
 		global $wpdb, $wp_object_cache;
 		$this->start_time   = microtime( true );
 		$this->query_offset = ! empty( $wpdb->queries ) ? count( $wpdb->queries ) : 0;
-		if ( false === ( $key = array_search( $this, self::$active_loggers ) ) ) {
+		$key                = array_search( $this, self::$active_loggers, true );
+
+		if ( false === $key ) {
 			self::$active_loggers[] = $this;
 		}
 		$this->cache_hit_offset  = ! empty( $wp_object_cache->cache_hits ) ? $wp_object_cache->cache_hits : 0;
@@ -62,7 +64,10 @@ public function stop() {
 			$this->time += microtime( true ) - $this->start_time;
 		}
 		if ( ! is_null( $this->query_offset ) && isset( $wpdb ) && ! empty( $wpdb->queries ) ) {
-			for ( $i = $this->query_offset; $i < count( $wpdb->queries ); $i++ ) {
+
+			$query_total_count = count( $wpdb->queries );
+
+			for ( $i = $this->query_offset; $i < $query_total_count; $i++ ) {
 				$this->query_time += $wpdb->queries[ $i ][1];
 				$this->query_count++;
 			}
@@ -84,7 +89,9 @@ public function stop() {
 		$this->query_offset      = null;
 		$this->cache_hit_offset  = null;
 		$this->cache_miss_offset = null;
-		if ( false !== ( $key = array_search( $this, self::$active_loggers ) ) ) {
+		$key                     = array_search( $this, self::$active_loggers, true );
+
+		if ( false !== $key ) {
 			unset( self::$active_loggers[ $key ] );
 		}
 	}

diff --git a/inc/class-profiler.php b/inc/class-profiler.php
@@ -460,7 +460,7 @@ private function load_wordpress_with_template() {
 			}
 		}
 		ob_start();
-		require_once( ABSPATH . WPINC . '/template-loader.php' );
+		require_once ABSPATH . WPINC . '/template-loader.php';
 		ob_get_clean();
 		if ( $this->running_hook ) {
 			$this->loggers[ $this->running_hook ]->stop();
@@ -567,7 +567,7 @@ private static function set_filter_callbacks( $filter, $callbacks ) {
 		global $wp_filter;
 
 		if ( ! isset( $wp_filter[ $filter ] ) && class_exists( 'WP_Hook' ) ) {
-			$wp_filter[ $filter ] = new \WP_Hook;
+			$wp_filter[ $filter ] = new \WP_Hook();
 		}
 
 		if ( is_a( $wp_filter[ $filter ], 'WP_Hook' ) ) {