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/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;
 

tests/test-Check_Notifications.php

Indentation +80 added lines, -80 removed lines

@@ -1,92 +1,92 @@
 <?php
 class CheckNotifications extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testSendFriendEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_friend');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'thought you might be interested in', $output );
-        $this->assertContains( 'Your friend has sent you a message from', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-    }
+	public function testSendFriendEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_friend');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'thought you might be interested in', $output );
+		$this->assertContains( 'Your friend has sent you a message from', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+	}
 
-    public function testSendEnquiryEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_enquiry');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Website Enquiry', $output );
-        $this->assertContains( 'An enquiry has been sent from', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-    }
+	public function testSendEnquiryEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_enquiry');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Website Enquiry', $output );
+		$this->assertContains( 'An enquiry has been sent from', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+	}
 
-    public function testForgotPassEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'forgot_password');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Your new password', $output );
-        $this->assertContains( 'You requested a new password for', $output );
-        $this->assertContains( 'test@test.com', $output );
-    }
+	public function testForgotPassEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'forgot_password');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Your new password', $output );
+		$this->assertContains( 'You requested a new password for', $output );
+		$this->assertContains( 'test@test.com', $output );
+	}
 
-    public function testRegistrationEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'registration');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Your Log In Details', $output );
-        $this->assertContains( 'You can log in  with the following information', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-    }
+	public function testRegistrationEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'registration');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Your Log In Details', $output );
+		$this->assertContains( 'You can log in  with the following information', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+	}
 
-    public function testPostSubmitEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'post_submit');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Post Submitted Successfully', $output );
-        $this->assertContains( 'You submitted the below listing information', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-        $this->assertContains( 'A new  listing has been published', $output );
-    }
+	public function testPostSubmitEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'post_submit');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Post Submitted Successfully', $output );
+		$this->assertContains( 'You submitted the below listing information', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+		$this->assertContains( 'A new  listing has been published', $output );
+	}
 
-    public function testListingPublishedEmail()
-    {
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'listing_published');
-        $output = ob_get_clean();
-        remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Listing Published Successfully', $output );
-        $this->assertContains( 'Your listing  has been published', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-    }
+	public function testListingPublishedEmail()
+	{
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'listing_published');
+		$output = ob_get_clean();
+		remove_filter('wp_mail', 'print_mail');
+		$this->assertContains( 'Listing Published Successfully', $output );
+		$this->assertContains( 'Your listing  has been published', $output );
+		$this->assertContains( 'test@test.com', $output );
+		$this->assertContains( 'ADMIN BCC COPY', $output );
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +30 added lines, -30 removed lines

@@ -10,78 +10,78 @@
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_friend');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_friend');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'thought you might be interested in', $output );
-        $this->assertContains( 'Your friend has sent you a message from', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
+        $this->assertContains('thought you might be interested in', $output);
+        $this->assertContains('Your friend has sent you a message from', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
     }
 
     public function testSendEnquiryEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_enquiry');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'send_enquiry');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Website Enquiry', $output );
-        $this->assertContains( 'An enquiry has been sent from', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
+        $this->assertContains('Website Enquiry', $output);
+        $this->assertContains('An enquiry has been sent from', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
     }
 
     public function testForgotPassEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'forgot_password');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'forgot_password');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Your new password', $output );
-        $this->assertContains( 'You requested a new password for', $output );
-        $this->assertContains( 'test@test.com', $output );
+        $this->assertContains('Your new password', $output);
+        $this->assertContains('You requested a new password for', $output);
+        $this->assertContains('test@test.com', $output);
     }
 
     public function testRegistrationEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'registration');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'registration');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Your Log In Details', $output );
-        $this->assertContains( 'You can log in  with the following information', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
+        $this->assertContains('Your Log In Details', $output);
+        $this->assertContains('You can log in  with the following information', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
     }
 
     public function testPostSubmitEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'post_submit');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'post_submit');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Post Submitted Successfully', $output );
-        $this->assertContains( 'You submitted the below listing information', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
-        $this->assertContains( 'A new  listing has been published', $output );
+        $this->assertContains('Post Submitted Successfully', $output);
+        $this->assertContains('You submitted the below listing information', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
+        $this->assertContains('A new  listing has been published', $output);
     }
 
     public function testListingPublishedEmail()
     {
         add_filter('wp_mail', 'print_mail');
         ob_start();
-        geodir_sendEmail('','', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'listing_published');
+        geodir_sendEmail('', '', 'test@test.com', 'Test User', 'Test subject', 'Test message', '', 'listing_published');
         $output = ob_get_clean();
         remove_filter('wp_mail', 'print_mail');
-        $this->assertContains( 'Listing Published Successfully', $output );
-        $this->assertContains( 'Your listing  has been published', $output );
-        $this->assertContains( 'test@test.com', $output );
-        $this->assertContains( 'ADMIN BCC COPY', $output );
+        $this->assertContains('Listing Published Successfully', $output);
+        $this->assertContains('Your listing  has been published', $output);
+        $this->assertContains('test@test.com', $output);
+        $this->assertContains('ADMIN BCC COPY', $output);
     }
 
     public function tearDown()

tests/test-Test_Dummy_Data.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             'post_type' => 'gd_place'
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
 
         $total_posts = $all_posts->found_posts;
 

Indentation +33 added lines, -33 removed lines

@@ -1,50 +1,50 @@
 <?php
 class TestDummyData extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-        geodir_delete_dummy_posts();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+		geodir_delete_dummy_posts();
+	}
 
-    public function testCreatePlaces()
-    {
-        global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
+	public function testCreatePlaces()
+	{
+		global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
 
-        global $geodir_post_custom_fields_cache;
-        $geodir_post_custom_fields_cache = array();
+		global $geodir_post_custom_fields_cache;
+		$geodir_post_custom_fields_cache = array();
 
-        $city_bound_lat1 = 40.4960439;
-        $city_bound_lng1 = -74.2557349;
-        $city_bound_lat2 = 40.91525559999999;
-        $city_bound_lng2 = -73.7002721;
+		$city_bound_lat1 = 40.4960439;
+		$city_bound_lng1 = -74.2557349;
+		$city_bound_lat2 = 40.91525559999999;
+		$city_bound_lng2 = -73.7002721;
 
 
-        $dummy_post_index = 30;
-        test_create_dummy_posts(30);
+		$dummy_post_index = 30;
+		test_create_dummy_posts(30);
 
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place'
-        );
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place'
+		);
 
-        $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((int) $total_posts > 0);
+		$this->assertTrue((int) $total_posts > 0);
 
-    }
+	}
 
-    public function testDeletePlaces()
-    {
-        geodir_delete_dummy_posts();
-    }
+	public function testDeletePlaces()
+	{
+		geodir_delete_dummy_posts();
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file