GeoDirectory / geodirectory

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

Spacing +4 added lines, -4 removed lines

@@ -9,21 +9,21 @@
 	function setUp() {
 		parent::setUp();
 
-		add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+		add_filter('pre_option_enable_xmlrpc', '__return_true');
 
 		$this->myxmlrpcserver = new wp_xmlrpc_server();
 	}
 
 	function tearDown() {
-		remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+		remove_filter('pre_option_enable_xmlrpc', '__return_true');
 
 		$this->remove_added_uploads();
 
 		parent::tearDown();
 	}
 
-	protected function make_user_by_role( $role ) {
-		return self::factory()->user->create( array(
+	protected function make_user_by_role($role) {
+		return self::factory()->user->create(array(
 			'user_login' => $role,
 			'user_pass'  => $role,
 			'role'       => $role

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

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Installs WordPress for the purpose of the unit-tests
- *
- * @todo Reuse the init/load code in init.php
- */
+	 * Installs WordPress for the purpose of the unit-tests
+	 *
+	 * @todo Reuse the init/load code in init.php
+	 */
 error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
 
 $config_file_path = $argv[1];

Spacing +21 added lines, -21 removed lines

@@ -4,14 +4,14 @@ 
  *
  * @todo Reuse the init/load code in init.php
  */
-error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
+error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
 
 $config_file_path = $argv[1];
-$multisite = ! empty( $argv[2] );
+$multisite = !empty($argv[2]);
 
-define( 'WP_INSTALLING', true );
+define('WP_INSTALLING', true);
 require_once $config_file_path;
-require_once dirname( __FILE__ ) . '/functions.php';
+require_once dirname(__FILE__) . '/functions.php';
 
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
@@ -28,46 +28,46 @@ 
 
 // Override the PHPMailer
 global $phpmailer;
-require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
+require_once(dirname(__FILE__) . '/mock-mailer.php');
 $phpmailer = new MockPHPMailer();
 
-$wpdb->query( 'SET storage_engine = INNODB' );
-$wpdb->select( DB_NAME, $wpdb->dbh );
+$wpdb->query('SET storage_engine = INNODB');
+$wpdb->select(DB_NAME, $wpdb->dbh);
 
 echo "Installing..." . PHP_EOL;
 
-foreach ( $wpdb->tables() as $table => $prefixed_table ) {
-	$wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
+foreach ($wpdb->tables() as $table => $prefixed_table) {
+	$wpdb->query("DROP TABLE IF EXISTS $prefixed_table");
 }
 
-foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
-	$wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
+foreach ($wpdb->tables('ms_global') as $table => $prefixed_table) {
+	$wpdb->query("DROP TABLE IF EXISTS $prefixed_table");
 
 	// We need to create references to ms global tables.
-	if ( $multisite )
+	if ($multisite)
 		$wpdb->$table = $prefixed_table;
 }
 
 // Prefill a permalink structure so that WP doesn't try to determine one itself.
-add_action( 'populate_options', '_set_default_permalink_structure_for_tests' );
+add_action('populate_options', '_set_default_permalink_structure_for_tests');
 
-wp_install( WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password' );
+wp_install(WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password');
 
 // Delete dummy permalink structure, as prefilled above.
-if ( ! is_multisite() ) {
-	delete_option( 'permalink_structure' );
+if (!is_multisite()) {
+	delete_option('permalink_structure');
 }
-remove_action( 'populate_options', '_set_default_permalink_structure_for_tests' );
+remove_action('populate_options', '_set_default_permalink_structure_for_tests');
 
-if ( $multisite ) {
+if ($multisite) {
 	echo "Installing network..." . PHP_EOL;
 
-	define( 'WP_INSTALLING_NETWORK', true );
+	define('WP_INSTALLING_NETWORK', true);
 
 	$title = WP_TESTS_TITLE . ' Network';
 	$subdomain_install = false;
 
 	install_network();
-	populate_network( 1, WP_TESTS_DOMAIN, WP_TESTS_EMAIL, $title, '/', $subdomain_install );
-	$wp_rewrite->set_permalink_structure( '' );
+	populate_network(1, WP_TESTS_DOMAIN, WP_TESTS_EMAIL, $title, '/', $subdomain_install);
+	$wp_rewrite->set_permalink_structure('');
 }

Braces +4 added lines, -3 removed lines

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

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

Spacing +58 added lines, -58 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,45 +43,45 @@ 
 
 $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 ) {
+if ($multisite) {
 	echo "Running as multisite..." . PHP_EOL;
-	define( 'MULTISITE', true );
-	define( 'SUBDOMAIN_INSTALL', false );
+	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;
 }
-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');
 	}
 }
 
@@ -91,14 +91,14 @@ 
 // 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,36 +140,36 @@ 
 			'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;
@@ -177,4 +177,4 @@ 
 		}
     }
 }
-new WP_PHPUnit_Util_Getopt( $_SERVER['argv'] );
+new WP_PHPUnit_Util_Getopt($_SERVER['argv']);

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'] );

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

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
+require_once(ABSPATH . '/wp-includes/class-phpmailer.php');
 
 class MockPHPMailer extends PHPMailer {
 	var $mock_sent = array();

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

Spacing +74 added lines, -74 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;
 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;

Braces +18 added lines, -12 removed lines

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

tests/lib/wordpress-tests-lib/includes/spy-rest-server.php

Spacing +6 added lines, -6 removed lines

@@ -21,18 +21,18 @@
 	 * @param array $args Arguments to pass to the method
 	 * @return mixed
 	 */
-	public function __call( $method, $args ) {
-		return call_user_func_array( array( $this, $method ), $args );
+	public function __call($method, $args) {
+		return call_user_func_array(array($this, $method), $args);
 	}
 
-	public function send_header( $header, $value ) {
-		$this->sent_headers[ $header ] = $value;
+	public function send_header($header, $value) {
+		$this->sent_headers[$header] = $value;
 	}
 
-	public function serve_request( $path = null ) {
+	public function serve_request($path = null) {
 
 		ob_start();
-		$result = parent::serve_request( $path );
+		$result = parent::serve_request($path);
 		$this->sent_body = ob_get_clean();
 		return $result;
 	}

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

Switch Indentation +26 added lines, -26 removed lines

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

Spacing +63 added lines, -63 removed lines

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

Braces +77 added lines, -51 removed lines

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