ntwb / wordpress

src/wp-includes/widgets/class-wp-widget-calendar.php

Spacing +12 added lines, -12 removed lines

@@ -35,10 +35,10 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_calendar',
-			'description' => __( 'A calendar of your site’s Posts.' ),
+			'description' => __('A calendar of your site’s Posts.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'calendar', __( 'Calendar' ), $widget_ops );
+		parent::__construct('calendar', __('Calendar'), $widget_ops);
 	}
 
 	/**
@@ -51,15 +51,15 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
-		if ( 0 === self::$instance ) {
+		if (0 === self::$instance) {
 			echo '<div id="calendar_wrap" class="calendar_wrap">';
 		} else {
 			echo '<div class="calendar_wrap">';
@@ -82,9 +82,9 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$instance['title'] = sanitize_text_field($new_instance['title']);
 
 		return $instance;
 	}
@@ -97,9 +97,9 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
-		$title = sanitize_text_field( $instance['title'] );
+	public function form($instance) {
+		$instance = wp_parse_args((array) $instance, array('title' => ''));
+		$title = sanitize_text_field($instance['title']);
 		?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
 		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>

src/wp-includes/widgets/class-wp-widget-archives.php

Spacing +30 added lines, -30 removed lines

@@ -25,7 +25,7 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_archive',
-			'description' => __( 'A monthly archive of your site’s Posts.' ),
+			'description' => __('A monthly archive of your site’s Posts.'),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct('archives', __('Archives'), $widget_ops);
@@ -41,23 +41,23 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Archives widget instance.
 	 */
-	public function widget( $args, $instance ) {
-		$c = ! empty( $instance['count'] ) ? '1' : '0';
-		$d = ! empty( $instance['dropdown'] ) ? '1' : '0';
+	public function widget($args, $instance) {
+		$c = ! empty($instance['count']) ? '1' : '0';
+		$d = ! empty($instance['dropdown']) ? '1' : '0';
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Archives' ) : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title'], $instance, $this->id_base);
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
-		if ( $d ) {
+		if ($d) {
 			$dropdown_id = "{$this->id_base}-dropdown-{$this->number}";
 			?>
-		<label class="screen-reader-text" for="<?php echo esc_attr( $dropdown_id ); ?>"><?php echo $title; ?></label>
-		<select id="<?php echo esc_attr( $dropdown_id ); ?>" name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
+		<label class="screen-reader-text" for="<?php echo esc_attr($dropdown_id); ?>"><?php echo $title; ?></label>
+		<select id="<?php echo esc_attr($dropdown_id); ?>" name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
 			<?php
 			/**
 			 * Filter the arguments for the Archives widget drop-down.
@@ -68,33 +68,33 @@ 
 			 *
 			 * @param array $args An array of Archives widget drop-down arguments.
 			 */
-			$dropdown_args = apply_filters( 'widget_archives_dropdown_args', array(
+			$dropdown_args = apply_filters('widget_archives_dropdown_args', array(
 				'type'            => 'monthly',
 				'format'          => 'option',
 				'show_post_count' => $c
-			) );
+			));
 
-			switch ( $dropdown_args['type'] ) {
+			switch ($dropdown_args['type']) {
 				case 'yearly':
-					$label = __( 'Select Year' );
+					$label = __('Select Year');
 					break;
 				case 'monthly':
-					$label = __( 'Select Month' );
+					$label = __('Select Month');
 					break;
 				case 'daily':
-					$label = __( 'Select Day' );
+					$label = __('Select Day');
 					break;
 				case 'weekly':
-					$label = __( 'Select Week' );
+					$label = __('Select Week');
 					break;
 				default:
-					$label = __( 'Select Post' );
+					$label = __('Select Post');
 					break;
 			}
 			?>
 
-			<option value=""><?php echo esc_attr( $label ); ?></option>
-			<?php wp_get_archives( $dropdown_args ); ?>
+			<option value=""><?php echo esc_attr($label); ?></option>
+			<?php wp_get_archives($dropdown_args); ?>
 
 		</select>
 		<?php } else { ?>
@@ -109,10 +109,10 @@ 
 		 *
 		 * @param array $args An array of Archives option arguments.
 		 */
-		wp_get_archives( apply_filters( 'widget_archives_args', array(
+		wp_get_archives(apply_filters('widget_archives_args', array(
 			'type'            => 'monthly',
 			'show_post_count' => $c
-		) ) );
+		)));
 		?>
 		</ul>
 		<?php
@@ -132,10 +132,10 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$new_instance = wp_parse_args( (array) $new_instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$new_instance = wp_parse_args((array) $new_instance, array('title' => '', 'count' => 0, 'dropdown' => ''));
+		$instance['title'] = sanitize_text_field($new_instance['title']);
 		$instance['count'] = $new_instance['count'] ? 1 : 0;
 		$instance['dropdown'] = $new_instance['dropdown'] ? 1 : 0;
 
@@ -150,15 +150,15 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
-		$title = sanitize_text_field( $instance['title'] );
+	public function form($instance) {
+		$instance = wp_parse_args((array) $instance, array('title' => '', 'count' => 0, 'dropdown' => ''));
+		$title = sanitize_text_field($instance['title']);
 		?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 		<p>
-			<input class="checkbox" type="checkbox"<?php checked( $instance['dropdown'] ); ?> id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>" /> <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e('Display as dropdown'); ?></label>
+			<input class="checkbox" type="checkbox"<?php checked($instance['dropdown']); ?> id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>" /> <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e('Display as dropdown'); ?></label>
 			<br/>
-			<input class="checkbox" type="checkbox"<?php checked( $instance['count'] ); ?> id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>" /> <label for="<?php echo $this->get_field_id('count'); ?>"><?php _e('Show post counts'); ?></label>
+			<input class="checkbox" type="checkbox"<?php checked($instance['count']); ?> id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>" /> <label for="<?php echo $this->get_field_id('count'); ?>"><?php _e('Show post counts'); ?></label>
 		</p>
 		<?php
 	}

src/wp-includes/widgets/class-wp-widget-recent-comments.php

Braces +9 added lines, -6 removed lines

@@ -52,8 +52,9 @@ 
 		 * @param string $id_base The widget ID.
 		 */
 		if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
-			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
-			return;
+			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) ) {
+					return;
+		}
 		?>
 		<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
 		<?php
@@ -70,8 +71,9 @@ 
 	 * @param array $instance Settings for the current Recent Comments widget instance.
 	 */
 	public function widget( $args, $instance ) {
-		if ( ! isset( $args['widget_id'] ) )
-			$args['widget_id'] = $this->id;
+		if ( ! isset( $args['widget_id'] ) ) {
+					$args['widget_id'] = $this->id;
+		}
 
 		$output = '';
 
@@ -81,8 +83,9 @@ 
 		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
 		$number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
-		if ( ! $number )
-			$number = 5;
+		if ( ! $number ) {
+					$number = 5;
+		}
 
 		/**
 		 * Filter the arguments for the Recent Comments widget.

Indentation +5 added lines, -5 removed lines

@@ -37,11 +37,11 @@
 	}
 
  	/**
-	 * Outputs the default styles for the Recent Comments widget.
-	 *
-	 * @since 2.8.0
-	 * @access public
-	 */
+ 	 * Outputs the default styles for the Recent Comments widget.
+ 	 *
+ 	 * @since 2.8.0
+ 	 * @access public
+ 	 */
 	public function recent_comments_style() {
 		/**
 		 * Filters the Recent Comments default widget styles.

Spacing +34 added lines, -34 removed lines

@@ -25,14 +25,14 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_recent_comments',
-			'description' => __( 'Your site’s most recent comments.' ),
+			'description' => __('Your site’s most recent comments.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'recent-comments', __( 'Recent Comments' ), $widget_ops );
+		parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
 		$this->alt_option_name = 'widget_recent_comments';
 
-		if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) {
-			add_action( 'wp_head', array( $this, 'recent_comments_style' ) );
+		if (is_active_widget(false, false, $this->id_base) || is_customize_preview()) {
+			add_action('wp_head', array($this, 'recent_comments_style'));
 		}
 	}
 
@@ -51,8 +51,8 @@ 
 		 * @param bool   $active  Whether the widget is active. Default true.
 		 * @param string $id_base The widget ID.
 		 */
-		if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
-			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
+		if ( ! current_theme_supports('widgets') // Temp hack #14876
+			|| ! apply_filters('show_recent_comments_widget_style', true, $this->id_base))
 			return;
 		?>
 		<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
@@ -69,19 +69,19 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Recent Comments widget instance.
 	 */
-	public function widget( $args, $instance ) {
-		if ( ! isset( $args['widget_id'] ) )
+	public function widget($args, $instance) {
+		if ( ! isset($args['widget_id']))
 			$args['widget_id'] = $this->id;
 
 		$output = '';
 
-		$title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
+		$title = ( ! empty($instance['title'])) ? $instance['title'] : __('Recent Comments');
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
-		$number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
-		if ( ! $number )
+		$number = ( ! empty($instance['number'])) ? absint($instance['number']) : 5;
+		if ( ! $number)
 			$number = 5;
 
 		/**
@@ -93,29 +93,29 @@ 
 		 *
 		 * @param array $comment_args An array of arguments used to retrieve the recent comments.
 		 */
-		$comments = get_comments( apply_filters( 'widget_comments_args', array(
+		$comments = get_comments(apply_filters('widget_comments_args', array(
 			'number'      => $number,
 			'status'      => 'approve',
 			'post_status' => 'publish'
-		) ) );
+		)));
 
 		$output .= $args['before_widget'];
-		if ( $title ) {
-			$output .= $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			$output .= $args['before_title'].$title.$args['after_title'];
 		}
 
 		$output .= '<ul id="recentcomments">';
-		if ( is_array( $comments ) && $comments ) {
+		if (is_array($comments) && $comments) {
 			// Prime cache for associated posts. (Prime post term cache if we need it for permalinks.)
-			$post_ids = array_unique( wp_list_pluck( $comments, 'comment_post_ID' ) );
-			_prime_post_caches( $post_ids, strpos( get_option( 'permalink_structure' ), '%category%' ), false );
+			$post_ids = array_unique(wp_list_pluck($comments, 'comment_post_ID'));
+			_prime_post_caches($post_ids, strpos(get_option('permalink_structure'), '%category%'), false);
 
-			foreach ( (array) $comments as $comment ) {
+			foreach ((array) $comments as $comment) {
 				$output .= '<li class="recentcomments">';
 				/* translators: comments widget: 1: comment author, 2: post link */
-				$output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
-					'<span class="comment-author-link">' . get_comment_author_link( $comment ) . '</span>',
-					'<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
+				$output .= sprintf(_x('%1$s on %2$s', 'widgets'),
+					'<span class="comment-author-link">'.get_comment_author_link($comment).'</span>',
+					'<a href="'.esc_url(get_comment_link($comment)).'">'.get_the_title($comment->comment_post_ID).'</a>'
 				);
 				$output .= '</li>';
 			}
@@ -137,10 +137,10 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['number'] = absint( $new_instance['number'] );
+		$instance['title'] = sanitize_text_field($new_instance['title']);
+		$instance['number'] = absint($new_instance['number']);
 		return $instance;
 	}
 
@@ -152,15 +152,15 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$title = isset( $instance['title'] ) ? $instance['title'] : '';
-		$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
+	public function form($instance) {
+		$title = isset($instance['title']) ? $instance['title'] : '';
+		$number = isset($instance['number']) ? absint($instance['number']) : 5;
 		?>
-		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
-		<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
+		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 
-		<p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of comments to show:' ); ?></label>
-		<input class="tiny-text" id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="number" step="1" min="1" value="<?php echo $number; ?>" size="3" /></p>
+		<p><label for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of comments to show:'); ?></label>
+		<input class="tiny-text" id="<?php echo $this->get_field_id('number'); ?>" name="<?php echo $this->get_field_name('number'); ?>" type="number" step="1" min="1" value="<?php echo $number; ?>" size="3" /></p>
 		<?php
 	}
 
@@ -173,6 +173,6 @@ 
 	 * @deprecated 4.4.0 Fragment caching was removed in favor of split queries.
 	 */
 	public function flush_widget_cache() {
-		_deprecated_function( __METHOD__, '4.4.0' );
+		_deprecated_function(__METHOD__, '4.4.0');
 	}
 }

src/wp-includes/widgets/class-wp-widget-meta.php

Spacing +18 added lines, -18 removed lines

@@ -27,10 +27,10 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_meta',
-			'description' => __( 'Login, RSS, & WordPress.org links.' ),
+			'description' => __('Login, RSS, & WordPress.org links.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'meta', __( 'Meta' ), $widget_ops );
+		parent::__construct('meta', __('Meta'), $widget_ops);
 	}
 
 	/**
@@ -43,20 +43,20 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Meta widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Meta' ) : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? __('Meta') : $instance['title'], $instance, $this->id_base);
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 			?>
 			<ul>
 			<?php wp_register(); ?>
 			<li><?php wp_loginout(); ?></li>
-			<li><a href="<?php echo esc_url( get_bloginfo( 'rss2_url' ) ); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-			<li><a href="<?php echo esc_url( get_bloginfo( 'comments_rss2_url' ) ); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+			<li><a href="<?php echo esc_url(get_bloginfo('rss2_url')); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+			<li><a href="<?php echo esc_url(get_bloginfo('comments_rss2_url')); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
 			<?php
 			/**
 			 * Filter the "Powered by WordPress" text in the Meta widget.
@@ -65,11 +65,11 @@ 
 			 *
 			 * @param string $title_text Default title text for the WordPress.org link.
 			 */
-			echo apply_filters( 'widget_meta_poweredby', sprintf( '<li><a href="%s" title="%s">%s</a></li>',
-				esc_url( __( 'https://wordpress.org/' ) ),
-				esc_attr__( 'Powered by WordPress, state-of-the-art semantic personal publishing platform.' ),
-				_x( 'WordPress.org', 'meta widget link text' )
-			) );
+			echo apply_filters('widget_meta_poweredby', sprintf('<li><a href="%s" title="%s">%s</a></li>',
+				esc_url(__('https://wordpress.org/')),
+				esc_attr__('Powered by WordPress, state-of-the-art semantic personal publishing platform.'),
+				_x('WordPress.org', 'meta widget link text')
+			));
 
 			wp_meta();
 			?>
@@ -89,9 +89,9 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$instance['title'] = sanitize_text_field($new_instance['title']);
 
 		return $instance;
 	}
@@ -104,9 +104,9 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
-		$title = sanitize_text_field( $instance['title'] );
+	public function form($instance) {
+		$instance = wp_parse_args((array) $instance, array('title' => ''));
+		$title = sanitize_text_field($instance['title']);
 ?>
 			<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 <?php

src/wp-includes/widgets/class-wp-widget-search.php

Spacing +11 added lines, -11 removed lines

@@ -25,10 +25,10 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_search',
-			'description' => __( 'A search form for your site.' ),
+			'description' => __('A search form for your site.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'search', _x( 'Search', 'Search widget' ), $widget_ops );
+		parent::__construct('search', _x('Search', 'Search widget'), $widget_ops);
 	}
 
 	/**
@@ -41,13 +41,13 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Search widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
 		// Use current theme search form if it exists
@@ -64,8 +64,8 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
+	public function form($instance) {
+		$instance = wp_parse_args((array) $instance, array('title' => ''));
 		$title = $instance['title'];
 		?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
@@ -83,10 +83,10 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$new_instance = wp_parse_args((array) $new_instance, array('title' => ''));
+		$instance['title'] = sanitize_text_field($new_instance['title']);
 		return $instance;
 	}
 

src/wp-includes/widgets/class-wp-widget-categories.php

Spacing +35 added lines, -35 removed lines

@@ -25,10 +25,10 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_categories',
-			'description' => __( 'A list or dropdown of categories.' ),
+			'description' => __('A list or dropdown of categories.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'categories', __( 'Categories' ), $widget_ops );
+		parent::__construct('categories', __('Categories'), $widget_ops);
 	}
 
 	/**
@@ -41,19 +41,19 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Categories widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		static $first_dropdown = true;
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? __('Categories') : $instance['title'], $instance, $this->id_base);
 
-		$c = ! empty( $instance['count'] ) ? '1' : '0';
-		$h = ! empty( $instance['hierarchical'] ) ? '1' : '0';
-		$d = ! empty( $instance['dropdown'] ) ? '1' : '0';
+		$c = ! empty($instance['count']) ? '1' : '0';
+		$h = ! empty($instance['hierarchical']) ? '1' : '0';
+		$d = ! empty($instance['dropdown']) ? '1' : '0';
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
 		$cat_args = array(
@@ -62,13 +62,13 @@ 
 			'hierarchical' => $h
 		);
 
-		if ( $d ) {
-			$dropdown_id = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
+		if ($d) {
+			$dropdown_id = ($first_dropdown) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
 			$first_dropdown = false;
 
-			echo '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>';
+			echo '<label class="screen-reader-text" for="'.esc_attr($dropdown_id).'">'.$title.'</label>';
 
-			$cat_args['show_option_none'] = __( 'Select Category' );
+			$cat_args['show_option_none'] = __('Select Category');
 			$cat_args['id'] = $dropdown_id;
 
 			/**
@@ -80,13 +80,13 @@ 
 			 *
 			 * @param array $cat_args An array of Categories widget drop-down arguments.
 			 */
-			wp_dropdown_categories( apply_filters( 'widget_categories_dropdown_args', $cat_args ) );
+			wp_dropdown_categories(apply_filters('widget_categories_dropdown_args', $cat_args));
 			?>
 
 <script type='text/javascript'>
 /* <![CDATA[ */
 (function() {
-	var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" );
+	var dropdown = document.getElementById( "<?php echo esc_js($dropdown_id); ?>" );
 	function onCatChange() {
 		if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
 			location.href = "<?php echo home_url(); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
@@ -111,7 +111,7 @@ 
 		 *
 		 * @param array $cat_args An array of Categories widget options.
 		 */
-		wp_list_categories( apply_filters( 'widget_categories_args', $cat_args ) );
+		wp_list_categories(apply_filters('widget_categories_args', $cat_args));
 ?>
 		</ul>
 <?php
@@ -131,12 +131,12 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['count'] = !empty($new_instance['count']) ? 1 : 0;
-		$instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0;
-		$instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
+		$instance['title'] = sanitize_text_field($new_instance['title']);
+		$instance['count'] = ! empty($new_instance['count']) ? 1 : 0;
+		$instance['hierarchical'] = ! empty($new_instance['hierarchical']) ? 1 : 0;
+		$instance['dropdown'] = ! empty($new_instance['dropdown']) ? 1 : 0;
 
 		return $instance;
 	}
@@ -149,25 +149,25 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 		//Defaults
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-		$title = sanitize_text_field( $instance['title'] );
-		$count = isset($instance['count']) ? (bool) $instance['count'] :false;
-		$hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false;
-		$dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
+		$instance = wp_parse_args((array) $instance, array('title' => ''));
+		$title = sanitize_text_field($instance['title']);
+		$count = isset($instance['count']) ? (bool) $instance['count'] : false;
+		$hierarchical = isset($instance['hierarchical']) ? (bool) $instance['hierarchical'] : false;
+		$dropdown = isset($instance['dropdown']) ? (bool) $instance['dropdown'] : false;
 		?>
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
-		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
+		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 
-		<p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
-		<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display as dropdown' ); ?></label><br />
+		<p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked($dropdown); ?> />
+		<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e('Display as dropdown'); ?></label><br />
 
-		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>"<?php checked( $count ); ?> />
-		<label for="<?php echo $this->get_field_id('count'); ?>"><?php _e( 'Show post counts' ); ?></label><br />
+		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>"<?php checked($count); ?> />
+		<label for="<?php echo $this->get_field_id('count'); ?>"><?php _e('Show post counts'); ?></label><br />
 
-		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked( $hierarchical ); ?> />
-		<label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e( 'Show hierarchy' ); ?></label></p>
+		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked($hierarchical); ?> />
+		<label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e('Show hierarchy'); ?></label></p>
 		<?php
 	}
 

src/wp-admin/includes/class-automatic-upgrader-skin.php

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	}
 
 	/**
-	 * @param string|array|WP_Error $data
+	 * @param string $data
 	 */
 	public function feedback( $data ) {
 		if ( is_wp_error( $data ) ) {

Spacing +18 added lines, -18 removed lines

@@ -26,14 +26,14 @@ 
 	 * @param bool   $allow_relaxed_file_ownership
 	 * @return bool
 	 */
-	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
-		if ( $context ) {
+	public function request_filesystem_credentials($error = false, $context = '', $allow_relaxed_file_ownership = false) {
+		if ($context) {
 			$this->options['context'] = $context;
 		}
 		// TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version
 		// This will output a credentials form in event of failure, We don't want that, so just hide with a buffer
 		ob_start();
-		$result = parent::request_filesystem_credentials( $error, $context, $allow_relaxed_file_ownership );
+		$result = parent::request_filesystem_credentials($error, $context, $allow_relaxed_file_ownership);
 		ob_end_clean();
 		return $result;
 	}
@@ -50,37 +50,37 @@ 
 	/**
 	 * @param string|array|WP_Error $data
 	 */
-	public function feedback( $data ) {
-		if ( is_wp_error( $data ) ) {
+	public function feedback($data) {
+		if (is_wp_error($data)) {
 			$string = $data->get_error_message();
-		} elseif ( is_array( $data ) ) {
+		} elseif (is_array($data)) {
 			return;
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
-			$string = $this->upgrader->strings[ $string ];
+		if ( ! empty($this->upgrader->strings[$string]))
+			$string = $this->upgrader->strings[$string];
 
-		if ( strpos( $string, '%' ) !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
-			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
-				$string = vsprintf( $string, $args );
+			$args = array_splice($args, 1);
+			if ( ! empty($args))
+				$string = vsprintf($string, $args);
 		}
 
-		$string = trim( $string );
+		$string = trim($string);
 
 		// Only allow basic HTML in the messages, as it'll be used in emails/logs rather than direct browser output.
-		$string = wp_kses( $string, array(
+		$string = wp_kses($string, array(
 			'a' => array(
 				'href' => true
 			),
 			'br' => true,
 			'em' => true,
 			'strong' => true,
-		) );
+		));
 
-		if ( empty( $string ) )
+		if (empty($string))
 			return;
 
 		$this->messages[] = $string;
@@ -98,7 +98,7 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
-			$this->feedback( $output );
+		if ( ! empty($output))
+			$this->feedback($output);
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -58,14 +58,16 @@ 
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
-			$string = $this->upgrader->strings[ $string ];
+		if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
+					$string = $this->upgrader->strings[ $string ];
+		}
 
 		if ( strpos( $string, '%' ) !== false ) {
 			$args = func_get_args();
 			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
-				$string = vsprintf( $string, $args );
+			if ( ! empty( $args ) ) {
+							$string = vsprintf( $string, $args );
+			}
 		}
 
 		$string = trim( $string );
@@ -80,8 +82,9 @@ 
 			'strong' => true,
 		) );
 
-		if ( empty( $string ) )
-			return;
+		if ( empty( $string ) ) {
+					return;
+		}
 
 		$this->messages[] = $string;
 	}
@@ -98,7 +101,8 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
-			$this->feedback( $output );
+		if ( ! empty( $output ) ) {
+					$this->feedback( $output );
+		}
 	}
 }

src/wp-admin/includes/class-plugin-upgrader.php

Doc Comments +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 	 * @since 3.7.0 The `$args` parameter was added, making clearing the plugin update cache optional.
 	 * @access public
 	 *
-	 * @param array $plugins Array of the basename paths of the plugins' main files.
+	 * @param string[] $plugins Array of the basename paths of the plugins' main files.
 	 * @param array $args {
 	 *     Optional. Other arguments for upgrading several plugins at once. Default empty array.
 	 *

Indentation +1 added lines, -1 removed lines

@@ -498,7 +498,7 @@
 
 	/**
 	 * Determines script dependencies.
-     *
+	 *
 	 * @since 2.1.0
 	 * @access public
 	 *

Braces +60 added lines, -36 removed lines

@@ -118,8 +118,9 @@ 
 		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
 		remove_filter('upgrader_source_selection', array($this, 'check_package') );
 
-		if ( ! $this->result || is_wp_error($this->result) )
-			return $this->result;
+		if ( ! $this->result || is_wp_error($this->result) ) {
+					return $this->result;
+		}
 
 		// Force refresh of plugin update information
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
@@ -188,8 +189,9 @@ 
 		remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
-			return $this->result;
+		if ( ! $this->result || is_wp_error($this->result) ) {
+					return $this->result;
+		}
 
 		// Force refresh of plugin update information
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
@@ -247,10 +249,12 @@ 
 		 * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		 */
 		$maintenance = ( is_multisite() && ! empty( $plugins ) );
-		foreach ( $plugins as $plugin )
-			$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
-		if ( $maintenance )
-			$this->maintenance_mode(true);
+		foreach ( $plugins as $plugin ) {
+					$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
+		}
+		if ( $maintenance ) {
+					$this->maintenance_mode(true);
+		}
 
 		$results = array();
 
@@ -288,8 +292,9 @@ 
 			$results[$plugin] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
-				break;
+			if ( false === $result ) {
+							break;
+			}
 		} //end foreach $plugins
 
 		$this->maintenance_mode(false);
@@ -334,12 +339,15 @@ 
 	public function check_package($source) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
-			return $source;
+		if ( is_wp_error($source) ) {
+					return $source;
+		}
 
 		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		if ( ! is_dir($working_directory) ) {
+			// Sanity check, if the above fails, let's not prevent installation.
 			return $source;
+		}
 
 		// Check the folder contains at least 1 valid plugin.
 		$plugins_found = false;
@@ -354,8 +362,9 @@ 
 			}
 		}
 
-		if ( ! $plugins_found )
-			return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+		if ( ! $plugins_found ) {
+					return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+		}
 
 		return $source;
 	}
@@ -371,14 +380,17 @@ 
 	 * @return string|false The full path to the main plugin file, or false.
 	 */
 	public function plugin_info() {
-		if ( ! is_array($this->result) )
-			return false;
-		if ( empty($this->result['destination_name']) )
-			return false;
+		if ( ! is_array($this->result) ) {
+					return false;
+		}
+		if ( empty($this->result['destination_name']) ) {
+					return false;
+		}
 
 		$plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash
-		if ( empty($plugin) )
-			return false;
+		if ( empty($plugin) ) {
+					return false;
+		}
 
 		$pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
 
@@ -400,16 +412,20 @@ 
 	 */
 	public function deactivate_plugin_before_upgrade($return, $plugin) {
 
-		if ( is_wp_error($return) ) //Bypass.
+		if ( is_wp_error($return) ) {
+			//Bypass.
 			return $return;
+		}
 
 		// When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it
-		if ( defined( 'DOING_CRON' ) && DOING_CRON )
-			return $return;
+		if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+					return $return;
+		}
 
 		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
-			return new WP_Error('bad_request', $this->strings['bad_request']);
+		if ( empty($plugin) ) {
+					return new WP_Error('bad_request', $this->strings['bad_request']);
+		}
 
 		if ( is_plugin_active($plugin) ) {
 			//Deactivate the plugin silently, Prevent deactivation hooks from running.
@@ -439,27 +455,35 @@ 
 	public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($removed) )
-			return $removed; //Pass errors through.
+		if ( is_wp_error($removed) ) {
+					return $removed;
+		}
+		//Pass errors through.
 
 		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
-			return new WP_Error('bad_request', $this->strings['bad_request']);
+		if ( empty($plugin) ) {
+					return new WP_Error('bad_request', $this->strings['bad_request']);
+		}
 
 		$plugins_dir = $wp_filesystem->wp_plugins_dir();
 		$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
 
-		if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished.
+		if ( ! $wp_filesystem->exists($this_plugin_dir) ) {
+			//If it's already vanished.
 			return $removed;
+		}
 
 		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
+		if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) {
+			//base check on if plugin includes directory separator AND that it's not the root plugin folder
 			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
-		else
-			$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
+		} else {
+					$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
+		}
 
-		if ( ! $deleted )
-			return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+		if ( ! $deleted ) {
+					return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+		}
 
 		return true;
 	}

Spacing +68 added lines, -68 removed lines

@@ -90,23 +90,23 @@ 
 	 * }
 	 * @return bool|WP_Error True if the install was successful, false or a WP_Error otherwise.
 	 */
-	public function install( $package, $args = array() ) {
+	public function install($package, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->install_strings();
 
-		add_filter('upgrader_source_selection', array($this, 'check_package') );
-		if ( $parsed_args['clear_update_cache'] ) {
+		add_filter('upgrader_source_selection', array($this, 'check_package'));
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
-			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0);
 		}
 
-		$this->run( array(
+		$this->run(array(
 			'package' => $package,
 			'destination' => WP_PLUGIN_DIR,
 			'clear_destination' => false, // Do not overwrite files.
@@ -115,16 +115,16 @@ 
 				'type' => 'plugin',
 				'action' => 'install',
 			)
-		) );
+		));
 
-		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
-		remove_filter('upgrader_source_selection', array($this, 'check_package') );
+		remove_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9);
+		remove_filter('upgrader_source_selection', array($this, 'check_package'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error($this->result))
 			return $this->result;
 
 		// Force refresh of plugin update information
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 		return true;
 	}
@@ -145,18 +145,18 @@ 
 	 * }
 	 * @return bool|WP_Error True if the upgrade was successful, false or a WP_Error object otherwise.
 	 */
-	public function upgrade( $plugin, $args = array() ) {
+	public function upgrade($plugin, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->upgrade_strings();
 
-		$current = get_site_transient( 'update_plugins' );
-		if ( !isset( $current->response[ $plugin ] ) ) {
+		$current = get_site_transient('update_plugins');
+		if ( ! isset($current->response[$plugin])) {
 			$this->skin->before();
 			$this->skin->set_result(false);
 			$this->skin->error('up_to_date');
@@ -165,17 +165,17 @@ 
 		}
 
 		// Get the URL to the zip file
-		$r = $current->response[ $plugin ];
+		$r = $current->response[$plugin];
 
 		add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2);
 		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
 		//'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
-			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0);
 		}
 
-		$this->run( array(
+		$this->run(array(
 			'package' => $r->package,
 			'destination' => WP_PLUGIN_DIR,
 			'clear_destination' => true,
@@ -185,18 +185,18 @@ 
 				'type' => 'plugin',
 				'action' => 'update',
 			),
-		) );
+		));
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
+		remove_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9);
 		remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error($this->result))
 			return $this->result;
 
 		// Force refresh of plugin update information
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 		return true;
 	}
@@ -217,26 +217,26 @@ 
 	 * }
 	 * @return array|false An array of results indexed by plugin file, or false if unable to connect to the filesystem.
 	 */
-	public function bulk_upgrade( $plugins, $args = array() ) {
+	public function bulk_upgrade($plugins, $args = array()) {
 
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->bulk = true;
 		$this->upgrade_strings();
 
-		$current = get_site_transient( 'update_plugins' );
+		$current = get_site_transient('update_plugins');
 
 		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
 
 		$this->skin->header();
 
 		// Connect to the Filesystem first.
-		$res = $this->fs_connect( array(WP_CONTENT_DIR, WP_PLUGIN_DIR) );
-		if ( ! $res ) {
+		$res = $this->fs_connect(array(WP_CONTENT_DIR, WP_PLUGIN_DIR));
+		if ( ! $res) {
 			$this->skin->footer();
 			return false;
 		}
@@ -249,21 +249,21 @@ 
 		 * - a plugin with an update available is currently active.
 		 * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		 */
-		$maintenance = ( is_multisite() && ! empty( $plugins ) );
-		foreach ( $plugins as $plugin )
-			$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
-		if ( $maintenance )
+		$maintenance = (is_multisite() && ! empty($plugins));
+		foreach ($plugins as $plugin)
+			$maintenance = $maintenance || (is_plugin_active($plugin) && isset($current->response[$plugin]));
+		if ($maintenance)
 			$this->maintenance_mode(true);
 
 		$results = array();
 
 		$this->update_count = count($plugins);
 		$this->update_current = 0;
-		foreach ( $plugins as $plugin ) {
+		foreach ($plugins as $plugin) {
 			$this->update_current++;
-			$this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true);
+			$this->skin->plugin_info = get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin, false, true);
 
-			if ( !isset( $current->response[ $plugin ] ) ) {
+			if ( ! isset($current->response[$plugin])) {
 				$this->skin->set_result('up_to_date');
 				$this->skin->before();
 				$this->skin->feedback('up_to_date');
@@ -273,11 +273,11 @@ 
 			}
 
 			// Get the URL to the zip file.
-			$r = $current->response[ $plugin ];
+			$r = $current->response[$plugin];
 
 			$this->skin->plugin_active = is_plugin_active($plugin);
 
-			$result = $this->run( array(
+			$result = $this->run(array(
 				'package' => $r->package,
 				'destination' => WP_PLUGIN_DIR,
 				'clear_destination' => true,
@@ -286,27 +286,27 @@ 
 				'hook_extra' => array(
 					'plugin' => $plugin
 				)
-			) );
+			));
 
 			$results[$plugin] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
+			if (false === $result)
 				break;
 		} //end foreach $plugins
 
 		$this->maintenance_mode(false);
 
 		// Force refresh of plugin update information.
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array(
+		do_action('upgrader_process_complete', $this, array(
 			'action' => 'update',
 			'type' => 'plugin',
 			'bulk' => true,
 			'plugins' => $plugins,
-		) );
+		));
 
 		$this->skin->bulk_footer();
 
@@ -336,28 +336,28 @@ 
 	public function check_package($source) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
+		if (is_wp_error($source))
 			return $source;
 
-		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		$working_directory = str_replace($wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+		if ( ! is_dir($working_directory)) // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
 
 		// Check the folder contains at least 1 valid plugin.
 		$plugins_found = false;
-		$files = glob( $working_directory . '*.php' );
-		if ( $files ) {
-			foreach ( $files as $file ) {
-				$info = get_plugin_data( $file, false, false );
-				if ( ! empty( $info['Name'] ) ) {
+		$files = glob($working_directory.'*.php');
+		if ($files) {
+			foreach ($files as $file) {
+				$info = get_plugin_data($file, false, false);
+				if ( ! empty($info['Name'])) {
 					$plugins_found = true;
 					break;
 				}
 			}
 		}
 
-		if ( ! $plugins_found )
-			return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+		if ( ! $plugins_found)
+			return new WP_Error('incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __('No valid plugins were found.'));
 
 		return $source;
 	}
@@ -373,18 +373,18 @@ 
 	 * @return string|false The full path to the main plugin file, or false.
 	 */
 	public function plugin_info() {
-		if ( ! is_array($this->result) )
+		if ( ! is_array($this->result))
 			return false;
-		if ( empty($this->result['destination_name']) )
+		if (empty($this->result['destination_name']))
 			return false;
 
-		$plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash
-		if ( empty($plugin) )
+		$plugin = get_plugins('/'.$this->result['destination_name']); //Ensure to pass with leading slash
+		if (empty($plugin))
 			return false;
 
 		$pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
 
-		return $this->result['destination_name'] . '/' . $pluginfiles[0];
+		return $this->result['destination_name'].'/'.$pluginfiles[0];
 	}
 
 	/**
@@ -402,18 +402,18 @@ 
 	 */
 	public function deactivate_plugin_before_upgrade($return, $plugin) {
 
-		if ( is_wp_error($return) ) //Bypass.
+		if (is_wp_error($return)) //Bypass.
 			return $return;
 
 		// When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it
-		if ( defined( 'DOING_CRON' ) && DOING_CRON )
+		if (defined('DOING_CRON') && DOING_CRON)
 			return $return;
 
 		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
+		if (empty($plugin))
 			return new WP_Error('bad_request', $this->strings['bad_request']);
 
-		if ( is_plugin_active($plugin) ) {
+		if (is_plugin_active($plugin)) {
 			//Deactivate the plugin silently, Prevent deactivation hooks from running.
 			deactivate_plugins($plugin, true);
 		}
@@ -441,26 +441,26 @@ 
 	public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($removed) )
+		if (is_wp_error($removed))
 			return $removed; //Pass errors through.
 
 		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
+		if (empty($plugin))
 			return new WP_Error('bad_request', $this->strings['bad_request']);
 
 		$plugins_dir = $wp_filesystem->wp_plugins_dir();
-		$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
+		$this_plugin_dir = trailingslashit(dirname($plugins_dir.$plugin));
 
-		if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished.
+		if ( ! $wp_filesystem->exists($this_plugin_dir)) //If it's already vanished.
 			return $removed;
 
 		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
+		if (strpos($plugin, '/') && $this_plugin_dir != $plugins_dir) //base check on if plugin includes directory separator AND that it's not the root plugin folder
 			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
 		else
-			$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
+			$deleted = $wp_filesystem->delete($plugins_dir.$plugin);
 
-		if ( ! $deleted )
+		if ( ! $deleted)
 			return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
 
 		return true;

src/wp-admin/includes/list-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  *
  * @param string $class The type of the list table, which is the class name.
  * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'.
- * @return object|bool Object on success, false if the class does not exist.
+ * @return string Object on success, false if the class does not exist.
  */
 function _get_list_table( $class, $args = array() ) {
 	$core_classes = array(

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
  * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'.
  * @return object|bool Object on success, false if the class does not exist.
  */
-function _get_list_table( $class, $args = array() ) {
+function _get_list_table($class, $args = array()) {
 	$core_classes = array(
 		//Site Admin
 		'WP_Posts_List_Table' => 'posts',
@@ -27,11 +27,11 @@ 
 		'WP_Terms_List_Table' => 'terms',
 		'WP_Users_List_Table' => 'users',
 		'WP_Comments_List_Table' => 'comments',
-		'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ),
+		'WP_Post_Comments_List_Table' => array('comments', 'post-comments'),
 		'WP_Links_List_Table' => 'links',
 		'WP_Plugin_Install_List_Table' => 'plugin-install',
 		'WP_Themes_List_Table' => 'themes',
-		'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),
+		'WP_Theme_Install_List_Table' => array('themes', 'theme-install'),
 		'WP_Plugins_List_Table' => 'plugins',
 		// Network Admin
 		'WP_MS_Sites_List_Table' => 'ms-sites',
@@ -39,18 +39,18 @@ 
 		'WP_MS_Themes_List_Table' => 'ms-themes',
 	);
 
-	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
-			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+	if (isset($core_classes[$class])) {
+		foreach ((array) $core_classes[$class] as $required)
+			require_once(ABSPATH.'wp-admin/includes/class-wp-'.$required.'-list-table.php');
 
-		if ( isset( $args['screen'] ) )
-			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
+		if (isset($args['screen']))
+			$args['screen'] = convert_to_screen($args['screen']);
+		elseif (isset($GLOBALS['hook_suffix']))
 			$args['screen'] = get_current_screen();
 		else
 			$args['screen'] = null;
 
-		return new $class( $args );
+		return new $class($args);
 	}
 
 	return false;
@@ -66,7 +66,7 @@ 
  * @see get_column_headers(), print_column_headers(), get_hidden_columns()
  */
 function register_column_headers($screen, $columns) {
-	new _WP_List_Table_Compat( $screen, $columns );
+	new _WP_List_Table_Compat($screen, $columns);
 }
 
 /**
@@ -77,8 +77,8 @@ 
  * @param string|WP_Screen $screen  The screen hook name or screen object.
  * @param bool             $with_id Whether to set the id attribute or not.
  */
-function print_column_headers( $screen, $with_id = true ) {
+function print_column_headers($screen, $with_id = true) {
 	$wp_list_table = new _WP_List_Table_Compat($screen);
 
-	$wp_list_table->print_column_headers( $with_id );
+	$wp_list_table->print_column_headers($with_id);
 }

Braces +10 added lines, -8 removed lines

@@ -40,15 +40,17 @@
 	);
 
 	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
-			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		foreach ( (array) $core_classes[ $class ] as $required ) {
+					require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		}
 
-		if ( isset( $args['screen'] ) )
-			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
-			$args['screen'] = get_current_screen();
-		else
-			$args['screen'] = null;
+		if ( isset( $args['screen'] ) ) {
+					$args['screen'] = convert_to_screen( $args['screen'] );
+		} elseif ( isset( $GLOBALS['hook_suffix'] ) ) {
+					$args['screen'] = get_current_screen();
+		} else {
+					$args['screen'] = null;
+		}
 
 		return new $class( $args );
 	}