GeoDirectory / geodirectory

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

Braces +26 added lines, -20 removed lines

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

tests/lib/wordpress-tests-lib/includes/speed-trap-listener.php

Braces +3 added lines, -1 removed lines

@@ -133,7 +133,9 @@
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
-        if (!$test instanceof PHPUnit_Framework_TestCase) return;
+        if (!$test instanceof PHPUnit_Framework_TestCase) {
+        	return;
+        }
 
         $time = $this->toMilliseconds($time);
         $threshold = $this->getSlowThreshold($test);

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

Braces +60 added lines, -39 removed lines

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

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

Braces +6 added lines, -4 removed lines

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

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

Braces +4 added lines, -3 removed lines

@@ -44,9 +44,10 @@
 	$wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
 
 	// We need to create references to ms global tables.
-	if ( $multisite )
-		$wpdb->$table = $prefixed_table;
-}
+	if ( $multisite ) {
+			$wpdb->$table = $prefixed_table;
+	}
+	}
 
 // Prefill a permalink structure so that WP doesn't try to determine one itself.
 add_action( 'populate_options', '_set_default_permalink_structure_for_tests' );

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

Braces +7 added lines, -6 removed lines

@@ -7,9 +7,10 @@ 
 $config_file_path = dirname( dirname( __FILE__ ) );
 if ( ! file_exists( $config_file_path . '/wp-tests-config.php' ) ) {
 	// Support the config file from the root of the develop repository.
-	if ( basename( $config_file_path ) === 'phpunit' && basename( dirname( $config_file_path ) ) === 'tests' )
-		$config_file_path = dirname( dirname( $config_file_path ) );
-}
+	if ( basename( $config_file_path ) === 'phpunit' && basename( dirname( $config_file_path ) ) === 'tests' ) {
+			$config_file_path = dirname( dirname( $config_file_path ) );
+	}
+	}
 $config_file_path .= '/wp-tests-config.php';
 
 /*
@@ -26,8 +27,9 @@ 
 define( 'WP_TESTS_TABLE_PREFIX', $table_prefix );
 define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/../data' );
 
-if ( ! defined( 'WP_TESTS_FORCE_KNOWN_BUGS' ) )
+if ( ! defined( 'WP_TESTS_FORCE_KNOWN_BUGS' ) ) {
 	define( 'WP_TESTS_FORCE_KNOWN_BUGS', false );
+}
 
 // Cron tries to make an HTTP request to the blog, which always fails, because tests are run in CLI mode only
 define( 'DISABLE_WP_CRON', true );
@@ -126,8 +128,7 @@ 
 				if ( strlen( $arg ) > 1 && $arg[0] === '-' && $arg[1] === '-' ) {
 					PHPUnit_Util_Getopt::parseLongOption( substr( $arg, 2 ), $this->longOptions, $options, $argv );
 				}
-			}
-			catch ( PHPUnit_Framework_Exception $e ) {
+			} catch ( PHPUnit_Framework_Exception $e ) {
 				// Enforcing recognized arguments or correctly formed arguments is
 				// not really the concern here.
 				continue;

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

Braces +18 added lines, -12 removed lines

@@ -168,19 +168,22 @@ 
 	public function assertCanonical( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
 		$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, (array) $expected_doing_it_wrong );
 
-		if ( $ticket )
-			$this->knownWPBug( $ticket );
+		if ( $ticket ) {
+					$this->knownWPBug( $ticket );
+		}
 
 		$ticket_ref = ($ticket > 0) ? 'Ticket #' . $ticket : null;
 global $wpdb;
 //print_r( $wpdb->get_results( "SELECT * FROM $wpdb->terms" ) );
-		if ( is_string($expected) )
-			$expected = array('url' => $expected);
-		elseif ( is_array($expected) && !isset($expected['url']) && !isset($expected['qv']) )
-			$expected = array( 'qv' => $expected );
+		if ( is_string($expected) ) {
+					$expected = array('url' => $expected);
+		} elseif ( is_array($expected) && !isset($expected['url']) && !isset($expected['qv']) ) {
+					$expected = array( 'qv' => $expected );
+		}
 
-		if ( !isset($expected['url']) && !isset($expected['qv']) )
-			$this->markTestSkipped('No valid expected output was provided');
+		if ( !isset($expected['url']) && !isset($expected['qv']) ) {
+					$this->markTestSkipped('No valid expected output was provided');
+		}
 
 		$this->go_to( home_url( $test_url ) );
 
@@ -193,8 +196,9 @@ 
 			$this->assertEquals( $expected['url'], $parsed_can_url['path'] . (!empty($parsed_can_url['query']) ? '?' . $parsed_can_url['query'] : ''), $ticket_ref );
 		}
 
-		if ( ! isset($expected['qv']) )
-			return;
+		if ( ! isset($expected['qv']) ) {
+					return;
+		}
 
 		// "make" that the request and check the query is correct
 		$this->go_to( $can_url );
@@ -227,8 +231,10 @@ 
 		$test_url = home_url( $test_url );
 
 		$can_url = redirect_canonical( $test_url, false );
-		if ( ! $can_url )
-			return $test_url; // No redirect will take place for this request
+		if ( ! $can_url ) {
+					return $test_url;
+		}
+		// No redirect will take place for this request
 
 		return $can_url;
 	}

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

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 );
+		}
 	}
 }
 

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;
+		}
 	}
 }