GeoDirectory / geodirectory

tests/test-Send_Enquiry.php

Indentation +111 added lines, -111 removed lines

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

Spacing +7 added lines, -7 removed lines

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

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

Spacing +14 added lines, -14 removed lines

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

Braces +26 added lines, -20 removed lines

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

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

Indentation +317 added lines, -317 removed lines

@@ -6,321 +6,321 @@
  */
 class SpeedTrapListener implements PHPUnit_Framework_TestListener
 {
-    /**
-     * Internal tracking for test suites.
-     *
-     * Increments as more suites are run, then decremented as they finish. All
-     * suites have been run when returns to 0.
-     *
-     * @var integer
-     */
-    protected $suites = 0;
-
-    /**
-     * Time in milliseconds at which a test will be considered "slow" and be
-     * reported by this listener.
-     *
-     * @var int
-     */
-    protected $slowThreshold;
-
-    /**
-     * Number of tests to report on for slowness.
-     *
-     * @var int
-     */
-    protected $reportLength;
-
-    /**
-     * Collection of slow tests.
-     *
-     * @var array
-     */
-    protected $slow = array();
-
-    /**
-     * Construct a new instance.
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $this->loadOptions($options);
-    }
-
-    /**
-     * An error occurred.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                   $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    /**
-     * A warning occurred.
-     *
-     * @param PHPUnit_Framework_Test    $test
-     * @param PHPUnit_Framework_Warning $e
-     * @param float                     $time
-     * @since Method available since Release 5.1.0
-     */
-    public function addWarning(PHPUnit_Framework_Test $test, PHPUnit_Framework_Warning $e, $time)
-    {
-    }
-
-    /**
-     * A failure occurred.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                   $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-    }
-
-    /**
-     * Incomplete test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                   $time
-     */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    /**
-     * Risky test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                   $time
-     * @since  Method available since Release 4.0.0
-     */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    /**
-     * Skipped test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                   $time
-     */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    /**
-     * A test started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-    }
-
-    /**
-     * A test ended.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                   $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-        if (!$test instanceof PHPUnit_Framework_TestCase) return;
-
-        $time = $this->toMilliseconds($time);
-        $threshold = $this->getSlowThreshold($test);
-
-        if ($this->isSlow($time, $threshold)) {
-            $this->addSlowTest($test, $time);
-        }
-    }
-
-    /**
-     * A test suite started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        $this->suites++;
-    }
-
-    /**
-     * A test suite ended.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        $this->suites--;
-
-        if (0 === $this->suites && $this->hasSlowTests()) {
-            arsort($this->slow); // Sort longest running tests to the top
-
-            $this->renderHeader();
-            $this->renderBody();
-            $this->renderFooter();
-        }
-    }
-
-    /**
-     * Whether the given test execution time is considered slow.
-     *
-     * @param int $time          Test execution time in milliseconds
-     * @param int $slowThreshold Test execution time at which a test should be considered slow (milliseconds)
-     * @return bool
-     */
-    protected function isSlow($time, $slowThreshold)
-    {
-        return $time >= $slowThreshold;
-    }
-
-    /**
-     * Stores a test as slow.
-     *
-     * @param PHPUnit_Framework_TestCase $test
-     * @param int                         $time Test execution time in milliseconds
-     */
-    protected function addSlowTest(PHPUnit_Framework_TestCase $test, $time)
-    {
-        $label = $this->makeLabel($test);
-
-        $this->slow[$label] = $time;
-    }
-
-    /**
-     * Whether at least one test has been considered slow.
-     *
-     * @return bool
-     */
-    protected function hasSlowTests()
-    {
-        return !empty($this->slow);
-    }
-
-    /**
-     * Convert PHPUnit's reported test time (microseconds) to milliseconds.
-     *
-     * @param float $time
-     * @return int
-     */
-    protected function toMilliseconds($time)
-    {
-        return (int) round($time * 1000);
-    }
-
-    /**
-     * Label for describing a test.
-     *
-     * @param PHPUnit_Framework_TestCase $test
-     * @return string
-     */
-    protected function makeLabel(PHPUnit_Framework_TestCase $test)
-    {
-        return sprintf('%s:%s', get_class($test), $test->getName());
-    }
-
-    /**
-     * Calculate number of slow tests to report about.
-     *
-     * @return int
-     */
-    protected function getReportLength()
-    {
-        return min(count($this->slow), $this->reportLength);
-    }
-
-    /**
-     * Find how many slow tests occurred that won't be shown due to list length.
-     *
-     * @return int Number of hidden slow tests
-     */
-    protected function getHiddenCount()
-    {
-        $total = count($this->slow);
-        $showing = $this->getReportLength($this->slow);
-
-        $hidden = 0;
-        if ($total > $showing) {
-            $hidden = $total - $showing;
-        }
-
-        return $hidden;
-    }
-
-    /**
-     * Renders slow test report header.
-     */
-    protected function renderHeader()
-    {
-        echo sprintf("\n\nYou should really fix these slow tests (>%sms)...\n", $this->slowThreshold);
-    }
-
-    /**
-     * Renders slow test report body.
-     */
-    protected function renderBody()
-    {
-        $slowTests = $this->slow;
-
-        $length = $this->getReportLength($slowTests);
-        for ($i = 1; $i <= $length; ++$i) {
-            $label = key($slowTests);
-            $time = array_shift($slowTests);
-
-            echo sprintf(" %s. %sms to run %s\n", $i, $time, $label);
-        }
-    }
-
-    /**
-     * Renders slow test report footer.
-     */
-    protected function renderFooter()
-    {
-        if ($hidden = $this->getHiddenCount($this->slow)) {
-            echo sprintf("...and there %s %s more above your threshold hidden from view", $hidden == 1 ? 'is' : 'are', $hidden);
-        }
-    }
-
-    /**
-     * Populate options into class internals.
-     *
-     * @param array $options
-     */
-    protected function loadOptions(array $options)
-    {
-        $this->slowThreshold = isset($options['slowThreshold']) ? $options['slowThreshold'] : 500;
-        $this->reportLength = isset($options['reportLength']) ? $options['reportLength'] : 10;
-    }
-
-    /**
-     * Get slow test threshold for given test. A TestCase can override the
-     * suite-wide slow threshold by using the annotation @slowThreshold with
-     * the threshold value in milliseconds.
-     *
-     * The following test will only be considered slow when its execution time
-     * reaches 5000ms (5 seconds):
-     *
-     * <code>
-     * @slowThreshold 5000
-     * public function testLongRunningProcess() {}
-     * </code>
-     *
-     * @param PHPUnit_Framework_TestCase $test
-     * @return int
-     */
-    protected function getSlowThreshold(PHPUnit_Framework_TestCase $test)
-    {
-        $ann = $test->getAnnotations();
-
-        return isset($ann['method']['slowThreshold'][0]) ? $ann['method']['slowThreshold'][0] : $this->slowThreshold;
-    }
+	/**
+	 * Internal tracking for test suites.
+	 *
+	 * Increments as more suites are run, then decremented as they finish. All
+	 * suites have been run when returns to 0.
+	 *
+	 * @var integer
+	 */
+	protected $suites = 0;
+
+	/**
+	 * Time in milliseconds at which a test will be considered "slow" and be
+	 * reported by this listener.
+	 *
+	 * @var int
+	 */
+	protected $slowThreshold;
+
+	/**
+	 * Number of tests to report on for slowness.
+	 *
+	 * @var int
+	 */
+	protected $reportLength;
+
+	/**
+	 * Collection of slow tests.
+	 *
+	 * @var array
+	 */
+	protected $slow = array();
+
+	/**
+	 * Construct a new instance.
+	 *
+	 * @param array $options
+	 */
+	public function __construct(array $options = array())
+	{
+		$this->loadOptions($options);
+	}
+
+	/**
+	 * An error occurred.
+	 *
+	 * @param PHPUnit_Framework_Test $test
+	 * @param Exception              $e
+	 * @param float                   $time
+	 */
+	public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+	{
+	}
+
+	/**
+	 * A warning occurred.
+	 *
+	 * @param PHPUnit_Framework_Test    $test
+	 * @param PHPUnit_Framework_Warning $e
+	 * @param float                     $time
+	 * @since Method available since Release 5.1.0
+	 */
+	public function addWarning(PHPUnit_Framework_Test $test, PHPUnit_Framework_Warning $e, $time)
+	{
+	}
+
+	/**
+	 * A failure occurred.
+	 *
+	 * @param PHPUnit_Framework_Test                 $test
+	 * @param PHPUnit_Framework_AssertionFailedError $e
+	 * @param float                                   $time
+	 */
+	public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+	{
+	}
+
+	/**
+	 * Incomplete test.
+	 *
+	 * @param PHPUnit_Framework_Test $test
+	 * @param Exception              $e
+	 * @param float                   $time
+	 */
+	public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+	{
+	}
+
+	/**
+	 * Risky test.
+	 *
+	 * @param PHPUnit_Framework_Test $test
+	 * @param Exception              $e
+	 * @param float                   $time
+	 * @since  Method available since Release 4.0.0
+	 */
+	public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+	{
+	}
+
+	/**
+	 * Skipped test.
+	 *
+	 * @param PHPUnit_Framework_Test $test
+	 * @param Exception              $e
+	 * @param float                   $time
+	 */
+	public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+	{
+	}
+
+	/**
+	 * A test started.
+	 *
+	 * @param PHPUnit_Framework_Test $test
+	 */
+	public function startTest(PHPUnit_Framework_Test $test)
+	{
+	}
+
+	/**
+	 * A test ended.
+	 *
+	 * @param PHPUnit_Framework_Test $test
+	 * @param float                   $time
+	 */
+	public function endTest(PHPUnit_Framework_Test $test, $time)
+	{
+		if (!$test instanceof PHPUnit_Framework_TestCase) return;
+
+		$time = $this->toMilliseconds($time);
+		$threshold = $this->getSlowThreshold($test);
+
+		if ($this->isSlow($time, $threshold)) {
+			$this->addSlowTest($test, $time);
+		}
+	}
+
+	/**
+	 * A test suite started.
+	 *
+	 * @param PHPUnit_Framework_TestSuite $suite
+	 */
+	public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+	{
+		$this->suites++;
+	}
+
+	/**
+	 * A test suite ended.
+	 *
+	 * @param PHPUnit_Framework_TestSuite $suite
+	 */
+	public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+	{
+		$this->suites--;
+
+		if (0 === $this->suites && $this->hasSlowTests()) {
+			arsort($this->slow); // Sort longest running tests to the top
+
+			$this->renderHeader();
+			$this->renderBody();
+			$this->renderFooter();
+		}
+	}
+
+	/**
+	 * Whether the given test execution time is considered slow.
+	 *
+	 * @param int $time          Test execution time in milliseconds
+	 * @param int $slowThreshold Test execution time at which a test should be considered slow (milliseconds)
+	 * @return bool
+	 */
+	protected function isSlow($time, $slowThreshold)
+	{
+		return $time >= $slowThreshold;
+	}
+
+	/**
+	 * Stores a test as slow.
+	 *
+	 * @param PHPUnit_Framework_TestCase $test
+	 * @param int                         $time Test execution time in milliseconds
+	 */
+	protected function addSlowTest(PHPUnit_Framework_TestCase $test, $time)
+	{
+		$label = $this->makeLabel($test);
+
+		$this->slow[$label] = $time;
+	}
+
+	/**
+	 * Whether at least one test has been considered slow.
+	 *
+	 * @return bool
+	 */
+	protected function hasSlowTests()
+	{
+		return !empty($this->slow);
+	}
+
+	/**
+	 * Convert PHPUnit's reported test time (microseconds) to milliseconds.
+	 *
+	 * @param float $time
+	 * @return int
+	 */
+	protected function toMilliseconds($time)
+	{
+		return (int) round($time * 1000);
+	}
+
+	/**
+	 * Label for describing a test.
+	 *
+	 * @param PHPUnit_Framework_TestCase $test
+	 * @return string
+	 */
+	protected function makeLabel(PHPUnit_Framework_TestCase $test)
+	{
+		return sprintf('%s:%s', get_class($test), $test->getName());
+	}
+
+	/**
+	 * Calculate number of slow tests to report about.
+	 *
+	 * @return int
+	 */
+	protected function getReportLength()
+	{
+		return min(count($this->slow), $this->reportLength);
+	}
+
+	/**
+	 * Find how many slow tests occurred that won't be shown due to list length.
+	 *
+	 * @return int Number of hidden slow tests
+	 */
+	protected function getHiddenCount()
+	{
+		$total = count($this->slow);
+		$showing = $this->getReportLength($this->slow);
+
+		$hidden = 0;
+		if ($total > $showing) {
+			$hidden = $total - $showing;
+		}
+
+		return $hidden;
+	}
+
+	/**
+	 * Renders slow test report header.
+	 */
+	protected function renderHeader()
+	{
+		echo sprintf("\n\nYou should really fix these slow tests (>%sms)...\n", $this->slowThreshold);
+	}
+
+	/**
+	 * Renders slow test report body.
+	 */
+	protected function renderBody()
+	{
+		$slowTests = $this->slow;
+
+		$length = $this->getReportLength($slowTests);
+		for ($i = 1; $i <= $length; ++$i) {
+			$label = key($slowTests);
+			$time = array_shift($slowTests);
+
+			echo sprintf(" %s. %sms to run %s\n", $i, $time, $label);
+		}
+	}
+
+	/**
+	 * Renders slow test report footer.
+	 */
+	protected function renderFooter()
+	{
+		if ($hidden = $this->getHiddenCount($this->slow)) {
+			echo sprintf("...and there %s %s more above your threshold hidden from view", $hidden == 1 ? 'is' : 'are', $hidden);
+		}
+	}
+
+	/**
+	 * Populate options into class internals.
+	 *
+	 * @param array $options
+	 */
+	protected function loadOptions(array $options)
+	{
+		$this->slowThreshold = isset($options['slowThreshold']) ? $options['slowThreshold'] : 500;
+		$this->reportLength = isset($options['reportLength']) ? $options['reportLength'] : 10;
+	}
+
+	/**
+	 * Get slow test threshold for given test. A TestCase can override the
+	 * suite-wide slow threshold by using the annotation @slowThreshold with
+	 * the threshold value in milliseconds.
+	 *
+	 * The following test will only be considered slow when its execution time
+	 * reaches 5000ms (5 seconds):
+	 *
+	 * <code>
+	 * @slowThreshold 5000
+	 * public function testLongRunningProcess() {}
+	 * </code>
+	 *
+	 * @param PHPUnit_Framework_TestCase $test
+	 * @return int
+	 */
+	protected function getSlowThreshold(PHPUnit_Framework_TestCase $test)
+	{
+		$ann = $test->getAnnotations();
+
+		return isset($ann['method']['slowThreshold'][0]) ? $ann['method']['slowThreshold'][0] : $this->slowThreshold;
+	}
 }

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

Indentation +1 added lines, -1 removed lines

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

Braces +60 added lines, -39 removed lines

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

Spacing +204 added lines, -204 removed lines

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

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

Spacing +23 added lines, -23 removed lines

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

tests/lib/wordpress-tests-lib/includes/mock-image-editor.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (class_exists( 'WP_Image_Editor' ) ) :
+if (class_exists('WP_Image_Editor')) :
 
 	class WP_Image_Editor_Mock extends WP_Image_Editor {
 
@@ -9,38 +9,38 @@ 
 		public static $save_return = array();
 
 		// Allow testing of jpeg_quality filter.
-		public function set_mime_type( $mime_type = null ) {
+		public function set_mime_type($mime_type = null) {
 			$this->mime_type = $mime_type;
 		}
 
 		public function load() {
 			return self::$load_return;
 		}
-		public static function test( $args = array() ) {
+		public static function test($args = array()) {
 			return self::$test_return;
 		}
-		public static function supports_mime_type( $mime_type ) {
+		public static function supports_mime_type($mime_type) {
 			return true;
 		}
-		public function resize( $max_w, $max_h, $crop = false ) {
+		public function resize($max_w, $max_h, $crop = false) {
 
 		}
-		public function multi_resize( $sizes ) {
+		public function multi_resize($sizes) {
 
 		}
-		public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
+		public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false) {
 
 		}
-		public function rotate( $angle ) {
+		public function rotate($angle) {
 
 		}
-		public function flip( $horz, $vert ) {
+		public function flip($horz, $vert) {
 
 		}
-		public function save( $destfilename = null, $mime_type = null ) {
+		public function save($destfilename = null, $mime_type = null) {
 			return self::$save_return;
 		}
-		public function stream( $mime_type = null ) {
+		public function stream($mime_type = null) {
 
 		}
 	}

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

Spacing +7 added lines, -7 removed lines

@@ -1,19 +1,19 @@
 <?php
 
 abstract class WP_Test_REST_TestCase extends WP_UnitTestCase {
-	protected function assertErrorResponse( $code, $response, $status = null ) {
+	protected function assertErrorResponse($code, $response, $status = null) {
 
-		if ( is_a( $response, 'WP_REST_Response' ) ) {
+		if (is_a($response, 'WP_REST_Response')) {
 			$response = $response->as_error();
 		}
 
-		$this->assertInstanceOf( 'WP_Error', $response );
-		$this->assertEquals( $code, $response->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $response);
+		$this->assertEquals($code, $response->get_error_code());
 
-		if ( null !== $status ) {
+		if (null !== $status) {
 			$data = $response->get_error_data();
-			$this->assertArrayHasKey( 'status', $data );
-			$this->assertEquals( $status, $data['status'] );
+			$this->assertArrayHasKey('status', $data);
+			$this->assertEquals($status, $data['status']);
 		}
 	}
 }

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;

Indentation +1 added lines, -1 removed lines

@@ -175,6 +175,6 @@
 			echo 'If this changeset includes changes to HTTP, make sure there are no timeouts.' . PHP_EOL;
 			echo PHP_EOL;
 		}
-    }
+	}
 }
 new WP_PHPUnit_Util_Getopt( $_SERVER['argv'] );

Spacing +63 added lines, -63 removed lines

@@ -4,11 +4,11 @@ 
  */
 
 
-$config_file_path = dirname( dirname( __FILE__ ) );
-if ( ! file_exists( $config_file_path . '/wp-tests-config.php' ) ) {
+$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';
 
@@ -18,22 +18,22 @@ 
  */
 global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer;
 
-if ( !is_readable( $config_file_path ) ) {
-	die( "ERROR: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n" );
+if (!is_readable($config_file_path)) {
+	die("ERROR: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n");
 }
 require_once $config_file_path;
 
-define( 'WP_TESTS_TABLE_PREFIX', $table_prefix );
-define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/../data' );
+define('WP_TESTS_TABLE_PREFIX', $table_prefix);
+define('DIR_TESTDATA', dirname(__FILE__).'/../data');
 
-if ( ! defined( 'WP_TESTS_FORCE_KNOWN_BUGS' ) )
-	define( 'WP_TESTS_FORCE_KNOWN_BUGS', false );
+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 );
+define('DISABLE_WP_CRON', true);
 
-define( 'WP_MEMORY_LIMIT', -1 );
-define( 'WP_MAX_MEMORY_LIMIT', -1 );
+define('WP_MEMORY_LIMIT', -1);
+define('WP_MAX_MEMORY_LIMIT', -1);
 
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
@@ -43,62 +43,62 @@ 
 
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
 
-if ( "1" == getenv( 'WP_MULTISITE' ) ||
-	( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE ) ) {
+if ("1" == getenv('WP_MULTISITE') ||
+	(defined('WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE)) {
 	$multisite = true;
 } else {
 	$multisite = false;
 }
 
 // Override the PHPMailer
-require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
+require_once(dirname(__FILE__).'/mock-mailer.php');
 $phpmailer = new MockPHPMailer();
 
-system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
+system(WP_PHP_BINARY.' '.escapeshellarg(dirname(__FILE__).'/install.php').' '.escapeshellarg($config_file_path).' '.$multisite);
 
-if ( $multisite ) {
-	echo "Running as multisite..." . PHP_EOL;
-	define( 'MULTISITE', true );
-	define( 'SUBDOMAIN_INSTALL', false );
+if ($multisite) {
+	echo "Running as multisite...".PHP_EOL;
+	define('MULTISITE', true);
+	define('SUBDOMAIN_INSTALL', false);
 	$GLOBALS['base'] = '/';
 } else {
-	echo "Running as single site... To run multisite, use -c tests/phpunit/multisite.xml" . PHP_EOL;
+	echo "Running as single site... To run multisite, use -c tests/phpunit/multisite.xml".PHP_EOL;
 }
-unset( $multisite );
+unset($multisite);
 
-require_once dirname( __FILE__ ) . '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 $GLOBALS['_wp_die_disabled'] = false;
 // Allow tests to override wp_die
-tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter' );
+tests_add_filter('wp_die_handler', '_wp_die_handler_filter');
 
 // Preset WordPress options defined in bootstrap file.
 // Used to activate themes, plugins, as well as  other settings.
-if(isset($GLOBALS['wp_tests_options'])) {
-	function wp_tests_options( $value ) {
-		$key = substr( current_filter(), strlen( 'pre_option_' ) );
+if (isset($GLOBALS['wp_tests_options'])) {
+	function wp_tests_options($value) {
+		$key = substr(current_filter(), strlen('pre_option_'));
 		return $GLOBALS['wp_tests_options'][$key];
 	}
 
-	foreach ( array_keys( $GLOBALS['wp_tests_options'] ) as $key ) {
-		tests_add_filter( 'pre_option_'.$key, 'wp_tests_options' );
+	foreach (array_keys($GLOBALS['wp_tests_options']) as $key) {
+		tests_add_filter('pre_option_'.$key, 'wp_tests_options');
 	}
 }
 
 // Load WordPress
-require_once ABSPATH . '/wp-settings.php';
+require_once ABSPATH.'/wp-settings.php';
 
 // Delete any default posts & related data
 _delete_all_posts();
 
-require dirname( __FILE__ ) . '/testcase.php';
-require dirname( __FILE__ ) . '/testcase-rest-api.php';
-require dirname( __FILE__ ) . '/testcase-xmlrpc.php';
-require dirname( __FILE__ ) . '/testcase-ajax.php';
-require dirname( __FILE__ ) . '/testcase-canonical.php';
-require dirname( __FILE__ ) . '/exceptions.php';
-require dirname( __FILE__ ) . '/utils.php';
-require dirname( __FILE__ ) . '/spy-rest-server.php';
+require dirname(__FILE__).'/testcase.php';
+require dirname(__FILE__).'/testcase-rest-api.php';
+require dirname(__FILE__).'/testcase-xmlrpc.php';
+require dirname(__FILE__).'/testcase-ajax.php';
+require dirname(__FILE__).'/testcase-canonical.php';
+require dirname(__FILE__).'/exceptions.php';
+require dirname(__FILE__).'/utils.php';
+require dirname(__FILE__).'/spy-rest-server.php';
 
 /**
  * A child class of the PHP test runner.
@@ -118,16 +118,16 @@ 
 	  'exclude-group=',
 	  'group=',
 	);
-	function __construct( $argv ) {
-		array_shift( $argv );
+	function __construct($argv) {
+		array_shift($argv);
 		$options = array();
-		while ( list( $i, $arg ) = each( $argv ) ) {
+		while (list($i, $arg) = each($argv)) {
 			try {
-				if ( strlen( $arg ) > 1 && $arg[0] === '-' && $arg[1] === '-' ) {
-					PHPUnit_Util_Getopt::parseLongOption( substr( $arg, 2 ), $this->longOptions, $options, $argv );
+				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;
@@ -140,41 +140,41 @@ 
 			'external-http' => true,
 		);
 
-		foreach ( $options as $option ) {
-			switch ( $option[0] ) {
+		foreach ($options as $option) {
+			switch ($option[0]) {
 				case '--exclude-group' :
-					foreach ( $skipped_groups as $group_name => $skipped ) {
-						$skipped_groups[ $group_name ] = false;
+					foreach ($skipped_groups as $group_name => $skipped) {
+						$skipped_groups[$group_name] = false;
 					}
 					continue 2;
 				case '--group' :
-					$groups = explode( ',', $option[1] );
-					foreach ( $groups as $group ) {
-						if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) ) {
-							WP_UnitTestCase::forceTicket( $group );
+					$groups = explode(',', $option[1]);
+					foreach ($groups as $group) {
+						if (is_numeric($group) || preg_match('/^(UT|Plugin)\d+$/', $group)) {
+							WP_UnitTestCase::forceTicket($group);
 						}
 					}
 
-					foreach ( $skipped_groups as $group_name => $skipped ) {
-						if ( in_array( $group_name, $groups ) ) {
-							$skipped_groups[ $group_name ] = false;
+					foreach ($skipped_groups as $group_name => $skipped) {
+						if (in_array($group_name, $groups)) {
+							$skipped_groups[$group_name] = false;
 						}
 					}
 					continue 2;
 			}
 		}
 
-		$skipped_groups = array_filter( $skipped_groups );
-		foreach ( $skipped_groups as $group_name => $skipped ) {
-			echo sprintf( 'Not running %1$s tests. To execute these, use --group %1$s.', $group_name ) . PHP_EOL;
+		$skipped_groups = array_filter($skipped_groups);
+		foreach ($skipped_groups as $group_name => $skipped) {
+			echo sprintf('Not running %1$s tests. To execute these, use --group %1$s.', $group_name).PHP_EOL;
 		}
 
-		if ( ! isset( $skipped_groups['external-http'] ) ) {
+		if (!isset($skipped_groups['external-http'])) {
 			echo PHP_EOL;
-			echo 'External HTTP skipped tests can be caused by timeouts.' . PHP_EOL;
-			echo 'If this changeset includes changes to HTTP, make sure there are no timeouts.' . PHP_EOL;
+			echo 'External HTTP skipped tests can be caused by timeouts.'.PHP_EOL;
+			echo 'If this changeset includes changes to HTTP, make sure there are no timeouts.'.PHP_EOL;
 			echo PHP_EOL;
 		}
     }
 }
-new WP_PHPUnit_Util_Getopt( $_SERVER['argv'] );
+new WP_PHPUnit_Util_Getopt($_SERVER['argv']);

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

Spacing +75 added lines, -75 removed lines

@@ -18,13 +18,13 @@ 
 	public function setUp() {
 		parent::setUp();
 
-		update_option( 'page_comments', true );
-		update_option( 'comments_per_page', 5 );
-		update_option( 'posts_per_page', 5 );
+		update_option('page_comments', true);
+		update_option('comments_per_page', 5);
+		update_option('posts_per_page', 5);
 
 		global $wp_rewrite;
 		$wp_rewrite->init();
-		$wp_rewrite->set_permalink_structure( $this->structure );
+		$wp_rewrite->set_permalink_structure($this->structure);
 
 		create_initial_taxonomies();
 
@@ -38,94 +38,94 @@ 
 	 *
 	 * @since 4.1.0
 	 */
-	public static function generate_shared_fixtures( $factory ) {
+	public static function generate_shared_fixtures($factory) {
 		self::$old_current_user = get_current_user_id();
-		self::$author_id = $factory->user->create( array( 'user_login' => 'canonical-author' ) );
+		self::$author_id = $factory->user->create(array('user_login' => 'canonical-author'));
 
 		/*
 		 * Also set in self::setUp(), but we must configure here to make sure that
 		 * post authorship is properly attributed for fixtures.
 		 */
-		wp_set_current_user( self::$author_id );
+		wp_set_current_user(self::$author_id);
 
 		// Already created by install defaults:
 		// self::factory()->term->create( array( 'taxonomy' => 'category', 'name' => 'uncategorized' ) );
 
-		self::$post_ids[] = $factory->post->create( array( 'import_id' => 587, 'post_title' => 'post-format-test-audio', 'post_date' => '2008-06-02 00:00:00' ) );
-		self::$post_ids[] = $post_id = $factory->post->create( array( 'post_title' => 'post-format-test-gallery', 'post_date' => '2008-06-10 00:00:00' ) );
-		self::$post_ids[] = $factory->post->create( array( 'import_id' => 611, 'post_type' => 'attachment', 'post_title' => 'canola2', 'post_parent' => $post_id ) );
+		self::$post_ids[] = $factory->post->create(array('import_id' => 587, 'post_title' => 'post-format-test-audio', 'post_date' => '2008-06-02 00:00:00'));
+		self::$post_ids[] = $post_id = $factory->post->create(array('post_title' => 'post-format-test-gallery', 'post_date' => '2008-06-10 00:00:00'));
+		self::$post_ids[] = $factory->post->create(array('import_id' => 611, 'post_type' => 'attachment', 'post_title' => 'canola2', 'post_parent' => $post_id));
 
-		self::$post_ids[] = $factory->post->create( array(
+		self::$post_ids[] = $factory->post->create(array(
 			'post_title' => 'images-test',
 			'post_date' => '2008-09-03 00:00:00',
 			'post_content' => 'Page 1 <!--nextpage--> Page 2 <!--nextpage--> Page 3'
-		) );
+		));
 
-		self::$post_ids[] = $post_id = $factory->post->create( array( 'import_id' => 149, 'post_title' => 'comment-test', 'post_date' => '2008-03-03 00:00:00' ) );
-		self::$comment_ids = $factory->comment->create_post_comments( $post_id, 15 );
+		self::$post_ids[] = $post_id = $factory->post->create(array('import_id' => 149, 'post_title' => 'comment-test', 'post_date' => '2008-03-03 00:00:00'));
+		self::$comment_ids = $factory->comment->create_post_comments($post_id, 15);
 
-		self::$post_ids[] = $factory->post->create( array( 'post_date' => '2008-09-05 00:00:00' ) );
+		self::$post_ids[] = $factory->post->create(array('post_date' => '2008-09-05 00:00:00'));
 
-		self::$post_ids[] = $factory->post->create( array( 'import_id' => 123 ) );
-		self::$post_ids[] = $factory->post->create( array( 'import_id' => 1 ) );
-		self::$post_ids[] = $factory->post->create( array( 'import_id' => 358 ) );
+		self::$post_ids[] = $factory->post->create(array('import_id' => 123));
+		self::$post_ids[] = $factory->post->create(array('import_id' => 1));
+		self::$post_ids[] = $factory->post->create(array('import_id' => 358));
 
-		self::$post_ids[] = $factory->post->create( array( 'post_type' => 'page', 'post_title' => 'sample-page' ) );
-		self::$post_ids[] = $factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about' ) );
-		self::$post_ids[] = $post_id = $factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+		self::$post_ids[] = $factory->post->create(array('post_type' => 'page', 'post_title' => 'sample-page'));
+		self::$post_ids[] = $factory->post->create(array('post_type' => 'page', 'post_title' => 'about'));
+		self::$post_ids[] = $post_id = $factory->post->create(array('post_type' => 'page', 'post_title' => 'parent-page'));
 		self::$post_ids[] = $factory->post->create(
-			array( 'import_id' => 144, 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $post_id,
+			array('import_id' => 144, 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $post_id,
 		) );
 
-		self::$post_ids[] = $parent_id = $factory->post->create( array(
+		self::$post_ids[] = $parent_id = $factory->post->create(array(
 			'post_name' => 'parent',
 			'post_type' => 'page',
-		) );
-		self::$post_ids[] = $child_id_1 = $factory->post->create( array(
+		));
+		self::$post_ids[] = $child_id_1 = $factory->post->create(array(
 			'post_name'   => 'child1',
 			'post_type'   => 'page',
 			'post_parent' => $parent_id,
-		) );
-		self::$post_ids[] = $child_id_2 = $factory->post->create( array(
+		));
+		self::$post_ids[] = $child_id_2 = $factory->post->create(array(
 			'post_name'   => 'child2',
 			'post_type'   => 'page',
 			'post_parent' => $parent_id,
-		) );
-		self::$post_ids[] = $grandchild_id_1 = $factory->post->create( array(
+		));
+		self::$post_ids[] = $grandchild_id_1 = $factory->post->create(array(
 			'post_name'   => 'grandchild',
 			'post_type'   => 'page',
 			'post_parent' => $child_id_1,
-		) );
-		self::$post_ids[] = $grandchild_id_2 = $factory->post->create( array(
+		));
+		self::$post_ids[] = $grandchild_id_2 = $factory->post->create(array(
 			'post_name'   => 'grandchild',
 			'post_type'   => 'page',
 			'post_parent' => $child_id_2,
-		) );
+		));
 
-		$cat1 = $factory->term->create( array( 'taxonomy' => 'category', 'name' => 'parent' ) );
+		$cat1 = $factory->term->create(array('taxonomy' => 'category', 'name' => 'parent'));
 		self::$terms['/category/parent/'] = $cat1;
-		self::$term_ids[ $cat1 ] = 'category';
+		self::$term_ids[$cat1] = 'category';
 
-		$cat2 = $factory->term->create( array(
+		$cat2 = $factory->term->create(array(
 			'taxonomy' => 'category', 'name' => 'child-1', 'parent' => self::$terms['/category/parent/'],
-		) );
+		));
 		self::$terms['/category/parent/child-1/'] = $cat2;
-		self::$term_ids[ $cat2 ] = 'category';
+		self::$term_ids[$cat2] = 'category';
 
-		$cat3 = $factory->term->create( array(
+		$cat3 = $factory->term->create(array(
 			'taxonomy' => 'category', 'name' => 'child-2', 'parent' => self::$terms['/category/parent/child-1/'],
-		) );
+		));
 		self::$terms['/category/parent/child-1/child-2/'] = $cat3;
-		self::$term_ids[ $cat3 ] = 'category';
+		self::$term_ids[$cat3] = 'category';
 
-		$cat4 = $factory->term->create( array( 'taxonomy' => 'category', 'name' => 'cat-a' ) );
-		self::$term_ids[ $cat4 ] = 'category';
+		$cat4 = $factory->term->create(array('taxonomy' => 'category', 'name' => 'cat-a'));
+		self::$term_ids[$cat4] = 'category';
 
-		$cat5 = $factory->term->create( array( 'taxonomy' => 'category', 'name' => 'cat-b' ) );
-		self::$term_ids[ $cat5 ] = 'category';
+		$cat5 = $factory->term->create(array('taxonomy' => 'category', 'name' => 'cat-b'));
+		self::$term_ids[$cat5] = 'category';
 
-		$tag1 = $factory->term->create( array( 'name' => 'post-formats' ) );
-		self::$term_ids[ $tag1 ] = 'post_tag';
+		$tag1 = $factory->term->create(array('name' => 'post-formats'));
+		self::$term_ids[$tag1] = 'post_tag';
 	}
 
 	/**
@@ -134,18 +134,18 @@ 
 	 * @since 4.1.0
 	 */
 	public static function delete_shared_fixtures() {
-		self::delete_user( self::$author_id );
+		self::delete_user(self::$author_id);
 
-		foreach ( self::$post_ids as $pid ) {
-			wp_delete_post( $pid, true );
+		foreach (self::$post_ids as $pid) {
+			wp_delete_post($pid, true);
 		}
 
-		foreach ( self::$comment_ids as $cid ) {
-			wp_delete_comment( $cid, true );
+		foreach (self::$comment_ids as $cid) {
+			wp_delete_comment($cid, true);
 		}
 
-		foreach ( self::$term_ids as $tid => $tax ) {
-			wp_delete_term( $tid, $tax );
+		foreach (self::$term_ids as $tid => $tax) {
+			wp_delete_term($tid, $tax);
 		}
 
 		self::$author_id = null;
@@ -165,54 +165,54 @@ 
 	 * @param int    $ticket                  Optional. Trac ticket number.
 	 * @param array  $expected_doing_it_wrong Array of class/function names expected to throw _doing_it_wrong() notices.
 	 */
-	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 );
+	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;
+		$ticket_ref = ($ticket > 0) ? 'Ticket #'.$ticket : null;
 global $wpdb;
 //print_r( $wpdb->get_results( "SELECT * FROM $wpdb->terms" ) );
-		if ( is_string($expected) )
+		if (is_string($expected))
 			$expected = array('url' => $expected);
-		elseif ( is_array($expected) && !isset($expected['url']) && !isset($expected['qv']) )
-			$expected = array( 'qv' => $expected );
+		elseif (is_array($expected) && !isset($expected['url']) && !isset($expected['qv']))
+			$expected = array('qv' => $expected);
 
-		if ( !isset($expected['url']) && !isset($expected['qv']) )
+		if (!isset($expected['url']) && !isset($expected['qv']))
 			$this->markTestSkipped('No valid expected output was provided');
 
-		$this->go_to( home_url( $test_url ) );
+		$this->go_to(home_url($test_url));
 
 		// Does the redirect match what's expected?
-		$can_url = $this->get_canonical( $test_url );
+		$can_url = $this->get_canonical($test_url);
 		$parsed_can_url = parse_url($can_url);
 
 		// Just test the Path and Query if present
-		if ( isset($expected['url']) ) {
-			$this->assertEquals( $expected['url'], $parsed_can_url['path'] . (!empty($parsed_can_url['query']) ? '?' . $parsed_can_url['query'] : ''), $ticket_ref );
+		if (isset($expected['url'])) {
+			$this->assertEquals($expected['url'], $parsed_can_url['path'].(!empty($parsed_can_url['query']) ? '?'.$parsed_can_url['query'] : ''), $ticket_ref);
 		}
 
-		if ( ! isset($expected['qv']) )
+		if (!isset($expected['qv']))
 			return;
 
 		// "make" that the request and check the query is correct
-		$this->go_to( $can_url );
+		$this->go_to($can_url);
 
 		// Are all query vars accounted for, And correct?
 		global $wp;
 
 		$query_vars = array_diff($wp->query_vars, $wp->extra_query_vars);
-		if ( !empty($parsed_can_url['query']) ) {
+		if (!empty($parsed_can_url['query'])) {
 			parse_str($parsed_can_url['query'], $_qv);
 
 			// $_qv should not contain any elements which are set in $query_vars already (ie. $_GET vars should not be present in the Rewrite)
-			$this->assertEquals( array(), array_intersect( $query_vars, $_qv ), 'Query vars are duplicated from the Rewrite into $_GET; ' . $ticket_ref );
+			$this->assertEquals(array(), array_intersect($query_vars, $_qv), 'Query vars are duplicated from the Rewrite into $_GET; '.$ticket_ref);
 
 			$query_vars = array_merge($query_vars, $_qv);
 		}
 
-		$this->assertEquals( $expected['qv'], $query_vars );
+		$this->assertEquals($expected['qv'], $query_vars);
 	}
 
 	/**
@@ -223,11 +223,11 @@ 
 	 * @return $can_url Returns the original $test_url if no canonical can be generated, otherwise returns
 	 *                  the fully-qualified URL as generated by redirect_canonical().
 	 */
-	public function get_canonical( $test_url ) {
-		$test_url = home_url( $test_url );
+	public function get_canonical($test_url) {
+		$test_url = home_url($test_url);
 
-		$can_url = redirect_canonical( $test_url, false );
-		if ( ! $can_url )
+		$can_url = redirect_canonical($test_url, false);
+		if (!$can_url)
 			return $test_url; // No redirect will take place for this request
 
 		return $can_url;