GeoDirectory / geodirectory

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

Switch Indentation +26 added lines, -26 removed lines

@@ -412,37 +412,37 @@
 		ini_set( 'pcre.backtrack_limit', $i );
 		
 		switch( $strategy ) {
-		case 'split':
-			preg_split( $pattern, $subject );
-			break;
-		case 'match':
-			preg_match( $pattern, $subject );
-			break;
-		case 'match_all':
-			$matches = array();
-			preg_match_all( $pattern, $subject, $matches );
-			break;
+			case 'split':
+				preg_split( $pattern, $subject );
+				break;
+			case 'match':
+				preg_match( $pattern, $subject );
+				break;
+			case 'match_all':
+				$matches = array();
+				preg_match_all( $pattern, $subject, $matches );
+				break;
 		}
 
 		ini_set( 'pcre.backtrack_limit', $saved_config );
 
 		switch( preg_last_error() ) {
-		case PREG_NO_ERROR:
-			return $i;
-		case PREG_BACKTRACK_LIMIT_ERROR:
-			continue;
-		case PREG_RECURSION_LIMIT_ERROR:
-			trigger_error('PCRE recursion limit encountered before backtrack limit.');
-			return;
-		case PREG_BAD_UTF8_ERROR:
-			trigger_error('UTF-8 error during PCRE benchmark.');
-			return;
-		case PREG_INTERNAL_ERROR:
-			trigger_error('Internal error during PCRE benchmark.');
-			return;
-		default:
-			trigger_error('Unexpected error during PCRE benchmark.');
-			return;
+			case PREG_NO_ERROR:
+				return $i;
+			case PREG_BACKTRACK_LIMIT_ERROR:
+				continue;
+			case PREG_RECURSION_LIMIT_ERROR:
+				trigger_error('PCRE recursion limit encountered before backtrack limit.');
+				return;
+			case PREG_BAD_UTF8_ERROR:
+				trigger_error('UTF-8 error during PCRE benchmark.');
+				return;
+			case PREG_INTERNAL_ERROR:
+				trigger_error('Internal error during PCRE benchmark.');
+				return;
+			default:
+				trigger_error('Unexpected error during PCRE benchmark.');
+				return;
 		}
 	}
 

Braces +77 added lines, -51 removed lines

@@ -10,9 +10,10 @@ 
 function strip_ws($txt) {
 	$lines = explode("\n", $txt);
 	$result = array();
-	foreach ($lines as $line)
-		if (trim($line))
+	foreach ($lines as $line) {
+			if (trim($line))
 			$result[] = trim($line);
+	}
 
 	return trim(join("\n", $result));
 }
@@ -38,21 +39,26 @@ 
 	}
 
 	function current_filter() {
-		if (is_callable('current_filter'))
-			return current_filter();
+		if (is_callable('current_filter')) {
+					return current_filter();
+		}
 		global $wp_actions;
 		return end($wp_actions);
 	}
 
 	function action($arg) {
-if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+if ($this->debug) {
+	dmp(__FUNCTION__, $this->current_filter());
+}
 		$args = func_get_args();
 		$this->events[] = array('action' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
 		return $arg;
 	}
 
 	function action2($arg) {
-if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+if ($this->debug) {
+	dmp(__FUNCTION__, $this->current_filter());
+}
 
 		$args = func_get_args();
 		$this->events[] = array('action' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
@@ -60,7 +66,9 @@ 
 	}
 
 	function filter($arg) {
-if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+if ($this->debug) {
+	dmp(__FUNCTION__, $this->current_filter());
+}
 
 		$args = func_get_args();
 		$this->events[] = array('filter' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
@@ -68,7 +76,9 @@ 
 	}
 
 	function filter2($arg) {
-if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+if ($this->debug) {
+	dmp(__FUNCTION__, $this->current_filter());
+}
 
 		$args = func_get_args();
 		$this->events[] = array('filter' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
@@ -76,7 +86,9 @@ 
 	}
 
 	function filter_append($arg) {
-if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+if ($this->debug) {
+	dmp(__FUNCTION__, $this->current_filter());
+}
 
 		$args = func_get_args();
 		$this->events[] = array('filter' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
@@ -85,7 +97,9 @@ 
 
 	function filterall($tag, $arg=NULL) {
 	// this one doesn't return the result, so it's safe to use with the new 'all' filter
-if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
+if ($this->debug) {
+	dmp(__FUNCTION__, $this->current_filter());
+}
 
 		$args = func_get_args();
 		$this->events[] = array('filter' => __FUNCTION__, 'tag'=>$tag, 'args'=>array_slice($args, 1));
@@ -100,9 +114,10 @@ 
 	function get_call_count($tag='') {
 		if ($tag) {
 			$count = 0;
-			foreach ($this->events as $e)
-				if ($e['action'] == $tag)
+			foreach ($this->events as $e) {
+							if ($e['action'] == $tag)
 					++$count;
+			}
 			return $count;
 		}
 		return count($this->events);
@@ -120,8 +135,9 @@ 
 	// return an array of args passed in calls to this action
 	function get_args() {
 		$out = array();
-		foreach ($this->events as $e)
-			$out[] = $e['args'];
+		foreach ($this->events as $e) {
+					$out[] = $e['args'];
+		}
 		return $out;
 	}
 }
@@ -186,17 +202,18 @@ 
 	$n = count($a);
 	$out = array();
 
-	if ($n < 1)
-		return $out;
+	if ($n < 1) {
+			return $out;
+	}
 
 	for ($i=0; $i<count($tree); $i++) {
 #		echo "checking '{$tree[$i][name]}' == '{$a[0]}'\n";
 #		var_dump($tree[$i]['name'], $a[0]);
 		if ($tree[$i]['name'] == $a[0]) {
 #			echo "n == {$n}\n";
-			if ($n == 1)
-				$out[] = $tree[$i];
-			else {
+			if ($n == 1) {
+							$out[] = $tree[$i];
+			} else {
 				$subtree =& $tree[$i]['child'];
 				$call_args = array($subtree);
 				$call_args = array_merge($call_args, array_slice($a, 1));
@@ -210,8 +227,9 @@ 
 
 function xml_join_atts($atts) {
 	$a = array();
-	foreach ($atts as $k=>$v)
-		$a[] = $k.'="'.$v.'"';
+	foreach ($atts as $k=>$v) {
+			$a[] = $k.'="'.$v.'"';
+	}
 	return join(' ', $a);
 }
 
@@ -220,14 +238,15 @@ 
 
 	foreach (array_keys($data) as $i) {
 		$name = $data[$i]['name'];
-		if (!empty($data[$i]['attributes']))
-			$name .= ' '.xml_join_atts($data[$i]['attributes']);
+		if (!empty($data[$i]['attributes'])) {
+					$name .= ' '.xml_join_atts($data[$i]['attributes']);
+		}
 
 		if (!empty($data[$i]['child'])) {
 			$out[$name][] = xml_array_dumbdown($data[$i]['child']);
+		} else {
+					$out[$name] = $data[$i]['content'];
 		}
-		else
-			$out[$name] = $data[$i]['content'];
 	}
 
 	return $out;
@@ -236,9 +255,10 @@ 
 function dmp() {
 	$args = func_get_args();
 
-	foreach ($args as $thing)
-		echo (is_scalar($thing) ? strval($thing) : var_export($thing, true)), "\n";
-}
+	foreach ($args as $thing) {
+			echo (is_scalar($thing) ? strval($thing) : var_export($thing, true)), "\n";
+	}
+	}
 
 function dmp_filter($a) {
 	dmp($a);
@@ -255,18 +275,17 @@ 
 function gen_tests_array($name, $array) {
 	$out = array();
 	foreach ($array as $k=>$v) {
-		if (is_numeric($k))
-			$index = strval($k);
-		else
-			$index = "'".addcslashes($k, "\n\r\t'\\")."'";
+		if (is_numeric($k)) {
+					$index = strval($k);
+		} else {
+					$index = "'".addcslashes($k, "\n\r\t'\\")."'";
+		}
 
 		if (is_string($v)) {
 			$out[] = '$this->assertEquals( \'' . addcslashes($v, "\n\r\t'\\") . '\', $'.$name.'['.$index.'] );';
-		}
-		elseif (is_numeric($v)) {
+		} elseif (is_numeric($v)) {
 			$out[] = '$this->assertEquals( ' . $v . ', $'.$name.'['.$index.'] );';
-		}
-		elseif (is_array($v)) {
+		} elseif (is_array($v)) {
 			$out[] = gen_tests_array("{$name}[{$index}]", $v);
 		}
 	}
@@ -284,9 +303,10 @@ 
 function drop_tables() {
 	global $wpdb;
 	$tables = $wpdb->get_col('SHOW TABLES;');
-	foreach ($tables as $table)
-		$wpdb->query("DROP TABLE IF EXISTS {$table}");
-}
+	foreach ($tables as $table) {
+			$wpdb->query("DROP TABLE IF EXISTS {$table}");
+	}
+	}
 
 function print_backtrace() {
 	$bt = debug_backtrace();
@@ -294,10 +314,12 @@ 
 	$i = 0;
 	foreach ($bt as $stack) {
 		echo ++$i, ": ";
-		if ( isset($stack['class']) )
-			echo $stack['class'].'::';
-		if ( isset($stack['function']) )
-			echo $stack['function'].'() ';
+		if ( isset($stack['class']) ) {
+					echo $stack['class'].'::';
+		}
+		if ( isset($stack['function']) ) {
+					echo $stack['function'].'() ';
+		}
 		echo "line {$stack[line]} in {$stack[file]}\n";
 	}
 	echo "\n";
@@ -350,20 +372,24 @@ 
 
 function _cleanup_query_vars() {
 	// clean out globals to stop them polluting wp and wp_query
-	foreach ( $GLOBALS['wp']->public_query_vars as $v )
-		unset( $GLOBALS[$v] );
+	foreach ( $GLOBALS['wp']->public_query_vars as $v ) {
+			unset( $GLOBALS[$v] );
+	}
 
-	foreach ( $GLOBALS['wp']->private_query_vars as $v )
-		unset( $GLOBALS[$v] );
+	foreach ( $GLOBALS['wp']->private_query_vars as $v ) {
+			unset( $GLOBALS[$v] );
+	}
 
 	foreach ( get_taxonomies( array() , 'objects' ) as $t ) {
-		if ( $t->public && ! empty( $t->query_var ) )
-			$GLOBALS['wp']->add_query_var( $t->query_var );
+		if ( $t->public && ! empty( $t->query_var ) ) {
+					$GLOBALS['wp']->add_query_var( $t->query_var );
+		}
 	}
 
 	foreach ( get_post_types( array() , 'objects' ) as $t ) {
-		if ( is_post_type_viewable( $t ) && ! empty( $t->query_var ) )
-			$GLOBALS['wp']->add_query_var( $t->query_var );
+		if ( is_post_type_viewable( $t ) && ! empty( $t->query_var ) ) {
+					$GLOBALS['wp']->add_query_var( $t->query_var );
+		}
 	}
 }
 

Spacing +57 added lines, -57 removed lines

@@ -2,7 +2,7 @@ 
 
 // misc help functions and utilities
 
-function rand_str($len=32) {
+function rand_str($len = 32) {
 	return substr(md5(uniqid(rand())), 0, $len);
 }
 
@@ -28,7 +28,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $debug = 0 ) {
+	function __construct($debug = 0) {
 		$this->reset();
 		$this->debug = $debug;
 	}
@@ -80,10 +80,10 @@ 
 
 		$args = func_get_args();
 		$this->events[] = array('filter' => __FUNCTION__, 'tag'=>$this->current_filter(), 'args'=>$args);
-		return $arg . '_append';
+		return $arg.'_append';
 	}
 
-	function filterall($tag, $arg=NULL) {
+	function filterall($tag, $arg = NULL) {
 	// this one doesn't return the result, so it's safe to use with the new 'all' filter
 if ($this->debug) dmp(__FUNCTION__, $this->current_filter());
 
@@ -97,7 +97,7 @@ 
 	}
 
 	// return a count of the number of times the action was called since the last reset
-	function get_call_count($tag='') {
+	function get_call_count($tag = '') {
 		if ($tag) {
 			$count = 0;
 			foreach ($this->events as $e)
@@ -135,10 +135,10 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $in ) {
+	function __construct($in) {
 		$this->xml = xml_parser_create();
 		xml_set_object($this->xml, $this);
-		xml_parser_set_option($this->xml,XML_OPTION_CASE_FOLDING, 0);
+		xml_parser_set_option($this->xml, XML_OPTION_CASE_FOLDING, 0);
 		xml_set_element_handler($this->xml, array($this, 'startHandler'), array($this, 'endHandler'));
 		xml_set_character_data_handler($this->xml, array($this, 'dataHandler'));
 		$this->parse($in);
@@ -189,7 +189,7 @@ 
 	if ($n < 1)
 		return $out;
 
-	for ($i=0; $i<count($tree); $i++) {
+	for ($i = 0; $i < count($tree); $i++) {
 #		echo "checking '{$tree[$i][name]}' == '{$a[0]}'\n";
 #		var_dump($tree[$i]['name'], $a[0]);
 		if ($tree[$i]['name'] == $a[0]) {
@@ -197,7 +197,7 @@ 
 			if ($n == 1)
 				$out[] = $tree[$i];
 			else {
-				$subtree =& $tree[$i]['child'];
+				$subtree = & $tree[$i]['child'];
 				$call_args = array($subtree);
 				$call_args = array_merge($call_args, array_slice($a, 1));
 				$out = array_merge($out, call_user_func_array('xml_find', $call_args));
@@ -261,10 +261,10 @@ 
 			$index = "'".addcslashes($k, "\n\r\t'\\")."'";
 
 		if (is_string($v)) {
-			$out[] = '$this->assertEquals( \'' . addcslashes($v, "\n\r\t'\\") . '\', $'.$name.'['.$index.'] );';
+			$out[] = '$this->assertEquals( \''.addcslashes($v, "\n\r\t'\\").'\', $'.$name.'['.$index.'] );';
 		}
 		elseif (is_numeric($v)) {
-			$out[] = '$this->assertEquals( ' . $v . ', $'.$name.'['.$index.'] );';
+			$out[] = '$this->assertEquals( '.$v.', $'.$name.'['.$index.'] );';
 		}
 		elseif (is_array($v)) {
 			$out[] = gen_tests_array("{$name}[{$index}]", $v);
@@ -294,9 +294,9 @@ 
 	$i = 0;
 	foreach ($bt as $stack) {
 		echo ++$i, ": ";
-		if ( isset($stack['class']) )
+		if (isset($stack['class']))
 			echo $stack['class'].'::';
-		if ( isset($stack['function']) )
+		if (isset($stack['function']))
 			echo $stack['function'].'() ';
 		echo "line {$stack[line]} in {$stack[file]}\n";
 	}
@@ -304,17 +304,17 @@ 
 }
 
 // mask out any input fields matching the given name
-function mask_input_value($in, $name='_wpnonce') {
+function mask_input_value($in, $name = '_wpnonce') {
 	return preg_replace('@<input([^>]*) name="'.preg_quote($name).'"([^>]*) value="[^>]*" />@', '<input$1 name="'.preg_quote($name).'"$2 value="***" />', $in);
 }
 
-if ( !function_exists( 'str_getcsv' ) ) {
-	function str_getcsv( $input, $delimiter = ',', $enclosure = '"', $escape = "\\" ) {
-		$fp = fopen( 'php://temp/', 'r+' );
-		fputs( $fp, $input );
-		rewind( $fp );
-		$data = fgetcsv( $fp, strlen( $input ), $delimiter, $enclosure );
-		fclose( $fp );
+if (!function_exists('str_getcsv')) {
+	function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = "\\") {
+		$fp = fopen('php://temp/', 'r+');
+		fputs($fp, $input);
+		rewind($fp);
+		$data = fgetcsv($fp, strlen($input), $delimiter, $enclosure);
+		fclose($fp);
 		return $data;
 	}
 }
@@ -322,19 +322,19 @@ 
 /**
  * Removes the post type and its taxonomy associations.
  */
-function _unregister_post_type( $cpt_name ) {
-	unset( $GLOBALS['wp_post_types'][ $cpt_name ] );
-	unset( $GLOBALS['_wp_post_type_features'][ $cpt_name ] );
+function _unregister_post_type($cpt_name) {
+	unset($GLOBALS['wp_post_types'][$cpt_name]);
+	unset($GLOBALS['_wp_post_type_features'][$cpt_name]);
 
-	foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy ) {
-		if ( false !== $key = array_search( $cpt_name, $taxonomy->object_type ) ) {
-			unset( $taxonomy->object_type[$key] );
+	foreach ($GLOBALS['wp_taxonomies'] as $taxonomy) {
+		if (false !== $key = array_search($cpt_name, $taxonomy->object_type)) {
+			unset($taxonomy->object_type[$key]);
 		}
 	}
 }
 
-function _unregister_taxonomy( $taxonomy_name ) {
-	unset( $GLOBALS['wp_taxonomies'][$taxonomy_name] );
+function _unregister_taxonomy($taxonomy_name) {
+	unset($GLOBALS['wp_taxonomies'][$taxonomy_name]);
 }
 
 /**
@@ -344,32 +344,32 @@ 
  *
  * @param string $status
  */
-function _unregister_post_status( $status ) {
-	unset( $GLOBALS['wp_post_statuses'][ $status ] );
+function _unregister_post_status($status) {
+	unset($GLOBALS['wp_post_statuses'][$status]);
 }
 
 function _cleanup_query_vars() {
 	// clean out globals to stop them polluting wp and wp_query
-	foreach ( $GLOBALS['wp']->public_query_vars as $v )
-		unset( $GLOBALS[$v] );
+	foreach ($GLOBALS['wp']->public_query_vars as $v)
+		unset($GLOBALS[$v]);
 
-	foreach ( $GLOBALS['wp']->private_query_vars as $v )
-		unset( $GLOBALS[$v] );
+	foreach ($GLOBALS['wp']->private_query_vars as $v)
+		unset($GLOBALS[$v]);
 
-	foreach ( get_taxonomies( array() , 'objects' ) as $t ) {
-		if ( $t->public && ! empty( $t->query_var ) )
-			$GLOBALS['wp']->add_query_var( $t->query_var );
+	foreach (get_taxonomies(array(), 'objects') as $t) {
+		if ($t->public && !empty($t->query_var))
+			$GLOBALS['wp']->add_query_var($t->query_var);
 	}
 
-	foreach ( get_post_types( array() , 'objects' ) as $t ) {
-		if ( is_post_type_viewable( $t ) && ! empty( $t->query_var ) )
-			$GLOBALS['wp']->add_query_var( $t->query_var );
+	foreach (get_post_types(array(), 'objects') as $t) {
+		if (is_post_type_viewable($t) && !empty($t->query_var))
+			$GLOBALS['wp']->add_query_var($t->query_var);
 	}
 }
 
 function _clean_term_filters() {
-	remove_filter( 'get_terms',     array( 'Featured_Content', 'hide_featured_term'     ), 10, 2 );
-	remove_filter( 'get_the_terms', array( 'Featured_Content', 'hide_the_featured_term' ), 10, 3 );
+	remove_filter('get_terms', array('Featured_Content', 'hide_featured_term'), 10, 2);
+	remove_filter('get_the_terms', array('Featured_Content', 'hide_the_featured_term'), 10, 3);
 }
 
 /**
@@ -386,8 +386,8 @@ 
 		$this->charset = $wpdb->charset;
 	}
 
-	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);
 	}
 }
 
@@ -396,37 +396,37 @@ 
  *
  * @return int The backtrack count.
  */
-function benchmark_pcre_backtracking( $pattern, $subject, $strategy ) {
-	$saved_config = ini_get( 'pcre.backtrack_limit' );
+function benchmark_pcre_backtracking($pattern, $subject, $strategy) {
+	$saved_config = ini_get('pcre.backtrack_limit');
 	
 	// Attempt to prevent PHP crashes.  Adjust these lower when needed.
-	if ( version_compare( phpversion(), '5.4.8', '>' ) ) {
+	if (version_compare(phpversion(), '5.4.8', '>')) {
 		$limit = 1000000;
 	} else {
-		$limit = 20000;  // 20,000 is a reasonable upper limit, but see also https://core.trac.wordpress.org/ticket/29557#comment:10
+		$limit = 20000; // 20,000 is a reasonable upper limit, but see also https://core.trac.wordpress.org/ticket/29557#comment:10
 	}
 
 	// Start with small numbers, so if a crash is encountered at higher numbers we can still debug the problem.
-	for( $i = 4; $i <= $limit; $i *= 2 ) {
+	for ($i = 4; $i <= $limit; $i *= 2) {
 
-		ini_set( 'pcre.backtrack_limit', $i );
+		ini_set('pcre.backtrack_limit', $i);
 		
-		switch( $strategy ) {
+		switch ($strategy) {
 		case 'split':
-			preg_split( $pattern, $subject );
+			preg_split($pattern, $subject);
 			break;
 		case 'match':
-			preg_match( $pattern, $subject );
+			preg_match($pattern, $subject);
 			break;
 		case 'match_all':
 			$matches = array();
-			preg_match_all( $pattern, $subject, $matches );
+			preg_match_all($pattern, $subject, $matches);
 			break;
 		}
 
-		ini_set( 'pcre.backtrack_limit', $saved_config );
+		ini_set('pcre.backtrack_limit', $saved_config);
 
-		switch( preg_last_error() ) {
+		switch (preg_last_error()) {
 		case PREG_NO_ERROR:
 			return $i;
 		case PREG_BACKTRACK_LIMIT_ERROR:

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

Braces +6 added lines, -4 removed lines

@@ -119,8 +119,9 @@ 
 	public function logout() {
 		unset( $GLOBALS['current_user'] );
 		$cookies = array(AUTH_COOKIE, SECURE_AUTH_COOKIE, LOGGED_IN_COOKIE, USER_COOKIE, PASS_COOKIE);
-		foreach ( $cookies as $c )
-			unset( $_COOKIE[$c] );
+		foreach ( $cookies as $c ) {
+					unset( $_COOKIE[$c] );
+		}
 	}
 
 	/**
@@ -195,7 +196,8 @@ 
 
 		// Save the output
 		$buffer = ob_get_clean();
-		if ( !empty( $buffer ) )
-			$this->_last_response = $buffer;
+		if ( !empty( $buffer ) ) {
+					$this->_last_response = $buffer;
+		}
 	}
 }

Spacing +37 added lines, -37 removed lines

@@ -57,18 +57,18 @@ 
 	);
 
 	public static function setUpBeforeClass() {
-		if ( ! defined( 'DOING_AJAX' ) ) {
-			define( 'DOING_AJAX', true );
+		if (!defined('DOING_AJAX')) {
+			define('DOING_AJAX', true);
 		}
 
-		remove_action( 'admin_init', '_maybe_update_core' );
-		remove_action( 'admin_init', '_maybe_update_plugins' );
-		remove_action( 'admin_init', '_maybe_update_themes' );
+		remove_action('admin_init', '_maybe_update_core');
+		remove_action('admin_init', '_maybe_update_plugins');
+		remove_action('admin_init', '_maybe_update_themes');
 
 		// Register the core actions
-		foreach ( array_merge( self::$_core_actions_get, self::$_core_actions_post ) as $action ) {
-			if ( function_exists( 'wp_ajax_' . str_replace( '-', '_', $action ) ) ) {
-				add_action( 'wp_ajax_' . $action, 'wp_ajax_' . str_replace( '-', '_', $action ), 1 );
+		foreach (array_merge(self::$_core_actions_get, self::$_core_actions_post) as $action) {
+			if (function_exists('wp_ajax_'.str_replace('-', '_', $action))) {
+				add_action('wp_ajax_'.$action, 'wp_ajax_'.str_replace('-', '_', $action), 1);
 			}
 		}
 
@@ -82,19 +82,19 @@ 
 	public function setUp() {
 		parent::setUp();
 
-		add_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
+		add_filter('wp_die_ajax_handler', array($this, 'getDieHandler'), 1, 1);
 
-		set_current_screen( 'ajax' );
+		set_current_screen('ajax');
 
 		// Clear logout cookies
-		add_action( 'clear_auth_cookie', array( $this, 'logout' ) );
+		add_action('clear_auth_cookie', array($this, 'logout'));
 
 		// Suppress warnings from "Cannot modify header information - headers already sent by"
 		$this->_error_level = error_reporting();
-		error_reporting( $this->_error_level & ~E_WARNING );
+		error_reporting($this->_error_level & ~E_WARNING);
 
 		// Make some posts
-		self::factory()->post->create_many( 5 );
+		self::factory()->post->create_many(5);
 	}
 
 	/**
@@ -105,22 +105,22 @@ 
 		parent::tearDown();
 		$_POST = array();
 		$_GET = array();
-		unset( $GLOBALS['post'] );
-		unset( $GLOBALS['comment'] );
-		remove_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
-		remove_action( 'clear_auth_cookie', array( $this, 'logout' ) );
-		error_reporting( $this->_error_level );
-		set_current_screen( 'front' );
+		unset($GLOBALS['post']);
+		unset($GLOBALS['comment']);
+		remove_filter('wp_die_ajax_handler', array($this, 'getDieHandler'), 1, 1);
+		remove_action('clear_auth_cookie', array($this, 'logout'));
+		error_reporting($this->_error_level);
+		set_current_screen('front');
 	}
 
 	/**
 	 * Clear login cookies, unset the current user
 	 */
 	public function logout() {
-		unset( $GLOBALS['current_user'] );
+		unset($GLOBALS['current_user']);
 		$cookies = array(AUTH_COOKIE, SECURE_AUTH_COOKIE, LOGGED_IN_COOKIE, USER_COOKIE, PASS_COOKIE);
-		foreach ( $cookies as $c )
-			unset( $_COOKIE[$c] );
+		foreach ($cookies as $c)
+			unset($_COOKIE[$c]);
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 * @return callback
 	 */
 	public function getDieHandler() {
-		return array( $this, 'dieHandler' );
+		return array($this, 'dieHandler');
 	}
 
 	/**
@@ -146,17 +146,17 @@ 
 	 * </code>
 	 * @param string $message
 	 */
-	public function dieHandler( $message ) {
+	public function dieHandler($message) {
 		$this->_last_response .= ob_get_clean();
 
-		if ( '' === $this->_last_response ) {
-			if ( is_scalar( $message ) ) {
-				throw new WPAjaxDieStopException( (string) $message );
+		if ('' === $this->_last_response) {
+			if (is_scalar($message)) {
+				throw new WPAjaxDieStopException((string) $message);
 			} else {
-				throw new WPAjaxDieStopException( '0' );
+				throw new WPAjaxDieStopException('0');
 			}
 		} else {
-			throw new WPAjaxDieContinueException( $message );
+			throw new WPAjaxDieContinueException($message);
 		}
 	}
 
@@ -165,10 +165,10 @@ 
 	 * E.g. administrator, editor, author, contributor, subscriber
 	 * @param string $role
 	 */
-	protected function _setRole( $role ) {
+	protected function _setRole($role) {
 		$post = $_POST;
-		$user_id = self::factory()->user->create( array( 'role' => $role ) );
-		wp_set_current_user( $user_id );
+		$user_id = self::factory()->user->create(array('role' => $role));
+		wp_set_current_user($user_id);
 		$_POST = array_merge($_POST, $post);
 	}
 
@@ -181,21 +181,21 @@ 
 	protected function _handleAjax($action) {
 
 		// Start output buffering
-		ini_set( 'implicit_flush', false );
+		ini_set('implicit_flush', false);
 		ob_start();
 
 		// Build the request
 		$_POST['action'] = $action;
 		$_GET['action']  = $action;
-		$_REQUEST        = array_merge( $_POST, $_GET );
+		$_REQUEST        = array_merge($_POST, $_GET);
 
 		// Call the hooks
-		do_action( 'admin_init' );
-		do_action( 'wp_ajax_' . $_REQUEST['action'], null );
+		do_action('admin_init');
+		do_action('wp_ajax_'.$_REQUEST['action'], null);
 
 		// Save the output
 		$buffer = ob_get_clean();
-		if ( !empty( $buffer ) )
+		if (!empty($buffer))
 			$this->_last_response = $buffer;
 	}
 }

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

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/factory.php

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/test-Search_With_Keyword.php

Indentation +26 added lines, -26 removed lines

@@ -1,38 +1,38 @@
 <?php
 class SearchWithKeyword extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testSearchWithKeyword()
-    {
-        $_REQUEST['geodir_search'] = 1;
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-            's' => 'Longwood Gardens'
-        );
+	public function testSearchWithKeyword()
+	{
+		$_REQUEST['geodir_search'] = 1;
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+			's' => 'Longwood Gardens'
+		);
 
-        $all_posts = new WP_Query( $query_args );
+		$all_posts = new WP_Query( $query_args );
 
-        $total_posts = $all_posts->found_posts;
+		$total_posts = $all_posts->found_posts;
 
-        $this->assertTrue(is_int((int) $total_posts));
+		$this->assertTrue(is_int((int) $total_posts));
 
-        $title = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $title = get_the_title();
-        endwhile;
+		$title = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$title = get_the_title();
+		endwhile;
 
-        $this->assertEquals($title, 'Longwood Gardens');
-    }
+		$this->assertEquals($title, 'Longwood Gardens');
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -16,14 +16,14 @@
             's' => 'Longwood Gardens'
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
 
         $total_posts = $all_posts->found_posts;
 
         $this->assertTrue(is_int((int) $total_posts));
 
         $title = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $title = get_the_title();
         endwhile;
 

tests/test-Add_Listing.php

Indentation +31 added lines, -31 removed lines

@@ -1,39 +1,39 @@
 <?php
 class AddListing 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 testAddListing()
-    {
-        $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_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);
+	public function testAddListing()
+	{
+		$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_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);
 
-        $this->assertTrue(is_int($post_id));
-    }
+		$this->assertTrue(is_int($post_id));
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

tests/test-Check_Login_Box.php

Indentation +48 added lines, -48 removed lines

@@ -1,57 +1,57 @@
 <?php
 class CheckLoginBox extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testLoginBoxEmptyPassword()
-    {
-        global $errors;
-        $_POST['testcookie'] = 1;
-        $_POST['log'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
-    }
+	public function testLoginBoxEmptyPassword()
+	{
+		global $errors;
+		$_POST['testcookie'] = 1;
+		$_POST['log'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_password', $errors["errors"] );
+		$this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+	}
 
-    public function testLoginBoxIncorrectPassword()
-    {
-        global $errors;
-        $_POST['testcookie'] = 1;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'testuser';
-        $_POST['pwd'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
-        $this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
-    }
+	public function testLoginBoxIncorrectPassword()
+	{
+		global $errors;
+		$_POST['testcookie'] = 1;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'testuser';
+		$_POST['pwd'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
+		$this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
+	}
 
-    public function testLoginBoxInvalidUsername()
-    {
-        global $errors;
-        $_POST['testcookie'] = 1;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'adm##@in';
-        $_POST['pwd'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
-    }
+	public function testLoginBoxInvalidUsername()
+	{
+		global $errors;
+		$_POST['testcookie'] = 1;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'adm##@in';
+		$_POST['pwd'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
+		$this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -15,8 +15,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+        $this->assertArrayHasKey('empty_password', $errors["errors"]);
+        $this->assertContains('The password field is empty', $errors["errors"]["empty_password"][0]);
     }
 
     public function testLoginBoxIncorrectPassword()
@@ -30,8 +30,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
-        $this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
+        $this->assertArrayHasKey('incorrect_password', $errors["errors"]);
+        $this->assertContains('The password you entered for the username', $errors["errors"]["incorrect_password"][0]);
     }
 
     public function testLoginBoxInvalidUsername()
@@ -45,8 +45,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
+        $this->assertArrayHasKey('invalid_username', $errors["errors"]);
+        $this->assertContains('Invalid username', $errors["errors"]["invalid_username"][0]);
     }
 
     public function tearDown()

tests/test-Login.php

Spacing +12 added lines, -12 removed lines

@@ -16,8 +16,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+        $this->assertArrayHasKey('empty_password', $errors["errors"]);
+        $this->assertContains('The password field is empty', $errors["errors"]["empty_password"][0]);
     }
 
     public function testLoginIncorrectPassword()
@@ -30,8 +30,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
-        $this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
+        $this->assertArrayHasKey('incorrect_password', $errors["errors"]);
+        $this->assertContains('The password you entered for the username', $errors["errors"]["incorrect_password"][0]);
     }
 
     public function testLoginInvalidUsername()
@@ -44,8 +44,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
+        $this->assertArrayHasKey('invalid_username', $errors["errors"]);
+        $this->assertContains('Invalid username', $errors["errors"]["invalid_username"][0]);
     }
 
 //    public function testLoginValid()
@@ -70,8 +70,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_username', $errors["errors"] );
-        $this->assertContains( 'Enter a username or e-mail address', $errors["errors"]["empty_username"][0] );
+        $this->assertArrayHasKey('empty_username', $errors["errors"]);
+        $this->assertContains('Enter a username or e-mail address', $errors["errors"]["empty_username"][0]);
     }
 
     public function testForgotPassInvalidEmail()
@@ -85,8 +85,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
-        $this->assertContains( 'There is no user registered with that email address', $errors["errors"]["invalid_email"][0] );
+        $this->assertArrayHasKey('invalid_email', $errors["errors"]);
+        $this->assertContains('There is no user registered with that email address', $errors["errors"]["invalid_email"][0]);
     }
 
     public function testForgotPassInvalidUsername()
@@ -100,8 +100,8 @@ 
         geodir_user_signup();
         remove_filter('wp_redirect', '__return_false');
         $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalidcombo', $errors["errors"] );
-        $this->assertContains( 'Invalid username or e-mail', $errors["errors"]["invalidcombo"][0] );
+        $this->assertArrayHasKey('invalidcombo', $errors["errors"]);
+        $this->assertContains('Invalid username or e-mail', $errors["errors"]["invalidcombo"][0]);
     }
 
     public function tearDown()

Indentation +88 added lines, -88 removed lines

@@ -1,51 +1,51 @@ 
 <?php
 class LoginUser extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testLoginEmptyPassword()
-    {
-        global $errors;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_password', $errors["errors"] );
-        $this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
-    }
+	public function testLoginEmptyPassword()
+	{
+		global $errors;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_password', $errors["errors"] );
+		$this->assertContains( 'The password field is empty', $errors["errors"]["empty_password"][0] );
+	}
 
-    public function testLoginIncorrectPassword()
-    {
-        global $errors;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'testuser';
-        $_POST['pwd'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
-        $this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
-    }
+	public function testLoginIncorrectPassword()
+	{
+		global $errors;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'testuser';
+		$_POST['pwd'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'incorrect_password', $errors["errors"] );
+		$this->assertContains( 'The password you entered for the username', $errors["errors"]["incorrect_password"][0] );
+	}
 
-    public function testLoginInvalidUsername()
-    {
-        global $errors;
-        $_REQUEST['action'] = 'login';
-        $_POST['log'] = 'adm##@in';
-        $_POST['pwd'] = 'admin';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
-        $this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
-    }
+	public function testLoginInvalidUsername()
+	{
+		global $errors;
+		$_REQUEST['action'] = 'login';
+		$_POST['log'] = 'adm##@in';
+		$_POST['pwd'] = 'admin';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalid_username', $errors["errors"] );
+		$this->assertContains( 'Invalid username', $errors["errors"]["invalid_username"][0] );
+	}
 
 //    public function testLoginValid()
 //    {
@@ -58,55 +58,55 @@ 
 //        remove_filter('wp_redirect', '__return_false');
 //    }
 
-    public function testForgotPassEmptyData()
-    {
-        global $errors;
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        $_REQUEST['action'] = 'retrievepassword';
-        $_POST['user_login'] = '';
-        $_POST['user_email'] = '';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'empty_username', $errors["errors"] );
-        $this->assertContains( 'Enter a username or e-mail address', $errors["errors"]["empty_username"][0] );
-    }
+	public function testForgotPassEmptyData()
+	{
+		global $errors;
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_REQUEST['action'] = 'retrievepassword';
+		$_POST['user_login'] = '';
+		$_POST['user_email'] = '';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'empty_username', $errors["errors"] );
+		$this->assertContains( 'Enter a username or e-mail address', $errors["errors"]["empty_username"][0] );
+	}
 
-    public function testForgotPassInvalidEmail()
-    {
-        global $errors;
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        $_REQUEST['action'] = 'retrievepassword';
-        $_POST['user_login'] = 'holla@hello.com';
-        $_POST['user_email'] = '';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
-        $this->assertContains( 'There is no user registered with that email address', $errors["errors"]["invalid_email"][0] );
-    }
+	public function testForgotPassInvalidEmail()
+	{
+		global $errors;
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_REQUEST['action'] = 'retrievepassword';
+		$_POST['user_login'] = 'holla@hello.com';
+		$_POST['user_email'] = '';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalid_email', $errors["errors"] );
+		$this->assertContains( 'There is no user registered with that email address', $errors["errors"]["invalid_email"][0] );
+	}
 
-    public function testForgotPassInvalidUsername()
-    {
-        global $errors;
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        $_REQUEST['action'] = 'retrievepassword';
-        $_POST['user_login'] = 'holla';
-        $_POST['user_email'] = 'holla@hello.com';
-        add_filter('wp_redirect', '__return_false');
-        geodir_user_signup();
-        remove_filter('wp_redirect', '__return_false');
-        $errors = (array) $errors;
-        $this->assertArrayHasKey( 'invalidcombo', $errors["errors"] );
-        $this->assertContains( 'Invalid username or e-mail', $errors["errors"]["invalidcombo"][0] );
-    }
+	public function testForgotPassInvalidUsername()
+	{
+		global $errors;
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_REQUEST['action'] = 'retrievepassword';
+		$_POST['user_login'] = 'holla';
+		$_POST['user_email'] = 'holla@hello.com';
+		add_filter('wp_redirect', '__return_false');
+		geodir_user_signup();
+		remove_filter('wp_redirect', '__return_false');
+		$errors = (array) $errors;
+		$this->assertArrayHasKey( 'invalidcombo', $errors["errors"] );
+		$this->assertContains( 'Invalid username or e-mail', $errors["errors"]["invalidcombo"][0] );
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 
 }
 ?>
\ No newline at end of file

tests/test-Edit_Listing.php

Indentation +58 added lines, -58 removed lines

@@ -1,63 +1,63 @@
 <?php
 class EditListing extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
-
-    public function testEditListing()
-    {
-        $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));
-
-        $args = array(
-            'pid' => $post_id,
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title Modified',
-            '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'
-        );
-        $saved_post_id = geodir_save_listing($args, true);
-
-        $this->assertTrue(is_int($saved_post_id));
-
-        $title = get_the_title($post_id);
-
-        $this->assertEquals('Test Listing Title Modified', $title);
-
-
-    }
-
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
+
+	public function testEditListing()
+	{
+		$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));
+
+		$args = array(
+			'pid' => $post_id,
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title Modified',
+			'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'
+		);
+		$saved_post_id = geodir_save_listing($args, true);
+
+		$this->assertTrue(is_int($saved_post_id));
+
+		$title = get_the_title($post_id);
+
+		$this->assertEquals('Test Listing Title Modified', $title);
+
+
+	}
+
+
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,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;