Inspection of "New hook added to filter address fields being disp..." - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Pull Request — master (#408)

by Kiran

created 2017-06-12 05:48 UTC

Status

Indentation +157 added lines, -157 removed lines patch added patch discarded remove patch

@@ -20,72 +20,72 @@  discard block
 block discarded – undo
 /** This action is documented in geodirectory-templates/listing-listview.php */
 $grid_view_class = apply_filters('geodir_grid_view_widget_columns', $gridview_columns_widget);
 if ($gd_session->get('gd_listing_view') && !isset($before_widget)) {
-    $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));
+	$grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));
 }
 ?>
     <ul class="geodir_category_list_view clearfix <?php echo apply_filters('geodir_listing_listview_ul_extra_class', '', 'widget'); ?>">
         <?php
-        if (!empty($widget_listings)) {
-            /** This action is documented in geodirectory-templates/listing-listview.php */
-            do_action('geodir_before_listing_post_listview');
-            $all_postypes = geodir_get_posttypes();
-            $geodir_days_new = (int)get_option('geodir_listing_new_days');
-            foreach ($widget_listings as $widget_listing) {
-                global $gd_widget_listing_type;
-                $post = $widget_listing;
+		if (!empty($widget_listings)) {
+			/** This action is documented in geodirectory-templates/listing-listview.php */
+			do_action('geodir_before_listing_post_listview');
+			$all_postypes = geodir_get_posttypes();
+			$geodir_days_new = (int)get_option('geodir_listing_new_days');
+			foreach ($widget_listings as $widget_listing) {
+				global $gd_widget_listing_type;
+				$post = $widget_listing;
 
-                $GLOBALS['post'] = $post;
-                setup_postdata($post);
+				$GLOBALS['post'] = $post;
+				setup_postdata($post);
 
-                $gd_widget_listing_type = $post->post_type;
+				$gd_widget_listing_type = $post->post_type;
 
-                /** This action is documented in geodirectory-templates/listing-listview.php */
-                $post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);
+				/** This action is documented in geodirectory-templates/listing-listview.php */
+				$post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);
 
-                /** This action is documented in geodirectory-templates/listing-listview.php */
-                $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
-                ?>
+				/** This action is documented in geodirectory-templates/listing-listview.php */
+				$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}%;'";
-                }
+					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}%;'";
+				}
 
-                echo " data-post-id='$post->ID' ";
-                /** This action is documented in geodirectory-templates/listing-listview.php */
-                do_action('geodir_listview_inside_li', $post, 'widget');
-                ?>>
+				echo " data-post-id='$post->ID' ";
+				/** This action is documented in geodirectory-templates/listing-listview.php */
+				do_action('geodir_listview_inside_li', $post, 'widget');
+				?>>
                     <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', '', 'widget'); ?>">
                             <?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>
                                 <a href="<?php the_permalink(); ?>"><?php echo $fimage; ?></a>
                                 <?php
-                                /** This action is documented in geodirectory-templates/listing-listview.php */
-                                do_action('geodir_before_badge_on_image', $post);
-                                if ($post->is_featured) {
-                                    echo geodir_show_badges_on_image('featured', $post, get_permalink());
-                                }
+								/** This action is documented in geodirectory-templates/listing-listview.php */
+								do_action('geodir_before_badge_on_image', $post);
+								if ($post->is_featured) {
+									echo geodir_show_badges_on_image('featured', $post, get_permalink());
+								}
 
 
-                                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());
-                                }
+								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());
+								}
 
-                                /** This action is documented in geodirectory-templates/listing-listview.php */
-                                do_action('geodir_after_badge_on_image', $post);
-                            }
-                            ?>
+								/** This action is documented in geodirectory-templates/listing-listview.php */
+								do_action('geodir_after_badge_on_image', $post);
+							}
+							?>
                         </div>
                         <div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'widget'); ?>">
                             <?php
-                            /** This action is documented in geodirectory-templates/listing-listview.php */
-                            do_action('geodir_before_listing_post_title', 'listview', $post); ?>
+							/** This action is documented in geodirectory-templates/listing-listview.php */
+							do_action('geodir_before_listing_post_title', 'listview', $post); ?>
                             <header class="geodir-entry-header">
                                 <h3 class="geodir-entry-title">
                                     <a href="<?php the_permalink(); ?>"
@@ -94,158 +94,158 @@  discard block
 block discarded – undo
                             </header>
                             <!-- .entry-header -->
                             <?php
-                            /** This action is documented in geodirectory-templates/listing-listview.php */
-                            do_action('geodir_after_listing_post_title', 'listview', $post); ?>
+							/** This action is documented in geodirectory-templates/listing-listview.php */
+							do_action('geodir_after_listing_post_title', 'listview', $post); ?>
                             <?php /// Print Distance
-                            if (isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') {
-                                $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
+							if (isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') {
+								$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);
-                                ?>
+								$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, 'geodirectory') . '
+									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, 'geodirectory') . '
 			<br />
 			';
-                                    } else {
-                                        if ($uom == 'miles') {
-                                            $uom = __('miles', 'geodirectory');
-                                        } else {
-                                            $uom = __('km', 'geodirectory');
-                                        }
-                                        echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
+									} else {
+										if ($uom == 'miles') {
+											$uom = __('miles', 'geodirectory');
+										} else {
+											$uom = __('km', 'geodirectory');
+										}
+										echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
 			<br />
 			';
-                                    }
-                                    ?>
+									}
+									?>
                                 </h3>
                             <?php } ?>
                             <?php
-                            /** This action is documented in geodirectory-templates/listing-listview.php */
-                            do_action('geodir_before_listing_post_excerpt', $post); ?>
+							/** This action is documented in geodirectory-templates/listing-listview.php */
+							do_action('geodir_before_listing_post_excerpt', $post); ?>
                             <?php echo geodir_show_listing_info('listing'); ?>
                             <?php if (isset($character_count) && $character_count == '0') {
-                            } else { ?>
+							} else { ?>
                                 <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 object $post The post object.
-                                     */
-                                    $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $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>";
-                                        }
-                                    }
-                                    ?>
+									/**
+									 * Filter to hide the listing excerpt
+									 *
+									 * @since 1.5.3
+									 * @param bool $display Display the excerpt or not. Default true.
+									 * @param object $post The post object.
+									 */
+									$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $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 } ?>
                             <?php
-                            /** This action is documented in geodirectory-templates/listing-listview.php */
-                            do_action('geodir_after_listing_post_excerpt', $post); ?>
+							/** This action is documented in geodirectory-templates/listing-listview.php */
+							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 'widget'.
-                         */
-                        do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
+						/**
+						 * Called after printing listing content.
+						 *
+						 * @since 1.5.3
+						 * @param object $post The post object.
+						 * @param string $view The view type, default 'widget'.
+						 */
+						do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">
                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">
                                 <?php
-                                /**
-                                 * Called before printing review stars html.
-                                 *
-                                 * @since 1.5.3
-                                 * @param object $post The post object.
-                                 * @param string $view The view type, default 'widget'.
-                                 */
-                                do_action( 'geodir_before_review_html', $post, 'widget' );
-                                $review_show = geodir_is_reviews_show('listview');
-                                if ($review_show) {
+								/**
+								 * Called before printing review stars html.
+								 *
+								 * @since 1.5.3
+								 * @param object $post The post object.
+								 * @param string $view The view type, default 'widget'.
+								 */
+								do_action( 'geodir_before_review_html', $post, 'widget' );
+								$review_show = geodir_is_reviews_show('listview');
+								if ($review_show) {
 
-                                    $post_avgratings = geodir_get_post_rating($post->ID);
+									$post_avgratings = geodir_get_post_rating($post->ID);
 
-                                    /** This action is documented in geodirectory-templates/listing-listview.php */
-                                    do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
+									/** This action is documented in geodirectory-templates/listing-listview.php */
+									do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
 
-                                    echo geodir_get_rating_stars($post_avgratings, $post->ID);
+									echo geodir_get_rating_stars($post_avgratings, $post->ID);
 
-                                    /** This action is documented in geodirectory-templates/listing-listview.php */
-                                    do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
-                                    ?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
+									/** This action is documented in geodirectory-templates/listing-listview.php */
+									do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
+									?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
                                         class="fa 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, 'widget' );
+								/**
+								 * Called after printing favorite html.
+								 *
+								 * @since 1.0.0
+								 */
+								do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
 
-                                if ($post->post_author == get_current_user_id()) {
-                                    $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);
+								if ($post->post_author == get_current_user_id()) {
+									$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']) {
-                    /** This action is documented in geodirectory-templates/listing-listview.php */
-                    do_action('geodir_before_edit_post_link_on_listing');
-                    ?>
+				if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {
+					/** This action is documented in geodirectory-templates/listing-listview.php */
+					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', 'fa fa-edit');
-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
-                        ?>
+						$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa 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', 'fa fa-close');
-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
-                        ?>
+						$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');
+						echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
+						?>
                         <?php _e('Delete', 'geodirectory'); ?>
                     </a>
                     <?php
-                    /** This action is documented in geodirectory-templates/listing-listview.php */
-                    do_action('geodir_after_edit_post_link_on_listing');
-                } ?>
+					/** This action is documented in geodirectory-templates/listing-listview.php */
+					do_action('geodir_after_edit_post_link_on_listing');
+				} ?>
 					</span>
                                 <?php } ?>
                             </div>
@@ -255,17 +255,17 @@  discard block
 block discarded – undo
                     </article>
                 </li>
                 <?php
-                unset($gd_widget_listing_type);
-            }
-            /** This action is documented in geodirectory-templates/listing-listview.php */
-            do_action('geodir_after_listing_post_listview');
-        } else {
+				unset($gd_widget_listing_type);
+			}
+			/** This action is documented in geodirectory-templates/listing-listview.php */
+			do_action('geodir_after_listing_post_listview');
+		} else {
 			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
             
 			/** This action is documented in geodirectory-templates/listing-listview.php */
-            do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);
-        }
-        ?>
+			do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);
+		}
+		?>
     </ul>  <!-- geodir_category_list_view ends here-->
     <div class="clear"></div>
 <?php

Please login to merge, or discard this patch.

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
             /** This action is documented in geodirectory-templates/listing-listview.php */
             do_action('geodir_before_listing_post_listview');
             $all_postypes = geodir_get_posttypes();
-            $geodir_days_new = (int)get_option('geodir_listing_new_days');
+            $geodir_days_new = (int) get_option('geodir_listing_new_days');
             foreach ($widget_listings as $widget_listing) {
                 global $gd_widget_listing_type;
                 $post = $widget_listing;
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
                 $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;
+                    echo 'geodir-gridview '.$grid_view_class;
                 } else {
                     echo ' geodir-listview ';
                 } ?> <?php if ($post_view_class) {
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
                                         } else {
                                             $uom = __('meters', 'geodirectory');
                                         }
-                                        echo round($distance) . ' ' . __($uom, 'geodirectory') . '
+                                        echo round($distance).' '.__($uom, 'geodirectory').'
 			<br />
 			';
                                     } else {
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
                                         } else {
                                             $uom = __('km', 'geodirectory');
                                         }
-                                        echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
+                                        echo round($distance, 2).' '.__($uom, 'geodirectory').'
 			<br />
 			';
                                     }
@@ -149,13 +149,13 @@  discard block
 block discarded – undo
                                      */
                                     $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $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>";
                                         }
                                     }
                                     ?>
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
                          * @param object $post The post object.
                          * @param string $view The view type, default 'widget'.
                          */
-                        do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
+                        do_action('geodir_after_listing_content', $post, 'widget'); ?>
                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">
                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">
                                 <?php
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
                                  * @param object $post The post object.
                                  * @param string $view The view type, default 'widget'.
                                  */
-                                do_action( 'geodir_before_review_html', $post, 'widget' );
+                                do_action('geodir_before_review_html', $post, 'widget');
                                 $review_show = geodir_is_reviews_show('listview');
                                 if ($review_show) {
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
                                  *
                                  * @since 1.0.0
                                  */
-                                do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
+                                do_action('geodir_after_favorite_html', $post->ID, 'widget');
 
                                 if ($post->post_author == get_current_user_id()) {
                                     $addplacelink = get_permalink(geodir_add_listing_page_id());
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
                        title="<?php _e('Edit Listing', 'geodirectory'); ?>">
                         <?php
                         $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');
-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
+                        echo '<i class="'.$geodir_listing_edit_icon.'"></i>';
                         ?>
                         <?php _e('Edit', 'geodirectory'); ?>
                     </a>
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
                        title="<?php _e('Delete Listing', 'geodirectory'); ?>">
                         <?php
                         $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');
-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
+                        echo '<i class="'.$geodir_listing_delete_icon.'"></i>';
                         ?>
                         <?php _e('Delete', 'geodirectory'); ?>
                     </a>

Please login to merge, or discard this patch.

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

Doc Comments +25 added lines patch added patch discarded remove patch

@@ -64,6 +64,9 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 	public $next;
 	public $template_string;
 
+	/**
+	 * @param integer $start
+	 */
 	function __construct( $template_string = '%s', $start = null ) {
 		if ( $start ) {
 			$this->next = $start;

Please login to merge, or discard this patch.

Braces +29 added lines, -21 removed lines patch added patch discarded remove patch

@@ -104,8 +104,9 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 
 	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;

Please login to merge, or discard this patch.

Spacing +143 added lines, -143 removed lines patch added patch discarded remove patch

@@ -48,78 +48,78 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 
 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_%[email protected]' ),
+			'user_email' => new WP_UnitTest_Generator_Sequence('user_%[email protected]'),
 		);
 	}
 
-	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	}
 
 	function next() {
-		$generated = sprintf( $this->template_string , $this->next );
+		$generated = sprintf($this->template_string, $this->next);
 		$this->next++;
 		return $generated;
 	}
@@ -425,11 +425,11 @@  discard block
 block discarded – undo
 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);
 	}
 }

Please login to merge, or discard this patch.

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

Doc Comments +6 added lines patch added patch discarded remove patch

@@ -10,6 +10,9 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	return '_wp_die_handler';
 }
 
+/**
+ * @param string $title
+ */
 function _wp_die_handler_txt( $message, $title, $args ) {
 	echo "\nwp_die called\n";
 	echo "Message : $message\n";

Please login to merge, or discard this patch.

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -14,8 +14,9 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 
 	$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 );
+		}
 	}
 }
 

Please login to merge, or discard this patch.

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
 
 	$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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
  * @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%/');
 }

Please login to merge, or discard this patch.

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

Doc Comments +4 added lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Braces +49 added lines, -33 removed lines patch added patch discarded remove patch

@@ -21,13 +21,15 @@  discard block
 block discarded – undo
 
 	// 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 @@  discard block
 block discarded – undo
 	 * "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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 
 		$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;

Please login to merge, or discard this patch.

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -20,13 +20,13 @@  discard block
 block discarded – undo
 	}
 
 	// 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 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	/**
 	 * 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	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

Please login to merge, or discard this patch.

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

Doc Comments -3 removed lines patch added patch discarded remove patch

@@ -336,8 +336,6 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 * 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;

Please login to merge, or discard this patch.

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Braces +60 added lines, -39 removed lines patch added patch discarded remove patch

@@ -256,14 +256,16 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 		// 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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		}
 
 		$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 @@  discard block
 block discarded – undo
 			$type = $upload['type'];
 		} else {
 			$mime = wp_check_filetype( $upload['file'] );
-			if ($mime)
-				$type = $mime['type'];
+			if ($mime) {
+							$type = $mime['type'];
+			}
 		}
 
 		$attachment = array(

Please login to merge, or discard this patch.

Spacing +204 added lines, -204 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		 * 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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	/**
 	 * 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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 	/**
 	 * 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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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;
 	}
 }

Please login to merge, or discard this patch.

tests/test-Check_Maps.php 2 patches

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

@@ -1,69 +1,69 @@
 block discarded – undo
 <?php
 class CheckMaps extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testCheckHomeMap()
-    {
-        $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
-    }
+	public function testCheckHomeMap()
+	{
+		$output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
+		$this->assertContains( 'geodir-map-home-page', $output );
+	}
 
-    public function testListingsPageMap()
-    {
-        $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
-    }
+	public function testListingsPageMap()
+	{
+		$output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
+		$this->assertContains( 'geodir-map-listing-page', $output );
+	}
 
-    public function testDetailPageMap()
-    {
+	public function testDetailPageMap()
+	{
 
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
 
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-            global $post;
-            $post =  geodir_get_post_info($post_id);
-            setup_postdata($post);
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+			global $post;
+			$post =  geodir_get_post_info($post_id);
+			setup_postdata($post);
 
-            $map_args = array();
-            $map_args['map_canvas_name'] = 'detail_page_map_canvas';
-            $map_args['width'] = '600';
-            $map_args['height'] = '300';
-            if ($post->post_mapzoom) {
-                $map_args['zoom'] = '' . $post->post_mapzoom . '';
-            }
-            $map_args['autozoom'] = false;
-            $map_args['child_collapse'] = '0';
-            $map_args['enable_cat_filters'] = false;
-            $map_args['enable_text_search'] = false;
-            $map_args['enable_post_type_filters'] = false;
-            $map_args['enable_location_filters'] = false;
-            $map_args['enable_jason_on_load'] = true;
-            $map_args['enable_map_direction'] = true;
-            $map_args['map_class_name'] = 'geodir-map-detail-page';
-            $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
-            ob_start();
-            geodir_draw_map($map_args);
-            $output = ob_get_clean();
-            $this->assertContains( 'geodir-map-detail-page', $output );
-        endwhile;
+			$map_args = array();
+			$map_args['map_canvas_name'] = 'detail_page_map_canvas';
+			$map_args['width'] = '600';
+			$map_args['height'] = '300';
+			if ($post->post_mapzoom) {
+				$map_args['zoom'] = '' . $post->post_mapzoom . '';
+			}
+			$map_args['autozoom'] = false;
+			$map_args['child_collapse'] = '0';
+			$map_args['enable_cat_filters'] = false;
+			$map_args['enable_text_search'] = false;
+			$map_args['enable_post_type_filters'] = false;
+			$map_args['enable_location_filters'] = false;
+			$map_args['enable_jason_on_load'] = true;
+			$map_args['enable_map_direction'] = true;
+			$map_args['map_class_name'] = 'geodir-map-detail-page';
+			$map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
+			ob_start();
+			geodir_draw_map($map_args);
+			$output = ob_get_clean();
+			$this->assertContains( 'geodir-map-detail-page', $output );
+		endwhile;
 
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -9,13 +9,13 @@  discard block
 block discarded – undo
     public function testCheckHomeMap()
     {
         $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
+        $this->assertContains('geodir-map-home-page', $output);
     }
 
     public function testListingsPageMap()
     {
         $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
+        $this->assertContains('geodir-map-listing-page', $output);
     }
 
     public function testDetailPageMap()
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
             global $post;
-            $post =  geodir_get_post_info($post_id);
+            $post = geodir_get_post_info($post_id);
             setup_postdata($post);
 
             $map_args = array();
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
             $map_args['width'] = '600';
             $map_args['height'] = '300';
             if ($post->post_mapzoom) {
-                $map_args['zoom'] = '' . $post->post_mapzoom . '';
+                $map_args['zoom'] = ''.$post->post_mapzoom.'';
             }
             $map_args['autozoom'] = false;
             $map_args['child_collapse'] = '0';
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
             ob_start();
             geodir_draw_map($map_args);
             $output = ob_get_clean();
-            $this->assertContains( 'geodir-map-detail-page', $output );
+            $this->assertContains('geodir-map-detail-page', $output);
         endwhile;
 
 

Please login to merge, or discard this patch.

tests/test-Check_PinPoint.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@
 block discarded – undo
 <?php
 class CheckPinpoint extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testCheckPinpoint()
-    {
+	public function testCheckPinpoint()
+	{
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

tests/test-Add_A_Review.php 1 patch

Indentation +51 added lines, -51 removed lines patch added patch discarded remove patch

@@ -1,63 +1,63 @@
 block discarded – undo
 <?php
 class AddReview extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
 
-    public function testAddReview()
-    {
-        $time = current_time('mysql');
+	public function testAddReview()
+	{
+		$time = current_time('mysql');
 
-        $args = array(
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_latitude' => '40.7127837',
-            'post_longitude' => '-74.00594130000002',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => '[email protected]',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer'
-        );
-        $post_id = geodir_save_listing($args, true);
+		$args = array(
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_latitude' => '40.7127837',
+			'post_longitude' => '-74.00594130000002',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => '[email protected]',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer'
+		);
+		$post_id = geodir_save_listing($args, true);
 
-        $data = array(
-            'comment_post_ID' => $post_id,
-            'comment_author' => 'admin',
-            'comment_author_email' => '[email protected]',
-            'comment_author_url' => 'http://wpgeodirectory.com',
-            'comment_content' => 'content here',
-            'comment_type' => '',
-            'comment_parent' => 0,
-            'user_id' => 1,
-            'comment_author_IP' => '127.0.0.1',
-            'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
-            'comment_date' => $time,
-            'comment_approved' => 1,
-        );
+		$data = array(
+			'comment_post_ID' => $post_id,
+			'comment_author' => 'admin',
+			'comment_author_email' => '[email protected]',
+			'comment_author_url' => 'http://wpgeodirectory.com',
+			'comment_content' => 'content here',
+			'comment_type' => '',
+			'comment_parent' => 0,
+			'user_id' => 1,
+			'comment_author_IP' => '127.0.0.1',
+			'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
+			'comment_date' => $time,
+			'comment_approved' => 1,
+		);
 
-        $comment_id = wp_insert_comment($data);
+		$comment_id = wp_insert_comment($data);
 
-        $_REQUEST['geodir_overallrating'] = 5.0;
-        geodir_save_rating($comment_id);
+		$_REQUEST['geodir_overallrating'] = 5.0;
+		geodir_save_rating($comment_id);
 
-        $this->assertTrue(is_int($comment_id));
-    }
+		$this->assertTrue(is_int($comment_id));
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

tests/test-Send_Enquiry.php 2 patches

Indentation +111 added lines, -111 removed lines patch added patch discarded remove patch

@@ -1,116 +1,116 @@
 block discarded – undo
 <?php
 class SendEnquiry extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
-
-    public function testSendEnquiry()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $data = array(
-            'sendact' => 'send_inqury',
-            'pid' => (string) $post_id,
-            'inq_name' => 'Test User',
-            'inq_email' => '[email protected]',
-            'inq_phone' => 'Test',
-            'inq_msg' => 'Hi there, I would like to enquire about this place. I would like to ask more info about...',
-            'Send' => 'Send'
-        );
-
-        add_filter('wp_redirect', '__return_false');
-        geodir_send_inquiry($data);
-        remove_filter('wp_redirect', '__return_false');
-    }
-
-    public function testSendToFriend()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $data = array(
-            'sendact' => 'email_frnd',
-            'pid' => (string) $post_id,
-            'yourname' => 'Test User',
-            'youremail' => '[email protected]',
-            'frnd_subject' => 'Test',
-            'frnd_comments' => 'Hi there, This is a comment',
-            'to_email' => '[email protected]',
-            'to_name' => 'Test User 2',
-            'Send' => 'Send'
-        );
-
-        add_filter('wp_redirect', '__return_false');
-        geodir_send_friend($data);
-        remove_filter('wp_redirect', '__return_false');
-    }
-
-    public function texstSendToFriendFailure()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $data = array(
-            'sendact' => 'email_frnd',
-            'pid' => (string) $post_id,
-            'yourname' => 'Test User',
-            'youremail' => '[email protected]',
-            'frnd_subject' => 'Test',
-            'frnd_comments' => 'Hi there, This is a comment',
-            'to_email' => 'Test User 2', //incorrect email
-            'to_name' => '[email protected]',
-            'Send' => 'Send'
-        );
-
-        add_filter('wp_redirect', '__return_false');
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_send_friend($data);
-        $output = ob_get_clean();
-        $this->assertContains( 'Email from GeoDirectory failed to send', $output );
-        remove_filter('wp_mail', 'print_mail');
-        remove_filter('wp_redirect', '__return_false');
-    }
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
+
+	public function testSendEnquiry()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$data = array(
+			'sendact' => 'send_inqury',
+			'pid' => (string) $post_id,
+			'inq_name' => 'Test User',
+			'inq_email' => '[email protected]',
+			'inq_phone' => 'Test',
+			'inq_msg' => 'Hi there, I would like to enquire about this place. I would like to ask more info about...',
+			'Send' => 'Send'
+		);
+
+		add_filter('wp_redirect', '__return_false');
+		geodir_send_inquiry($data);
+		remove_filter('wp_redirect', '__return_false');
+	}
+
+	public function testSendToFriend()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$data = array(
+			'sendact' => 'email_frnd',
+			'pid' => (string) $post_id,
+			'yourname' => 'Test User',
+			'youremail' => '[email protected]',
+			'frnd_subject' => 'Test',
+			'frnd_comments' => 'Hi there, This is a comment',
+			'to_email' => '[email protected]',
+			'to_name' => 'Test User 2',
+			'Send' => 'Send'
+		);
+
+		add_filter('wp_redirect', '__return_false');
+		geodir_send_friend($data);
+		remove_filter('wp_redirect', '__return_false');
+	}
+
+	public function texstSendToFriendFailure()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$data = array(
+			'sendact' => 'email_frnd',
+			'pid' => (string) $post_id,
+			'yourname' => 'Test User',
+			'youremail' => '[email protected]',
+			'frnd_subject' => 'Test',
+			'frnd_comments' => 'Hi there, This is a comment',
+			'to_email' => 'Test User 2', //incorrect email
+			'to_name' => '[email protected]',
+			'Send' => 'Send'
+		);
+
+		add_filter('wp_redirect', '__return_false');
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_send_friend($data);
+		$output = ob_get_clean();
+		$this->assertContains( 'Email from GeoDirectory failed to send', $output );
+		remove_filter('wp_mail', 'print_mail');
+		remove_filter('wp_redirect', '__return_false');
+	}
+
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -14,9 +14,9 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
         ob_start();
         geodir_send_friend($data);
         $output = ob_get_clean();
-        $this->assertContains( 'Email from GeoDirectory failed to send', $output );
+        $this->assertContains('Email from GeoDirectory failed to send', $output);
         remove_filter('wp_mail', 'print_mail');
         remove_filter('wp_redirect', '__return_false');
     }

Please login to merge, or discard this patch.

		@@ -256,14 +256,16 @@ discard block
		block discarded – undo
256	256	}
257	257
258	258	function _create_temporary_tables( $query ) {
259		- if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) )
260		- return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
	259	+ if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) ) {
	260	+ return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
	261	+ }
261	262	return $query;
262	263	}
263	264
264	265	function _drop_temporary_tables( $query ) {
265		- if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) )
266		- return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
	266	+ if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) ) {
	267	+ return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
	268	+ }
267	269	return $query;
268	270	}
269	271
		@@ -278,10 +280,12 @@ discard block
		block discarded – undo
278	280	function expectDeprecated() {
279	281	$annotations = $this->getAnnotations();
280	282	foreach ( array( 'class', 'method' ) as $depth ) {
281		- if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) )
282		- $this->expected_deprecated = array_merge( $this->expected_deprecated, $annotations[ $depth ]['expectedDeprecated'] );
283		- if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) )
284		- $this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $annotations[ $depth ]['expectedIncorrectUsage'] );
	283	+ if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) ) {
	284	+ $this->expected_deprecated = array_merge( $this->expected_deprecated, $annotations[ $depth ]['expectedDeprecated'] );
	285	+ }
	286	+ if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) ) {
	287	+ $this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $annotations[ $depth ]['expectedIncorrectUsage'] );
	288	+ }
285	289	}
286	290	add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
287	291	add_action( 'deprecated_argument_run', array( $this, 'deprecated_function_run' ) );
		@@ -344,13 +348,15 @@ discard block
		block discarded – undo
344	348	}
345	349
346	350	function deprecated_function_run( $function ) {
347		- if ( ! in_array( $function, $this->caught_deprecated ) )
348		- $this->caught_deprecated[] = $function;
	351	+ if ( ! in_array( $function, $this->caught_deprecated ) ) {
	352	+ $this->caught_deprecated[] = $function;
	353	+ }
349	354	}
350	355
351	356	function doing_it_wrong_run( $function ) {
352		- if ( ! in_array( $function, $this->caught_doing_it_wrong ) )
353		- $this->caught_doing_it_wrong[] = $function;
	357	+ if ( ! in_array( $function, $this->caught_doing_it_wrong ) ) {
	358	+ $this->caught_doing_it_wrong[] = $function;
	359	+ }
354	360	}
355	361
356	362	function assertWPError( $actual, $message = '' ) {
		@@ -394,7 +400,9 @@ discard block
		block discarded – undo
394	400	// to run them more than once without very carefully clearing everything
395	401	$_GET = $_POST = array();
396	402	foreach (array('query_string', 'id', 'postdata', 'authordata', 'day', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages', 'pagenow') as $v) {
397		- if ( isset( $GLOBALS[$v] ) ) unset( $GLOBALS[$v] );
	403	+ if ( isset( $GLOBALS[$v] ) ) {
	404	+ unset( $GLOBALS[$v] );
	405	+ }
398	406	}
399	407	$parts = parse_url($url);
400	408	if (isset($parts['scheme'])) {
		@@ -439,20 +447,23 @@ discard block
		block discarded – undo
439	447	return;
440	448	}
441	449
442		- if ( WP_TESTS_FORCE_KNOWN_BUGS )
443		- return;
	450	+ if ( WP_TESTS_FORCE_KNOWN_BUGS ) {
	451	+ return;
	452	+ }
444	453	$tickets = PHPUnit_Util_Test::getTickets( get_class( $this ), $this->getName( false ) );
445	454	foreach ( $tickets as $ticket ) {
446	455	if ( is_numeric( $ticket ) ) {
447	456	$this->knownWPBug( $ticket );
448	457	} elseif ( 'UT' == substr( $ticket, 0, 2 ) ) {
449	458	$ticket = substr( $ticket, 2 );
450		- if ( $ticket && is_numeric( $ticket ) )
451		- $this->knownUTBug( $ticket );
	459	+ if ( $ticket && is_numeric( $ticket ) ) {
	460	+ $this->knownUTBug( $ticket );
	461	+ }
452	462	} elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) {
453	463	$ticket = substr( $ticket, 6 );
454		- if ( $ticket && is_numeric( $ticket ) )
455		- $this->knownPluginBug( $ticket );
	464	+ if ( $ticket && is_numeric( $ticket ) ) {
	465	+ $this->knownPluginBug( $ticket );
	466	+ }
456	467	}
457	468	}
458	469	}
		@@ -461,30 +472,36 @@ discard block
		block discarded – undo
461	472	* Skips the current test if there is an open WordPress ticket with id $ticket_id
462	473	*/
463	474	function knownWPBug( $ticket_id ) {
464		- if ( WP_TESTS_FORCE_KNOWN_BUGS \|\| in_array( $ticket_id, self::$forced_tickets ) )
465		- return;
466		- if ( ! TracTickets::isTracTicketClosed( 'https://core.trac.wordpress.org', $ticket_id ) )
467		- $this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
	475	+ if ( WP_TESTS_FORCE_KNOWN_BUGS \|\| in_array( $ticket_id, self::$forced_tickets ) ) {
	476	+ return;
	477	+ }
	478	+ if ( ! TracTickets::isTracTicketClosed( 'https://core.trac.wordpress.org', $ticket_id ) ) {
	479	+ $this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
	480	+ }
468	481	}
469	482
470	483	/**
471	484	* Skips the current test if there is an open unit tests ticket with id $ticket_id
472	485	*/
473	486	function knownUTBug( $ticket_id ) {
474		- if ( WP_TESTS_FORCE_KNOWN_BUGS \|\| in_array( 'UT' . $ticket_id, self::$forced_tickets ) )
475		- return;
476		- if ( ! TracTickets::isTracTicketClosed( 'https://unit-tests.trac.wordpress.org', $ticket_id ) )
477		- $this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
	487	+ if ( WP_TESTS_FORCE_KNOWN_BUGS \|\| in_array( 'UT' . $ticket_id, self::$forced_tickets ) ) {
	488	+ return;
	489	+ }
	490	+ if ( ! TracTickets::isTracTicketClosed( 'https://unit-tests.trac.wordpress.org', $ticket_id ) ) {
	491	+ $this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
	492	+ }
478	493	}
479	494
480	495	/**
481	496	* Skips the current test if there is an open plugin ticket with id $ticket_id
482	497	*/
483	498	function knownPluginBug( $ticket_id ) {
484		- if ( WP_TESTS_FORCE_KNOWN_BUGS \|\| in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) )
485		- return;
486		- if ( ! TracTickets::isTracTicketClosed( 'https://plugins.trac.wordpress.org', $ticket_id ) )
487		- $this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
	499	+ if ( WP_TESTS_FORCE_KNOWN_BUGS \|\| in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) ) {
	500	+ return;
	501	+ }
	502	+ if ( ! TracTickets::isTracTicketClosed( 'https://plugins.trac.wordpress.org', $ticket_id ) ) {
	503	+ $this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
	504	+ }
488	505	}
489	506
490	507	public static function forceTicket( $ticket ) {
		@@ -506,9 +523,10 @@ discard block
		block discarded – undo
506	523	function temp_filename() {
507	524	$tmp_dir = '';
508	525	$dirs = array( 'TMP', 'TMPDIR', 'TEMP' );
509		- foreach( $dirs as $dir )
510		- if ( isset( $_ENV[$dir] ) && !empty( $_ENV[$dir] ) ) {
	526	+ foreach( $dirs as $dir ) {
	527	+ if ( isset( $_ENV[$dir] ) && !empty( $_ENV[$dir] ) ) {
511	528	$tmp_dir = $dir;
	529	+ }
512	530	break;
513	531	}
514	532	if ( empty( $tmp_dir ) ) {
		@@ -579,10 +597,12 @@ discard block
		block discarded – undo
579	597	}
580	598
581	599	$message = '';
582		- if ( count($not_true) )
583		- $message .= implode( $not_true, ', ' ) . ' is expected to be true. ';
584		- if ( count($not_false) )
585		- $message .= implode( $not_false, ', ' ) . ' is expected to be false.';
	600	+ if ( count($not_true) ) {
	601	+ $message .= implode( $not_true, ', ' ) . ' is expected to be true. ';
	602	+ }
	603	+ if ( count($not_false) ) {
	604	+ $message .= implode( $not_false, ', ' ) . ' is expected to be false.';
	605	+ }
586	606	$this->assertTrue( $passed, $message );
587	607	}
588	608
		@@ -702,8 +722,9 @@ discard block
		block discarded – undo
702	722	$type = $upload['type'];
703	723	} else {
704	724	$mime = wp_check_filetype( $upload['file'] );
705		- if ($mime)
706		- $type = $mime['type'];
	725	+ if ($mime) {
	726	+ $type = $mime['type'];
	727	+ }
707	728	}
708	729
709	730	$attachment = array(

		@@ -20,72 +20,72 @@ discard block
		block discarded – undo
20	20	/** This action is documented in geodirectory-templates/listing-listview.php */
21	21	$grid_view_class = apply_filters('geodir_grid_view_widget_columns', $gridview_columns_widget);
22	22	if ($gd_session->get('gd_listing_view') && !isset($before_widget)) {
23		- $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));
	23	+ $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));
24	24	}
25	25	?>
26	26	<ul class="geodir_category_list_view clearfix <?php echo apply_filters('geodir_listing_listview_ul_extra_class', '', 'widget'); ?>">
27	27	<?php
28		- if (!empty($widget_listings)) {
29		- /** This action is documented in geodirectory-templates/listing-listview.php */
30		- do_action('geodir_before_listing_post_listview');
31		- $all_postypes = geodir_get_posttypes();
32		- $geodir_days_new = (int)get_option('geodir_listing_new_days');
33		- foreach ($widget_listings as $widget_listing) {
34		- global $gd_widget_listing_type;
35		- $post = $widget_listing;
	28	+ if (!empty($widget_listings)) {
	29	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	30	+ do_action('geodir_before_listing_post_listview');
	31	+ $all_postypes = geodir_get_posttypes();
	32	+ $geodir_days_new = (int)get_option('geodir_listing_new_days');
	33	+ foreach ($widget_listings as $widget_listing) {
	34	+ global $gd_widget_listing_type;
	35	+ $post = $widget_listing;
36	36
37		- $GLOBALS['post'] = $post;
38		- setup_postdata($post);
	37	+ $GLOBALS['post'] = $post;
	38	+ setup_postdata($post);
39	39
40		- $gd_widget_listing_type = $post->post_type;
	40	+ $gd_widget_listing_type = $post->post_type;
41	41
42		- /** This action is documented in geodirectory-templates/listing-listview.php */
43		- $post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);
	42	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	43	+ $post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);
44	44
45		- /** This action is documented in geodirectory-templates/listing-listview.php */
46		- $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
47		- ?>
	45	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	46	+ $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
	47	+ ?>
48	48	<li class="clearfix <?php if ($grid_view_class) {
49		- echo 'geodir-gridview ' . $grid_view_class;
50		- } else {
51		- echo ' geodir-listview ';
52		- } ?> <?php if ($post_view_class) {
53		- echo $post_view_class;
54		- } ?>" <?php if (isset($listing_width) && $listing_width) {
55		- echo "style='width:{$listing_width}%;'";
56		- }
	49	+ echo 'geodir-gridview ' . $grid_view_class;
	50	+ } else {
	51	+ echo ' geodir-listview ';
	52	+ } ?> <?php if ($post_view_class) {
	53	+ echo $post_view_class;
	54	+ } ?>" <?php if (isset($listing_width) && $listing_width) {
	55	+ echo "style='width:{$listing_width}%;'";
	56	+ }
57	57
58		- echo " data-post-id='$post->ID' ";
59		- /** This action is documented in geodirectory-templates/listing-listview.php */
60		- do_action('geodir_listview_inside_li', $post, 'widget');
61		- ?>>
	58	+ echo " data-post-id='$post->ID' ";
	59	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	60	+ do_action('geodir_listview_inside_li', $post, 'widget');
	61	+ ?>>
62	62	<article class="geodir-category-listing <?php if ($post_view_article_class) {
63		- echo $post_view_article_class;
64		- } ?>">
	63	+ echo $post_view_article_class;
	64	+ } ?>">
65	65	<div class="geodir-post-img <?php echo apply_filters('geodir_listing_listview_thumb_extra_class', '', 'widget'); ?>">
66	66	<?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>
67	67	<a href="<?php the_permalink(); ?>"><?php echo $fimage; ?></a>
68	68	<?php
69		- /** This action is documented in geodirectory-templates/listing-listview.php */
70		- do_action('geodir_before_badge_on_image', $post);
71		- if ($post->is_featured) {
72		- echo geodir_show_badges_on_image('featured', $post, get_permalink());
73		- }
	69	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	70	+ do_action('geodir_before_badge_on_image', $post);
	71	+ if ($post->is_featured) {
	72	+ echo geodir_show_badges_on_image('featured', $post, get_permalink());
	73	+ }
74	74
75	75
76		- if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
77		- echo geodir_show_badges_on_image('new', $post, get_permalink());
78		- }
	76	+ if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
	77	+ echo geodir_show_badges_on_image('new', $post, get_permalink());
	78	+ }
79	79
80		- /** This action is documented in geodirectory-templates/listing-listview.php */
81		- do_action('geodir_after_badge_on_image', $post);
82		- }
83		- ?>
	80	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	81	+ do_action('geodir_after_badge_on_image', $post);
	82	+ }
	83	+ ?>
84	84	</div>
85	85	<div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'widget'); ?>">
86	86	<?php
87		- /** This action is documented in geodirectory-templates/listing-listview.php */
88		- do_action('geodir_before_listing_post_title', 'listview', $post); ?>
	87	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	88	+ do_action('geodir_before_listing_post_title', 'listview', $post); ?>
89	89	<header class="geodir-entry-header">
90	90	<h3 class="geodir-entry-title">
91	91	<a href="<?php the_permalink(); ?>"
		@@ -94,158 +94,158 @@ discard block
		block discarded – undo
94	94	</header>
95	95	<!-- .entry-header -->
96	96	<?php
97		- /** This action is documented in geodirectory-templates/listing-listview.php */
98		- do_action('geodir_after_listing_post_title', 'listview', $post); ?>
	97	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	98	+ do_action('geodir_after_listing_post_title', 'listview', $post); ?>
99	99	<?php /// Print Distance
100		- if (isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') {
101		- $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
	100	+ if (isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') {
	101	+ $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
102	102
103		- $endLat = $post->post_latitude;
104		- $endLon = $post->post_longitude;
105		- $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);
106		- $uom = get_option('geodir_search_dist_1');
107		- $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
108		- ?>
	103	+ $endLat = $post->post_latitude;
	104	+ $endLon = $post->post_longitude;
	105	+ $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);
	106	+ $uom = get_option('geodir_search_dist_1');
	107	+ $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
	108	+ ?>
109	109	<h3>
110	110	<?php
111		- if (round($distance, 2) == 0) {
112		- $uom = get_option('geodir_search_dist_2');
113		- $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
114		- if ($uom == 'feet') {
115		- $uom = __('feet', 'geodirectory');
116		- } else {
117		- $uom = __('meters', 'geodirectory');
118		- }
119		- echo round($distance) . ' ' . __($uom, 'geodirectory') . '
	111	+ if (round($distance, 2) == 0) {
	112	+ $uom = get_option('geodir_search_dist_2');
	113	+ $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
	114	+ if ($uom == 'feet') {
	115	+ $uom = __('feet', 'geodirectory');
	116	+ } else {
	117	+ $uom = __('meters', 'geodirectory');
	118	+ }
	119	+ echo round($distance) . ' ' . __($uom, 'geodirectory') . '
120	120	<br />
121	121	';
122		- } else {
123		- if ($uom == 'miles') {
124		- $uom = __('miles', 'geodirectory');
125		- } else {
126		- $uom = __('km', 'geodirectory');
127		- }
128		- echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
	122	+ } else {
	123	+ if ($uom == 'miles') {
	124	+ $uom = __('miles', 'geodirectory');
	125	+ } else {
	126	+ $uom = __('km', 'geodirectory');
	127	+ }
	128	+ echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
129	129	<br />
130	130	';
131		- }
132		- ?>
	131	+ }
	132	+ ?>
133	133	</h3>
134	134	<?php } ?>
135	135	<?php
136		- /** This action is documented in geodirectory-templates/listing-listview.php */
137		- do_action('geodir_before_listing_post_excerpt', $post); ?>
	136	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	137	+ do_action('geodir_before_listing_post_excerpt', $post); ?>
138	138	<?php echo geodir_show_listing_info('listing'); ?>
139	139	<?php if (isset($character_count) && $character_count == '0') {
140		- } else { ?>
	140	+ } else { ?>
141	141	<div class="geodir-entry-content">
142	142	<?php
143		- /**
144		- * Filter to hide the listing excerpt
145		- *
146		- * @since 1.5.3
147		- * @param bool $display Display the excerpt or not. Default true.
148		- * @param object $post The post object.
149		- */
150		- $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
151		- if ($show_listing_excerpt) {
152		- if ( isset( $character_count ) && ( $character_count \|\| $character_count == '0' ) ) {
153		- $content_out = geodir_max_excerpt( $character_count );
154		- } else {
155		- $content_out = get_the_excerpt();
156		- }
157		- if ( ! empty( $content_out ) ) {
158		- echo "<p>" . $content_out . "</p>";
159		- }
160		- }
161		- ?>
	143	+ /**
	144	+ * Filter to hide the listing excerpt
	145	+ *
	146	+ * @since 1.5.3
	147	+ * @param bool $display Display the excerpt or not. Default true.
	148	+ * @param object $post The post object.
	149	+ */
	150	+ $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
	151	+ if ($show_listing_excerpt) {
	152	+ if ( isset( $character_count ) && ( $character_count \|\| $character_count == '0' ) ) {
	153	+ $content_out = geodir_max_excerpt( $character_count );
	154	+ } else {
	155	+ $content_out = get_the_excerpt();
	156	+ }
	157	+ if ( ! empty( $content_out ) ) {
	158	+ echo "<p>" . $content_out . "</p>";
	159	+ }
	160	+ }
	161	+ ?>
162	162	</div>
163	163	<?php } ?>
164	164	<?php
165		- /** This action is documented in geodirectory-templates/listing-listview.php */
166		- do_action('geodir_after_listing_post_excerpt', $post); ?>
	165	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	166	+ do_action('geodir_after_listing_post_excerpt', $post); ?>
167	167	</div>
168	168	<!-- gd-content ends here-->
169	169	<?php
170		- /**
171		- * Called after printing listing content.
172		- *
173		- * @since 1.5.3
174		- * @param object $post The post object.
175		- * @param string $view The view type, default 'widget'.
176		- */
177		- do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
	170	+ /**
	171	+ * Called after printing listing content.
	172	+ *
	173	+ * @since 1.5.3
	174	+ * @param object $post The post object.
	175	+ * @param string $view The view type, default 'widget'.
	176	+ */
	177	+ do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
178	178	<footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">
179	179	<div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">
180	180	<?php
181		- /**
182		- * Called before printing review stars html.
183		- *
184		- * @since 1.5.3
185		- * @param object $post The post object.
186		- * @param string $view The view type, default 'widget'.
187		- */
188		- do_action( 'geodir_before_review_html', $post, 'widget' );
189		- $review_show = geodir_is_reviews_show('listview');
190		- if ($review_show) {
	181	+ /**
	182	+ * Called before printing review stars html.
	183	+ *
	184	+ * @since 1.5.3
	185	+ * @param object $post The post object.
	186	+ * @param string $view The view type, default 'widget'.
	187	+ */
	188	+ do_action( 'geodir_before_review_html', $post, 'widget' );
	189	+ $review_show = geodir_is_reviews_show('listview');
	190	+ if ($review_show) {
191	191
192		- $post_avgratings = geodir_get_post_rating($post->ID);
	192	+ $post_avgratings = geodir_get_post_rating($post->ID);
193	193
194		- /** This action is documented in geodirectory-templates/listing-listview.php */
195		- do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
	194	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	195	+ do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
196	196
197		- echo geodir_get_rating_stars($post_avgratings, $post->ID);
	197	+ echo geodir_get_rating_stars($post_avgratings, $post->ID);
198	198
199		- /** This action is documented in geodirectory-templates/listing-listview.php */
200		- do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
201		- ?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
	199	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	200	+ do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
	201	+ ?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
202	202	class="fa fa-comments"></i> <?php geodir_comments_number($post->rating_count); ?>
203	203	</a>
204	204	<?php
205		- }
	205	+ }
206	206
207	207
208		- /**
209		- * Called after printing favorite html.
210		- *
211		- * @since 1.0.0
212		- */
213		- do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
	208	+ /**
	209	+ * Called after printing favorite html.
	210	+ *
	211	+ * @since 1.0.0
	212	+ */
	213	+ do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
214	214
215		- if ($post->post_author == get_current_user_id()) {
216		- $addplacelink = get_permalink(geodir_add_listing_page_id());
217		- $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);
218		- $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);
	215	+ if ($post->post_author == get_current_user_id()) {
	216	+ $addplacelink = get_permalink(geodir_add_listing_page_id());
	217	+ $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);
	218	+ $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);
219	219
220		- $ajaxlink = geodir_get_ajax_url();
221		- $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);
222		- ?>
	220	+ $ajaxlink = geodir_get_ajax_url();
	221	+ $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);
	222	+ ?>
223	223	<span class="geodir-authorlink clearfix">
224	224	<?php
225		- if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {
226		- /** This action is documented in geodirectory-templates/listing-listview.php */
227		- do_action('geodir_before_edit_post_link_on_listing');
228		- ?>
	225	+ if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {
	226	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	227	+ do_action('geodir_before_edit_post_link_on_listing');
	228	+ ?>
229	229	<a href="<?php echo esc_url($editlink); ?>" class="geodir-edit"
230	230	title="<?php _e('Edit Listing', 'geodirectory'); ?>">
231	231	<?php
232		- $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');
233		- echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
234		- ?>
	232	+ $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');
	233	+ echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
	234	+ ?>
235	235	<?php _e('Edit', 'geodirectory'); ?>
236	236	</a>
237	237	<a href="<?php echo esc_url($deletelink); ?>" class="geodir-delete"
238	238	title="<?php _e('Delete Listing', 'geodirectory'); ?>">
239	239	<?php
240		- $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');
241		- echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
242		- ?>
	240	+ $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');
	241	+ echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
	242	+ ?>
243	243	<?php _e('Delete', 'geodirectory'); ?>
244	244	</a>
245	245	<?php
246		- /** This action is documented in geodirectory-templates/listing-listview.php */
247		- do_action('geodir_after_edit_post_link_on_listing');
248		- } ?>
	246	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	247	+ do_action('geodir_after_edit_post_link_on_listing');
	248	+ } ?>
249	249	</span>
250	250	<?php } ?>
251	251	</div>
		@@ -255,17 +255,17 @@ discard block
		block discarded – undo
255	255	</article>
256	256	</li>
257	257	<?php
258		- unset($gd_widget_listing_type);
259		- }
260		- /** This action is documented in geodirectory-templates/listing-listview.php */
261		- do_action('geodir_after_listing_post_listview');
262		- } else {
	258	+ unset($gd_widget_listing_type);
	259	+ }
	260	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	261	+ do_action('geodir_after_listing_post_listview');
	262	+ } else {
263	263	$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
264	264
265	265	/** This action is documented in geodirectory-templates/listing-listview.php */
266		- do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);
267		- }
268		- ?>
	266	+ do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);
	267	+ }
	268	+ ?>
269	269	</ul> <!-- geodir_category_list_view ends here-->
270	270	<div class="clear"></div>
271	271	<?php

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	/** This action is documented in geodirectory-templates/listing-listview.php */
30	30	do_action('geodir_before_listing_post_listview');
31	31	$all_postypes = geodir_get_posttypes();
32		- $geodir_days_new = (int)get_option('geodir_listing_new_days');
	32	+ $geodir_days_new = (int) get_option('geodir_listing_new_days');
33	33	foreach ($widget_listings as $widget_listing) {
34	34	global $gd_widget_listing_type;
35	35	$post = $widget_listing;
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	$post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
47	47	?>
48	48	<li class="clearfix <?php if ($grid_view_class) {
49		- echo 'geodir-gridview ' . $grid_view_class;
	49	+ echo 'geodir-gridview '.$grid_view_class;
50	50	} else {
51	51	echo ' geodir-listview ';
52	52	} ?> <?php if ($post_view_class) {
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	} else {
117	117	$uom = __('meters', 'geodirectory');
118	118	}
119		- echo round($distance) . ' ' . __($uom, 'geodirectory') . '
	119	+ echo round($distance).' '.__($uom, 'geodirectory').'
120	120	<br />
121	121	';
122	122	} else {
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	} else {
126	126	$uom = __('km', 'geodirectory');
127	127	}
128		- echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
	128	+ echo round($distance, 2).' '.__($uom, 'geodirectory').'
129	129	<br />
130	130	';
131	131	}
		@@ -149,13 +149,13 @@ discard block
		block discarded – undo
149	149	*/
150	150	$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
151	151	if ($show_listing_excerpt) {
152		- if ( isset( $character_count ) && ( $character_count \|\| $character_count == '0' ) ) {
153		- $content_out = geodir_max_excerpt( $character_count );
	152	+ if (isset($character_count) && ($character_count \|\| $character_count == '0')) {
	153	+ $content_out = geodir_max_excerpt($character_count);
154	154	} else {
155	155	$content_out = get_the_excerpt();
156	156	}
157		- if ( ! empty( $content_out ) ) {
158		- echo "<p>" . $content_out . "</p>";
	157	+ if (!empty($content_out)) {
	158	+ echo "<p>".$content_out."</p>";
159	159	}
160	160	}
161	161	?>
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	* @param object $post The post object.
175	175	* @param string $view The view type, default 'widget'.
176	176	*/
177		- do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
	177	+ do_action('geodir_after_listing_content', $post, 'widget'); ?>
178	178	<footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">
179	179	<div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">
180	180	<?php
		@@ -185,7 +185,7 @@ discard block
		block discarded – undo
185	185	* @param object $post The post object.
186	186	* @param string $view The view type, default 'widget'.
187	187	*/
188		- do_action( 'geodir_before_review_html', $post, 'widget' );
	188	+ do_action('geodir_before_review_html', $post, 'widget');
189	189	$review_show = geodir_is_reviews_show('listview');
190	190	if ($review_show) {
191	191
		@@ -210,7 +210,7 @@ discard block
		block discarded – undo
210	210	*
211	211	* @since 1.0.0
212	212	*/
213		- do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
	213	+ do_action('geodir_after_favorite_html', $post->ID, 'widget');
214	214
215	215	if ($post->post_author == get_current_user_id()) {
216	216	$addplacelink = get_permalink(geodir_add_listing_page_id());
		@@ -230,7 +230,7 @@ discard block
		block discarded – undo
230	230	title="<?php _e('Edit Listing', 'geodirectory'); ?>">
231	231	<?php
232	232	$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');
233		- echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
	233	+ echo '<i class="'.$geodir_listing_edit_icon.'"></i>';
234	234	?>
235	235	<?php _e('Edit', 'geodirectory'); ?>
236	236	</a>
		@@ -238,7 +238,7 @@ discard block
		block discarded – undo
238	238	title="<?php _e('Delete Listing', 'geodirectory'); ?>">
239	239	<?php
240	240	$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');
241		- echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
	241	+ echo '<i class="'.$geodir_listing_delete_icon.'"></i>';
242	242	?>
243	243	<?php _e('Delete', 'geodirectory'); ?>
244	244	</a>

		@@ -64,6 +64,9 @@ discard block
		block discarded – undo
64	64
65	65	class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
66	66
	67	+ /**
	68	+ * @param WP_UnitTest_Factory $factory
	69	+ */
67	70	function __construct( $factory = null ) {
68	71	parent::__construct( $factory );
69	72	$this->default_generation_definitions = array(
		@@ -127,6 +130,9 @@ discard block
		block discarded – undo
127	130
128	131	class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
129	132
	133	+ /**
	134	+ * @param WP_UnitTest_Factory $factory
	135	+ */
130	136	function __construct( $factory = null ) {
131	137	parent::__construct( $factory );
132	138	$this->default_generation_definitions = array(
		@@ -152,6 +158,9 @@ discard block
		block discarded – undo
152	158
153	159	class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
154	160
	161	+ /**
	162	+ * @param WP_UnitTest_Factory $factory
	163	+ */
155	164	function __construct( $factory = null ) {
156	165	parent::__construct( $factory );
157	166	$this->default_generation_definitions = array(
		@@ -183,6 +192,9 @@ discard block
		block discarded – undo
183	192
184	193	class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
185	194
	195	+ /**
	196	+ * @param WP_UnitTest_Factory $factory
	197	+ */
186	198	function __construct( $factory = null ) {
187	199	global $current_site, $base;
188	200	parent::__construct( $factory );
		@@ -219,6 +231,9 @@ discard block
		block discarded – undo
219	231
220	232	class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
221	233
	234	+ /**
	235	+ * @param WP_UnitTest_Factory $factory
	236	+ */
222	237	function __construct( $factory = null ) {
223	238	parent::__construct( $factory );
224	239	$this->default_generation_definitions = array(
		@@ -255,6 +270,10 @@ discard block
		block discarded – undo
255	270	private $taxonomy;
256	271	const DEFAULT_TAXONOMY = 'post_tag';
257	272
	273	+ /**
	274	+ * @param WP_UnitTest_Factory $factory
	275	+ * @param string $taxonomy
	276	+ */
258	277	function __construct( $factory = null, $taxonomy = null ) {
259	278	parent::__construct( $factory );
260	279	$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
		@@ -342,6 +361,9 @@ discard block
		block discarded – undo
342	361
343	362	abstract function get_object_by_id( $object_id );
344	363
	364	+ /**
	365	+ * @param integer $count
	366	+ */
345	367	function create_many( $count, $args = array(), $generation_definitions = null ) {
346	368	$results = array();
347	369	for ( $i = 0; $i < $count; $i++ ) {
		@@ -405,6 +427,9 @@ discard block
		block discarded – undo
405	427	public $next;
406	428	public $template_string;
407	429
	430	+ /**
	431	+ * @param integer $start
	432	+ */
408	433	function __construct( $template_string = '%s', $start = null ) {
409	434	if ( $start ) {
410	435	$this->next = $start;

		@@ -104,8 +104,9 @@ discard block
		block discarded – undo
104	104	$type = $upload['type'];
105	105	} else {
106	106	$mime = wp_check_filetype( $upload['file'] );
107		- if ($mime)
108		- $type = $mime['type'];
	107	+ if ($mime) {
	108	+ $type = $mime['type'];
	109	+ }
109	110	}
110	111
111	112	$attachment = array(
		@@ -268,15 +269,17 @@ discard block
		block discarded – undo
268	269	function create_object( $args ) {
269	270	$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
270	271	$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
271		- if ( is_wp_error( $term_id_pair ) )
272		- return $term_id_pair;
	272	+ if ( is_wp_error( $term_id_pair ) ) {
	273	+ return $term_id_pair;
	274	+ }
273	275	return $term_id_pair['term_id'];
274	276	}
275	277
276	278	function update_object( $term, $fields ) {
277	279	$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
278		- if ( is_object( $term ) )
279		- $taxonomy = $term->taxonomy;
	280	+ if ( is_object( $term ) ) {
	281	+ $taxonomy = $term->taxonomy;
	282	+ }
280	283	$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
281	284	return $term_id_pair['term_id'];
282	285	}
		@@ -318,19 +321,22 @@ discard block
		block discarded – undo
318	321	abstract function update_object( $object, $fields );
319	322
320	323	function create( $args = array(), $generation_definitions = null ) {
321		- if ( is_null( $generation_definitions ) )
322		- $generation_definitions = $this->default_generation_definitions;
	324	+ if ( is_null( $generation_definitions ) ) {
	325	+ $generation_definitions = $this->default_generation_definitions;
	326	+ }
323	327
324	328	$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
325	329	$created = $this->create_object( $generated_args );
326		- if ( !$created \|\| is_wp_error( $created ) )
327		- return $created;
	330	+ if ( !$created \|\| is_wp_error( $created ) ) {
	331	+ return $created;
	332	+ }
328	333
329	334	if ( $callbacks ) {
330	335	$updated_fields = $this->apply_callbacks( $callbacks, $created );
331	336	$save_result = $this->update_object( $created, $updated_fields );
332		- if ( !$save_result \|\| is_wp_error( $save_result ) )
333		- return $save_result;
	337	+ if ( !$save_result \|\| is_wp_error( $save_result ) ) {
	338	+ return $save_result;
	339	+ }
334	340	}
335	341	return $created;
336	342	}
		@@ -352,20 +358,22 @@ discard block
		block discarded – undo
352	358
353	359	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
354	360	$callbacks = array();
355		- if ( is_null( $generation_definitions ) )
356		- $generation_definitions = $this->default_generation_definitions;
	361	+ if ( is_null( $generation_definitions ) ) {
	362	+ $generation_definitions = $this->default_generation_definitions;
	363	+ }
357	364
358	365	foreach( array_keys( $generation_definitions ) as $field_name ) {
359	366	if ( !isset( $args[$field_name] ) ) {
360	367	$generator = $generation_definitions[$field_name];
361		- if ( is_scalar( $generator ) )
362		- $args[$field_name] = $generator;
363		- elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
	368	+ if ( is_scalar( $generator ) ) {
	369	+ $args[$field_name] = $generator;
	370	+ } elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
364	371	$callbacks[$field_name] = $generator;
365		- } elseif ( is_object( $generator ) )
366		- $args[$field_name] = $generator->next();
367		- else
368		- return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
	372	+ } elseif ( is_object( $generator ) ) {
	373	+ $args[$field_name] = $generator->next();
	374	+ } else {
	375	+ return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
	376	+ }
369	377	}
370	378	}
371	379	return $args;

		@@ -10,6 +10,9 @@ discard block
		block discarded – undo
10	10	return true;
11	11	}
12	12
	13	+/**
	14	+ * @param integer $priority
	15	+ */
13	16	function _test_filter_build_unique_id($tag, $function, $priority) {
14	17	global $wp_filter;
15	18	static $filter_id_count = 0;
		@@ -92,6 +95,9 @@ discard block
		block discarded – undo
92	95	return '_wp_die_handler';
93	96	}
94	97
	98	+/**
	99	+ * @param string $title
	100	+ */
95	101	function _wp_die_handler_txt( $message, $title, $args ) {
96	102	echo "\nwp_die called\n";
97	103	echo "Message : $message\n";

		@@ -14,8 +14,9 @@ discard block
		block discarded – undo
14	14	global $wp_filter;
15	15	static $filter_id_count = 0;
16	16
17		- if ( is_string($function) )
18		- return $function;
	17	+ if ( is_string($function) ) {
	18	+ return $function;
	19	+ }
19	20
20	21	if ( is_object($function) ) {
21	22	// Closures are currently implemented as objects
		@@ -37,8 +38,9 @@ discard block
		block discarded – undo
37	38
38	39	$all_posts = $wpdb->get_col("SELECT ID from {$wpdb->posts}");
39	40	if ($all_posts) {
40		- foreach ($all_posts as $id)
41		- wp_delete_post( $id, true );
	41	+ foreach ($all_posts as $id) {
	42	+ wp_delete_post( $id, true );
	43	+ }
42	44	}
43	45	}
44	46

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6
7	7	$idx = _test_filter_build_unique_id($tag, $function_to_add, $priority);
8	8	$wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
9		- unset( $merged_filters[ $tag ] );
	9	+ unset($merged_filters[$tag]);
10	10	return true;
11	11	}
12	12
		@@ -14,19 +14,19 @@ discard block
		block discarded – undo
14	14	global $wp_filter;
15	15	static $filter_id_count = 0;
16	16
17		- if ( is_string($function) )
	17	+ if (is_string($function))
18	18	return $function;
19	19
20		- if ( is_object($function) ) {
	20	+ if (is_object($function)) {
21	21	// Closures are currently implemented as objects
22		- $function = array( $function, '' );
	22	+ $function = array($function, '');
23	23	} else {
24	24	$function = (array) $function;
25	25	}
26	26
27		- if (is_object($function[0]) ) {
28		- return spl_object_hash($function[0]) . $function[1];
29		- } else if ( is_string($function[0]) ) {
	27	+ if (is_object($function[0])) {
	28	+ return spl_object_hash($function[0]).$function[1];
	29	+ } else if (is_string($function[0])) {
30	30	// Static Calling
31	31	return $function[0].$function[1];
32	32	}
		@@ -38,31 +38,31 @@ discard block
		block discarded – undo
38	38	$all_posts = $wpdb->get_col("SELECT ID from {$wpdb->posts}");
39	39	if ($all_posts) {
40	40	foreach ($all_posts as $id)
41		- wp_delete_post( $id, true );
	41	+ wp_delete_post($id, true);
42	42	}
43	43	}
44	44
45	45	class Basic_Object {
46	46	private $foo = 'bar';
47	47
48		- public function __get( $name ) {
	48	+ public function __get($name) {
49	49	return $this->{$name};
50	50	}
51	51
52		- public function __set( $name, $value ) {
	52	+ public function __set($name, $value) {
53	53	return $this->{$name} = $value;
54	54	}
55	55
56		- public function __isset( $name ) {
57		- return isset( $this->{$name} );
	56	+ public function __isset($name) {
	57	+ return isset($this->{$name} );
58	58	}
59	59
60		- public function __unset( $name ) {
61		- unset( $this->{$name} );
	60	+ public function __unset($name) {
	61	+ unset($this->{$name} );
62	62	}
63	63
64		- public function __call( $name, $arguments ) {
65		- return call_user_func_array( array( $this, $name ), $arguments );
	64	+ public function __call($name, $arguments) {
	65	+ return call_user_func_array(array($this, $name), $arguments);
66	66	}
67	67
68	68	private function callMe() {
		@@ -72,9 +72,9 @@ discard block
		block discarded – undo
72	72
73	73	class Basic_Subclass extends Basic_Object {}
74	74
75		-function _wp_die_handler( $message, $title = '', $args = array() ) {
76		- if ( !$GLOBALS['_wp_die_disabled'] ) {
77		- _wp_die_handler_txt( $message, $title, $args);
	75	+function _wp_die_handler($message, $title = '', $args = array()) {
	76	+ if (!$GLOBALS['_wp_die_disabled']) {
	77	+ _wp_die_handler_txt($message, $title, $args);
78	78	} else {
79	79	//Ignore at our peril
80	80	}
		@@ -92,13 +92,13 @@ discard block
		block discarded – undo
92	92	return '_wp_die_handler';
93	93	}
94	94
95		-function _wp_die_handler_txt( $message, $title, $args ) {
	95	+function _wp_die_handler_txt($message, $title, $args) {
96	96	echo "\nwp_die called\n";
97	97	echo "Message : $message\n";
98	98	echo "Title : $title\n";
99		- if ( ! empty( $args ) ) {
	99	+ if (!empty($args)) {
100	100	echo "Args: \n";
101		- foreach( $args as $k => $v ){
	101	+ foreach ($args as $k => $v) {
102	102	echo "\t $k : $v\n";
103	103	}
104	104	}
		@@ -113,5 +113,5 @@ discard block
		block discarded – undo
113	113	* @since 4.2.0
114	114	*/
115	115	function _set_default_permalink_structure_for_tests() {
116		- update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
	116	+ update_option('permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
117	117	}

		@@ -49,6 +49,7 @@ discard block
		block discarded – undo
49	49
50	50	/**
51	51	* "Bulk Loads" a filesystem into the internal virtual filesystem
	52	+ * @param string $paths
52	53	*/
53	54	function setfs( $paths ) {
54	55	if ( ! is_array($paths) )
		@@ -144,6 +145,9 @@ discard block
		block discarded – undo
144	145	return isset( $this->fs_map[ $file ] ) && $this->fs_map[ $file ]->is_file();
145	146	}
146	147
	148	+ /**
	149	+ * @param string $path
	150	+ */
147	151	function is_dir( $path ) {
148	152	$path = trailingslashit( $path );
149	153

		@@ -21,13 +21,15 @@ discard block
		block discarded – undo
21	21
22	22	// Copy of core's function, but accepts a path.
23	23	function abspath( $path = false ) {
24		- if ( ! $path )
25		- $path = ABSPATH;
	24	+ if ( ! $path ) {
	25	+ $path = ABSPATH;
	26	+ }
26	27	$folder = $this->find_folder( $path );
27	28
28	29	// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
29		- if ( ! $folder && $this->is_dir('/wp-includes') )
30		- $folder = '/';
	30	+ if ( ! $folder && $this->is_dir('/wp-includes') ) {
	31	+ $folder = '/';
	32	+ }
31	33	return $folder;
32	34	}
33	35
		@@ -51,21 +53,25 @@ discard block
		block discarded – undo
51	53	* "Bulk Loads" a filesystem into the internal virtual filesystem
52	54	*/
53	55	function setfs( $paths ) {
54		- if ( ! is_array($paths) )
55		- $paths = explode( "\n", $paths );
	56	+ if ( ! is_array($paths) ) {
	57	+ $paths = explode( "\n", $paths );
	58	+ }
56	59
57	60	$paths = array_filter( array_map( 'trim', $paths ) );
58	61
59	62	foreach ( $paths as $path ) {
60	63	// Allow for comments
61		- if ( '#' == $path[0] )
62		- continue;
	64	+ if ( '#' == $path[0] ) {
	65	+ continue;
	66	+ }
63	67
64	68	// Directories
65		- if ( '/' == $path[ strlen($path) -1 ] )
66		- $this->mkdir( $path );
67		- else // Files (with dummy content for now)
	69	+ if ( '/' == $path[ strlen($path) -1 ] ) {
	70	+ $this->mkdir( $path );
	71	+ } else {
	72	+ // Files (with dummy content for now)
68	73	$this->put_contents( $path, 'This is a test file' );
	74	+ }
69	75	}
70	76
71	77	}
		@@ -95,8 +101,9 @@ discard block
		block discarded – undo
95	101	$dirname = str_replace( '\\', '/', dirname( $path ) );
96	102	$this->mkdir( $dirname );
97	103	$parent_node = $this->locate_parent_node( $path );
98		- if ( ! $parent_node )
99		- return false;
	104	+ if ( ! $parent_node ) {
	105	+ return false;
	106	+ }
100	107	}
101	108
102	109	$node = new MockFS_Directory_Node( $path );
		@@ -108,8 +115,9 @@ discard block
		block discarded – undo
108	115	}
109	116
110	117	function put_contents( $path, $contents = '', $mode = null ) {
111		- if ( ! $this->is_dir( dirname( $path ) ) )
112		- $this->mkdir( dirname( $path ) );
	118	+ if ( ! $this->is_dir( dirname( $path ) ) ) {
	119	+ $this->mkdir( dirname( $path ) );
	120	+ }
113	121
114	122	$parent = $this->locate_parent_node( $path );
115	123	$new_file = new MockFS_File_Node( $path, $contents );
		@@ -119,8 +127,9 @@ discard block
		block discarded – undo
119	127	}
120	128
121	129	function get_contents( $file ) {
122		- if ( ! $this->is_file( $file ) )
123		- return false;
	130	+ if ( ! $this->is_file( $file ) ) {
	131	+ return false;
	132	+ }
124	133	return $this->fs_map[ $file ]->contents;
125	134	}
126	135
		@@ -129,8 +138,9 @@ discard block
		block discarded – undo
129	138	}
130	139
131	140	function chdir( $path ) {
132		- if ( ! isset( $this->fs_map[ $path ] ) )
133		- return false;
	141	+ if ( ! isset( $this->fs_map[ $path ] ) ) {
	142	+ return false;
	143	+ }
134	144
135	145	$this->cwd = $this->fs_map[ $path ];
136	146	return true;
		@@ -152,11 +162,13 @@ discard block
		block discarded – undo
152	162
153	163	function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
154	164
155		- if ( empty( $path ) \|\| '.' == $path )
156		- $path = $this->cwd();
	165	+ if ( empty( $path ) \|\| '.' == $path ) {
	166	+ $path = $this->cwd();
	167	+ }
157	168
158		- if ( ! $this->exists( $path ) )
159		- return false;
	169	+ if ( ! $this->exists( $path ) ) {
	170	+ return false;
	171	+ }
160	172
161	173	$limit_file = false;
162	174	if ( $this->is_file( $path ) ) {
		@@ -166,24 +178,28 @@ discard block
		block discarded – undo
166	178
167	179	$ret = array();
168	180	foreach ( $this->fs_map[ $path ]->children as $entry ) {
169		- if ( '.' == $entry->name \|\| '..' == $entry->name )
170		- continue;
	181	+ if ( '.' == $entry->name \|\| '..' == $entry->name ) {
	182	+ continue;
	183	+ }
171	184
172		- if ( ! $include_hidden && '.' == $entry->name )
173		- continue;
	185	+ if ( ! $include_hidden && '.' == $entry->name ) {
	186	+ continue;
	187	+ }
174	188
175		- if ( $limit_file && $entry->name != $limit_file )
176		- continue;
	189	+ if ( $limit_file && $entry->name != $limit_file ) {
	190	+ continue;
	191	+ }
177	192
178	193	$struc = array();
179	194	$struc['name'] = $entry->name;
180	195	$struc['type'] = $entry->type;
181	196
182	197	if ( 'd' == $struc['type'] ) {
183		- if ( $recursive )
184		- $struc['files'] = $this->dirlist( trailingslashit( $path ) . trailingslashit( $struc['name'] ), $include_hidden, $recursive );
185		- else
186		- $struc['files'] = array();
	198	+ if ( $recursive ) {
	199	+ $struc['files'] = $this->dirlist( trailingslashit( $path ) . trailingslashit( $struc['name'] ), $include_hidden, $recursive );
	200	+ } else {
	201	+ $struc['files'] = array();
	202	+ }
187	203	}
188	204
189	205	$ret[ $entry->name ] = $struc;

		@@ -20,13 +20,13 @@ discard block
		block discarded – undo
20	20	}
21	21
22	22	// Copy of core's function, but accepts a path.
23		- function abspath( $path = false ) {
24		- if ( ! $path )
	23	+ function abspath($path = false) {
	24	+ if (!$path)
25	25	$path = ABSPATH;
26		- $folder = $this->find_folder( $path );
	26	+ $folder = $this->find_folder($path);
27	27
28	28	// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
29		- if ( ! $folder && $this->is_dir('/wp-includes') )
	29	+ if (!$folder && $this->is_dir('/wp-includes'))
30	30	$folder = '/';
31	31	return $folder;
32	32	}
		@@ -37,35 +37,35 @@ discard block
		block discarded – undo
37	37	* Sets initial filesystem environment and/or clears the current environment.
38	38	* Can also be passed the initial filesystem to be setup which is passed to self::setfs()
39	39	*/
40		- function init( $paths = '', $home_dir = '/' ) {
41		- $this->fs = new MockFS_Directory_Node( '/' );
	40	+ function init($paths = '', $home_dir = '/') {
	41	+ $this->fs = new MockFS_Directory_Node('/');
42	42	$this->fs_map = array(
43	43	'/' => $this->fs,
44	44	);
45	45	$this->cache = array(); // Used by find_folder() and friends
46		- $this->cwd = isset( $this->fs_map[ $home_dir ] ) ? $this->fs_map[ $home_dir ] : '/';
47		- $this->setfs( $paths );
	46	+ $this->cwd = isset($this->fs_map[$home_dir]) ? $this->fs_map[$home_dir] : '/';
	47	+ $this->setfs($paths);
48	48	}
49	49
50	50	/**
51	51	* "Bulk Loads" a filesystem into the internal virtual filesystem
52	52	*/
53		- function setfs( $paths ) {
54		- if ( ! is_array($paths) )
55		- $paths = explode( "\n", $paths );
	53	+ function setfs($paths) {
	54	+ if (!is_array($paths))
	55	+ $paths = explode("\n", $paths);
56	56
57		- $paths = array_filter( array_map( 'trim', $paths ) );
	57	+ $paths = array_filter(array_map('trim', $paths));
58	58
59		- foreach ( $paths as $path ) {
	59	+ foreach ($paths as $path) {
60	60	// Allow for comments
61		- if ( '#' == $path[0] )
	61	+ if ('#' == $path[0])
62	62	continue;
63	63
64	64	// Directories
65		- if ( '/' == $path[ strlen($path) -1 ] )
66		- $this->mkdir( $path );
	65	+ if ('/' == $path[strlen($path) - 1])
	66	+ $this->mkdir($path);
67	67	else // Files (with dummy content for now)
68		- $this->put_contents( $path, 'This is a test file' );
	68	+ $this->put_contents($path, 'This is a test file');
69	69	}
70	70
71	71	}
		@@ -73,120 +73,120 @@ discard block
		block discarded – undo
73	73	/**
74	74	* Locates a filesystem "node"
75	75	*/
76		- private function locate_node( $path ) {
77		- return isset( $this->fs_map[ $path ] ) ? $this->fs_map[ $path ] : false;
	76	+ private function locate_node($path) {
	77	+ return isset($this->fs_map[$path]) ? $this->fs_map[$path] : false;
78	78	}
79	79
80	80	/**
81	81	* Locates a filesystem node for the parent of the given item
82	82	*/
83		- private function locate_parent_node( $path ) {
84		- $dirname = str_replace( '\\', '/', dirname( $path ) );
85		- return $this->locate_node( trailingslashit( $dirname ) );
	83	+ private function locate_parent_node($path) {
	84	+ $dirname = str_replace('\\', '/', dirname($path));
	85	+ return $this->locate_node(trailingslashit($dirname));
86	86	}
87	87
88	88	// Here starteth the WP_Filesystem functions.
89	89
90		- function mkdir( $path, /* Optional args are ignored */ $chmod = false, $chown = false, $chgrp = false ) {
91		- $path = trailingslashit( $path );
	90	+ function mkdir($path, /* Optional args are ignored */ $chmod = false, $chown = false, $chgrp = false) {
	91	+ $path = trailingslashit($path);
92	92
93		- $parent_node = $this->locate_parent_node( $path );
94		- if ( ! $parent_node ) {
95		- $dirname = str_replace( '\\', '/', dirname( $path ) );
96		- $this->mkdir( $dirname );
97		- $parent_node = $this->locate_parent_node( $path );
98		- if ( ! $parent_node )
	93	+ $parent_node = $this->locate_parent_node($path);
	94	+ if (!$parent_node) {
	95	+ $dirname = str_replace('\\', '/', dirname($path));
	96	+ $this->mkdir($dirname);
	97	+ $parent_node = $this->locate_parent_node($path);
	98	+ if (!$parent_node)
99	99	return false;
100	100	}
101	101
102		- $node = new MockFS_Directory_Node( $path );
	102	+ $node = new MockFS_Directory_Node($path);
103	103
104		- $parent_node->children[ $node->name ] = $node;
105		- $this->fs_map[ $path ] = $node;
	104	+ $parent_node->children[$node->name] = $node;
	105	+ $this->fs_map[$path] = $node;
106	106
107	107	return true;
108	108	}
109	109
110		- function put_contents( $path, $contents = '', $mode = null ) {
111		- if ( ! $this->is_dir( dirname( $path ) ) )
112		- $this->mkdir( dirname( $path ) );
	110	+ function put_contents($path, $contents = '', $mode = null) {
	111	+ if (!$this->is_dir(dirname($path)))
	112	+ $this->mkdir(dirname($path));
113	113
114		- $parent = $this->locate_parent_node( $path );
115		- $new_file = new MockFS_File_Node( $path, $contents );
	114	+ $parent = $this->locate_parent_node($path);
	115	+ $new_file = new MockFS_File_Node($path, $contents);
116	116
117		- $parent->children[ $new_file->name ] = $new_file;
118		- $this->fs_map[ $path ] = $new_file;
	117	+ $parent->children[$new_file->name] = $new_file;
	118	+ $this->fs_map[$path] = $new_file;
119	119	}
120	120
121		- function get_contents( $file ) {
122		- if ( ! $this->is_file( $file ) )
	121	+ function get_contents($file) {
	122	+ if (!$this->is_file($file))
123	123	return false;
124		- return $this->fs_map[ $file ]->contents;
	124	+ return $this->fs_map[$file]->contents;
125	125	}
126	126
127	127	function cwd() {
128	128	return $this->cwd->path;
129	129	}
130	130
131		- function chdir( $path ) {
132		- if ( ! isset( $this->fs_map[ $path ] ) )
	131	+ function chdir($path) {
	132	+ if (!isset($this->fs_map[$path]))
133	133	return false;
134	134
135		- $this->cwd = $this->fs_map[ $path ];
	135	+ $this->cwd = $this->fs_map[$path];
136	136	return true;
137	137	}
138	138
139		- function exists( $path ) {
140		- return isset( $this->fs_map[ $path ] ) \|\| isset( $this->fs_map[ trailingslashit( $path ) ] );
	139	+ function exists($path) {
	140	+ return isset($this->fs_map[$path]) \|\| isset($this->fs_map[trailingslashit($path)]);
141	141	}
142	142
143		- function is_file( $file ) {
144		- return isset( $this->fs_map[ $file ] ) && $this->fs_map[ $file ]->is_file();
	143	+ function is_file($file) {
	144	+ return isset($this->fs_map[$file]) && $this->fs_map[$file]->is_file();
145	145	}
146	146
147		- function is_dir( $path ) {
148		- $path = trailingslashit( $path );
	147	+ function is_dir($path) {
	148	+ $path = trailingslashit($path);
149	149
150		- return isset( $this->fs_map[ $path ] ) && $this->fs_map[ $path ]->is_dir();
	150	+ return isset($this->fs_map[$path]) && $this->fs_map[$path]->is_dir();
151	151	}
152	152
153		- function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
	153	+ function dirlist($path = '.', $include_hidden = true, $recursive = false) {
154	154
155		- if ( empty( $path ) \|\| '.' == $path )
	155	+ if (empty($path) \|\| '.' == $path)
156	156	$path = $this->cwd();
157	157
158		- if ( ! $this->exists( $path ) )
	158	+ if (!$this->exists($path))
159	159	return false;
160	160
161	161	$limit_file = false;
162		- if ( $this->is_file( $path ) ) {
163		- $limit_file = $this->locate_node( $path )->name;
164		- $path = dirname( $path ) . '/';
	162	+ if ($this->is_file($path)) {
	163	+ $limit_file = $this->locate_node($path)->name;
	164	+ $path = dirname($path).'/';
165	165	}
166	166
167	167	$ret = array();
168		- foreach ( $this->fs_map[ $path ]->children as $entry ) {
169		- if ( '.' == $entry->name \|\| '..' == $entry->name )
	168	+ foreach ($this->fs_map[$path]->children as $entry) {
	169	+ if ('.' == $entry->name \|\| '..' == $entry->name)
170	170	continue;
171	171
172		- if ( ! $include_hidden && '.' == $entry->name )
	172	+ if (!$include_hidden && '.' == $entry->name)
173	173	continue;
174	174
175		- if ( $limit_file && $entry->name != $limit_file )
	175	+ if ($limit_file && $entry->name != $limit_file)
176	176	continue;
177	177
178	178	$struc = array();
179	179	$struc['name'] = $entry->name;
180	180	$struc['type'] = $entry->type;
181	181
182		- if ( 'd' == $struc['type'] ) {
183		- if ( $recursive )
184		- $struc['files'] = $this->dirlist( trailingslashit( $path ) . trailingslashit( $struc['name'] ), $include_hidden, $recursive );
	182	+ if ('d' == $struc['type']) {
	183	+ if ($recursive)
	184	+ $struc['files'] = $this->dirlist(trailingslashit($path).trailingslashit($struc['name']), $include_hidden, $recursive);
185	185	else
186	186	$struc['files'] = array();
187	187	}
188	188
189		- $ret[ $entry->name ] = $struc;
	189	+ $ret[$entry->name] = $struc;
190	190	}
191	191	return $ret;
192	192	}
		@@ -198,9 +198,9 @@ discard block
		block discarded – undo
198	198	public $type; // The type of the entry 'f' for file, 'd' for Directory
199	199	public $path; // The full path to the entry.
200	200
201		- function __construct( $path ) {
	201	+ function __construct($path) {
202	202	$this->path = $path;
203		- $this->name = basename( $path );
	203	+ $this->name = basename($path);
204	204	}
205	205
206	206	function is_file() {
		@@ -221,8 +221,8 @@ discard block
		block discarded – undo
221	221	public $type = 'f';
222	222	public $contents = ''; // The contents of the file
223	223
224		- function __construct( $path, $contents = '' ) {
225		- parent::__construct( $path );
	224	+ function __construct($path, $contents = '') {
	225	+ parent::__construct($path);
226	226	$this->contents = $contents;
227	227	}
228	228	}
229	229	\ No newline at end of file

		@@ -336,8 +336,6 @@ discard block
		block discarded – undo
336	336	*
337	337	* @since 4.2.0
338	338	*
339		- * @param string $deprecated Name of the function, method, or class that appears in the first argument of the
340		- * source `_doing_it_wrong()` call.
341	339	*/
342	340	public function setExpectedIncorrectUsage( $doing_it_wrong ) {
343	341	array_push( $this->expected_doing_it_wrong, $doing_it_wrong );
		@@ -525,7 +523,6 @@ discard block
		block discarded – undo
525	523	* expected to be false. For example, assertQueryTrue('is_single', 'is_feed') means is_single()
526	524	* and is_feed() must be true and everything else must be false to pass.
527	525	*
528		- * @param string $prop,... Any number of WP_Query properties that are expected to be true for the current request.
529	526	*/
530	527	function assertQueryTrue(/* ... */) {
531	528	global $wp_query;

		@@ -21,7 +21,7 @@
		block discarded – undo
21	21	function __get( $name ) {
22	22	if ( 'factory' === $name ) {
23	23	return self::factory();
24		- }
	24	+ }
25	25	}
26	26
27	27	protected static function factory() {

		@@ -1,69 +1,69 @@
		block discarded – undo
1	1	<?php
2	2	class CheckMaps extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ }
8	8
9		- public function testCheckHomeMap()
10		- {
11		- $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
12		- $this->assertContains( 'geodir-map-home-page', $output );
13		- }
	9	+ public function testCheckHomeMap()
	10	+ {
	11	+ $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
	12	+ $this->assertContains( 'geodir-map-home-page', $output );
	13	+ }
14	14
15		- public function testListingsPageMap()
16		- {
17		- $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
18		- $this->assertContains( 'geodir-map-listing-page', $output );
19		- }
	15	+ public function testListingsPageMap()
	16	+ {
	17	+ $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
	18	+ $this->assertContains( 'geodir-map-listing-page', $output );
	19	+ }
20	20
21		- public function testDetailPageMap()
22		- {
	21	+ public function testDetailPageMap()
	22	+ {
23	23
24		- $query_args = array(
25		- 'post_status' => 'publish',
26		- 'post_type' => 'gd_place',
27		- 'posts_per_page' => 1,
28		- );
	24	+ $query_args = array(
	25	+ 'post_status' => 'publish',
	26	+ 'post_type' => 'gd_place',
	27	+ 'posts_per_page' => 1,
	28	+ );
29	29
30		- $all_posts = new WP_Query( $query_args );
31		- $post_id = null;
32		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
33		- $post_id = get_the_ID();
34		- global $post;
35		- $post = geodir_get_post_info($post_id);
36		- setup_postdata($post);
	30	+ $all_posts = new WP_Query( $query_args );
	31	+ $post_id = null;
	32	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	33	+ $post_id = get_the_ID();
	34	+ global $post;
	35	+ $post = geodir_get_post_info($post_id);
	36	+ setup_postdata($post);
37	37
38		- $map_args = array();
39		- $map_args['map_canvas_name'] = 'detail_page_map_canvas';
40		- $map_args['width'] = '600';
41		- $map_args['height'] = '300';
42		- if ($post->post_mapzoom) {
43		- $map_args['zoom'] = '' . $post->post_mapzoom . '';
44		- }
45		- $map_args['autozoom'] = false;
46		- $map_args['child_collapse'] = '0';
47		- $map_args['enable_cat_filters'] = false;
48		- $map_args['enable_text_search'] = false;
49		- $map_args['enable_post_type_filters'] = false;
50		- $map_args['enable_location_filters'] = false;
51		- $map_args['enable_jason_on_load'] = true;
52		- $map_args['enable_map_direction'] = true;
53		- $map_args['map_class_name'] = 'geodir-map-detail-page';
54		- $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
55		- ob_start();
56		- geodir_draw_map($map_args);
57		- $output = ob_get_clean();
58		- $this->assertContains( 'geodir-map-detail-page', $output );
59		- endwhile;
	38	+ $map_args = array();
	39	+ $map_args['map_canvas_name'] = 'detail_page_map_canvas';
	40	+ $map_args['width'] = '600';
	41	+ $map_args['height'] = '300';
	42	+ if ($post->post_mapzoom) {
	43	+ $map_args['zoom'] = '' . $post->post_mapzoom . '';
	44	+ }
	45	+ $map_args['autozoom'] = false;
	46	+ $map_args['child_collapse'] = '0';
	47	+ $map_args['enable_cat_filters'] = false;
	48	+ $map_args['enable_text_search'] = false;
	49	+ $map_args['enable_post_type_filters'] = false;
	50	+ $map_args['enable_location_filters'] = false;
	51	+ $map_args['enable_jason_on_load'] = true;
	52	+ $map_args['enable_map_direction'] = true;
	53	+ $map_args['map_class_name'] = 'geodir-map-detail-page';
	54	+ $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
	55	+ ob_start();
	56	+ geodir_draw_map($map_args);
	57	+ $output = ob_get_clean();
	58	+ $this->assertContains( 'geodir-map-detail-page', $output );
	59	+ endwhile;
60	60
61	61
62		- }
	62	+ }
63	63
64		- public function tearDown()
65		- {
66		- parent::tearDown();
67		- }
	64	+ public function tearDown()
	65	+ {
	66	+ parent::tearDown();
	67	+ }
68	68	}
69	69	?>
70	70	\ No newline at end of file

		@@ -9,13 +9,13 @@ discard block
		block discarded – undo
9	9	public function testCheckHomeMap()
10	10	{
11	11	$output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
12		- $this->assertContains( 'geodir-map-home-page', $output );
	12	+ $this->assertContains('geodir-map-home-page', $output);
13	13	}
14	14
15	15	public function testListingsPageMap()
16	16	{
17	17	$output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
18		- $this->assertContains( 'geodir-map-listing-page', $output );
	18	+ $this->assertContains('geodir-map-listing-page', $output);
19	19	}
20	20
21	21	public function testDetailPageMap()
		@@ -27,12 +27,12 @@ discard block
		block discarded – undo
27	27	'posts_per_page' => 1,
28	28	);
29	29
30		- $all_posts = new WP_Query( $query_args );
	30	+ $all_posts = new WP_Query($query_args);
31	31	$post_id = null;
32		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	32	+ while ($all_posts->have_posts()) : $all_posts->the_post();
33	33	$post_id = get_the_ID();
34	34	global $post;
35		- $post = geodir_get_post_info($post_id);
	35	+ $post = geodir_get_post_info($post_id);
36	36	setup_postdata($post);
37	37
38	38	$map_args = array();
		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	$map_args['width'] = '600';
41	41	$map_args['height'] = '300';
42	42	if ($post->post_mapzoom) {
43		- $map_args['zoom'] = '' . $post->post_mapzoom . '';
	43	+ $map_args['zoom'] = ''.$post->post_mapzoom.'';
44	44	}
45	45	$map_args['autozoom'] = false;
46	46	$map_args['child_collapse'] = '0';
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	ob_start();
56	56	geodir_draw_map($map_args);
57	57	$output = ob_get_clean();
58		- $this->assertContains( 'geodir-map-detail-page', $output );
	58	+ $this->assertContains('geodir-map-detail-page', $output);
59	59	endwhile;
60	60
61	61

		@@ -1,19 +1,19 @@
		block discarded – undo
1	1	<?php
2	2	class CheckPinpoint extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ }
8	8
9		- public function testCheckPinpoint()
10		- {
	9	+ public function testCheckPinpoint()
	10	+ {
11	11
12		- }
	12	+ }
13	13
14		- public function tearDown()
15		- {
16		- parent::tearDown();
17		- }
	14	+ public function tearDown()
	15	+ {
	16	+ parent::tearDown();
	17	+ }
18	18	}
19	19	?>
20	20	\ No newline at end of file

		@@ -1,63 +1,63 @@
		block discarded – undo
1	1	<?php
2	2	class AddReview extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- wp_set_current_user(1);
8		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ wp_set_current_user(1);
	8	+ }
9	9
10		- public function testAddReview()
11		- {
12		- $time = current_time('mysql');
	10	+ public function testAddReview()
	11	+ {
	12	+ $time = current_time('mysql');
13	13
14		- $args = array(
15		- 'listing_type' => 'gd_place',
16		- 'post_title' => 'Test Listing Title',
17		- 'post_desc' => 'Test Desc',
18		- 'post_tags' => 'test1,test2',
19		- 'post_address' => 'New York City Hall',
20		- 'post_zip' => '10007',
21		- 'post_latitude' => '40.7127837',
22		- 'post_longitude' => '-74.00594130000002',
23		- 'post_mapview' => 'ROADMAP',
24		- 'post_mapzoom' => '10',
25		- 'geodir_timing' => '10.00 am to 6 pm every day',
26		- 'geodir_contact' => '1234567890',
27		- 'geodir_email' => '[email protected]',
28		- 'geodir_website' => 'http://test.com',
29		- 'geodir_twitter' => 'http://twitter.com/test',
30		- 'geodir_facebook' => 'http://facebook.com/test',
31		- 'geodir_special_offers' => 'Test offer'
32		- );
33		- $post_id = geodir_save_listing($args, true);
	14	+ $args = array(
	15	+ 'listing_type' => 'gd_place',
	16	+ 'post_title' => 'Test Listing Title',
	17	+ 'post_desc' => 'Test Desc',
	18	+ 'post_tags' => 'test1,test2',
	19	+ 'post_address' => 'New York City Hall',
	20	+ 'post_zip' => '10007',
	21	+ 'post_latitude' => '40.7127837',
	22	+ 'post_longitude' => '-74.00594130000002',
	23	+ 'post_mapview' => 'ROADMAP',
	24	+ 'post_mapzoom' => '10',
	25	+ 'geodir_timing' => '10.00 am to 6 pm every day',
	26	+ 'geodir_contact' => '1234567890',
	27	+ 'geodir_email' => '[email protected]',
	28	+ 'geodir_website' => 'http://test.com',
	29	+ 'geodir_twitter' => 'http://twitter.com/test',
	30	+ 'geodir_facebook' => 'http://facebook.com/test',
	31	+ 'geodir_special_offers' => 'Test offer'
	32	+ );
	33	+ $post_id = geodir_save_listing($args, true);
34	34
35		- $data = array(
36		- 'comment_post_ID' => $post_id,
37		- 'comment_author' => 'admin',
38		- 'comment_author_email' => '[email protected]',
39		- 'comment_author_url' => 'http://wpgeodirectory.com',
40		- 'comment_content' => 'content here',
41		- 'comment_type' => '',
42		- 'comment_parent' => 0,
43		- 'user_id' => 1,
44		- 'comment_author_IP' => '127.0.0.1',
45		- 'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
46		- 'comment_date' => $time,
47		- 'comment_approved' => 1,
48		- );
	35	+ $data = array(
	36	+ 'comment_post_ID' => $post_id,
	37	+ 'comment_author' => 'admin',
	38	+ 'comment_author_email' => '[email protected]',
	39	+ 'comment_author_url' => 'http://wpgeodirectory.com',
	40	+ 'comment_content' => 'content here',
	41	+ 'comment_type' => '',
	42	+ 'comment_parent' => 0,
	43	+ 'user_id' => 1,
	44	+ 'comment_author_IP' => '127.0.0.1',
	45	+ 'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
	46	+ 'comment_date' => $time,
	47	+ 'comment_approved' => 1,
	48	+ );
49	49
50		- $comment_id = wp_insert_comment($data);
	50	+ $comment_id = wp_insert_comment($data);
51	51
52		- $_REQUEST['geodir_overallrating'] = 5.0;
53		- geodir_save_rating($comment_id);
	52	+ $_REQUEST['geodir_overallrating'] = 5.0;
	53	+ geodir_save_rating($comment_id);
54	54
55		- $this->assertTrue(is_int($comment_id));
56		- }
	55	+ $this->assertTrue(is_int($comment_id));
	56	+ }
57	57
58		- public function tearDown()
59		- {
60		- parent::tearDown();
61		- }
	58	+ public function tearDown()
	59	+ {
	60	+ parent::tearDown();
	61	+ }
62	62	}
63	63	?>
64	64	\ No newline at end of file

		@@ -1,116 +1,116 @@
		block discarded – undo
1	1	<?php
2	2	class SendEnquiry extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- }
8		-
9		- public function testSendEnquiry()
10		- {
11		- $query_args = array(
12		- 'post_status' => 'publish',
13		- 'post_type' => 'gd_place',
14		- 'posts_per_page' => 1,
15		- );
16		-
17		- $all_posts = new WP_Query( $query_args );
18		- $post_id = null;
19		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
20		- $post_id = get_the_ID();
21		- endwhile;
22		-
23		- $this->assertTrue(is_int($post_id));
24		-
25		- $data = array(
26		- 'sendact' => 'send_inqury',
27		- 'pid' => (string) $post_id,
28		- 'inq_name' => 'Test User',
29		- 'inq_email' => '[email protected]',
30		- 'inq_phone' => 'Test',
31		- 'inq_msg' => 'Hi there, I would like to enquire about this place. I would like to ask more info about...',
32		- 'Send' => 'Send'
33		- );
34		-
35		- add_filter('wp_redirect', '__return_false');
36		- geodir_send_inquiry($data);
37		- remove_filter('wp_redirect', '__return_false');
38		- }
39		-
40		- public function testSendToFriend()
41		- {
42		- $query_args = array(
43		- 'post_status' => 'publish',
44		- 'post_type' => 'gd_place',
45		- 'posts_per_page' => 1,
46		- );
47		-
48		- $all_posts = new WP_Query( $query_args );
49		- $post_id = null;
50		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
51		- $post_id = get_the_ID();
52		- endwhile;
53		-
54		- $this->assertTrue(is_int($post_id));
55		-
56		- $data = array(
57		- 'sendact' => 'email_frnd',
58		- 'pid' => (string) $post_id,
59		- 'yourname' => 'Test User',
60		- 'youremail' => '[email protected]',
61		- 'frnd_subject' => 'Test',
62		- 'frnd_comments' => 'Hi there, This is a comment',
63		- 'to_email' => '[email protected]',
64		- 'to_name' => 'Test User 2',
65		- 'Send' => 'Send'
66		- );
67		-
68		- add_filter('wp_redirect', '__return_false');
69		- geodir_send_friend($data);
70		- remove_filter('wp_redirect', '__return_false');
71		- }
72		-
73		- public function texstSendToFriendFailure()
74		- {
75		- $query_args = array(
76		- 'post_status' => 'publish',
77		- 'post_type' => 'gd_place',
78		- 'posts_per_page' => 1,
79		- );
80		-
81		- $all_posts = new WP_Query( $query_args );
82		- $post_id = null;
83		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
84		- $post_id = get_the_ID();
85		- endwhile;
86		-
87		- $this->assertTrue(is_int($post_id));
88		-
89		- $data = array(
90		- 'sendact' => 'email_frnd',
91		- 'pid' => (string) $post_id,
92		- 'yourname' => 'Test User',
93		- 'youremail' => '[email protected]',
94		- 'frnd_subject' => 'Test',
95		- 'frnd_comments' => 'Hi there, This is a comment',
96		- 'to_email' => 'Test User 2', //incorrect email
97		- 'to_name' => '[email protected]',
98		- 'Send' => 'Send'
99		- );
100		-
101		- add_filter('wp_redirect', '__return_false');
102		- add_filter('wp_mail', 'print_mail');
103		- ob_start();
104		- geodir_send_friend($data);
105		- $output = ob_get_clean();
106		- $this->assertContains( 'Email from GeoDirectory failed to send', $output );
107		- remove_filter('wp_mail', 'print_mail');
108		- remove_filter('wp_redirect', '__return_false');
109		- }
110		-
111		- public function tearDown()
112		- {
113		- parent::tearDown();
114		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ }
	8	+
	9	+ public function testSendEnquiry()
	10	+ {
	11	+ $query_args = array(
	12	+ 'post_status' => 'publish',
	13	+ 'post_type' => 'gd_place',
	14	+ 'posts_per_page' => 1,
	15	+ );
	16	+
	17	+ $all_posts = new WP_Query( $query_args );
	18	+ $post_id = null;
	19	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	20	+ $post_id = get_the_ID();
	21	+ endwhile;
	22	+
	23	+ $this->assertTrue(is_int($post_id));
	24	+
	25	+ $data = array(
	26	+ 'sendact' => 'send_inqury',
	27	+ 'pid' => (string) $post_id,
	28	+ 'inq_name' => 'Test User',
	29	+ 'inq_email' => '[email protected]',
	30	+ 'inq_phone' => 'Test',
	31	+ 'inq_msg' => 'Hi there, I would like to enquire about this place. I would like to ask more info about...',
	32	+ 'Send' => 'Send'
	33	+ );
	34	+
	35	+ add_filter('wp_redirect', '__return_false');
	36	+ geodir_send_inquiry($data);
	37	+ remove_filter('wp_redirect', '__return_false');
	38	+ }
	39	+
	40	+ public function testSendToFriend()
	41	+ {
	42	+ $query_args = array(
	43	+ 'post_status' => 'publish',
	44	+ 'post_type' => 'gd_place',
	45	+ 'posts_per_page' => 1,
	46	+ );
	47	+
	48	+ $all_posts = new WP_Query( $query_args );
	49	+ $post_id = null;
	50	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	51	+ $post_id = get_the_ID();
	52	+ endwhile;
	53	+
	54	+ $this->assertTrue(is_int($post_id));
	55	+
	56	+ $data = array(
	57	+ 'sendact' => 'email_frnd',
	58	+ 'pid' => (string) $post_id,
	59	+ 'yourname' => 'Test User',
	60	+ 'youremail' => '[email protected]',
	61	+ 'frnd_subject' => 'Test',
	62	+ 'frnd_comments' => 'Hi there, This is a comment',
	63	+ 'to_email' => '[email protected]',
	64	+ 'to_name' => 'Test User 2',
	65	+ 'Send' => 'Send'
	66	+ );
	67	+
	68	+ add_filter('wp_redirect', '__return_false');
	69	+ geodir_send_friend($data);
	70	+ remove_filter('wp_redirect', '__return_false');
	71	+ }
	72	+
	73	+ public function texstSendToFriendFailure()
	74	+ {
	75	+ $query_args = array(
	76	+ 'post_status' => 'publish',
	77	+ 'post_type' => 'gd_place',
	78	+ 'posts_per_page' => 1,
	79	+ );
	80	+
	81	+ $all_posts = new WP_Query( $query_args );
	82	+ $post_id = null;
	83	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	84	+ $post_id = get_the_ID();
	85	+ endwhile;
	86	+
	87	+ $this->assertTrue(is_int($post_id));
	88	+
	89	+ $data = array(
	90	+ 'sendact' => 'email_frnd',
	91	+ 'pid' => (string) $post_id,
	92	+ 'yourname' => 'Test User',
	93	+ 'youremail' => '[email protected]',
	94	+ 'frnd_subject' => 'Test',
	95	+ 'frnd_comments' => 'Hi there, This is a comment',
	96	+ 'to_email' => 'Test User 2', //incorrect email
	97	+ 'to_name' => '[email protected]',
	98	+ 'Send' => 'Send'
	99	+ );
	100	+
	101	+ add_filter('wp_redirect', '__return_false');
	102	+ add_filter('wp_mail', 'print_mail');
	103	+ ob_start();
	104	+ geodir_send_friend($data);
	105	+ $output = ob_get_clean();
	106	+ $this->assertContains( 'Email from GeoDirectory failed to send', $output );
	107	+ remove_filter('wp_mail', 'print_mail');
	108	+ remove_filter('wp_redirect', '__return_false');
	109	+ }
	110	+
	111	+ public function tearDown()
	112	+ {
	113	+ parent::tearDown();
	114	+ }
115	115	}
116	116	?>
117	117	\ No newline at end of file

		@@ -14,9 +14,9 @@ discard block
		block discarded – undo
14	14	'posts_per_page' => 1,
15	15	);
16	16
17		- $all_posts = new WP_Query( $query_args );
	17	+ $all_posts = new WP_Query($query_args);
18	18	$post_id = null;
19		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	19	+ while ($all_posts->have_posts()) : $all_posts->the_post();
20	20	$post_id = get_the_ID();
21	21	endwhile;
22	22
		@@ -45,9 +45,9 @@ discard block
		block discarded – undo
45	45	'posts_per_page' => 1,
46	46	);
47	47
48		- $all_posts = new WP_Query( $query_args );
	48	+ $all_posts = new WP_Query($query_args);
49	49	$post_id = null;
50		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	50	+ while ($all_posts->have_posts()) : $all_posts->the_post();
51	51	$post_id = get_the_ID();
52	52	endwhile;
53	53
		@@ -78,9 +78,9 @@ discard block
		block discarded – undo
78	78	'posts_per_page' => 1,
79	79	);
80	80
81		- $all_posts = new WP_Query( $query_args );
	81	+ $all_posts = new WP_Query($query_args);
82	82	$post_id = null;
83		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	83	+ while ($all_posts->have_posts()) : $all_posts->the_post();
84	84	$post_id = get_the_ID();
85	85	endwhile;
86	86
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	ob_start();
104	104	geodir_send_friend($data);
105	105	$output = ob_get_clean();
106		- $this->assertContains( 'Email from GeoDirectory failed to send', $output );
	106	+ $this->assertContains('Email from GeoDirectory failed to send', $output);
107	107	remove_filter('wp_mail', 'print_mail');
108	108	remove_filter('wp_redirect', '__return_false');
109	109	}

GeoDirectory / geodirectory

Pull Request — master (#408)

Status

Category

Indentation +157 added lines, -157 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Doc Comments +25 added lines patch added patch discarded remove patch

Braces +29 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +143 added lines, -143 removed lines patch added patch discarded remove patch

Doc Comments +6 added lines patch added patch discarded remove patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Doc Comments +4 added lines patch added patch discarded remove patch

Braces +49 added lines, -33 removed lines patch added patch discarded remove patch

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

Doc Comments -3 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +60 added lines, -39 removed lines patch added patch discarded remove patch

Spacing +204 added lines, -204 removed lines patch added patch discarded remove patch

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +51 added lines, -51 removed lines patch added patch discarded remove patch

Indentation +111 added lines, -111 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch