GeoDirectory / geodirectory

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

Doc Comments +25 added lines

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

Braces +29 added lines, -21 removed lines

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

Spacing +143 added lines, -143 removed lines

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

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

Doc Comments +6 added lines

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

Braces +6 added lines, -4 removed lines

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

Spacing +23 added lines, -23 removed lines

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

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

Doc Comments +4 added lines

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

Braces +49 added lines, -33 removed lines

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

Spacing +71 added lines, -71 removed lines

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

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

Doc Comments -3 removed lines

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

Indentation +1 added lines, -1 removed lines

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

Braces +60 added lines, -39 removed lines

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

Spacing +204 added lines, -204 removed lines

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

tests/test-Check_Maps.php

Indentation +55 added lines, -55 removed lines

@@ -1,69 +1,69 @@
 <?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

Spacing +7 added lines, -7 removed lines

@@ -9,13 +9,13 @@ 
     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 @@ 
             '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 @@ 
             $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 @@ 
             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;
 
 

tests/test-Check_PinPoint.php

Indentation +11 added lines, -11 removed lines

@@ -1,19 +1,19 @@
 <?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

tests/test-Add_A_Review.php

Indentation +51 added lines, -51 removed lines

@@ -1,63 +1,63 @@
 <?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' => 'test@test.com',
-            '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' => 'test@test.com',
+			'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' => 'admin@admin.com',
-            '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' => 'admin@admin.com',
+			'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

tests/test-Send_Enquiry.php

Indentation +111 added lines, -111 removed lines

@@ -1,116 +1,116 @@
 <?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' => 'test@test.com',
-            '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' => 'test@test.com',
-            'frnd_subject' => 'Test',
-            'frnd_comments' => 'Hi there, This is a comment',
-            'to_email' => 'test2@test.com',
-            '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' => 'test@test.com',
-            'frnd_subject' => 'Test',
-            'frnd_comments' => 'Hi there, This is a comment',
-            'to_email' => 'Test User 2', //incorrect email
-            'to_name' => 'test@test.com',
-            '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' => 'test@test.com',
+			'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' => 'test@test.com',
+			'frnd_subject' => 'Test',
+			'frnd_comments' => 'Hi there, This is a comment',
+			'to_email' => 'test2@test.com',
+			'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' => 'test@test.com',
+			'frnd_subject' => 'Test',
+			'frnd_comments' => 'Hi there, This is a comment',
+			'to_email' => 'Test User 2', //incorrect email
+			'to_name' => 'test@test.com',
+			'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

Spacing +7 added lines, -7 removed lines

@@ -14,9 +14,9 @@ 
             '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 @@ 
             '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 @@ 
             '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 @@ 
         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');
     }

tests/lib/wordpress-tests-lib/includes/wp-profiler.php

Spacing +14 added lines, -14 removed lines

@@ -40,7 +40,7 @@ 
 		// reset the wpdb queries log, storing it on the profile stack if necessary
 		global $wpdb;
 		if ($this->stack) {
-			$this->stack[count($this->stack)-1]['queries'] = $wpdb->queries;
+			$this->stack[count($this->stack) - 1]['queries'] = $wpdb->queries;
 		}
 		$wpdb->queries = array();
 
@@ -74,14 +74,14 @@ 
 
 		if (isset($this->profile[$name])) {
 			$this->profile[$name]['time'] += $time;
-			$this->profile[$name]['calls'] ++;
+			$this->profile[$name]['calls']++;
 			$this->profile[$name]['cache_cold_hits'] += ($wp_object_cache->cold_cache_hits - $item['cache_cold_hits']);
 			$this->profile[$name]['cache_warm_hits'] += ($wp_object_cache->warm_cache_hits - $item['cache_warm_hits']);
 			$this->profile[$name]['cache_misses'] += ($wp_object_cache->cache_misses - $item['cache_misses']);
-			$this->profile[$name]['cache_dirty_objects'] = array_add( $this->profile[$name]['cache_dirty_objects'], $cache_dirty_delta) ;
-			$this->profile[$name]['actions'] = array_add( $this->profile[$name]['actions'], $item['actions'] );
-			$this->profile[$name]['filters'] = array_add( $this->profile[$name]['filters'], $item['filters'] );
-			$this->profile[$name]['queries'] = array_add( $this->profile[$name]['queries'], $item['queries'] );
+			$this->profile[$name]['cache_dirty_objects'] = array_add($this->profile[$name]['cache_dirty_objects'], $cache_dirty_delta);
+			$this->profile[$name]['actions'] = array_add($this->profile[$name]['actions'], $item['actions']);
+			$this->profile[$name]['filters'] = array_add($this->profile[$name]['filters'], $item['filters']);
+			$this->profile[$name]['queries'] = array_add($this->profile[$name]['queries'], $item['queries']);
 			#$this->_query_summary($item['queries'], $this->profile[$name]['queries']);
 
 		}
@@ -109,28 +109,28 @@ 
 
 	function microtime($since = 0.0) {
 		list($usec, $sec) = explode(' ', microtime());
-		return (float)$sec + (float)$usec - $since;
+		return (float) $sec + (float) $usec - $since;
 	}
 
 	function log_filter($tag) {
 		if ($this->stack) {
 			global $wp_actions;
 			if ($tag == end($wp_actions))
-				@$this->stack[count($this->stack)-1]['actions'][$tag] ++;
+				@$this->stack[count($this->stack) - 1]['actions'][$tag]++;
 			else
-				@$this->stack[count($this->stack)-1]['filters'][$tag] ++;
+				@$this->stack[count($this->stack) - 1]['filters'][$tag]++;
 		}
 		return $arg;
 	}
 
 	function log_action($tag) {
 		if ($this->stack)
-			@$this->stack[count($this->stack)-1]['actions'][$tag] ++;
+			@$this->stack[count($this->stack) - 1]['actions'][$tag]++;
 	}
 
 	function _current_action() {
 		global $wp_actions;
-		return $wp_actions[count($wp_actions)-1];
+		return $wp_actions[count($wp_actions) - 1];
 	}
 
 	function results() {
@@ -143,7 +143,7 @@ 
 			$sql = preg_replace('/(WHERE \w+ =) \d+/', '$1 x', $sql);
 			$sql = preg_replace('/(WHERE \w+ =) \'\[-\w]+\'/', '$1 \'xxx\'', $sql);
 
-			@$out[$sql] ++;
+			@$out[$sql]++;
 		}
 		asort($out);
 		return;
@@ -154,9 +154,9 @@ 
 		$out = array();
 		foreach ($queries as $q) {
 			if (empty($q[2]))
-				@$out['unknown'] ++;
+				@$out['unknown']++;
 			else
-				@$out[$q[2]] ++;
+				@$out[$q[2]]++;
 		}
 		return $out;
 	}

Braces +26 added lines, -20 removed lines

@@ -84,8 +84,7 @@ 
 			$this->profile[$name]['queries'] = array_add( $this->profile[$name]['queries'], $item['queries'] );
 			#$this->_query_summary($item['queries'], $this->profile[$name]['queries']);
 
-		}
-		else {
+		} else {
 			$queries = array();
 			$this->_query_summary($item['queries'], $queries);
 			$this->profile[$name] = array(
@@ -115,17 +114,19 @@ 
 	function log_filter($tag) {
 		if ($this->stack) {
 			global $wp_actions;
-			if ($tag == end($wp_actions))
-				@$this->stack[count($this->stack)-1]['actions'][$tag] ++;
-			else
-				@$this->stack[count($this->stack)-1]['filters'][$tag] ++;
+			if ($tag == end($wp_actions)) {
+							@$this->stack[count($this->stack)-1]['actions'][$tag] ++;
+			} else {
+							@$this->stack[count($this->stack)-1]['filters'][$tag] ++;
+			}
 		}
 		return $arg;
 	}
 
 	function log_action($tag) {
-		if ($this->stack)
-			@$this->stack[count($this->stack)-1]['actions'][$tag] ++;
+		if ($this->stack) {
+					@$this->stack[count($this->stack)-1]['actions'][$tag] ++;
+		}
 	}
 
 	function _current_action() {
@@ -153,36 +154,41 @@ 
 		// this requires the savequeries patch at https://core.trac.wordpress.org/ticket/5218
 		$out = array();
 		foreach ($queries as $q) {
-			if (empty($q[2]))
-				@$out['unknown'] ++;
-			else
-				@$out[$q[2]] ++;
+			if (empty($q[2])) {
+							@$out['unknown'] ++;
+			} else {
+							@$out[$q[2]] ++;
+			}
 		}
 		return $out;
 	}
 
 	function _dirty_objects_count($dirty_objects) {
 		$out = array();
-		foreach (array_keys($dirty_objects) as $group)
-			$out[$group] = count($dirty_objects[$group]);
+		foreach (array_keys($dirty_objects) as $group) {
+					$out[$group] = count($dirty_objects[$group]);
+		}
 		return $out;
 	}
 
 	function array_add($a, $b) {
 		$out = $a;
-		foreach (array_keys($b) as $key)
-			if (array_key_exists($key, $out))
+		foreach (array_keys($b) as $key) {
+					if (array_key_exists($key, $out))
 				$out[$key] += $b[$key];
-			else
-				$out[$key] = $b[$key];
+		}
+			else {
+							$out[$key] = $b[$key];
+			}
 		return $out;
 	}
 
 	function array_sub($a, $b) {
 		$out = $a;
-		foreach (array_keys($b) as $key)
-			if (array_key_exists($key, $b))
+		foreach (array_keys($b) as $key) {
+					if (array_key_exists($key, $b))
 				$out[$key] -= $b[$key];
+		}
 		return $out;
 	}