GeoDirectory / geodirectory

geodirectory-widgets/geodirectory_related_listing_widget.php

Braces +9 added lines, -5 removed lines

@@ -118,10 +118,11 @@ 
         $instance['listing_width'] = strip_tags($new_instance['listing_width']);
         $instance['list_sort'] = strip_tags($new_instance['list_sort']);
         $instance['character_count'] = $new_instance['character_count'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 
         return $instance;
     }
@@ -279,7 +280,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>
                        value="1"/>
             </label>
         </p>

Indentation +110 added lines, -110 removed lines

@@ -14,160 +14,160 @@ 
  */
 class geodir_related_listing_postview extends WP_Widget
 {
-    /**
+	/**
 	 * Register the related listing widget.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
 	 */
-    public function __construct() {
-        $widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
-        parent::__construct(
-            'post_related_listing', // Base ID
-            __('GD > Related Listing', 'geodirectory'), // Name
-            $widget_ops// Args
-        );
-    }
+	public function __construct() {
+		$widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
+		parent::__construct(
+			'post_related_listing', // Base ID
+			__('GD > Related Listing', 'geodirectory'), // Name
+			$widget_ops// Args
+		);
+	}
 
 	/**
 	 * Front-end display content for related listing widget.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $args     Widget arguments.
 	 * @param array $instance Saved values from database.
 	 */
-    public function widget($args, $instance)
-    {
+	public function widget($args, $instance)
+	{
 
-        // prints the widget
-        extract($args, EXTR_SKIP);
+		// prints the widget
+		extract($args, EXTR_SKIP);
 
-        /** This filter is documented in geodirectory_widgets.php */
-        $title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
+		/** This filter is documented in geodirectory_widgets.php */
+		$title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
 
-        /**
-         * Filter the relation type to get related listing.
-         *
-         * @since 1.0.0
-         * @param string $instance['relate_to'] Can be tags or category.
-         */
+		/**
+		 * Filter the relation type to get related listing.
+		 *
+		 * @since 1.0.0
+		 * @param string $instance['relate_to'] Can be tags or category.
+		 */
 		$relate_to = empty($instance['relate_to']) ? 'category' : apply_filters('widget_relate_to', $instance['relate_to']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$character_count = empty($instance['character_count']) ? 20 : apply_filters('widget_list_character_count', $instance['character_count']);
 
-        $arr = array(
-            'before_title' => $before_title,
-            'after_title' => $after_title,
-            'title' => $title,
-            'post_number' => $post_number,
-            'relate_to' => $relate_to,
-            'layout' => $layout,
-            'add_location_filter' => $add_location_filter,
-            'listing_width' => $listing_width,
-            'list_sort' => $list_sort,
-            'character_count' => $character_count,
-            'is_widget' => '1'
-        );
-
-        if ($widget_display = geodir_related_posts_display($arr)) {
-
-            echo $before_widget;
-            echo $widget_display;
-            echo $after_widget;
-        }
-    }
+		$arr = array(
+			'before_title' => $before_title,
+			'after_title' => $after_title,
+			'title' => $title,
+			'post_number' => $post_number,
+			'relate_to' => $relate_to,
+			'layout' => $layout,
+			'add_location_filter' => $add_location_filter,
+			'listing_width' => $listing_width,
+			'list_sort' => $list_sort,
+			'character_count' => $character_count,
+			'is_widget' => '1'
+		);
+
+		if ($widget_display = geodir_related_posts_display($arr)) {
+
+			echo $before_widget;
+			echo $widget_display;
+			echo $after_widget;
+		}
+	}
 
 	/**
 	 * Sanitize related listing widget form values as they are saved.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $new_instance Values just sent to be saved.
 	 * @param array $old_instance Previously saved values from database.
 	 *
 	 * @return array Updated safe values to be saved.
 	 */
-    public function update($new_instance, $old_instance)
-    {
-        //save the widget
-        $instance = $old_instance;
-
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['post_number'] = strip_tags($new_instance['post_number']);
-        $instance['relate_to'] = strip_tags($new_instance['relate_to']);
-        $instance['layout'] = strip_tags($new_instance['layout']);
-        $instance['listing_width'] = strip_tags($new_instance['listing_width']);
-        $instance['list_sort'] = strip_tags($new_instance['list_sort']);
-        $instance['character_count'] = $new_instance['character_count'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
-
-        return $instance;
-    }
+	public function update($new_instance, $old_instance)
+	{
+		//save the widget
+		$instance = $old_instance;
+
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['post_number'] = strip_tags($new_instance['post_number']);
+		$instance['relate_to'] = strip_tags($new_instance['relate_to']);
+		$instance['layout'] = strip_tags($new_instance['layout']);
+		$instance['listing_width'] = strip_tags($new_instance['listing_width']);
+		$instance['list_sort'] = strip_tags($new_instance['list_sort']);
+		$instance['character_count'] = $new_instance['character_count'];
+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+		else
+			$instance['add_location_filter'] = '0';
+
+		return $instance;
+	}
 
 	/**
 	 * Back-end related listing widget settings form.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $instance Previously saved values from database.
 	 */
-    public function form($instance)
-    {
-        //widgetform in backend
-        $instance = wp_parse_args((array)$instance,
-            array('title' => '',
-                'list_sort' => '',
-                'list_order' => '',
-                'post_number' => '5',
-                'relate_to' => '',
-                'layout' => 'gridview_onehalf',
-                'listing_width' => '',
-                'add_location_filter' => '1',
-                'character_count' => '20')
-        );
+	public function form($instance)
+	{
+		//widgetform in backend
+		$instance = wp_parse_args((array)$instance,
+			array('title' => '',
+				'list_sort' => '',
+				'list_order' => '',
+				'post_number' => '5',
+				'relate_to' => '',
+				'layout' => 'gridview_onehalf',
+				'listing_width' => '',
+				'add_location_filter' => '1',
+				'character_count' => '20')
+		);
 
-        $title = strip_tags($instance['title']);
+		$title = strip_tags($instance['title']);
 
-        $list_sort = strip_tags($instance['list_sort']);
+		$list_sort = strip_tags($instance['list_sort']);
 
-        $list_order = strip_tags($instance['list_order']);
+		$list_order = strip_tags($instance['list_order']);
 
-        $post_number = strip_tags($instance['post_number']);
+		$post_number = strip_tags($instance['post_number']);
 
-        $relate_to = strip_tags($instance['relate_to']);
+		$relate_to = strip_tags($instance['relate_to']);
 
-        $layout = strip_tags($instance['layout']);
+		$layout = strip_tags($instance['layout']);
 
-        $listing_width = strip_tags($instance['listing_width']);
+		$listing_width = strip_tags($instance['listing_width']);
 
-        $add_location_filter = strip_tags($instance['add_location_filter']);
+		$add_location_filter = strip_tags($instance['add_location_filter']);
 
-        $character_count = $instance['character_count'];
+		$character_count = $instance['character_count'];
 
-        ?>
+		?>
         <p>
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
 
@@ -203,11 +203,11 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
                     <option <?php if ($relate_to == 'category') {
-                        echo 'selected="selected"';
-                    } ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
                     <option <?php if ($relate_to == 'tags') {
-                        echo 'selected="selected"';
-                    } ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
                 </select>
             </label>
         </p>
@@ -218,24 +218,24 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"
                         name="<?php echo $this->get_field_name('layout'); ?>">
                     <option <?php if ($layout == 'gridview_onehalf') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="gridview_onehalf"><?php _e('Grid View (Two Columns)', 'geodirectory'); ?></option>
                     <option <?php if ($layout == 'gridview_onethird') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="gridview_onethird"><?php _e('Grid View (Three Columns)', 'geodirectory'); ?></option>
                     <option <?php if ($layout == 'gridview_onefourth') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="gridview_onefourth"><?php _e('Grid View (Four Columns)', 'geodirectory'); ?></option>
                     <option <?php if ($layout == 'gridview_onefifth') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="gridview_onefifth"><?php _e('Grid View (Five Columns)', 'geodirectory'); ?></option>
                     <option <?php if ($layout == 'list') {
-                        echo 'selected="selected"';
-                    } ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>
 
                 </select>
             </label>
@@ -267,7 +267,7 @@ 
         </p>
 
     <?php
-    }
+	}
 } // class geodir_related_listing_postview
 
 register_widget('geodir_related_listing_postview');
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -137,7 +137,7 @@ 
     public function form($instance)
     {
         //widgetform in backend
-        $instance = wp_parse_args((array)$instance,
+        $instance = wp_parse_args((array) $instance,
             array('title' => '',
                 'list_sort' => '',
                 'list_order' => '',
@@ -169,7 +169,7 @@ 
 
         ?>
         <p>
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
                        name="<?php echo $this->get_field_name('title'); ?>" type="text"
@@ -177,20 +177,20 @@ 
             </label>
         </p>
         <p>
-            <label for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>
+            <label for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory'); ?>
                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>" name="<?php echo $this->get_field_name('list_sort'); ?>">
-                    <option value="latest"<?php selected( $list_sort, 'latest' ); ?>><?php _e('Latest', 'geodirectory'); ?></option>
-                    <option value="featured"<?php selected( $list_sort, 'featured' ); ?>><?php _e('Featured', 'geodirectory'); ?></option>
-                    <option value="high_review"<?php selected( $list_sort, 'high_review' ); ?>><?php _e('Review', 'geodirectory'); ?></option>
-                    <option value="high_rating"<?php selected( $list_sort, 'high_rating' ); ?>><?php _e('Rating', 'geodirectory'); ?></option>
-                    <option value="random"<?php selected( $list_sort, 'random' ); ?>><?php _e('Random', 'geodirectory'); ?></option>
-                    <option value="nearest"<?php selected( $list_sort, 'nearest' ); ?>><?php _e('Nearest', 'geodirectory'); ?></option>
+                    <option value="latest"<?php selected($list_sort, 'latest'); ?>><?php _e('Latest', 'geodirectory'); ?></option>
+                    <option value="featured"<?php selected($list_sort, 'featured'); ?>><?php _e('Featured', 'geodirectory'); ?></option>
+                    <option value="high_review"<?php selected($list_sort, 'high_review'); ?>><?php _e('Review', 'geodirectory'); ?></option>
+                    <option value="high_rating"<?php selected($list_sort, 'high_rating'); ?>><?php _e('Rating', 'geodirectory'); ?></option>
+                    <option value="random"<?php selected($list_sort, 'random'); ?>><?php _e('Random', 'geodirectory'); ?></option>
+                    <option value="nearest"<?php selected($list_sort, 'nearest'); ?>><?php _e('Nearest', 'geodirectory'); ?></option>
                 </select>
             </label>
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"
                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"
@@ -199,7 +199,7 @@ 
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('relate_to'); ?>">
-                <?php _e('Relate to:', 'geodirectory');?>
+                <?php _e('Relate to:', 'geodirectory'); ?>
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
                     <option <?php if ($relate_to == 'category') {
@@ -214,7 +214,7 @@ 
         <p>
         <p>
             <label for="<?php echo $this->get_field_id('layout'); ?>">
-                <?php _e('Layout:', 'geodirectory');?>
+                <?php _e('Layout:', 'geodirectory'); ?>
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"
                         name="<?php echo $this->get_field_name('layout'); ?>">
                     <option <?php if ($layout == 'gridview_onehalf') {
@@ -242,7 +242,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('listing_width'); ?>"
                        name="<?php echo $this->get_field_name('listing_width'); ?>" type="text"
@@ -251,7 +251,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>
                 <input class="widefat" id="<?php echo $this->get_field_id('character_count'); ?>"
                        name="<?php echo $this->get_field_name('character_count'); ?>" type="text"
                        value="<?php echo esc_attr($character_count); ?>"/>
@@ -259,9 +259,9 @@ 
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
-                <?php _e('Enable Location Filter:', 'geodirectory');?>
+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>
                        value="1"/>
             </label>
         </p>

geodirectory-widgets/geodirectory_reviews_widget.php

Indentation +49 added lines, -49 removed lines

@@ -14,37 +14,37 @@ 
  */

 class geodir_recent_reviews_widget extends WP_Widget

 {

-    /**

+	/**

 	 * Register the recent reviews widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

-        parent::__construct(

-            'geodir_recent_reviews', // Base ID

-            __('GD > Recent Reviews', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

+		parent::__construct(

+			'geodir_recent_reviews', // Base ID

+			__('GD > Recent Reviews', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for recent reviews widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        // prints the widget

-        extract($args, EXTR_SKIP);

+	{

+		// prints the widget

+		extract($args, EXTR_SKIP);

 

-        /** This filter is documented in geodirectory_widgets.php */

-        $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+		/** This filter is documented in geodirectory_widgets.php */

+		$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 		

 		/**

 		 * Filter the number of reviews to display.

@@ -63,35 +63,35 @@ 
 		 * @param int $g_size Height and width of the avatar image in pixels. Default 30.

 		 */

 		$g_size = apply_filters('geodir_recent_reviews_g_size', 30);

-        /**

-         * Filter the excerpt length

-         *

-         * @since 1.0.0

-         *

-         * @param int $excerpt_length Excerpt length. Default 100.

-         */

-        $excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

-        $comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

+		/**

+		 * Filter the excerpt length

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param int $excerpt_length Excerpt length. Default 100.

+		 */

+		$excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

+		$comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

 

-        if ($comments_li) {

-            echo $before_widget;

-            ?>

+		if ($comments_li) {

+			echo $before_widget;

+			?>

             <div class="widget geodir_recent_reviews_section">

                 <?php if ($title) {

-                    echo $before_title . $title . $after_title;

-                } ?>

+					echo $before_title . $title . $after_title;

+				} ?>

                 <ul class="geodir_recent_reviews"><?php echo $comments_li; ?></ul>

             </div>

             <?php

-            echo $after_widget;

-        }

-    }

+			echo $after_widget;

+		}

+	}

 

 	/**

 	 * Sanitize recent reviews widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $new_instance Values just sent to be saved.

 	 * @param array $old_instance Previously saved values from database.

@@ -99,29 +99,29 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-        $instance['title'] = strip_tags($new_instance['title']);

-        $instance['count'] = strip_tags($new_instance['count']);

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+		$instance['title'] = strip_tags($new_instance['title']);

+		$instance['count'] = strip_tags($new_instance['count']);

+		return $instance;

+	}

     

 	/**

 	 * Back-end recent reviews widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $instance Previously saved values from database.

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

-        $title = strip_tags($instance['title']);

-        $count = strip_tags($instance['count']);

-        ?>

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

+		$title = strip_tags($instance['title']);

+		$count = strip_tags($instance['count']);

+		?>

         <p><label for="<?php echo $this->get_field_id('title'); ?>">Widget Title: <input class="widefat"

                                                                                          id="<?php echo $this->get_field_id('title'); ?>"

                                                                                          name="<?php echo $this->get_field_name('title'); ?>"

@@ -135,7 +135,7 @@ 
                                                                                              value="<?php echo esc_attr($count); ?>"/></label>

         </p>

     <?php

-    }

+	}

 } // class geodir_recent_reviews_widget

 

 register_widget('geodir_recent_reviews_widget');
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
             ?>

             <div class="widget geodir_recent_reviews_section">

                 <?php if ($title) {

-                    echo $before_title . $title . $after_title;

+                    echo $before_title.$title.$after_title;

                 } ?>

                 <ul class="geodir_recent_reviews"><?php echo $comments_li; ?></ul>

             </div>

@@ -118,7 +118,7 @@ 
 	public function form($instance)

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

+        $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

         $title = strip_tags($instance['title']);

         $count = strip_tags($instance['count']);

         ?>

geodirectory-admin/admin_install.php

Indentation +160 added lines, -160 removed lines

@@ -24,8 +24,8 @@ 
 function geodir_activation()

 {

 

-    geodir_install();

-    add_action('wp_loaded', 'geodir_flush_activation');

+	geodir_install();

+	add_action('wp_loaded', 'geodir_flush_activation');

 }

 

 /**

@@ -36,9 +36,9 @@ 
  */

 function geodir_flush_activation()

 {

-    // Remove rewrite rules and then recreate rewrite rules.

-    // flush late so everything is loaded

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	// flush late so everything is loaded

+	flush_rewrite_rules();

 }

 

 /**

@@ -50,44 +50,44 @@ 
  */

 function geodir_install()

 {

-    global $geodir_settings;

-

-    /**

-     * Called before the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_end'

-     */

-    do_action('geodir_installation_start');

-

-    // Do install

-    if (!get_option('geodir_default_data_installed')) {

-        geodir_create_tables(); // in admin db install.php

-        geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

-        geodir_create_default_fields();

-        //geodir_default_taxonomies();

-        geodir_set_default_options();

-        geodir_create_pages();

-        geodir_set_default_widgets();

-        gd_install_theme_compat();

-

-        update_option('geodir_default_data_installed', 1);

-

-    }

-

-    if (!get_option('geodir_default_data_installed_1.2.8')) {

-        //geodir_create_tables(); // in admin db install.php

-        update_option('geodir_default_data_installed_1.2.8', 1);

-    }

-

-    geodir_installation_end();

-    /**

-     * Called after the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_start'

-     */

-    do_action('geodir_installation_end');

+	global $geodir_settings;

+

+	/**

+	 * Called before the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_end'

+	 */

+	do_action('geodir_installation_start');

+

+	// Do install

+	if (!get_option('geodir_default_data_installed')) {

+		geodir_create_tables(); // in admin db install.php

+		geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

+		geodir_create_default_fields();

+		//geodir_default_taxonomies();

+		geodir_set_default_options();

+		geodir_create_pages();

+		geodir_set_default_widgets();

+		gd_install_theme_compat();

+

+		update_option('geodir_default_data_installed', 1);

+

+	}

+

+	if (!get_option('geodir_default_data_installed_1.2.8')) {

+		//geodir_create_tables(); // in admin db install.php

+		update_option('geodir_default_data_installed_1.2.8', 1);

+	}

+

+	geodir_installation_end();

+	/**

+	 * Called after the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_start'

+	 */

+	do_action('geodir_installation_end');

 

 

 }

@@ -104,16 +104,16 @@ 
 function geodir_create_pages()

 {

 

-    //geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

+	//geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

 

-    //New since 1.5.3

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	//New since 1.5.3

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 

 

 }

@@ -129,11 +129,11 @@ 
  */

 function geodir_installation_end()

 {

-    //update_option( "geodir_db_version", GEODIRECTORY_VERSION );

+	//update_option( "geodir_db_version", GEODIRECTORY_VERSION );

 

-    update_option("geodir_installed", 1);

-    update_option("geodir_installation_redirect", 1);

-    update_option('skip_install_geodir_pages', 0);

+	update_option("geodir_installed", 1);

+	update_option("geodir_installation_redirect", 1);

+	update_option('skip_install_geodir_pages', 0);

 }

 

 /**

@@ -147,45 +147,45 @@ 
  */

 function geodir_set_default_options()

 {

-    global $geodir_settings;

-    /**

-     * Contains settings array for general tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/general_settings_array.php");

-    /**

-     * Contains settings array for design tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/design_settings_array.php");

-    /**

-     * Contains settings array for notifications tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/notifications_settings_array.php");

-    /**

-     * Contains settings array for permalink tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/permalink_settings_array.php");

-    /**

-     * Contains settings array for title / meta tab.

-     *

-     * @since 1.5.4

-     * @package GeoDirectory

-     */

-    include_once("option-pages/title_meta_settings_array.php");

-    foreach ($geodir_settings as $value) {

-        geodir_update_options($value, true);

-    }

+	global $geodir_settings;

+	/**

+	 * Contains settings array for general tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/general_settings_array.php");

+	/**

+	 * Contains settings array for design tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/design_settings_array.php");

+	/**

+	 * Contains settings array for notifications tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/notifications_settings_array.php");

+	/**

+	 * Contains settings array for permalink tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/permalink_settings_array.php");

+	/**

+	 * Contains settings array for title / meta tab.

+	 *

+	 * @since 1.5.4

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/title_meta_settings_array.php");

+	foreach ($geodir_settings as $value) {

+		geodir_update_options($value, true);

+	}

 

 }

 

@@ -199,103 +199,103 @@ 
 function geodir_set_default_widgets()

 {

 

-    $widget_option_list = array();

-    $widgetinfo = array();

-    $sidebarvalue_array = array();

-    $sidebars_widgets = array();

+	$widget_option_list = array();

+	$widgetinfo = array();

+	$sidebarvalue_array = array();

+	$sidebars_widgets = array();

 

-    /*===========================*/

-    /*  Widgets ON HOME PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON HOME PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_home_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_home_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_home_content'] =

-        array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_content'] =

+		array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

 

-    $widget_option_list['geodir_home_right'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_right'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON LISTING PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON LISTING PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_listing_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_listing_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_listing_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_listing_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON SEARCH PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON SEARCH PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_search_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_search_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_search_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_search_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON DETAIL/SINGLE PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON DETAIL/SINGLE PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_detail_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_detail_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON AUTHOR PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON AUTHOR PAGE     */

+	/*===========================*/

 

 

-    $widget_option_list['geodir_author_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

+	$widget_option_list['geodir_author_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

 

 

-    $sidebars_widgets = get_option('sidebars_widgets');

+	$sidebars_widgets = get_option('sidebars_widgets');

 

-    foreach ($widget_option_list as $key => $widget_options) {

+	foreach ($widget_option_list as $key => $widget_options) {

 

-        foreach ($widget_options as $key2 => $widget_options_obj) {

-            $widgetid = 'widget_' . $key2;

+		foreach ($widget_options as $key2 => $widget_options_obj) {

+			$widgetid = 'widget_' . $key2;

 

-            $widgetinfo[$widgetid][] = $widget_options_obj;

+			$widgetinfo[$widgetid][] = $widget_options_obj;

 

-            $sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

+			$sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

 

-            $widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

+			$widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

 

-        }

+		}

 

-        if (!empty($sidebarvalue_array[$key])) {

+		if (!empty($sidebarvalue_array[$key])) {

 

-            $sidebars_widgets = get_option('sidebars_widgets');

-            $sidebars_widgets[$key] = $sidebarvalue_array[$key];

-            update_option('sidebars_widgets', $sidebars_widgets);

+			$sidebars_widgets = get_option('sidebars_widgets');

+			$sidebars_widgets[$key] = $sidebarvalue_array[$key];

+			update_option('sidebars_widgets', $sidebars_widgets);

 

-            foreach ($widget_update as $key => $value) {

+			foreach ($widget_update as $key => $value) {

 

-                update_option($key, $value);

+				update_option($key, $value);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 

 }

Spacing +2 added lines, -2 removed lines

@@ -271,11 +271,11 @@
     foreach ($widget_option_list as $key => $widget_options) {

 

         foreach ($widget_options as $key2 => $widget_options_obj) {

-            $widgetid = 'widget_' . $key2;

+            $widgetid = 'widget_'.$key2;

 

             $widgetinfo[$widgetid][] = $widget_options_obj;

 

-            $sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

+            $sidebarvalue_array[$key][] = $key2."-".(count($widgetinfo[$widgetid]));

 

             $widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

 

geodirectory-templates/add-listing.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 global $gd_session;
 
 if (!isset($_REQUEST['backandedit'])) {
-    $gd_session->un_set('listing');
+	$gd_session->un_set('listing');
 }
 // call header
 get_header();

geodirectory-templates/listing-listview.php

Braces +8 added lines, -3 removed lines

@@ -80,7 +80,10 @@ 
                     echo ' geodir-listview ';

                 } ?> <?php if ($post_view_class) {

                     echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

+                } ?>" <?php if (isset($listing_width) && $listing_width) {
+                	echo "style='width:{$listing_width}%;'";
+                }
+                // Width for widget listing

 

                 echo " data-post-id='$post->ID' ";

                 /**

@@ -402,8 +405,10 @@ 
              */

             do_action('geodir_after_listing_post_listview');

 

-        else:

-			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

+        else {
+        	:

+			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
+        }
             

 			/**

              * Called inside the `ul` of the listings template, when no listing found.

Indentation +275 added lines, -275 removed lines

@@ -44,57 +44,57 @@ 
 

         <?php if (have_posts()) :

 

-            /**

-             * Called inside the `ul` of the listings template, but before any `li` elements.

-             *

-             * When used by the widget view template then it will only show if there are listings to be shown.

-             *

-             * @since 1.0.0

-             * @see 'geodir_after_listing_post_listview'

-             */

-            do_action('geodir_before_listing_post_listview');

-

-            while (have_posts()) : the_post();

-                global $post, $wpdb, $preview;

-

-                /**

-                 * Add a class to the `li` element of the listings list template.

-                 *

-                 * @since 1.0.0

-                 * @param string $class The extra class for the `li` element, default empty.

-                 */

-                $post_view_class = apply_filters('geodir_post_view_extra_class', '');

-

-                /**

-                 * Add a class to the `article` tag inside the `li` element on the listings list template.

-                 *

-                 * @since 1.0.0

-                 * @param string $class The extra class for the `article` element, default empty.

-                 */

-                $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

-                ?>

+			/**

+			 * Called inside the `ul` of the listings template, but before any `li` elements.

+			 *

+			 * When used by the widget view template then it will only show if there are listings to be shown.

+			 *

+			 * @since 1.0.0

+			 * @see 'geodir_after_listing_post_listview'

+			 */

+			do_action('geodir_before_listing_post_listview');

+

+			while (have_posts()) : the_post();

+				global $post, $wpdb, $preview;

+

+				/**

+				 * Add a class to the `li` element of the listings list template.

+				 *

+				 * @since 1.0.0

+				 * @param string $class The extra class for the `li` element, default empty.

+				 */

+				$post_view_class = apply_filters('geodir_post_view_extra_class', '');

+

+				/**

+				 * Add a class to the `article` tag inside the `li` element on the listings list template.

+				 *

+				 * @since 1.0.0

+				 * @param string $class The extra class for the `article` element, default empty.

+				 */

+				$post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

+				?>

 

                 <li class="clearfix <?php if ($grid_view_class) {

-                    echo 'geodir-gridview ' . $grid_view_class;

-                } else {

-                    echo ' geodir-listview ';

-                } ?> <?php if ($post_view_class) {

-                    echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

-

-                echo " data-post-id='$post->ID' ";

-                /**

-                 * Called inside the `<li>` tag for listing outputs.

-                 *

-                 * @since 1.5.9

-                 * @param object $post The post object.

-                 * @param string $string If called on the listing or widget template.

-                 */

-                do_action('geodir_listview_inside_li', $post, 'listing');

-                ?> >

+					echo 'geodir-gridview ' . $grid_view_class;

+				} else {

+					echo ' geodir-listview ';

+				} ?> <?php if ($post_view_class) {

+					echo $post_view_class;

+				} ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

+

+				echo " data-post-id='$post->ID' ";

+				/**

+				 * Called inside the `<li>` tag for listing outputs.

+				 *

+				 * @since 1.5.9

+				 * @param object $post The post object.

+				 * @param string $string If called on the listing or widget template.

+				 */

+				do_action('geodir_listview_inside_li', $post, 'listing');

+				?> >

                     <article class="geodir-category-listing <?php if ($post_view_article_class) {

-                        echo $post_view_article_class;

-                    } ?>">

+						echo $post_view_article_class;

+					} ?>">

                         <div class="geodir-post-img <?php echo apply_filters('geodir_listing_listview_thumb_extra_class', '', 'listing'); ?>">

                             <?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>

 

@@ -102,37 +102,37 @@ 
                                     <?php echo $fimage; ?>

                                 </a>

                                 <?php

-                                /**

-                                 * Called before badges are output.

-                                 *

-                                 * Called on the listings template after the image has been output and before the badges like `new` or `featured` are output.

-                                 *

-                                 * @since 1.0.0

-                                 * @param object $post The post object.

-                                 * @see 'geodir_after_badge_on_image'

-                                 */

-                                do_action('geodir_before_badge_on_image', $post);

-                                if (isset($post->is_featured) && $post->is_featured) {

-                                    echo geodir_show_badges_on_image('featured', $post, get_permalink());

-                                }

-

-                                $geodir_days_new = (int)get_option('geodir_listing_new_days');

-

-                                if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

-                                    echo geodir_show_badges_on_image('new', $post, get_permalink());

-                                }

-

-                                /**

-                                 * Called after badges are output.

-                                 *

-                                 * Called on the listings template after the image and badges like `new` or `featured` have been output.

-                                 *

-                                 * @since 1.0.0

-                                 * @param object $post The post object.

-                                 * @see 'geodir_before_badge_on_image'

-                                 */

-                                do_action('geodir_after_badge_on_image', $post);

-                                ?>

+								/**

+								 * Called before badges are output.

+								 *

+								 * Called on the listings template after the image has been output and before the badges like `new` or `featured` are output.

+								 *

+								 * @since 1.0.0

+								 * @param object $post The post object.

+								 * @see 'geodir_after_badge_on_image'

+								 */

+								do_action('geodir_before_badge_on_image', $post);

+								if (isset($post->is_featured) && $post->is_featured) {

+									echo geodir_show_badges_on_image('featured', $post, get_permalink());

+								}

+

+								$geodir_days_new = (int)get_option('geodir_listing_new_days');

+

+								if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

+									echo geodir_show_badges_on_image('new', $post, get_permalink());

+								}

+

+								/**

+								 * Called after badges are output.

+								 *

+								 * Called on the listings template after the image and badges like `new` or `featured` have been output.

+								 *

+								 * @since 1.0.0

+								 * @param object $post The post object.

+								 * @see 'geodir_before_badge_on_image'

+								 */

+								do_action('geodir_after_badge_on_image', $post);

+								?>

 

 

                             <?php } ?>

@@ -142,15 +142,15 @@ 
                         <div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'listing'); ?>">

 

                             <?php

-                            /**

-                             * Called before the post title on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param string $type The template type, default 'listview'.

-                             * @param object $post The post object.

-                             * @see 'geodir_after_listing_post_title'

-                             */

-                            do_action('geodir_before_listing_post_title', 'listview', $post); ?>

+							/**

+							 * Called before the post title on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param string $type The template type, default 'listview'.

+							 * @param object $post The post object.

+							 * @see 'geodir_after_listing_post_title'

+							 */

+							do_action('geodir_before_listing_post_title', 'listview', $post); ?>

 

                             <header class="geodir-entry-header"><h2 class="geodir-entry-title">

                                     <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">

@@ -162,225 +162,225 @@ 
                             <!-- .entry-header -->

 

                             <?php

-                            /**

-                             * Called after the post title on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param string $type The template type, default 'listview'.

-                             * @param object $post The post object.

-                             * @see 'geodir_before_listing_post_title'

-                             */

-                            do_action('geodir_after_listing_post_title', 'listview', $post); ?>

+							/**

+							 * Called after the post title on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param string $type The template type, default 'listview'.

+							 * @param object $post The post object.

+							 * @see 'geodir_before_listing_post_title'

+							 */

+							do_action('geodir_after_listing_post_title', 'listview', $post); ?>

 

                             <?php /// Print Distance

-                            if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {

-                                if ( $related_nearest && $related_parent_lat ) {

-                                    $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);

-                                } else {

-                                    $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

-                                }

-

-                                $endLat = $post->post_latitude;

-                                $endLon = $post->post_longitude;

-                                $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);

-                                $uom = get_option('geodir_search_dist_1');

-                                $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom); ?>

+							if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {

+								if ( $related_nearest && $related_parent_lat ) {

+									$startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);

+								} else {

+									$startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

+								}

+

+								$endLat = $post->post_latitude;

+								$endLon = $post->post_longitude;

+								$endPoint = array('latitude' => $endLat, 'longitude' => $endLon);

+								$uom = get_option('geodir_search_dist_1');

+								$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom); ?>

                                 <h3>

                                     <?php

 

-                                    if (round($distance, 2) == 0) {

-                                        $uom = get_option('geodir_search_dist_2');

-

-                                        $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

-                                        if ($uom == 'feet') {

-                                            $uom = __('feet', 'geodirectory');

-                                        } else {

-                                            $uom = __('meters', 'geodirectory');

-                                        }

-                                        echo round($distance) . ' ' . $uom . '<br />';

-                                    } else {

-                                        if ($uom == 'miles') {

-                                            $uom = __('miles', 'geodirectory');

-                                        } else {

-                                            $uom = __('km', 'geodirectory');

-                                        }

-                                        echo round($distance, 2) . ' ' . $uom . '<br />';

-                                    }

-                                    ?>

+									if (round($distance, 2) == 0) {

+										$uom = get_option('geodir_search_dist_2');

+

+										$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

+										if ($uom == 'feet') {

+											$uom = __('feet', 'geodirectory');

+										} else {

+											$uom = __('meters', 'geodirectory');

+										}

+										echo round($distance) . ' ' . $uom . '<br />';

+									} else {

+										if ($uom == 'miles') {

+											$uom = __('miles', 'geodirectory');

+										} else {

+											$uom = __('km', 'geodirectory');

+										}

+										echo round($distance, 2) . ' ' . $uom . '<br />';

+									}

+									?>

                                 </h3>

                             <?php } ?>

 

 

                             <?php

-                            /**

-                             * Called before the post excerpt on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param object $post The post object.

-                             * @see 'geodir_after_listing_post_excerpt'

-                             */

-                            do_action('geodir_before_listing_post_excerpt', $post); ?>

+							/**

+							 * Called before the post excerpt on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param object $post The post object.

+							 * @see 'geodir_after_listing_post_excerpt'

+							 */

+							do_action('geodir_before_listing_post_excerpt', $post); ?>

                             <?php echo geodir_show_listing_info('listing'); ?>

                             <div class="geodir-entry-content">

 

                                 <?php

-                                /**

-                                 * Filter to hide the listing excerpt

-                                 *

-                                 * @since 1.5.3

-                                 * @param bool $display Display the excerpt or not. Default true.

-                                 * @param string $view The view type, default 'listview'.

-                                 * @param object $post The post object.

-                                 */

-                                $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);

-                                if ($show_listing_excerpt) {

-                                    if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                        $content_out = geodir_max_excerpt( $character_count );

-                                    } else {

-                                        $content_out = get_the_excerpt();

-                                    }

-                                    if ( ! empty( $content_out ) ) {

-                                        echo "<p>" . $content_out . "</p>";

-                                    }

-                                }

-                                ?></div>

+								/**

+								 * Filter to hide the listing excerpt

+								 *

+								 * @since 1.5.3

+								 * @param bool $display Display the excerpt or not. Default true.

+								 * @param string $view The view type, default 'listview'.

+								 * @param object $post The post object.

+								 */

+								$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);

+								if ($show_listing_excerpt) {

+									if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

+										$content_out = geodir_max_excerpt( $character_count );

+									} else {

+										$content_out = get_the_excerpt();

+									}

+									if ( ! empty( $content_out ) ) {

+										echo "<p>" . $content_out . "</p>";

+									}

+								}

+								?></div>

 

                             <?php

-                            /**

-                             * Called after the post excerpt on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param object $post The post object.

-                             * @see 'geodir_before_listing_post_excerpt'

-                             */

-                            do_action('geodir_after_listing_post_excerpt', $post); ?>

+							/**

+							 * Called after the post excerpt on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param object $post The post object.

+							 * @see 'geodir_before_listing_post_excerpt'

+							 */

+							do_action('geodir_after_listing_post_excerpt', $post); ?>

                         </div>

                         <!-- gd-content ends here-->

                         <?php

-                        /**

-                         * Called after printing listing content.

-                         *

-                         * @since 1.5.3

-                         * @param object $post The post object.

-                         * @param string $view The view type, default 'listing'.

-                         */

-                        do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>

+						/**

+						 * Called after printing listing content.

+						 *

+						 * @since 1.5.3

+						 * @param object $post The post object.

+						 * @param string $view The view type, default 'listing'.

+						 */

+						do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'listing'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'listing'); ?>">

 

                                 <?php

-                                /**

-                                 * Called before printing review stars html.

-                                 *

-                                 * @since 1.5.3

-                                 * @param object $post The post object.

-                                 * @param string $view The view type, default 'listing'.

-                                 */

-                                do_action( 'geodir_before_review_html', $post, 'listing' );

-

-                                $review_show = geodir_is_reviews_show('listview');

-

-                                if ($review_show) {

-

-                                    if (!$preview) {

-                                        $post_avgratings = geodir_get_post_rating($post->ID);

-                                        /**

-                                         * Called before the rating stars are output on the listings view template.

-                                         *

-                                         * @since 1.0.0

-                                         * @param float $post_avgratings The average rating for the post.

-                                         * @param int $post->ID The post ID.

-                                         * @see 'geodir_after_review_rating_stars_on_listview'

-                                         */

-                                        do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);

-

-                                        echo geodir_get_rating_stars($post_avgratings, $post->ID);

-

-                                        /**

-                                         * Called after the rating stars are output on the listings view template.

-                                         *

-                                         * @since 1.0.0

-                                         * @param float $post_avgratings The average rating for the post.

-                                         * @param int $post->ID The post ID.

-                                         * @see 'geodir_before_review_rating_stars_on_listview'

-                                         */

-                                        do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);

-                                    }

-                                    ?>

+								/**

+								 * Called before printing review stars html.

+								 *

+								 * @since 1.5.3

+								 * @param object $post The post object.

+								 * @param string $view The view type, default 'listing'.

+								 */

+								do_action( 'geodir_before_review_html', $post, 'listing' );

+

+								$review_show = geodir_is_reviews_show('listview');

+

+								if ($review_show) {

+

+									if (!$preview) {

+										$post_avgratings = geodir_get_post_rating($post->ID);

+										/**

+										 * Called before the rating stars are output on the listings view template.

+										 *

+										 * @since 1.0.0

+										 * @param float $post_avgratings The average rating for the post.

+										 * @param int $post->ID The post ID.

+										 * @see 'geodir_after_review_rating_stars_on_listview'

+										 */

+										do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);

+

+										echo geodir_get_rating_stars($post_avgratings, $post->ID);

+

+										/**

+										 * Called after the rating stars are output on the listings view template.

+										 *

+										 * @since 1.0.0

+										 * @param float $post_avgratings The average rating for the post.

+										 * @param int $post->ID The post ID.

+										 * @see 'geodir_before_review_rating_stars_on_listview'

+										 */

+										do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);

+									}

+									?>

                                     <a href="<?php comments_link(); ?>" class="geodir-pcomments"><i

                                             class="fas fa-comments"></i>

                                         <?php geodir_comments_number($post->rating_count); ?></a>

                                 <?php

-                                }

+								}

 

 

-                                /**

-                                 * Called after printing favorite html.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );

+								/**

+								 * Called after printing favorite html.

+								 *

+								 * @since 1.0.0

+								 */

+								do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );

 

 

-                                /**

-                                 * Called after printing map pin point.

-                                 *

-                                 * @since 1.0.0

-                                 * @since 1.5.9 Added $post as second param.

-                                 * @param int $post->ID The post id.

-                                 * @param object $post The post object.

-                                 */

-                                do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);

+								/**

+								 * Called after printing map pin point.

+								 *

+								 * @since 1.0.0

+								 * @since 1.5.9 Added $post as second param.

+								 * @param int $post->ID The post id.

+								 * @param object $post The post object.

+								 */

+								do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);

 

-                                if ($post->post_author == get_current_user_id()) { ?>

+								if ($post->post_author == get_current_user_id()) { ?>

                                     <?php

-                                    $addplacelink = get_permalink(geodir_add_listing_page_id());

-                                    $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);

-                                    $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);

+									$addplacelink = get_permalink(geodir_add_listing_page_id());

+									$editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);

+									$upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);

 

-                                    $ajaxlink = geodir_get_ajax_url();

-                                    $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);

+									$ajaxlink = geodir_get_ajax_url();

+									$deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);

 

-                                    ?>

+									?>

 

                                     <span class="geodir-authorlink clearfix">

 											

 											<?php if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {

-                                                /**

-                                                 * Called before the edit post link on the listings view template used on the author page.

-                                                 *

-                                                 * @since 1.0.0

-                                                 * @see 'geodir_after_edit_post_link_on_listing'

-                                                 */

-                                                do_action('geodir_before_edit_post_link_on_listing');

-                                                ?>

+												/**

+												 * Called before the edit post link on the listings view template used on the author page.

+												 *

+												 * @since 1.0.0

+												 * @see 'geodir_after_edit_post_link_on_listing'

+												 */

+												do_action('geodir_before_edit_post_link_on_listing');

+												?>

 

                                                 <a href="<?php echo esc_url($editlink); ?>" class="geodir-edit"

                                                    title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                                                     <?php

-                                                    $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');

-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

-                                                    ?>

+													$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');

+													echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+													?>

                                                     <?php _e('Edit', 'geodirectory'); ?>

                                                 </a>

                                                 <a href="<?php echo esc_url($deletelink); ?>" class="geodir-delete"

                                                    title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                                                     <?php

-                                                    $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');

-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

-                                                    ?>

+													$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');

+													echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+													?>

                                                     <?php _e('Delete', 'geodirectory'); ?>

                                                 </a>

                                                 <?php

 

-                                                /**

-                                                 * Called after the edit post link on the listings view template used on the author page.

-                                                 *

-                                                 * @since 1.0.0

-                                                 * @see 'geodir_before_edit_post_link_on_listing'

-                                                 */

-                                                do_action('geodir_after_edit_post_link_on_listing');

-                                            } ?>

+												/**

+												 * Called after the edit post link on the listings view template used on the author page.

+												 *

+												 * @since 1.0.0

+												 * @see 'geodir_before_edit_post_link_on_listing'

+												 */

+												do_action('geodir_after_edit_post_link_on_listing');

+											} ?>

 											</span>

 

                                 <?php } ?>

@@ -393,32 +393,32 @@ 
                 </li>

 

             <?php

-            endwhile;

-

-            /**

-             * Called inside the `ul` of the listings template, but after all `li` elements.

-             *

-             * When used by the widget view template then it will only show if there are listings to be shown.

-             *

-             * @since 1.0.0

-             * @see 'geodir_before_listing_post_listview'

-             */

-            do_action('geodir_after_listing_post_listview');

-

-        else:

+			endwhile;

+

+			/**

+			 * Called inside the `ul` of the listings template, but after all `li` elements.

+			 *

+			 * When used by the widget view template then it will only show if there are listings to be shown.

+			 *

+			 * @since 1.0.0

+			 * @see 'geodir_before_listing_post_listview'

+			 */

+			do_action('geodir_after_listing_post_listview');

+

+		else:

 			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

             

 			/**

-             * Called inside the `ul` of the listings template, when no listing found.

-             *

-             * @since 1.5.5

+			 * Called inside the `ul` of the listings template, when no listing found.

+			 *

+			 * @since 1.5.5

 			 * @param string 'listing-listview' Listing listview template.

 			 * @param bool $favorite Are favorite listings results?

-             */

-            do_action('geodir_message_not_found_on_listing', 'listing-listview', $favorite);

-        endif;

+			 */

+			do_action('geodir_message_not_found_on_listing', 'listing-listview', $favorite);

+		endif;

 

-        ?>

+		?>

     </ul>  <!-- geodir_category_list_view ends here-->

 

     <div class="clear"></div>

Spacing +16 added lines, -16 removed lines

@@ -75,7 +75,7 @@ 
                 ?>

 

                 <li class="clearfix <?php if ($grid_view_class) {

-                    echo 'geodir-gridview ' . $grid_view_class;

+                    echo 'geodir-gridview '.$grid_view_class;

                 } else {

                     echo ' geodir-listview ';

                 } ?> <?php if ($post_view_class) {

@@ -116,7 +116,7 @@ 
                                     echo geodir_show_badges_on_image('featured', $post, get_permalink());

                                 }

 

-                                $geodir_days_new = (int)get_option('geodir_listing_new_days');

+                                $geodir_days_new = (int) get_option('geodir_listing_new_days');

 

                                 if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

                                     echo geodir_show_badges_on_image('new', $post, get_permalink());

@@ -173,8 +173,8 @@ 
                             do_action('geodir_after_listing_post_title', 'listview', $post); ?>

 

                             <?php /// Print Distance

-                            if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {

-                                if ( $related_nearest && $related_parent_lat ) {

+                            if ((isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') || ($related_nearest && $related_parent_lat)) {

+                                if ($related_nearest && $related_parent_lat) {

                                     $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);

                                 } else {

                                     $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

@@ -197,14 +197,14 @@ 
                                         } else {

                                             $uom = __('meters', 'geodirectory');

                                         }

-                                        echo round($distance) . ' ' . $uom . '<br />';

+                                        echo round($distance).' '.$uom.'<br />';

                                     } else {

                                         if ($uom == 'miles') {

                                             $uom = __('miles', 'geodirectory');

                                         } else {

                                             $uom = __('km', 'geodirectory');

                                         }

-                                        echo round($distance, 2) . ' ' . $uom . '<br />';

+                                        echo round($distance, 2).' '.$uom.'<br />';

                                     }

                                     ?>

                                 </h3>

@@ -234,13 +234,13 @@ 
                                  */

                                 $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);

                                 if ($show_listing_excerpt) {

-                                    if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                        $content_out = geodir_max_excerpt( $character_count );

+                                    if (isset($character_count) && ($character_count || $character_count == '0')) {

+                                        $content_out = geodir_max_excerpt($character_count);

                                     } else {

                                         $content_out = get_the_excerpt();

                                     }

-                                    if ( ! empty( $content_out ) ) {

-                                        echo "<p>" . $content_out . "</p>";

+                                    if (!empty($content_out)) {

+                                        echo "<p>".$content_out."</p>";

                                     }

                                 }

                                 ?></div>

@@ -264,7 +264,7 @@ 
                          * @param object $post The post object.

                          * @param string $view The view type, default 'listing'.

                          */

-                        do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>

+                        do_action('geodir_after_listing_content', $post, 'listing'); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'listing'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'listing'); ?>">

 

@@ -276,7 +276,7 @@ 
                                  * @param object $post The post object.

                                  * @param string $view The view type, default 'listing'.

                                  */

-                                do_action( 'geodir_before_review_html', $post, 'listing' );

+                                do_action('geodir_before_review_html', $post, 'listing');

 

                                 $review_show = geodir_is_reviews_show('listview');

 

@@ -319,7 +319,7 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );

+                                do_action('geodir_after_favorite_html', $post->ID, 'listing');

 

 

                                 /**

@@ -330,7 +330,7 @@ 
                                  * @param int $post->ID The post id.

                                  * @param object $post The post object.

                                  */

-                                do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);

+                                do_action('geodir_listing_after_pinpoint', $post->ID, $post);

 

                                 if ($post->post_author == get_current_user_id()) { ?>

                                     <?php

@@ -359,7 +359,7 @@ 
                                                    title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                                                     <?php

                                                     $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');

-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+                                                    echo '<i class="'.$geodir_listing_edit_icon.'"></i>';

                                                     ?>

                                                     <?php _e('Edit', 'geodirectory'); ?>

                                                 </a>

@@ -367,7 +367,7 @@ 
                                                    title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                                                     <?php

                                                     $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');

-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+                                                    echo '<i class="'.$geodir_listing_delete_icon.'"></i>';

                                                     ?>

                                                     <?php _e('Delete', 'geodirectory'); ?>

                                                 </a>

tests/lib/wordpress-tests-lib/includes/factory.php

Doc Comments +25 added lines

@@ -64,6 +64,9 @@ 
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -127,6 +130,9 @@ 
 
 class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -152,6 +158,9 @@ 
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -183,6 +192,9 @@ 
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		global $current_site, $base;
 		parent::__construct( $factory );
@@ -219,6 +231,9 @@ 
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -255,6 +270,10 @@ 
 	private $taxonomy;
 	const DEFAULT_TAXONOMY = 'post_tag';
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 * @param string $taxonomy
+	 */
 	function __construct( $factory = null, $taxonomy = null ) {
 		parent::__construct( $factory );
 		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
@@ -342,6 +361,9 @@ 
 
 	abstract function get_object_by_id( $object_id );
 
+	/**
+	 * @param integer $count
+	 */
 	function create_many( $count, $args = array(), $generation_definitions = null ) {
 		$results = array();
 		for ( $i = 0; $i < $count; $i++ ) {
@@ -405,6 +427,9 @@ 
 	public $next;
 	public $template_string;
 
+	/**
+	 * @param integer $start
+	 */
 	function __construct( $template_string = '%s', $start = null ) {
 		if ( $start ) {
 			$this->next = $start;

Braces +29 added lines, -21 removed lines

@@ -104,8 +104,9 @@ 
 			$type = $upload['type'];
 		} else {
 			$mime = wp_check_filetype( $upload['file'] );
-			if ($mime)
-				$type = $mime['type'];
+			if ($mime) {
+							$type = $mime['type'];
+			}
 		}
 
 		$attachment = array(
@@ -268,15 +269,17 @@ 
 	function create_object( $args ) {
 		$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
 		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
-		if ( is_wp_error( $term_id_pair ) )
-			return $term_id_pair;
+		if ( is_wp_error( $term_id_pair ) ) {
+					return $term_id_pair;
+		}
 		return $term_id_pair['term_id'];
 	}
 
 	function update_object( $term, $fields ) {
 		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
-		if ( is_object( $term ) )
-			$taxonomy = $term->taxonomy;
+		if ( is_object( $term ) ) {
+					$taxonomy = $term->taxonomy;
+		}
 		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
 		return $term_id_pair['term_id'];
 	}
@@ -318,19 +321,22 @@ 
 	abstract function update_object( $object, $fields );
 
 	function create( $args = array(), $generation_definitions = null ) {
-		if ( is_null( $generation_definitions ) )
-			$generation_definitions = $this->default_generation_definitions;
+		if ( is_null( $generation_definitions ) ) {
+					$generation_definitions = $this->default_generation_definitions;
+		}
 
 		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
 		$created = $this->create_object( $generated_args );
-		if ( !$created || is_wp_error( $created ) )
-			return $created;
+		if ( !$created || is_wp_error( $created ) ) {
+					return $created;
+		}
 
 		if ( $callbacks ) {
 			$updated_fields = $this->apply_callbacks( $callbacks, $created );
 			$save_result = $this->update_object( $created, $updated_fields );
-			if ( !$save_result || is_wp_error( $save_result ) )
-				return $save_result;
+			if ( !$save_result || is_wp_error( $save_result ) ) {
+							return $save_result;
+			}
 		}
 		return $created;
 	}
@@ -352,20 +358,22 @@ 
 
 	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
 		$callbacks = array();
-		if ( is_null( $generation_definitions ) )
-			$generation_definitions = $this->default_generation_definitions;
+		if ( is_null( $generation_definitions ) ) {
+					$generation_definitions = $this->default_generation_definitions;
+		}
 
 		foreach( array_keys( $generation_definitions ) as $field_name ) {
 			if ( !isset( $args[$field_name] ) ) {
 				$generator = $generation_definitions[$field_name];
-				if ( is_scalar( $generator ) )
-					$args[$field_name] = $generator;
-				elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+				if ( is_scalar( $generator ) ) {
+									$args[$field_name] = $generator;
+				} elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
 					$callbacks[$field_name] = $generator;
-				} elseif ( is_object( $generator ) )
-					$args[$field_name] = $generator->next();
-				else
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+				} elseif ( is_object( $generator ) ) {
+									$args[$field_name] = $generator->next();
+				} else {
+									return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+				}
 			}
 		}
 		return $args;

Spacing +143 added lines, -143 removed lines

@@ -48,78 +48,78 @@ 
 	public $network;
 
 	function __construct() {
-		$this->post = new WP_UnitTest_Factory_For_Post( $this );
-		$this->attachment = new WP_UnitTest_Factory_For_Attachment( $this );
-		$this->comment = new WP_UnitTest_Factory_For_Comment( $this );
-		$this->user = new WP_UnitTest_Factory_For_User( $this );
-		$this->term = new WP_UnitTest_Factory_For_Term( $this );
-		$this->category = new WP_UnitTest_Factory_For_Term( $this, 'category' );
-		$this->tag = new WP_UnitTest_Factory_For_Term( $this, 'post_tag' );
-		if ( is_multisite() ) {
-			$this->blog = new WP_UnitTest_Factory_For_Blog( $this );
-			$this->network = new WP_UnitTest_Factory_For_Network( $this );
+		$this->post = new WP_UnitTest_Factory_For_Post($this);
+		$this->attachment = new WP_UnitTest_Factory_For_Attachment($this);
+		$this->comment = new WP_UnitTest_Factory_For_Comment($this);
+		$this->user = new WP_UnitTest_Factory_For_User($this);
+		$this->term = new WP_UnitTest_Factory_For_Term($this);
+		$this->category = new WP_UnitTest_Factory_For_Term($this, 'category');
+		$this->tag = new WP_UnitTest_Factory_For_Term($this, 'post_tag');
+		if (is_multisite()) {
+			$this->blog = new WP_UnitTest_Factory_For_Blog($this);
+			$this->network = new WP_UnitTest_Factory_For_Network($this);
 		}
 	}
 }
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'post_status' => 'publish',
-			'post_title' => new WP_UnitTest_Generator_Sequence( 'Post title %s' ),
-			'post_content' => new WP_UnitTest_Generator_Sequence( 'Post content %s' ),
-			'post_excerpt' => new WP_UnitTest_Generator_Sequence( 'Post excerpt %s' ),
+			'post_title' => new WP_UnitTest_Generator_Sequence('Post title %s'),
+			'post_content' => new WP_UnitTest_Generator_Sequence('Post content %s'),
+			'post_excerpt' => new WP_UnitTest_Generator_Sequence('Post excerpt %s'),
 			'post_type' => 'post'
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_post( $args );
+	function create_object($args) {
+		return wp_insert_post($args);
 	}
 
-	function update_object( $post_id, $fields ) {
+	function update_object($post_id, $fields) {
 		$fields['ID'] = $post_id;
-		return wp_update_post( $fields );
+		return wp_update_post($fields);
 	}
 
-	function get_object_by_id( $post_id ) {
-		return get_post( $post_id );
+	function get_object_by_id($post_id) {
+		return get_post($post_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Attachment extends WP_UnitTest_Factory_For_Post {
 
-	function create_object( $file, $parent = 0, $args = array() ) {
-		return wp_insert_attachment( $args, $file, $parent );
+	function create_object($file, $parent = 0, $args = array()) {
+		return wp_insert_attachment($args, $file, $parent);
 	}
 
-	function create_upload_object( $file, $parent = 0 ) {
+	function create_upload_object($file, $parent = 0) {
 		$contents = file_get_contents($file);
 		$upload = wp_upload_bits(basename($file), null, $contents);
 
 		$type = '';
-		if ( ! empty($upload['type']) ) {
+		if (!empty($upload['type'])) {
 			$type = $upload['type'];
 		} else {
-			$mime = wp_check_filetype( $upload['file'] );
+			$mime = wp_check_filetype($upload['file']);
 			if ($mime)
 				$type = $mime['type'];
 		}
 
 		$attachment = array(
-			'post_title' => basename( $upload['file'] ),
+			'post_title' => basename($upload['file']),
 			'post_content' => '',
 			'post_type' => 'attachment',
 			'post_parent' => $parent,
 			'post_mime_type' => $type,
-			'guid' => $upload[ 'url' ],
+			'guid' => $upload['url'],
 		);
 
 		// Save the data
-		$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $parent );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+		$id = wp_insert_attachment($attachment, $upload['file'], $parent);
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $upload['file']));
 
 		return $id;
 	}
@@ -127,126 +127,126 @@ 
 
 class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
-			'user_login' => new WP_UnitTest_Generator_Sequence( 'User %s' ),
+			'user_login' => new WP_UnitTest_Generator_Sequence('User %s'),
 			'user_pass' => 'password',
-			'user_email' => new WP_UnitTest_Generator_Sequence( 'user_%s@example.org' ),
+			'user_email' => new WP_UnitTest_Generator_Sequence('user_%s@example.org'),
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_user( $args );
+	function create_object($args) {
+		return wp_insert_user($args);
 	}
 
-	function update_object( $user_id, $fields ) {
+	function update_object($user_id, $fields) {
 		$fields['ID'] = $user_id;
-		return wp_update_user( $fields );
+		return wp_update_user($fields);
 	}
 
-	function get_object_by_id( $user_id ) {
-		return new WP_User( $user_id );
+	function get_object_by_id($user_id) {
+		return new WP_User($user_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
-			'comment_author' => new WP_UnitTest_Generator_Sequence( 'Commenter %s' ),
-			'comment_author_url' => new WP_UnitTest_Generator_Sequence( 'http://example.com/%s/' ),
+			'comment_author' => new WP_UnitTest_Generator_Sequence('Commenter %s'),
+			'comment_author_url' => new WP_UnitTest_Generator_Sequence('http://example.com/%s/'),
 			'comment_approved' => 1,
 			'comment_content' => 'This is a comment'
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_comment( $this->addslashes_deep( $args ) );
+	function create_object($args) {
+		return wp_insert_comment($this->addslashes_deep($args));
 	}
 
-	function update_object( $comment_id, $fields ) {
+	function update_object($comment_id, $fields) {
 		$fields['comment_ID'] = $comment_id;
-		return wp_update_comment( $this->addslashes_deep( $fields ) );
+		return wp_update_comment($this->addslashes_deep($fields));
 	}
 
-	function create_post_comments( $post_id, $count = 1, $args = array(), $generation_definitions = null ) {
+	function create_post_comments($post_id, $count = 1, $args = array(), $generation_definitions = null) {
 		$args['comment_post_ID'] = $post_id;
-		return $this->create_many( $count, $args, $generation_definitions );
+		return $this->create_many($count, $args, $generation_definitions);
 	}
 
-	function get_object_by_id( $comment_id ) {
-		return get_comment( $comment_id );
+	function get_object_by_id($comment_id) {
+		return get_comment($comment_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
+	function __construct($factory = null) {
 		global $current_site, $base;
-		parent::__construct( $factory );
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'domain' => $current_site->domain,
-			'path' => new WP_UnitTest_Generator_Sequence( $base . 'testpath%s' ),
-			'title' => new WP_UnitTest_Generator_Sequence( 'Site %s' ),
+			'path' => new WP_UnitTest_Generator_Sequence($base.'testpath%s'),
+			'title' => new WP_UnitTest_Generator_Sequence('Site %s'),
 			'site_id' => $current_site->id,
 		);
 	}
 
-	function create_object( $args ) {
+	function create_object($args) {
 		global $wpdb;
-		$meta = isset( $args['meta'] ) ? $args['meta'] : array();
-		$user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
+		$meta = isset($args['meta']) ? $args['meta'] : array();
+		$user_id = isset($args['user_id']) ? $args['user_id'] : get_current_user_id();
 		// temp tables will trigger db errors when we attempt to reference them as new temp tables
 		$suppress = $wpdb->suppress_errors();
-		$blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
-		$wpdb->suppress_errors( $suppress );
+		$blog = wpmu_create_blog($args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id']);
+		$wpdb->suppress_errors($suppress);
 
 		// Tell WP we're done installing.
-		wp_installing( false );
+		wp_installing(false);
 
 		return $blog;
 	}
 
-	function update_object( $blog_id, $fields ) {}
+	function update_object($blog_id, $fields) {}
 
-	function get_object_by_id( $blog_id ) {
-		return get_blog_details( $blog_id, false );
+	function get_object_by_id($blog_id) {
+		return get_blog_details($blog_id, false);
 	}
 }
 
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'domain' => WP_TESTS_DOMAIN,
-			'title' => new WP_UnitTest_Generator_Sequence( 'Network %s' ),
-			'path' => new WP_UnitTest_Generator_Sequence( '/testpath%s/' ),
-			'network_id' => new WP_UnitTest_Generator_Sequence( '%s', 2 ),
+			'title' => new WP_UnitTest_Generator_Sequence('Network %s'),
+			'path' => new WP_UnitTest_Generator_Sequence('/testpath%s/'),
+			'network_id' => new WP_UnitTest_Generator_Sequence('%s', 2),
 			'subdomain_install' => false,
 		);
 	}
 
-	function create_object( $args ) {
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+	function create_object($args) {
+		require_once ABSPATH.'wp-admin/includes/upgrade.php';
 
-		if ( ! isset( $args['user'] ) ) {
+		if (!isset($args['user'])) {
 			$email = WP_TESTS_EMAIL;
 		} else {
-			$email = get_userdata( $args['user'] )->user_email;
+			$email = get_userdata($args['user'])->user_email;
 		}
 
-		populate_network( $args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install'] );
+		populate_network($args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install']);
 		return $args['network_id'];
 	}
 
-	function update_object( $network_id, $fields ) {}
+	function update_object($network_id, $fields) {}
 
-	function get_object_by_id( $network_id ) {
-		return wp_get_network( $network_id );
+	function get_object_by_id($network_id) {
+		return wp_get_network($network_id);
 	}
 }
 
@@ -255,44 +255,44 @@ 
 	private $taxonomy;
 	const DEFAULT_TAXONOMY = 'post_tag';
 
-	function __construct( $factory = null, $taxonomy = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null, $taxonomy = null) {
+		parent::__construct($factory);
 		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
 		$this->default_generation_definitions = array(
-			'name' => new WP_UnitTest_Generator_Sequence( 'Term %s' ),
+			'name' => new WP_UnitTest_Generator_Sequence('Term %s'),
 			'taxonomy' => $this->taxonomy,
-			'description' => new WP_UnitTest_Generator_Sequence( 'Term description %s' ),
+			'description' => new WP_UnitTest_Generator_Sequence('Term description %s'),
 		);
 	}
 
-	function create_object( $args ) {
-		$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
-		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
-		if ( is_wp_error( $term_id_pair ) )
+	function create_object($args) {
+		$args = array_merge(array('taxonomy' => $this->taxonomy), $args);
+		$term_id_pair = wp_insert_term($args['name'], $args['taxonomy'], $args);
+		if (is_wp_error($term_id_pair))
 			return $term_id_pair;
 		return $term_id_pair['term_id'];
 	}
 
-	function update_object( $term, $fields ) {
-		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
-		if ( is_object( $term ) )
+	function update_object($term, $fields) {
+		$fields = array_merge(array('taxonomy' => $this->taxonomy), $fields);
+		if (is_object($term))
 			$taxonomy = $term->taxonomy;
-		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
+		$term_id_pair = wp_update_term($term, $taxonomy, $fields);
 		return $term_id_pair['term_id'];
 	}
 
-	function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
-		return wp_set_post_terms( $post_id, $terms, $taxonomy, $append );
+	function add_post_terms($post_id, $terms, $taxonomy, $append = true) {
+		return wp_set_post_terms($post_id, $terms, $taxonomy, $append);
 	}
 
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$term_id = $this->create( $args, $generation_definitions );
-		$taxonomy = isset( $args['taxonomy'] ) ? $args['taxonomy'] : $this->taxonomy;
-		return get_term( $term_id, $taxonomy );
+	function create_and_get($args = array(), $generation_definitions = null) {
+		$term_id = $this->create($args, $generation_definitions);
+		$taxonomy = isset($args['taxonomy']) ? $args['taxonomy'] : $this->taxonomy;
+		return get_term($term_id, $taxonomy);
 	}
 
-	function get_object_by_id( $term_id ) {
-		return get_term( $term_id, $this->taxonomy );
+	function get_object_by_id($term_id) {
+		return get_term($term_id, $this->taxonomy);
 	}
 }
 
@@ -309,90 +309,90 @@ 
 	 * can be generators -- an object with next() method. There are some default generators: {@link WP_UnitTest_Generator_Sequence},
 	 * {@link WP_UnitTest_Generator_Locale_Name}, {@link WP_UnitTest_Factory_Callback_After_Create}.
 	 */
-	function __construct( $factory, $default_generation_definitions = array() ) {
+	function __construct($factory, $default_generation_definitions = array()) {
 		$this->factory = $factory;
 		$this->default_generation_definitions = $default_generation_definitions;
 	}
 
-	abstract function create_object( $args );
-	abstract function update_object( $object, $fields );
+	abstract function create_object($args);
+	abstract function update_object($object, $fields);
 
-	function create( $args = array(), $generation_definitions = null ) {
-		if ( is_null( $generation_definitions ) )
+	function create($args = array(), $generation_definitions = null) {
+		if (is_null($generation_definitions))
 			$generation_definitions = $this->default_generation_definitions;
 
-		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
-		$created = $this->create_object( $generated_args );
-		if ( !$created || is_wp_error( $created ) )
+		$generated_args = $this->generate_args($args, $generation_definitions, $callbacks);
+		$created = $this->create_object($generated_args);
+		if (!$created || is_wp_error($created))
 			return $created;
 
-		if ( $callbacks ) {
-			$updated_fields = $this->apply_callbacks( $callbacks, $created );
-			$save_result = $this->update_object( $created, $updated_fields );
-			if ( !$save_result || is_wp_error( $save_result ) )
+		if ($callbacks) {
+			$updated_fields = $this->apply_callbacks($callbacks, $created);
+			$save_result = $this->update_object($created, $updated_fields);
+			if (!$save_result || is_wp_error($save_result))
 				return $save_result;
 		}
 		return $created;
 	}
 
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$object_id = $this->create( $args, $generation_definitions );
-		return $this->get_object_by_id( $object_id );
+	function create_and_get($args = array(), $generation_definitions = null) {
+		$object_id = $this->create($args, $generation_definitions);
+		return $this->get_object_by_id($object_id);
 	}
 
-	abstract function get_object_by_id( $object_id );
+	abstract function get_object_by_id($object_id);
 
-	function create_many( $count, $args = array(), $generation_definitions = null ) {
+	function create_many($count, $args = array(), $generation_definitions = null) {
 		$results = array();
-		for ( $i = 0; $i < $count; $i++ ) {
-			$results[] = $this->create( $args, $generation_definitions );
+		for ($i = 0; $i < $count; $i++) {
+			$results[] = $this->create($args, $generation_definitions);
 		}
 		return $results;
 	}
 
-	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
+	function generate_args($args = array(), $generation_definitions = null, &$callbacks = null) {
 		$callbacks = array();
-		if ( is_null( $generation_definitions ) )
+		if (is_null($generation_definitions))
 			$generation_definitions = $this->default_generation_definitions;
 
-		foreach( array_keys( $generation_definitions ) as $field_name ) {
-			if ( !isset( $args[$field_name] ) ) {
+		foreach (array_keys($generation_definitions) as $field_name) {
+			if (!isset($args[$field_name])) {
 				$generator = $generation_definitions[$field_name];
-				if ( is_scalar( $generator ) )
+				if (is_scalar($generator))
 					$args[$field_name] = $generator;
-				elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+				elseif (is_object($generator) && method_exists($generator, 'call')) {
 					$callbacks[$field_name] = $generator;
-				} elseif ( is_object( $generator ) )
+				} elseif (is_object($generator))
 					$args[$field_name] = $generator->next();
 				else
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+					return new WP_Error('invalid_argument', 'Factory default value should be either a scalar or an generator object.');
 			}
 		}
 		return $args;
 	}
 
-	function apply_callbacks( $callbacks, $created ) {
+	function apply_callbacks($callbacks, $created) {
 		$updated_fields = array();
-		foreach( $callbacks as $field_name => $generator ) {
-			$updated_fields[$field_name] = $generator->call( $created );
+		foreach ($callbacks as $field_name => $generator) {
+			$updated_fields[$field_name] = $generator->call($created);
 		}
 		return $updated_fields;
 	}
 
-	function callback( $function ) {
-		return new WP_UnitTest_Factory_Callback_After_Create( $function );
+	function callback($function) {
+		return new WP_UnitTest_Factory_Callback_After_Create($function);
 	}
 
 	function addslashes_deep($value) {
-		if ( is_array( $value ) ) {
-			$value = array_map( array( $this, 'addslashes_deep' ), $value );
-		} elseif ( is_object( $value ) ) {
-			$vars = get_object_vars( $value );
+		if (is_array($value)) {
+			$value = array_map(array($this, 'addslashes_deep'), $value);
+		} elseif (is_object($value)) {
+			$vars = get_object_vars($value);
 			foreach ($vars as $key=>$data) {
-				$value->{$key} = $this->addslashes_deep( $data );
+				$value->{$key} = $this->addslashes_deep($data);
 			}
-		} elseif ( is_string( $value ) ) {
-			$value = addslashes( $value );
+		} elseif (is_string($value)) {
+			$value = addslashes($value);
 		}
 
 		return $value;
@@ -405,8 +405,8 @@ 
 	public $next;
 	public $template_string;
 
-	function __construct( $template_string = '%s', $start = null ) {
-		if ( $start ) {
+	function __construct($template_string = '%s', $start = null) {
+		if ($start) {
 			$this->next = $start;
 		} else {
 			self::$incr++;
@@ -416,7 +416,7 @@ 
 	}
 
 	function next() {
-		$generated = sprintf( $this->template_string , $this->next );
+		$generated = sprintf($this->template_string, $this->next);
 		$this->next++;
 		return $generated;
 	}
@@ -425,11 +425,11 @@ 
 class WP_UnitTest_Factory_Callback_After_Create {
 	var $callback;
 
-	function __construct( $callback ) {
+	function __construct($callback) {
 		$this->callback = $callback;
 	}
 
-	function call( $object ) {
-		return call_user_func( $this->callback, $object );
+	function call($object) {
+		return call_user_func($this->callback, $object);
 	}
 }

tests/lib/wordpress-tests-lib/includes/functions.php

Doc Comments +6 added lines

@@ -10,6 +10,9 @@ 
 	return true;
 }
 
+/**
+ * @param integer $priority
+ */
 function _test_filter_build_unique_id($tag, $function, $priority) {
 	global $wp_filter;
 	static $filter_id_count = 0;
@@ -92,6 +95,9 @@ 
 	return '_wp_die_handler';
 }
 
+/**
+ * @param string $title
+ */
 function _wp_die_handler_txt( $message, $title, $args ) {
 	echo "\nwp_die called\n";
 	echo "Message : $message\n";

Braces +6 added lines, -4 removed lines

@@ -14,8 +14,9 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
-		return $function;
+	if ( is_string($function) ) {
+			return $function;
+	}
 
 	if ( is_object($function) ) {
 		// Closures are currently implemented as objects
@@ -37,8 +38,9 @@ 
 
 	$all_posts = $wpdb->get_col("SELECT ID from {$wpdb->posts}");
 	if ($all_posts) {
-		foreach ($all_posts as $id)
-			wp_delete_post( $id, true );
+		foreach ($all_posts as $id) {
+					wp_delete_post( $id, true );
+		}
 	}
 }
 

Spacing +23 added lines, -23 removed lines

@@ -6,7 +6,7 @@ 
 
 	$idx = _test_filter_build_unique_id($tag, $function_to_add, $priority);
 	$wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
-	unset( $merged_filters[ $tag ] );
+	unset($merged_filters[$tag]);
 	return true;
 }
 
@@ -14,19 +14,19 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
+	if (is_string($function))
 		return $function;
 
-	if ( is_object($function) ) {
+	if (is_object($function)) {
 		// Closures are currently implemented as objects
-		$function = array( $function, '' );
+		$function = array($function, '');
 	} else {
 		$function = (array) $function;
 	}
 
-	if (is_object($function[0]) ) {
-		return spl_object_hash($function[0]) . $function[1];
-	} else if ( is_string($function[0]) ) {
+	if (is_object($function[0])) {
+		return spl_object_hash($function[0]).$function[1];
+	} else if (is_string($function[0])) {
 		// Static Calling
 		return $function[0].$function[1];
 	}
@@ -38,31 +38,31 @@ 
 	$all_posts = $wpdb->get_col("SELECT ID from {$wpdb->posts}");
 	if ($all_posts) {
 		foreach ($all_posts as $id)
-			wp_delete_post( $id, true );
+			wp_delete_post($id, true);
 	}
 }
 
 class Basic_Object {
 	private $foo = 'bar';
 
-	public function __get( $name ) {
+	public function __get($name) {
 		return $this->{$name};
 	}
 
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		return $this->{$name} = $value;
 	}
 
-	public function __isset( $name ) {
-		return isset( $this->{$name} );
+	public function __isset($name) {
+		return isset($this->{$name} );
 	}
 
-	public function __unset( $name ) {
-		unset( $this->{$name} );
+	public function __unset($name) {
+		unset($this->{$name} );
 	}
 
-	public function __call( $name, $arguments ) {
-		return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		return call_user_func_array(array($this, $name), $arguments);
 	}
 
 	private function callMe() {
@@ -72,9 +72,9 @@ 
 
 class Basic_Subclass extends Basic_Object {}
 
-function _wp_die_handler( $message, $title = '', $args = array() ) {
-	if ( !$GLOBALS['_wp_die_disabled'] ) {
-		_wp_die_handler_txt( $message, $title, $args);
+function _wp_die_handler($message, $title = '', $args = array()) {
+	if (!$GLOBALS['_wp_die_disabled']) {
+		_wp_die_handler_txt($message, $title, $args);
 	} else {
 		//Ignore at our peril
 	}
@@ -92,13 +92,13 @@ 
 	return '_wp_die_handler';
 }
 
-function _wp_die_handler_txt( $message, $title, $args ) {
+function _wp_die_handler_txt($message, $title, $args) {
 	echo "\nwp_die called\n";
 	echo "Message : $message\n";
 	echo "Title : $title\n";
-	if ( ! empty( $args ) ) {
+	if (!empty($args)) {
 		echo "Args: \n";
-		foreach( $args as $k => $v ){
+		foreach ($args as $k => $v) {
 			echo "\t $k : $v\n";
 		}
 	}
@@ -113,5 +113,5 @@ 
  * @since 4.2.0
  */
 function _set_default_permalink_structure_for_tests() {
-	update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
+	update_option('permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
 }

tests/lib/wordpress-tests-lib/includes/mock-fs.php

Doc Comments +4 added lines

@@ -49,6 +49,7 @@ 
 
 	/**
 	 * "Bulk Loads" a filesystem into the internal virtual filesystem
+	 * @param string $paths
 	 */
 	function setfs( $paths ) {
 		if ( ! is_array($paths) )
@@ -144,6 +145,9 @@ 
 		return isset( $this->fs_map[ $file ] ) && $this->fs_map[ $file ]->is_file();
 	}
 
+	/**
+	 * @param string $path
+	 */
 	function is_dir( $path ) {
 		$path = trailingslashit( $path );
 

Braces +49 added lines, -33 removed lines

@@ -21,13 +21,15 @@ 
 
 	// Copy of core's function, but accepts a path.
 	function abspath( $path = false ) {
-		if ( ! $path )
-			$path = ABSPATH;
+		if ( ! $path ) {
+					$path = ABSPATH;
+		}
 		$folder = $this->find_folder( $path );
 
 		// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
-		if ( ! $folder && $this->is_dir('/wp-includes') )
-			$folder = '/';
+		if ( ! $folder && $this->is_dir('/wp-includes') ) {
+					$folder = '/';
+		}
 		return $folder;
 	}
 
@@ -51,21 +53,25 @@ 
 	 * "Bulk Loads" a filesystem into the internal virtual filesystem
 	 */
 	function setfs( $paths ) {
-		if ( ! is_array($paths) )
-			$paths = explode( "\n", $paths );
+		if ( ! is_array($paths) ) {
+					$paths = explode( "\n", $paths );
+		}
 
 		$paths = array_filter( array_map( 'trim', $paths ) );
 
 		foreach ( $paths as $path ) {
 			// Allow for comments
-			if ( '#' == $path[0] )
-				continue;
+			if ( '#' == $path[0] ) {
+							continue;
+			}
 
 			// Directories
-			if ( '/' == $path[ strlen($path) -1 ] )
-				$this->mkdir( $path );
-			else // Files (with dummy content for now)
+			if ( '/' == $path[ strlen($path) -1 ] ) {
+							$this->mkdir( $path );
+			} else {
+				// Files (with dummy content for now)
 				$this->put_contents( $path, 'This is a test file' );
+			}
 		}
 
 	}
@@ -95,8 +101,9 @@ 
 			$dirname = str_replace( '\\', '/', dirname( $path ) );
 			$this->mkdir( $dirname );
 			$parent_node = $this->locate_parent_node( $path );
-			if ( ! $parent_node )
-				return false;
+			if ( ! $parent_node ) {
+							return false;
+			}
 		}
 
 		$node = new MockFS_Directory_Node( $path );
@@ -108,8 +115,9 @@ 
 	}
 
 	function put_contents( $path, $contents = '', $mode = null ) {
-		if ( ! $this->is_dir( dirname( $path ) ) )
-			$this->mkdir( dirname( $path ) );
+		if ( ! $this->is_dir( dirname( $path ) ) ) {
+					$this->mkdir( dirname( $path ) );
+		}
 
 		$parent = $this->locate_parent_node( $path );
 		$new_file = new MockFS_File_Node( $path, $contents );
@@ -119,8 +127,9 @@ 
 	}
 
 	function get_contents( $file ) {
-		if ( ! $this->is_file( $file ) )
-			return false;
+		if ( ! $this->is_file( $file ) ) {
+					return false;
+		}
 		return $this->fs_map[ $file ]->contents;
 	}
 
@@ -129,8 +138,9 @@ 
 	}
 
 	function chdir( $path ) {
-		if ( ! isset( $this->fs_map[ $path ] ) )
-			return false;
+		if ( ! isset( $this->fs_map[ $path ] ) ) {
+					return false;
+		}
 
 		$this->cwd = $this->fs_map[ $path ];
 		return true;
@@ -152,11 +162,13 @@ 
 
 	function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
 
-		if ( empty( $path ) || '.' == $path )
-			$path = $this->cwd();
+		if ( empty( $path ) || '.' == $path ) {
+					$path = $this->cwd();
+		}
 
-		if ( ! $this->exists( $path ) )
-			return false;
+		if ( ! $this->exists( $path ) ) {
+					return false;
+		}
 
 		$limit_file = false;
 		if ( $this->is_file( $path ) ) {
@@ -166,24 +178,28 @@ 
 
 		$ret = array();
 		foreach ( $this->fs_map[ $path ]->children as $entry ) {
-			if ( '.' == $entry->name || '..' == $entry->name )
-				continue;
+			if ( '.' == $entry->name || '..' == $entry->name ) {
+							continue;
+			}
 
-			if ( ! $include_hidden && '.' == $entry->name )
-				continue;
+			if ( ! $include_hidden && '.' == $entry->name ) {
+							continue;
+			}
 
-			if ( $limit_file && $entry->name != $limit_file )
-				continue;
+			if ( $limit_file && $entry->name != $limit_file ) {
+							continue;
+			}
 
 			$struc = array();
 			$struc['name'] = $entry->name;
 			$struc['type'] = $entry->type;
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist( trailingslashit( $path ) . trailingslashit( $struc['name'] ), $include_hidden, $recursive );
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist( trailingslashit( $path ) . trailingslashit( $struc['name'] ), $include_hidden, $recursive );
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $entry->name ] = $struc;

Spacing +71 added lines, -71 removed lines

@@ -20,13 +20,13 @@ 
 	}
 
 	// Copy of core's function, but accepts a path.
-	function abspath( $path = false ) {
-		if ( ! $path )
+	function abspath($path = false) {
+		if (!$path)
 			$path = ABSPATH;
-		$folder = $this->find_folder( $path );
+		$folder = $this->find_folder($path);
 
 		// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
-		if ( ! $folder && $this->is_dir('/wp-includes') )
+		if (!$folder && $this->is_dir('/wp-includes'))
 			$folder = '/';
 		return $folder;
 	}
@@ -37,35 +37,35 @@ 
 	 * Sets initial filesystem environment and/or clears the current environment.
 	 * Can also be passed the initial filesystem to be setup which is passed to self::setfs()
 	 */
-	function init( $paths = '', $home_dir = '/' ) {
-		$this->fs = new MockFS_Directory_Node( '/' );
+	function init($paths = '', $home_dir = '/') {
+		$this->fs = new MockFS_Directory_Node('/');
 		$this->fs_map = array(
 			'/' => $this->fs,
 		);
 		$this->cache = array(); // Used by find_folder() and friends
-		$this->cwd = isset( $this->fs_map[ $home_dir ] ) ? $this->fs_map[ $home_dir ] : '/';
-		$this->setfs( $paths );
+		$this->cwd = isset($this->fs_map[$home_dir]) ? $this->fs_map[$home_dir] : '/';
+		$this->setfs($paths);
 	}
 
 	/**
 	 * "Bulk Loads" a filesystem into the internal virtual filesystem
 	 */
-	function setfs( $paths ) {
-		if ( ! is_array($paths) )
-			$paths = explode( "\n", $paths );
+	function setfs($paths) {
+		if (!is_array($paths))
+			$paths = explode("\n", $paths);
 
-		$paths = array_filter( array_map( 'trim', $paths ) );
+		$paths = array_filter(array_map('trim', $paths));
 
-		foreach ( $paths as $path ) {
+		foreach ($paths as $path) {
 			// Allow for comments
-			if ( '#' == $path[0] )
+			if ('#' == $path[0])
 				continue;
 
 			// Directories
-			if ( '/' == $path[ strlen($path) -1 ] )
-				$this->mkdir( $path );
+			if ('/' == $path[strlen($path) - 1])
+				$this->mkdir($path);
 			else // Files (with dummy content for now)
-				$this->put_contents( $path, 'This is a test file' );
+				$this->put_contents($path, 'This is a test file');
 		}
 
 	}
@@ -73,120 +73,120 @@ 
 	/**
 	 * Locates a filesystem "node"
 	 */
-	private function locate_node( $path ) {
-		return isset( $this->fs_map[ $path ] ) ? $this->fs_map[ $path ] : false;
+	private function locate_node($path) {
+		return isset($this->fs_map[$path]) ? $this->fs_map[$path] : false;
 	}
 
 	/**
 	 * Locates a filesystem node for the parent of the given item
 	 */
-	private function locate_parent_node( $path ) {
-		$dirname = str_replace( '\\', '/', dirname( $path ) );
-		return $this->locate_node( trailingslashit( $dirname ) );
+	private function locate_parent_node($path) {
+		$dirname = str_replace('\\', '/', dirname($path));
+		return $this->locate_node(trailingslashit($dirname));
 	}
 
 	// Here starteth the WP_Filesystem functions.
 
-	function mkdir( $path, /* Optional args are ignored */ $chmod = false, $chown = false, $chgrp = false ) {
-		$path = trailingslashit( $path );
+	function mkdir($path, /* Optional args are ignored */ $chmod = false, $chown = false, $chgrp = false) {
+		$path = trailingslashit($path);
 
-		$parent_node = $this->locate_parent_node( $path );
-		if ( ! $parent_node ) {
-			$dirname = str_replace( '\\', '/', dirname( $path ) );
-			$this->mkdir( $dirname );
-			$parent_node = $this->locate_parent_node( $path );
-			if ( ! $parent_node )
+		$parent_node = $this->locate_parent_node($path);
+		if (!$parent_node) {
+			$dirname = str_replace('\\', '/', dirname($path));
+			$this->mkdir($dirname);
+			$parent_node = $this->locate_parent_node($path);
+			if (!$parent_node)
 				return false;
 		}
 
-		$node = new MockFS_Directory_Node( $path );
+		$node = new MockFS_Directory_Node($path);
 
-		$parent_node->children[ $node->name ] = $node;
-		$this->fs_map[ $path ] = $node;
+		$parent_node->children[$node->name] = $node;
+		$this->fs_map[$path] = $node;
 
 		return true;
 	}
 
-	function put_contents( $path, $contents = '', $mode = null ) {
-		if ( ! $this->is_dir( dirname( $path ) ) )
-			$this->mkdir( dirname( $path ) );
+	function put_contents($path, $contents = '', $mode = null) {
+		if (!$this->is_dir(dirname($path)))
+			$this->mkdir(dirname($path));
 
-		$parent = $this->locate_parent_node( $path );
-		$new_file = new MockFS_File_Node( $path, $contents );
+		$parent = $this->locate_parent_node($path);
+		$new_file = new MockFS_File_Node($path, $contents);
 
-		$parent->children[ $new_file->name ] = $new_file;
-		$this->fs_map[ $path ] = $new_file;
+		$parent->children[$new_file->name] = $new_file;
+		$this->fs_map[$path] = $new_file;
 	}
 
-	function get_contents( $file ) {
-		if ( ! $this->is_file( $file ) )
+	function get_contents($file) {
+		if (!$this->is_file($file))
 			return false;
-		return $this->fs_map[ $file ]->contents;
+		return $this->fs_map[$file]->contents;
 	}
 
 	function cwd() {
 		return $this->cwd->path;
 	}
 
-	function chdir( $path ) {
-		if ( ! isset( $this->fs_map[ $path ] ) )
+	function chdir($path) {
+		if (!isset($this->fs_map[$path]))
 			return false;
 
-		$this->cwd = $this->fs_map[ $path ];
+		$this->cwd = $this->fs_map[$path];
 		return true;
 	}
 
-	function exists( $path ) {
-		return isset( $this->fs_map[ $path ] ) || isset( $this->fs_map[ trailingslashit( $path ) ] );
+	function exists($path) {
+		return isset($this->fs_map[$path]) || isset($this->fs_map[trailingslashit($path)]);
 	}
 
-	function is_file( $file ) {
-		return isset( $this->fs_map[ $file ] ) && $this->fs_map[ $file ]->is_file();
+	function is_file($file) {
+		return isset($this->fs_map[$file]) && $this->fs_map[$file]->is_file();
 	}
 
-	function is_dir( $path ) {
-		$path = trailingslashit( $path );
+	function is_dir($path) {
+		$path = trailingslashit($path);
 
-		return isset( $this->fs_map[ $path ] ) && $this->fs_map[ $path ]->is_dir();
+		return isset($this->fs_map[$path]) && $this->fs_map[$path]->is_dir();
 	}
 
-	function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
+	function dirlist($path = '.', $include_hidden = true, $recursive = false) {
 
-		if ( empty( $path ) || '.' == $path )
+		if (empty($path) || '.' == $path)
 			$path = $this->cwd();
 
-		if ( ! $this->exists( $path ) )
+		if (!$this->exists($path))
 			return false;
 
 		$limit_file = false;
-		if ( $this->is_file( $path ) ) {
-			$limit_file = $this->locate_node( $path )->name;
-			$path = dirname( $path ) . '/';
+		if ($this->is_file($path)) {
+			$limit_file = $this->locate_node($path)->name;
+			$path = dirname($path).'/';
 		}
 
 		$ret = array();
-		foreach ( $this->fs_map[ $path ]->children as $entry ) {
-			if ( '.' == $entry->name || '..' == $entry->name )
+		foreach ($this->fs_map[$path]->children as $entry) {
+			if ('.' == $entry->name || '..' == $entry->name)
 				continue;
 
-			if ( ! $include_hidden && '.' == $entry->name )
+			if (!$include_hidden && '.' == $entry->name)
 				continue;
 
-			if ( $limit_file && $entry->name != $limit_file )
+			if ($limit_file && $entry->name != $limit_file)
 				continue;
 
 			$struc = array();
 			$struc['name'] = $entry->name;
 			$struc['type'] = $entry->type;
 
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist( trailingslashit( $path ) . trailingslashit( $struc['name'] ), $include_hidden, $recursive );
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist(trailingslashit($path).trailingslashit($struc['name']), $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $entry->name ] = $struc;
+			$ret[$entry->name] = $struc;
 		}
 		return $ret;
 	}
@@ -198,9 +198,9 @@ 
 	public $type; // The type of the entry 'f' for file, 'd' for Directory
 	public $path; // The full path to the entry.
 
-	function __construct( $path ) {
+	function __construct($path) {
 		$this->path = $path;
-		$this->name = basename( $path );
+		$this->name = basename($path);
 	}
 
 	function is_file() {
@@ -221,8 +221,8 @@ 
 	public $type = 'f';
 	public $contents = ''; // The contents of the file
 
-	function __construct( $path, $contents = '' ) {
-		parent::__construct( $path );
+	function __construct($path, $contents = '') {
+		parent::__construct($path);
 		$this->contents = $contents;
 	}
 }
\ No newline at end of file

tests/lib/wordpress-tests-lib/includes/testcase.php

Doc Comments -3 removed lines

@@ -336,8 +336,6 @@ 
 	 *
 	 * @since 4.2.0
 	 *
-	 * @param string $deprecated Name of the function, method, or class that appears in the first argument of the
-	 *                           source `_doing_it_wrong()` call.
 	 */
 	public function setExpectedIncorrectUsage( $doing_it_wrong ) {
 		array_push( $this->expected_doing_it_wrong, $doing_it_wrong );
@@ -525,7 +523,6 @@ 
 	 * expected to be false. For example, assertQueryTrue('is_single', 'is_feed') means is_single()
 	 * and is_feed() must be true and everything else must be false to pass.
 	 *
-	 * @param string $prop,... Any number of WP_Query properties that are expected to be true for the current request.
 	 */
 	function assertQueryTrue(/* ... */) {
 		global $wp_query;

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	function __get( $name ) {
 		if ( 'factory' === $name ) {
 			return self::factory();
- 	    }
+ 		}
  	}
 
 	protected static function factory() {

Braces +60 added lines, -39 removed lines

@@ -256,14 +256,16 @@ 
 	}
 
 	function _create_temporary_tables( $query ) {
-		if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) )
-			return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
+		if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) ) {
+					return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
+		}
 		return $query;
 	}
 
 	function _drop_temporary_tables( $query ) {
-		if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) )
-			return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
+		if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) ) {
+					return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
+		}
 		return $query;
 	}
 
@@ -278,10 +280,12 @@ 
 	function expectDeprecated() {
 		$annotations = $this->getAnnotations();
 		foreach ( array( 'class', 'method' ) as $depth ) {
-			if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) )
-				$this->expected_deprecated = array_merge( $this->expected_deprecated, $annotations[ $depth ]['expectedDeprecated'] );
-			if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) )
-				$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $annotations[ $depth ]['expectedIncorrectUsage'] );
+			if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) ) {
+							$this->expected_deprecated = array_merge( $this->expected_deprecated, $annotations[ $depth ]['expectedDeprecated'] );
+			}
+			if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) ) {
+							$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $annotations[ $depth ]['expectedIncorrectUsage'] );
+			}
 		}
 		add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
 		add_action( 'deprecated_argument_run', array( $this, 'deprecated_function_run' ) );
@@ -344,13 +348,15 @@ 
 	}
 
 	function deprecated_function_run( $function ) {
-		if ( ! in_array( $function, $this->caught_deprecated ) )
-			$this->caught_deprecated[] = $function;
+		if ( ! in_array( $function, $this->caught_deprecated ) ) {
+					$this->caught_deprecated[] = $function;
+		}
 	}
 
 	function doing_it_wrong_run( $function ) {
-		if ( ! in_array( $function, $this->caught_doing_it_wrong ) )
-			$this->caught_doing_it_wrong[] = $function;
+		if ( ! in_array( $function, $this->caught_doing_it_wrong ) ) {
+					$this->caught_doing_it_wrong[] = $function;
+		}
 	}
 
 	function assertWPError( $actual, $message = '' ) {
@@ -394,7 +400,9 @@ 
 		// to run them more than once without very carefully clearing everything
 		$_GET = $_POST = array();
 		foreach (array('query_string', 'id', 'postdata', 'authordata', 'day', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages', 'pagenow') as $v) {
-			if ( isset( $GLOBALS[$v] ) ) unset( $GLOBALS[$v] );
+			if ( isset( $GLOBALS[$v] ) ) {
+				unset( $GLOBALS[$v] );
+			}
 		}
 		$parts = parse_url($url);
 		if (isset($parts['scheme'])) {
@@ -439,20 +447,23 @@ 
 			return;
 		}
 
-		if ( WP_TESTS_FORCE_KNOWN_BUGS )
-			return;
+		if ( WP_TESTS_FORCE_KNOWN_BUGS ) {
+					return;
+		}
 		$tickets = PHPUnit_Util_Test::getTickets( get_class( $this ), $this->getName( false ) );
 		foreach ( $tickets as $ticket ) {
 			if ( is_numeric( $ticket ) ) {
 				$this->knownWPBug( $ticket );
 			} elseif ( 'UT' == substr( $ticket, 0, 2 ) ) {
 				$ticket = substr( $ticket, 2 );
-				if ( $ticket && is_numeric( $ticket ) )
-					$this->knownUTBug( $ticket );
+				if ( $ticket && is_numeric( $ticket ) ) {
+									$this->knownUTBug( $ticket );
+				}
 			} elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) {
 				$ticket = substr( $ticket, 6 );
-				if ( $ticket && is_numeric( $ticket ) )
-					$this->knownPluginBug( $ticket );
+				if ( $ticket && is_numeric( $ticket ) ) {
+									$this->knownPluginBug( $ticket );
+				}
 			}
 		}
 	}
@@ -461,30 +472,36 @@ 
 	 * Skips the current test if there is an open WordPress ticket with id $ticket_id
 	 */
 	function knownWPBug( $ticket_id ) {
-		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) )
-			return;
-		if ( ! TracTickets::isTracTicketClosed( 'https://core.trac.wordpress.org', $ticket_id ) )
-			$this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
+		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) ) {
+					return;
+		}
+		if ( ! TracTickets::isTracTicketClosed( 'https://core.trac.wordpress.org', $ticket_id ) ) {
+					$this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
+		}
 	}
 
 	/**
 	 * Skips the current test if there is an open unit tests ticket with id $ticket_id
 	 */
 	function knownUTBug( $ticket_id ) {
-		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'UT' . $ticket_id, self::$forced_tickets ) )
-			return;
-		if ( ! TracTickets::isTracTicketClosed( 'https://unit-tests.trac.wordpress.org', $ticket_id ) )
-			$this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
+		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'UT' . $ticket_id, self::$forced_tickets ) ) {
+					return;
+		}
+		if ( ! TracTickets::isTracTicketClosed( 'https://unit-tests.trac.wordpress.org', $ticket_id ) ) {
+					$this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
+		}
 	}
 
 	/**
 	 * Skips the current test if there is an open plugin ticket with id $ticket_id
 	 */
 	function knownPluginBug( $ticket_id ) {
-		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) )
-			return;
-		if ( ! TracTickets::isTracTicketClosed( 'https://plugins.trac.wordpress.org', $ticket_id ) )
-			$this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
+		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) ) {
+					return;
+		}
+		if ( ! TracTickets::isTracTicketClosed( 'https://plugins.trac.wordpress.org', $ticket_id ) ) {
+					$this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
+		}
 	}
 
 	public static function forceTicket( $ticket ) {
@@ -506,9 +523,10 @@ 
 	function temp_filename() {
 		$tmp_dir = '';
 		$dirs = array( 'TMP', 'TMPDIR', 'TEMP' );
-		foreach( $dirs as $dir )
-			if ( isset( $_ENV[$dir] ) && !empty( $_ENV[$dir] ) ) {
+		foreach( $dirs as $dir ) {
+					if ( isset( $_ENV[$dir] ) && !empty( $_ENV[$dir] ) ) {
 				$tmp_dir = $dir;
+		}
 				break;
 			}
 		if ( empty( $tmp_dir ) ) {
@@ -579,10 +597,12 @@ 
 		}
 
 		$message = '';
-		if ( count($not_true) )
-			$message .= implode( $not_true, ', ' ) . ' is expected to be true. ';
-		if ( count($not_false) )
-			$message .= implode( $not_false, ', ' ) . ' is expected to be false.';
+		if ( count($not_true) ) {
+					$message .= implode( $not_true, ', ' ) . ' is expected to be true. ';
+		}
+		if ( count($not_false) ) {
+					$message .= implode( $not_false, ', ' ) . ' is expected to be false.';
+		}
 		$this->assertTrue( $passed, $message );
 	}
 
@@ -702,8 +722,9 @@ 
 			$type = $upload['type'];
 		} else {
 			$mime = wp_check_filetype( $upload['file'] );
-			if ($mime)
-				$type = $mime['type'];
+			if ($mime) {
+							$type = $mime['type'];
+			}
 		}
 
 		$attachment = array(

Spacing +204 added lines, -204 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-require_once dirname( __FILE__ ) . '/factory.php';
-require_once dirname( __FILE__ ) . '/trac.php';
+require_once dirname(__FILE__).'/factory.php';
+require_once dirname(__FILE__).'/trac.php';
 
 class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
 
@@ -14,26 +14,26 @@ 
 	protected static $hooks_saved = array();
 	protected static $ignore_files;
 
-	function __isset( $name ) {
+	function __isset($name) {
 		return 'factory' === $name;
  	}
 
-	function __get( $name ) {
-		if ( 'factory' === $name ) {
+	function __get($name) {
+		if ('factory' === $name) {
 			return self::factory();
  	    }
  	}
 
 	protected static function factory() {
 		static $factory = null;
-		if ( ! $factory ) {
+		if (!$factory) {
 			$factory = new WP_UnitTest_Factory();
 		}
 		return $factory;
 	}
 
 	public static function get_called_class() {
-		if ( function_exists( 'get_called_class' ) ) {
+		if (function_exists('get_called_class')) {
 			return get_called_class();
 		}
 
@@ -41,7 +41,7 @@ 
 		$backtrace = debug_backtrace();
 		// [0] WP_UnitTestCase::get_called_class()
 		// [1] WP_UnitTestCase::setUpBeforeClass()
-		if ( 'call_user_func' ===  $backtrace[2]['function'] ) {
+		if ('call_user_func' === $backtrace[2]['function']) {
 			return $backtrace[2]['args'][0][0];
 		}
 		return $backtrace[2]['class'];
@@ -51,11 +51,11 @@ 
 		parent::setUpBeforeClass();
 
 		$c = self::get_called_class();
-		if ( ! method_exists( $c, 'wpSetUpBeforeClass' ) ) {
+		if (!method_exists($c, 'wpSetUpBeforeClass')) {
 			return;
 		}
 
-		call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::factory() );
+		call_user_func(array($c, 'wpSetUpBeforeClass'), self::factory());
 
 		self::commit_transaction();
 	}
@@ -64,11 +64,11 @@ 
 		parent::tearDownAfterClass();
 
 		$c = self::get_called_class();
-		if ( ! method_exists( $c, 'wpTearDownAfterClass' ) ) {
+		if (!method_exists($c, 'wpTearDownAfterClass')) {
 			return;
 		}
 
-		call_user_func( array( $c, 'wpTearDownAfterClass' ) );
+		call_user_func(array($c, 'wpTearDownAfterClass'));
 
 		self::commit_transaction();
 	}
@@ -76,11 +76,11 @@ 
 	function setUp() {
 		set_time_limit(0);
 
-		if ( ! self::$ignore_files ) {
+		if (!self::$ignore_files) {
 			self::$ignore_files = $this->scan_user_uploads();
 		}
 
-		if ( ! self::$hooks_saved ) {
+		if (!self::$hooks_saved) {
 			$this->_backup_hooks();
 		}
 
@@ -88,7 +88,7 @@ 
 		$wpdb->suppress_errors = false;
 		$wpdb->show_errors = true;
 		$wpdb->db_connect();
-		ini_set('display_errors', 1 );
+		ini_set('display_errors', 1);
 		$this->clean_up_global_scope();
 
 		/*
@@ -97,19 +97,19 @@ 
 		 * given the large number of plugins that register post types and
 		 * taxonomies at 'init'.
 		 */
-		if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
+		if (defined('WP_RUN_CORE_TESTS') && WP_RUN_CORE_TESTS) {
 			$this->reset_post_types();
 			$this->reset_taxonomies();
 			$this->reset_post_statuses();
 
-			if ( $wp_rewrite->permalink_structure ) {
-				$this->set_permalink_structure( '' );
+			if ($wp_rewrite->permalink_structure) {
+				$this->set_permalink_structure('');
 			}
 		}
 
 		$this->start_transaction();
 		$this->expectDeprecated();
-		add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
+		add_filter('wp_die_handler', array($this, 'get_wp_die_handler'));
 	}
 
 	/**
@@ -125,21 +125,21 @@ 
 
 	function tearDown() {
 		global $wpdb, $wp_query, $wp, $post;
-		$wpdb->query( 'ROLLBACK' );
-		if ( is_multisite() ) {
-			while ( ms_is_switched() ) {
+		$wpdb->query('ROLLBACK');
+		if (is_multisite()) {
+			while (ms_is_switched()) {
 				restore_current_blog();
 			}
 		}
 		$wp_query = new WP_Query();
 		$wp = new WP();
 		$post = null;
-		remove_theme_support( 'html5' );
-		remove_filter( 'query', array( $this, '_create_temporary_tables' ) );
-		remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
-		remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
+		remove_theme_support('html5');
+		remove_filter('query', array($this, '_create_temporary_tables'));
+		remove_filter('query', array($this, '_drop_temporary_tables'));
+		remove_filter('wp_die_handler', array($this, 'get_wp_die_handler'));
 		$this->_restore_hooks();
-		wp_set_current_user( 0 );
+		wp_set_current_user(0);
 	}
 
 	function clean_up_global_scope() {
@@ -156,8 +156,8 @@ 
 	 * it has a chance to do so.
 	 */
 	protected function reset_post_types() {
-		foreach ( get_post_types() as $pt ) {
-			_unregister_post_type( $pt );
+		foreach (get_post_types() as $pt) {
+			_unregister_post_type($pt);
 		}
 		create_initial_post_types();
 	}
@@ -170,8 +170,8 @@ 
 	 * it has a chance to do so.
 	 */
 	protected function reset_taxonomies() {
-		foreach ( get_taxonomies() as $tax ) {
-			_unregister_taxonomy( $tax );
+		foreach (get_taxonomies() as $tax) {
+			_unregister_taxonomy($tax);
 		}
 		create_initial_taxonomies();
 	}
@@ -180,8 +180,8 @@ 
 	 * Unregister non-built-in post statuses.
 	 */
 	protected function reset_post_statuses() {
-		foreach ( get_post_stati( array( '_builtin' => false ) ) as $post_status ) {
-			_unregister_post_status( $post_status );
+		foreach (get_post_stati(array('_builtin' => false)) as $post_status) {
+			_unregister_post_status($post_status);
 		}
 	}
 
@@ -198,9 +198,9 @@ 
 	 * @return void
 	 */
 	protected function _backup_hooks() {
-		$globals = array( 'merged_filters', 'wp_actions', 'wp_current_filter', 'wp_filter' );
-		foreach ( $globals as $key ) {
-			self::$hooks_saved[ $key ] = $GLOBALS[ $key ];
+		$globals = array('merged_filters', 'wp_actions', 'wp_current_filter', 'wp_filter');
+		foreach ($globals as $key) {
+			self::$hooks_saved[$key] = $GLOBALS[$key];
 		}
 	}
 
@@ -215,10 +215,10 @@ 
 	 * @return void
 	 */
 	protected function _restore_hooks() {
-		$globals = array( 'merged_filters', 'wp_actions', 'wp_current_filter', 'wp_filter' );
-		foreach ( $globals as $key ) {
-			if ( isset( self::$hooks_saved[ $key ] ) ) {
-				$GLOBALS[ $key ] = self::$hooks_saved[ $key ];
+		$globals = array('merged_filters', 'wp_actions', 'wp_current_filter', 'wp_filter');
+		foreach ($globals as $key) {
+			if (isset(self::$hooks_saved[$key])) {
+				$GLOBALS[$key] = self::$hooks_saved[$key];
 			}
 		}
 	}
@@ -229,20 +229,20 @@ 
 		$wp_object_cache->stats = array();
 		$wp_object_cache->memcache_debug = array();
 		$wp_object_cache->cache = array();
-		if ( method_exists( $wp_object_cache, '__remoteset' ) ) {
+		if (method_exists($wp_object_cache, '__remoteset')) {
 			$wp_object_cache->__remoteset();
 		}
 		wp_cache_flush();
-		wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
-		wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+		wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache'));
+		wp_cache_add_non_persistent_groups(array('comment', 'counts', 'plugins'));
 	}
 
 	function start_transaction() {
 		global $wpdb;
-		$wpdb->query( 'SET autocommit = 0;' );
-		$wpdb->query( 'START TRANSACTION;' );
-		add_filter( 'query', array( $this, '_create_temporary_tables' ) );
-		add_filter( 'query', array( $this, '_drop_temporary_tables' ) );
+		$wpdb->query('SET autocommit = 0;');
+		$wpdb->query('START TRANSACTION;');
+		add_filter('query', array($this, '_create_temporary_tables'));
+		add_filter('query', array($this, '_drop_temporary_tables'));
 	}
 
 	/**
@@ -252,70 +252,70 @@ 
 	 */
 	public static function commit_transaction() {
 		global $wpdb;
-		$wpdb->query( 'COMMIT;' );
+		$wpdb->query('COMMIT;');
 	}
 
-	function _create_temporary_tables( $query ) {
-		if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) )
-			return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
+	function _create_temporary_tables($query) {
+		if ('CREATE TABLE' === substr(trim($query), 0, 12))
+			return substr_replace(trim($query), 'CREATE TEMPORARY TABLE', 0, 12);
 		return $query;
 	}
 
-	function _drop_temporary_tables( $query ) {
-		if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) )
-			return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
+	function _drop_temporary_tables($query) {
+		if ('DROP TABLE' === substr(trim($query), 0, 10))
+			return substr_replace(trim($query), 'DROP TEMPORARY TABLE', 0, 10);
 		return $query;
 	}
 
-	function get_wp_die_handler( $handler ) {
-		return array( $this, 'wp_die_handler' );
+	function get_wp_die_handler($handler) {
+		return array($this, 'wp_die_handler');
 	}
 
-	function wp_die_handler( $message ) {
-		throw new WPDieException( $message );
+	function wp_die_handler($message) {
+		throw new WPDieException($message);
 	}
 
 	function expectDeprecated() {
 		$annotations = $this->getAnnotations();
-		foreach ( array( 'class', 'method' ) as $depth ) {
-			if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) )
-				$this->expected_deprecated = array_merge( $this->expected_deprecated, $annotations[ $depth ]['expectedDeprecated'] );
-			if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) )
-				$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $annotations[ $depth ]['expectedIncorrectUsage'] );
+		foreach (array('class', 'method') as $depth) {
+			if (!empty($annotations[$depth]['expectedDeprecated']))
+				$this->expected_deprecated = array_merge($this->expected_deprecated, $annotations[$depth]['expectedDeprecated']);
+			if (!empty($annotations[$depth]['expectedIncorrectUsage']))
+				$this->expected_doing_it_wrong = array_merge($this->expected_doing_it_wrong, $annotations[$depth]['expectedIncorrectUsage']);
 		}
-		add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
-		add_action( 'deprecated_argument_run', array( $this, 'deprecated_function_run' ) );
-		add_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ) );
-		add_action( 'deprecated_function_trigger_error', '__return_false' );
-		add_action( 'deprecated_argument_trigger_error', '__return_false' );
-		add_action( 'doing_it_wrong_trigger_error',      '__return_false' );
+		add_action('deprecated_function_run', array($this, 'deprecated_function_run'));
+		add_action('deprecated_argument_run', array($this, 'deprecated_function_run'));
+		add_action('doing_it_wrong_run', array($this, 'doing_it_wrong_run'));
+		add_action('deprecated_function_trigger_error', '__return_false');
+		add_action('deprecated_argument_trigger_error', '__return_false');
+		add_action('doing_it_wrong_trigger_error', '__return_false');
 	}
 
 	function expectedDeprecated() {
 		$errors = array();
 
-		$not_caught_deprecated = array_diff( $this->expected_deprecated, $this->caught_deprecated );
-		foreach ( $not_caught_deprecated as $not_caught ) {
+		$not_caught_deprecated = array_diff($this->expected_deprecated, $this->caught_deprecated);
+		foreach ($not_caught_deprecated as $not_caught) {
 			$errors[] = "Failed to assert that $not_caught triggered a deprecated notice";
 		}
 
-		$unexpected_deprecated = array_diff( $this->caught_deprecated, $this->expected_deprecated );
-		foreach ( $unexpected_deprecated as $unexpected ) {
+		$unexpected_deprecated = array_diff($this->caught_deprecated, $this->expected_deprecated);
+		foreach ($unexpected_deprecated as $unexpected) {
 			$errors[] = "Unexpected deprecated notice for $unexpected";
 		}
 
-		$not_caught_doing_it_wrong = array_diff( $this->expected_doing_it_wrong, $this->caught_doing_it_wrong );
-		foreach ( $not_caught_doing_it_wrong as $not_caught ) {
+		$not_caught_doing_it_wrong = array_diff($this->expected_doing_it_wrong, $this->caught_doing_it_wrong);
+		foreach ($not_caught_doing_it_wrong as $not_caught) {
 			$errors[] = "Failed to assert that $not_caught triggered an incorrect usage notice";
 		}
 
-		$unexpected_doing_it_wrong = array_diff( $this->caught_doing_it_wrong, $this->expected_doing_it_wrong );
-		foreach ( $unexpected_doing_it_wrong as $unexpected ) {
+		$unexpected_doing_it_wrong = array_diff($this->caught_doing_it_wrong, $this->expected_doing_it_wrong);
+		foreach ($unexpected_doing_it_wrong as $unexpected) {
 			$errors[] = "Unexpected incorrect usage notice for $unexpected";
 		}
 
-		if ( ! empty( $errors ) ) {
-			$this->fail( implode( "\n", $errors ) );
+		if (!empty($errors)) {
+			$this->fail(implode("\n", $errors));
 		}
 	}
 
@@ -327,8 +327,8 @@ 
 	 * @param string $deprecated Name of the function, method, class, or argument that is deprecated. Must match
 	 *                           first parameter of the `_deprecated_function()` or `_deprecated_argument()` call.
 	 */
-	public function setExpectedDeprecated( $deprecated ) {
-		array_push( $this->expected_deprecated, $deprecated );
+	public function setExpectedDeprecated($deprecated) {
+		array_push($this->expected_deprecated, $deprecated);
 	}
 
 	/**
@@ -339,75 +339,75 @@ 
 	 * @param string $deprecated Name of the function, method, or class that appears in the first argument of the
 	 *                           source `_doing_it_wrong()` call.
 	 */
-	public function setExpectedIncorrectUsage( $doing_it_wrong ) {
-		array_push( $this->expected_doing_it_wrong, $doing_it_wrong );
+	public function setExpectedIncorrectUsage($doing_it_wrong) {
+		array_push($this->expected_doing_it_wrong, $doing_it_wrong);
 	}
 
-	function deprecated_function_run( $function ) {
-		if ( ! in_array( $function, $this->caught_deprecated ) )
+	function deprecated_function_run($function) {
+		if (!in_array($function, $this->caught_deprecated))
 			$this->caught_deprecated[] = $function;
 	}
 
-	function doing_it_wrong_run( $function ) {
-		if ( ! in_array( $function, $this->caught_doing_it_wrong ) )
+	function doing_it_wrong_run($function) {
+		if (!in_array($function, $this->caught_doing_it_wrong))
 			$this->caught_doing_it_wrong[] = $function;
 	}
 
-	function assertWPError( $actual, $message = '' ) {
-		$this->assertInstanceOf( 'WP_Error', $actual, $message );
+	function assertWPError($actual, $message = '') {
+		$this->assertInstanceOf('WP_Error', $actual, $message);
 	}
 
-	function assertNotWPError( $actual, $message = '' ) {
-		if ( is_wp_error( $actual ) && '' === $message ) {
+	function assertNotWPError($actual, $message = '') {
+		if (is_wp_error($actual) && '' === $message) {
 			$message = $actual->get_error_message();
 		}
-		$this->assertNotInstanceOf( 'WP_Error', $actual, $message );
+		$this->assertNotInstanceOf('WP_Error', $actual, $message);
 	}
 
-	function assertEqualFields( $object, $fields ) {
-		foreach( $fields as $field_name => $field_value ) {
-			if ( $object->{$field_name} != $field_value ) {
+	function assertEqualFields($object, $fields) {
+		foreach ($fields as $field_name => $field_value) {
+			if ($object->{$field_name} != $field_value) {
 				$this->fail();
 			}
 		}
 	}
 
-	function assertDiscardWhitespace( $expected, $actual ) {
-		$this->assertEquals( preg_replace( '/\s*/', '', $expected ), preg_replace( '/\s*/', '', $actual ) );
+	function assertDiscardWhitespace($expected, $actual) {
+		$this->assertEquals(preg_replace('/\s*/', '', $expected), preg_replace('/\s*/', '', $actual));
 	}
 
-	function assertEqualSets( $expected, $actual ) {
-		sort( $expected );
-		sort( $actual );
-		$this->assertEquals( $expected, $actual );
+	function assertEqualSets($expected, $actual) {
+		sort($expected);
+		sort($actual);
+		$this->assertEquals($expected, $actual);
 	}
 
-	function assertEqualSetsWithIndex( $expected, $actual ) {
-		ksort( $expected );
-		ksort( $actual );
-		$this->assertEquals( $expected, $actual );
+	function assertEqualSetsWithIndex($expected, $actual) {
+		ksort($expected);
+		ksort($actual);
+		$this->assertEquals($expected, $actual);
 	}
 
-	function go_to( $url ) {
+	function go_to($url) {
 		// note: the WP and WP_Query classes like to silently fetch parameters
 		// from all over the place (globals, GET, etc), which makes it tricky
 		// to run them more than once without very carefully clearing everything
 		$_GET = $_POST = array();
 		foreach (array('query_string', 'id', 'postdata', 'authordata', 'day', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages', 'pagenow') as $v) {
-			if ( isset( $GLOBALS[$v] ) ) unset( $GLOBALS[$v] );
+			if (isset($GLOBALS[$v])) unset($GLOBALS[$v]);
 		}
 		$parts = parse_url($url);
 		if (isset($parts['scheme'])) {
-			$req = isset( $parts['path'] ) ? $parts['path'] : '';
+			$req = isset($parts['path']) ? $parts['path'] : '';
 			if (isset($parts['query'])) {
-				$req .= '?' . $parts['query'];
+				$req .= '?'.$parts['query'];
 				// parse the url query vars into $_GET
 				parse_str($parts['query'], $_GET);
 			}
 		} else {
 			$req = $url;
 		}
-		if ( ! isset( $parts['query'] ) ) {
+		if (!isset($parts['query'])) {
 			$parts['query'] = '';
 		}
 
@@ -435,24 +435,24 @@ 
 		parent::checkRequirements();
 
 		// Core tests no longer check against open Trac tickets, but others using WP_UnitTestCase may do so.
-		if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
+		if (defined('WP_RUN_CORE_TESTS') && WP_RUN_CORE_TESTS) {
 			return;
 		}
 
-		if ( WP_TESTS_FORCE_KNOWN_BUGS )
+		if (WP_TESTS_FORCE_KNOWN_BUGS)
 			return;
-		$tickets = PHPUnit_Util_Test::getTickets( get_class( $this ), $this->getName( false ) );
-		foreach ( $tickets as $ticket ) {
-			if ( is_numeric( $ticket ) ) {
-				$this->knownWPBug( $ticket );
-			} elseif ( 'UT' == substr( $ticket, 0, 2 ) ) {
-				$ticket = substr( $ticket, 2 );
-				if ( $ticket && is_numeric( $ticket ) )
-					$this->knownUTBug( $ticket );
-			} elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) {
-				$ticket = substr( $ticket, 6 );
-				if ( $ticket && is_numeric( $ticket ) )
-					$this->knownPluginBug( $ticket );
+		$tickets = PHPUnit_Util_Test::getTickets(get_class($this), $this->getName(false));
+		foreach ($tickets as $ticket) {
+			if (is_numeric($ticket)) {
+				$this->knownWPBug($ticket);
+			} elseif ('UT' == substr($ticket, 0, 2)) {
+				$ticket = substr($ticket, 2);
+				if ($ticket && is_numeric($ticket))
+					$this->knownUTBug($ticket);
+			} elseif ('Plugin' == substr($ticket, 0, 6)) {
+				$ticket = substr($ticket, 6);
+				if ($ticket && is_numeric($ticket))
+					$this->knownPluginBug($ticket);
 			}
 		}
 	}
@@ -460,44 +460,44 @@ 
 	/**
 	 * Skips the current test if there is an open WordPress ticket with id $ticket_id
 	 */
-	function knownWPBug( $ticket_id ) {
-		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) )
+	function knownWPBug($ticket_id) {
+		if (WP_TESTS_FORCE_KNOWN_BUGS || in_array($ticket_id, self::$forced_tickets))
 			return;
-		if ( ! TracTickets::isTracTicketClosed( 'https://core.trac.wordpress.org', $ticket_id ) )
-			$this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
+		if (!TracTickets::isTracTicketClosed('https://core.trac.wordpress.org', $ticket_id))
+			$this->markTestSkipped(sprintf('WordPress Ticket #%d is not fixed', $ticket_id));
 	}
 
 	/**
 	 * Skips the current test if there is an open unit tests ticket with id $ticket_id
 	 */
-	function knownUTBug( $ticket_id ) {
-		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'UT' . $ticket_id, self::$forced_tickets ) )
+	function knownUTBug($ticket_id) {
+		if (WP_TESTS_FORCE_KNOWN_BUGS || in_array('UT'.$ticket_id, self::$forced_tickets))
 			return;
-		if ( ! TracTickets::isTracTicketClosed( 'https://unit-tests.trac.wordpress.org', $ticket_id ) )
-			$this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
+		if (!TracTickets::isTracTicketClosed('https://unit-tests.trac.wordpress.org', $ticket_id))
+			$this->markTestSkipped(sprintf('Unit Tests Ticket #%d is not fixed', $ticket_id));
 	}
 
 	/**
 	 * Skips the current test if there is an open plugin ticket with id $ticket_id
 	 */
-	function knownPluginBug( $ticket_id ) {
-		if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) )
+	function knownPluginBug($ticket_id) {
+		if (WP_TESTS_FORCE_KNOWN_BUGS || in_array('Plugin'.$ticket_id, self::$forced_tickets))
 			return;
-		if ( ! TracTickets::isTracTicketClosed( 'https://plugins.trac.wordpress.org', $ticket_id ) )
-			$this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
+		if (!TracTickets::isTracTicketClosed('https://plugins.trac.wordpress.org', $ticket_id))
+			$this->markTestSkipped(sprintf('WordPress Plugin Ticket #%d is not fixed', $ticket_id));
 	}
 
-	public static function forceTicket( $ticket ) {
+	public static function forceTicket($ticket) {
 		self::$forced_tickets[] = $ticket;
 	}
 
 	/**
 	 * Define constants after including files.
 	 */
-	function prepareTemplate( Text_Template $template ) {
-		$template->setVar( array( 'constants' => '' ) );
-		$template->setVar( array( 'wp_constants' => PHPUnit_Util_GlobalState::getConstantsAsString() ) );
-		parent::prepareTemplate( $template );
+	function prepareTemplate(Text_Template $template) {
+		$template->setVar(array('constants' => ''));
+		$template->setVar(array('wp_constants' => PHPUnit_Util_GlobalState::getConstantsAsString()));
+		parent::prepareTemplate($template);
 	}
 
 	/**
@@ -505,17 +505,17 @@ 
 	 */
 	function temp_filename() {
 		$tmp_dir = '';
-		$dirs = array( 'TMP', 'TMPDIR', 'TEMP' );
-		foreach( $dirs as $dir )
-			if ( isset( $_ENV[$dir] ) && !empty( $_ENV[$dir] ) ) {
+		$dirs = array('TMP', 'TMPDIR', 'TEMP');
+		foreach ($dirs as $dir)
+			if (isset($_ENV[$dir]) && !empty($_ENV[$dir])) {
 				$tmp_dir = $dir;
 				break;
 			}
-		if ( empty( $tmp_dir ) ) {
+		if (empty($tmp_dir)) {
 			$tmp_dir = '/tmp';
 		}
-		$tmp_dir = realpath( $tmp_dir );
-		return tempnam( $tmp_dir, 'wpunit' );
+		$tmp_dir = realpath($tmp_dir);
+		return tempnam($tmp_dir, 'wpunit');
 	}
 
 	/**
@@ -564,43 +564,43 @@ 
 		$passed = true;
 		$not_false = $not_true = array(); // properties that were not set to expected values
 
-		foreach ( $all as $query_thing ) {
-			$result = is_callable( $query_thing ) ? call_user_func( $query_thing ) : $wp_query->{$query_thing};
+		foreach ($all as $query_thing) {
+			$result = is_callable($query_thing) ? call_user_func($query_thing) : $wp_query->{$query_thing};
 
-			if ( in_array( $query_thing, $true ) ) {
-				if ( ! $result ) {
-					array_push( $not_true, $query_thing );
+			if (in_array($query_thing, $true)) {
+				if (!$result) {
+					array_push($not_true, $query_thing);
 					$passed = false;
 				}
-			} else if ( $result ) {
-				array_push( $not_false, $query_thing );
+			} else if ($result) {
+				array_push($not_false, $query_thing);
 				$passed = false;
 			}
 		}
 
 		$message = '';
-		if ( count($not_true) )
-			$message .= implode( $not_true, ', ' ) . ' is expected to be true. ';
-		if ( count($not_false) )
-			$message .= implode( $not_false, ', ' ) . ' is expected to be false.';
-		$this->assertTrue( $passed, $message );
+		if (count($not_true))
+			$message .= implode($not_true, ', ').' is expected to be true. ';
+		if (count($not_false))
+			$message .= implode($not_false, ', ').' is expected to be false.';
+		$this->assertTrue($passed, $message);
 	}
 
-	function unlink( $file ) {
-		$exists = is_file( $file );
-		if ( $exists && ! in_array( $file, self::$ignore_files ) ) {
+	function unlink($file) {
+		$exists = is_file($file);
+		if ($exists && !in_array($file, self::$ignore_files)) {
 			//error_log( $file );
-			unlink( $file );
-		} elseif ( ! $exists ) {
-			$this->fail( "Trying to delete a file that doesn't exist: $file" );
+			unlink($file);
+		} elseif (!$exists) {
+			$this->fail("Trying to delete a file that doesn't exist: $file");
 		}
 	}
 
-	function rmdir( $path ) {
-		$files = $this->files_in_dir( $path );
-		foreach ( $files as $file ) {
-			if ( ! in_array( $file, self::$ignore_files ) ) {
-				$this->unlink( $file );
+	function rmdir($path) {
+		$files = $this->files_in_dir($path);
+		foreach ($files as $file) {
+			if (!in_array($file, self::$ignore_files)) {
+				$this->unlink($file);
 			}
 		}
 	}
@@ -608,16 +608,16 @@ 
 	function remove_added_uploads() {
 		// Remove all uploads.
 		$uploads = wp_upload_dir();
-		$this->rmdir( $uploads['basedir'] );
+		$this->rmdir($uploads['basedir']);
 	}
 
-	function files_in_dir( $dir ) {
+	function files_in_dir($dir) {
 		$files = array();
 
-		$iterator = new RecursiveDirectoryIterator( $dir );
-		$objects = new RecursiveIteratorIterator( $iterator );
-		foreach ( $objects as $name => $object ) {
-			if ( is_file( $name ) ) {
+		$iterator = new RecursiveDirectoryIterator($dir);
+		$objects = new RecursiveIteratorIterator($iterator);
+		foreach ($objects as $name => $object) {
+			if (is_file($name)) {
 				$files[] = $name;
 			}
 		}
@@ -627,33 +627,33 @@ 
 
 	function scan_user_uploads() {
 		static $files = array();
-		if ( ! empty( $files ) ) {
+		if (!empty($files)) {
 			return $files;
 		}
 
 		$uploads = wp_upload_dir();
-		$files = $this->files_in_dir( $uploads['basedir'] );
+		$files = $this->files_in_dir($uploads['basedir']);
 		return $files;
 	}
 
-	function delete_folders( $path ) {
+	function delete_folders($path) {
 		$this->matched_dirs = array();
-		if ( ! is_dir( $path ) ) {
+		if (!is_dir($path)) {
 			return;
 		}
 
-		$this->scandir( $path );
-		foreach ( array_reverse( $this->matched_dirs ) as $dir ) {
-			rmdir( $dir );
+		$this->scandir($path);
+		foreach (array_reverse($this->matched_dirs) as $dir) {
+			rmdir($dir);
 		}
-		rmdir( $path );
+		rmdir($path);
 	}
 
-	function scandir( $dir ) {
-		foreach ( scandir( $dir ) as $path ) {
-			if ( 0 !== strpos( $path, '.' ) && is_dir( $dir . '/' . $path ) ) {
-				$this->matched_dirs[] = $dir . '/' . $path;
-				$this->scandir( $dir . '/' . $path );
+	function scandir($dir) {
+		foreach (scandir($dir) as $path) {
+			if (0 !== strpos($path, '.') && is_dir($dir.'/'.$path)) {
+				$this->matched_dirs[] = $dir.'/'.$path;
+				$this->scandir($dir.'/'.$path);
 			}
 		}
 	}
@@ -661,9 +661,9 @@ 
 	/**
 	 * Helper to Convert a microtime string into a float
 	 */
-	protected function _microtime_to_float($microtime ){
-		$time_array = explode( ' ', $microtime );
-		return array_sum( $time_array );
+	protected function _microtime_to_float($microtime) {
+		$time_array = explode(' ', $microtime);
+		return array_sum($time_array);
 	}
 
 	/**
@@ -671,11 +671,11 @@ 
 	 *
 	 * @since 4.3.0
 	 */
-	public static function delete_user( $user_id ) {
-		if ( is_multisite() ) {
-			return wpmu_delete_user( $user_id );
+	public static function delete_user($user_id) {
+		if (is_multisite()) {
+			return wpmu_delete_user($user_id);
 		} else {
-			return wp_delete_user( $user_id );
+			return wp_delete_user($user_id);
 		}
 	}
 
@@ -688,36 +688,36 @@ 
 	 *
 	 * @param string $structure Optional. Permalink structure to set. Default empty.
 	 */
-	public function set_permalink_structure( $structure = '' ) {
+	public function set_permalink_structure($structure = '') {
 		global $wp_rewrite;
 
 		$wp_rewrite->init();
-		$wp_rewrite->set_permalink_structure( $structure );
+		$wp_rewrite->set_permalink_structure($structure);
 		$wp_rewrite->flush_rules();
 	}
 
 	function _make_attachment($upload, $parent_post_id = 0) {
 		$type = '';
-		if ( !empty($upload['type']) ) {
+		if (!empty($upload['type'])) {
 			$type = $upload['type'];
 		} else {
-			$mime = wp_check_filetype( $upload['file'] );
+			$mime = wp_check_filetype($upload['file']);
 			if ($mime)
 				$type = $mime['type'];
 		}
 
 		$attachment = array(
-			'post_title' => basename( $upload['file'] ),
+			'post_title' => basename($upload['file']),
 			'post_content' => '',
 			'post_type' => 'attachment',
 			'post_parent' => $parent_post_id,
 			'post_mime_type' => $type,
-			'guid' => $upload[ 'url' ],
+			'guid' => $upload['url'],
 		);
 
 		// Save the data
-		$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $parent_post_id );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+		$id = wp_insert_attachment($attachment, $upload['file'], $parent_post_id);
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $upload['file']));
 		return $id;
 	}
 }