jarednova / timber

lib/timber-menu-item.php

Spacing +33 added lines, -33 removed lines

@@ -24,15 +24,15 @@ 
 	 *
 	 * @param array|object $data
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$data = (object) $data;
-		$this->import( $data );
-		$this->import_classes( $data );
-		if ( isset( $this->name ) ) {
+		$this->import($data);
+		$this->import_classes($data);
+		if ( isset($this->name) ) {
 			$this->_name = $this->name;
 		}
 		$this->name = $this->name();
-		$this->add_class( 'menu-item-' . $this->ID );
+		$this->add_class('menu-item-' . $this->ID);
 		$this->menu_object = $data;
 	}
 
@@ -47,7 +47,7 @@ 
 	 * add a class the menu item should have
 	 * @param string  $class_name to be added
 	 */
-	public function add_class( $class_name ) {
+	public function add_class($class_name) {
 		$this->classes[] = $class_name;
 		$this->class .= ' ' . $class_name;
 	}
@@ -61,7 +61,7 @@ 
 		if ( $title = $this->title() ) {
 			return $title;
 		}
-		if ( isset( $this->_name ) ) {
+		if ( isset($this->_name) ) {
 			return $this->_name;
 		}
 		return '';
@@ -82,10 +82,10 @@ 
 	 * @return string the slug of the menu item kinda-like-this
 	 */
 	public function slug() {
-		if ( !isset( $this->master_object ) ) {
+		if ( !isset($this->master_object) ) {
 			$this->master_object = $this->get_master_object();
 		}
-		if ( isset( $this->master_object->post_name ) && $this->master_object->post_name ) {
+		if ( isset($this->master_object->post_name) && $this->master_object->post_name ) {
 			return $this->master_object->post_name;
 		}
 		return $this->post_name;
@@ -96,8 +96,8 @@ 
 	 * @return mixed whatever object (Post, Term, etc.) the menu item represents
 	 */
 	protected function get_master_object() {
-		if ( isset( $this->_menu_item_object_id ) ) {
-			return new $this->PostClass( $this->_menu_item_object_id );
+		if ( isset($this->_menu_item_object_id) ) {
+			return new $this->PostClass($this->_menu_item_object_id);
 		}
 	}
 
@@ -107,10 +107,10 @@ 
 	 * @return string an absolute URL http://example.org/my-page
 	 */
 	function get_link() {
-		if ( !isset( $this->url ) || !$this->url ) {
-			if ( isset( $this->_menu_item_type ) && $this->_menu_item_type == 'custom' ) {
+		if ( !isset($this->url) || !$this->url ) {
+			if ( isset($this->_menu_item_type) && $this->_menu_item_type == 'custom' ) {
 				$this->url = $this->_menu_item_url;
-			} else if ( isset( $this->menu_object ) && method_exists( $this->menu_object, 'get_link' ) ) {
+			} else if ( isset($this->menu_object) && method_exists($this->menu_object, 'get_link') ) {
 					$this->url = $this->menu_object->get_link();
 				}
 		}
@@ -123,7 +123,7 @@ 
 	 * @return string a relative url /my-page
 	 */
 	function get_path() {
-		return TimberURLHelper::get_rel_url( $this->get_link() );
+		return TimberURLHelper::get_rel_url($this->get_link());
 	}
 
 	/**
@@ -131,17 +131,17 @@ 
 	 *
 	 * @param TimberMenuItem $item
 	 */
-	function add_child( $item ) {
+	function add_child($item) {
 		if ( !$this->has_child_class ) {
-			$this->add_class( 'menu-item-has-children' );
+			$this->add_class('menu-item-has-children');
 			$this->has_child_class = true;
 		}
-		if ( !isset( $this->children ) ) {
+		if ( !isset($this->children) ) {
 			$this->children = array();
 		}
 		$this->children[] = $item;
 		$item->level = $this->level + 1;
-		if ($item->children) {
+		if ( $item->children ) {
 			$this->update_child_levels();
 		}
 	}
@@ -152,8 +152,8 @@ 
 	 * @return bool 
 	 */
 	function update_child_levels() {
-		if (is_array($this->children)) {
-			foreach( $this->children as $child ) {
+		if ( is_array($this->children) ) {
+			foreach ($this->children as $child) {
 				$child->level = $this->level + 1;
 				$child->update_child_levels();
 			}
@@ -166,14 +166,14 @@ 
 	 * @internal
 	 * @param array|object  $data
 	 */
-	function import_classes( $data ) {
+	function import_classes($data) {
 		if ( is_array($data) ) {
 			$data = (object) $data;
 		}
-		$this->classes = array_merge( $this->classes, $data->classes );
-		$this->classes = array_unique( $this->classes );
-		$this->classes = apply_filters( 'nav_menu_css_class', $this->classes, $this );
-		$this->class = trim( implode( ' ', $this->classes ) );
+		$this->classes = array_merge($this->classes, $data->classes);
+		$this->classes = array_unique($this->classes);
+		$this->classes = apply_filters('nav_menu_css_class', $this->classes, $this);
+		$this->class = trim(implode(' ', $this->classes));
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 * @return array|bool
 	 */
 	function get_children() {
-		if ( isset( $this->children ) ) {
+		if ( isset($this->children) ) {
 			return $this->children;
 		}
 		return false;
@@ -201,18 +201,18 @@ 
 		if ( $this->type != 'custom' ) {
 			return false;
 		}
-		return TimberURLHelper::is_external( $this->url );
+		return TimberURLHelper::is_external($this->url);
 	}
 
 	/**
 	 * @param string $key lookup key
 	 * @return mixed whatever value is storied in the database
 	 */
-	public function meta( $key ) {
-		if ( is_object( $this->menu_object ) && method_exists( $this->menu_object, 'meta' ) ) {
-			return $this->menu_object->meta( $key );
+	public function meta($key) {
+		if ( is_object($this->menu_object) && method_exists($this->menu_object, 'meta') ) {
+			return $this->menu_object->meta($key);
 		}
-		if ( isset( $this->$key ) ) {
+		if ( isset($this->$key) ) {
 			return $this->$key;
 		}
 	}
@@ -299,7 +299,7 @@ 
 	 * @return string the public label like Foo
 	 */
 	public function title() {
-		if ( isset( $this->__title ) ) {
+		if ( isset($this->__title) ) {
 			return $this->__title;
 		}
 	}

lib/timber-menu.php

Spacing +24 added lines, -24 removed lines

@@ -77,16 +77,16 @@ 
 	 */
 	function __construct($slug = 0) {
 		$locations = get_nav_menu_locations();
-		if ($slug != 0 && is_numeric($slug)) {
+		if ( $slug != 0 && is_numeric($slug) ) {
 			$menu_id = $slug;
-		} else if (is_array($locations) && count($locations)) {
+		} else if ( is_array($locations) && count($locations) ) {
 			$menu_id = $this->get_menu_id_from_locations($slug, $locations);
-		} else if ($slug === false) {
+		} else if ( $slug === false ) {
 			$menu_id = false;
 		} else {
 			$menu_id = $this->get_menu_id_from_terms($slug);
 		}
-		if ($menu_id) {
+		if ( $menu_id ) {
 			$this->init($menu_id);
 		} else {
 			$this->init_as_page_menu();
@@ -99,9 +99,9 @@ 
 	 */
 	protected function init($menu_id) {
 		$menu = wp_get_nav_menu_items($menu_id);
-		if ($menu) {
+		if ( $menu ) {
 			_wp_menu_item_classes_by_context($menu);
-			if (is_array($menu)){
+			if ( is_array($menu) ) {
 				$menu = self::order_children($menu);
 			}
 			$this->items = $menu;
@@ -118,12 +118,12 @@ 
 	 */
 	protected function init_as_page_menu() {
 		$menu = get_pages();
-		if ($menu) {
-			foreach($menu as $mi) {
+		if ( $menu ) {
+			foreach ($menu as $mi) {
 				$mi->__title = $mi->post_title;
 			}
 			_wp_menu_item_classes_by_context($menu);
-			if (is_array($menu)){
+			if ( is_array($menu) ) {
 				$menu = self::order_children($menu);
 			}
 			$this->items = $menu;
@@ -137,13 +137,13 @@ 
 	 * @return integer
 	 */
 	protected function get_menu_id_from_locations($slug, $locations) {
-		if ($slug === 0) {
+		if ( $slug === 0 ) {
 			$slug = $this->get_menu_id_from_terms($slug);
 		}
-		if (is_numeric($slug)) {
+		if ( is_numeric($slug) ) {
 			$slug = array_search($slug, $locations);
 		}
-		if (isset($locations[$slug])) {
+		if ( isset($locations[$slug]) ) {
 			return $locations[$slug];
 		}
 	}
@@ -154,20 +154,20 @@ 
 	 * @return int
 	 */
 	protected function get_menu_id_from_terms($slug = 0) {
-		if (!is_numeric($slug) && is_string($slug)) {
+		if ( !is_numeric($slug) && is_string($slug) ) {
 			//we have a string so lets search for that
 			$menu_id = get_term_by('slug', $slug, 'nav_menu');
-			if ($menu_id) {
+			if ( $menu_id ) {
 				return $menu_id;
 			}
 			$menu_id = get_term_by('name', $slug, 'nav_menu');
-			if ($menu_id) {
+			if ( $menu_id ) {
 				return $menu_id;
 			}
 		}
 		$menus = get_terms('nav_menu', array('hide_empty' => true));
-		if (is_array($menus) && count($menus)) {
-			if (isset($menus[0]->term_id)) {
+		if ( is_array($menus) && count($menus) ) {
+			if ( isset($menus[0]->term_id) ) {
 				return $menus[0]->term_id;
 			}
 		}
@@ -181,7 +181,7 @@ 
 	 */
 	function find_parent_item_in_menu($menu_items, $parent_id) {
 		foreach ($menu_items as &$item) {
-			if ($item->ID == $parent_id) {
+			if ( $item->ID == $parent_id ) {
 				return $item;
 			}
 		}
@@ -196,25 +196,25 @@ 
 		$index = array();
 		$menu = array();
 		foreach ($items as $item) {
-			if (isset($item->title)) {
+			if ( isset($item->title) ) {
 				//items from wp can come with a $title property which conflicts with methods
 				$item->__title = $item->title;
 				unset($item->title);
 			}
-			if(isset($item->ID)){
-				if (is_object($item) && get_class($item) == 'WP_Post'){
+			if ( isset($item->ID) ) {
+				if ( is_object($item) && get_class($item) == 'WP_Post' ) {
 					$old_menu_item = $item;
 					$item = new $this->PostClass($item);
 				}
 				$menu_item = new $this->MenuItemClass($item);
-				if (isset($old_menu_item)){
+				if ( isset($old_menu_item) ) {
 					$menu_item->import_classes($old_menu_item);
 				}
 				$index[$item->ID] = $menu_item;
 			}
 		}
 		foreach ($index as $item) {
-			if (isset($item->menu_item_parent) && $item->menu_item_parent && isset($index[$item->menu_item_parent])) {
+			if ( isset($item->menu_item_parent) && $item->menu_item_parent && isset($index[$item->menu_item_parent]) ) {
 				$index[$item->menu_item_parent]->add_child($item);
 			} else {
 				$menu[] = $item;
@@ -227,7 +227,7 @@ 
 	 * @return array
 	 */
 	function get_items() {
-		if (is_array($this->items)) {
+		if ( is_array($this->items) ) {
 			return $this->items;
 		}
 		return array();

lib/timber-post-getter.php

Spacing +23 added lines, -23 removed lines

@@ -8,19 +8,19 @@ 
 	 * @return array|bool|null
 	 */
 	static function get_post($query = false, $PostClass = 'TimberPost') {
-		$posts = self::get_posts( $query, $PostClass );
-		if ( $post = reset($posts ) ) {
+		$posts = self::get_posts($query, $PostClass);
+		if ( $post = reset($posts) ) {
 			return $post;
 		}
 	}
 
-	static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
-		$posts = self::query_posts( $query, $PostClass );
-		return apply_filters('timber_post_getter_get_posts', $posts->get_posts( $return_collection ));
+	static function get_posts($query = false, $PostClass = 'TimberPost', $return_collection = false) {
+		$posts = self::query_posts($query, $PostClass);
+		return apply_filters('timber_post_getter_get_posts', $posts->get_posts($return_collection));
 	}
 
-	static function query_post( $query = false, $PostClass = 'TimberPost' ) {
-		$posts = self::query_posts( $query, $PostClass );
+	static function query_post($query = false, $PostClass = 'TimberPost') {
+		$posts = self::query_posts($query, $PostClass);
 		if ( method_exists($posts, 'current') && $post = $posts->current() ) {
 			return $post;
 		}
@@ -31,32 +31,32 @@ 
 	 * @param string $PostClass
 	 * @return array|bool|null
 	 */
-	static function query_posts($query = false, $PostClass = 'TimberPost' ) {
-		if (self::is_post_class_or_class_map($query)) {
+	static function query_posts($query = false, $PostClass = 'TimberPost') {
+		if ( self::is_post_class_or_class_map($query) ) {
 			$PostClass = $query;
 			$query = false;
 		}
 
-		if (is_object($query) && !is_a($query, 'WP_Query') ){
+		if ( is_object($query) && !is_a($query, 'WP_Query') ) {
 			// The only object other than a query is a type of post object
-			$query = array( $query );
+			$query = array($query);
 		}
 
-		if ( is_array( $query ) && count( $query ) && isset( $query[0] ) && is_object( $query[0] ) ) {
+		if ( is_array($query) && count($query) && isset($query[0]) && is_object($query[0]) ) {
 			// We have an array of post objects that already have data
-			return new TimberPostsCollection( $query, $PostClass );
+			return new TimberPostsCollection($query, $PostClass);
 		} else {
 			// We have a query (of sorts) to work with
-			$tqi = new TimberQueryIterator( $query, $PostClass );
+			$tqi = new TimberQueryIterator($query, $PostClass);
 			return $tqi;
 		}
 	}
 
-	static function get_pids($query){
+	static function get_pids($query) {
 		$posts = self::get_posts($query);
 		$pids = array();
-		foreach($posts as $post){
-			if (isset($post->ID)){
+		foreach ($posts as $post) {
+			if ( isset($post->ID) ) {
 				$pids[] = $post->ID;
 			}
 		}
@@ -64,7 +64,7 @@ 
 	}
 
 	static function loop_to_id() {
-		if (!self::wp_query_has_posts()) { return false; }
+		if ( !self::wp_query_has_posts() ) { return false; }
 
 		global $wp_query;
 		$post_num = property_exists($wp_query, 'current_post')
@@ -72,7 +72,7 @@ 
 				  : 0
 				  ;
 
-		if (!isset($wp_query->posts[$post_num])) { return false; }
+		if ( !isset($wp_query->posts[$post_num]) ) { return false; }
 
 		return $wp_query->posts[$post_num]->ID;
 	}
@@ -89,13 +89,13 @@ 
 	 * @param string|array $arg
 	 * @return bool
 	 */
-	static function is_post_class_or_class_map($arg){
-		if (is_string($arg) && class_exists($arg)) {
+	static function is_post_class_or_class_map($arg) {
+		if ( is_string($arg) && class_exists($arg) ) {
 			return true;
 		}
-		if (is_array($arg)) {
+		if ( is_array($arg) ) {
 			foreach ($arg as $item) {
-				if (is_string($item) && class_exists($item)) {
+				if ( is_string($item) && class_exists($item) ) {
 					return true;
 				}
 			}

lib/timber-post.php

Spacing +50 added lines, -50 removed lines

@@ -168,7 +168,7 @@ 
 	 * @param mixed $pid
 	 */
 	public function __construct($pid = null) {
-		$pid = $this->determine_id( $pid );
+		$pid = $this->determine_id($pid);
 		$this->init($pid);
 	}
 
@@ -188,13 +188,13 @@ 
 			&& get_class($wp_query->queried_object) == 'WP_Post'
 			) {
 			$pid = $wp_query->queried_object_id;
-		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id )  {
+		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id ) {
 			//hack for static page as home page
 			$pid = $wp_query->queried_object_id;
 		} else if ( $pid === null ) {
 			$gtid = false;
 			$maybe_post = get_post();
-			if ( isset($maybe_post->ID) ){
+			if ( isset($maybe_post->ID) ) {
 				$gtid = true;
 			}
 			if ( $gtid ) {
@@ -260,7 +260,7 @@ 
 	 * @param string $field
 	 * @param mixed $value
 	 */
-	public function update( $field, $value ) {
+	public function update($field, $value) {
 		if ( isset($this->ID) ) {
 			update_post_meta($this->ID, $field, $value);
 			$this->$field = $value;
@@ -275,7 +275,7 @@ 
 	 * @param mixed $pid
 	 * @return WP_Post on success
 	 */
-	protected function prepare_post_info( $pid = 0 ) {
+	protected function prepare_post_info($pid = 0) {
 		if ( is_string($pid) || is_numeric($pid) || (is_object($pid) && !isset($pid->post_title)) || $pid === 0 ) {
 			$pid = self::check_post_id($pid);
 			$post = get_post($pid);
@@ -297,7 +297,7 @@ 
 	 * @internal
 	 * @return integer ID number of a post
 	 */
-	protected function check_post_id( $pid ) {
+	protected function check_post_id($pid) {
 		if ( is_numeric($pid) && $pid === 0 ) {
 			$pid = get_the_ID();
 			return $pid;
@@ -323,7 +323,7 @@ 
 		global $wpdb;
 		$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $post_name);
 		$result = $wpdb->get_row($query);
-		if (!$result) {
+		if ( !$result ) {
 			return null;
 		}
 		return $result->ID;
@@ -362,7 +362,7 @@ 
 				$text = TimberHelper::trim_words($text, $len, false);
 				$trimmed = true;
 			}
-			$text = do_shortcode( $text );
+			$text = do_shortcode($text);
 		}
 		if ( !strlen($text) ) {
 			$text = TimberHelper::trim_words($this->get_content(), $len, false);
@@ -394,7 +394,7 @@ 
 			} elseif ( $readmore ) {
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore) . '</a>';
 			}
-			if ( !$strip && $last_p_tag && ( strpos($text, '<p>') || strpos($text, '<p ') ) ) {
+			if ( !$strip && $last_p_tag && (strpos($text, '<p>') || strpos($text, '<p ')) ) {
 				$text .= '</p>';
 			}
 		}
@@ -406,7 +406,7 @@ 
 	 * @internal
 	 * @param bool|int $pid a post ID number
 	 */
-	function import_custom( $pid = false ) {
+	function import_custom($pid = false) {
 		if ( !$pid ) {
 			$pid = $this->ID;
 		}
@@ -421,13 +421,13 @@ 
 	 * @param int $pid
 	 * @return array
 	 */
-	protected function get_post_custom( $pid ) {
+	protected function get_post_custom($pid) {
 		apply_filters('timber_post_get_meta_pre', array(), $pid, $this);
 		$customs = get_post_custom($pid);
 		if ( !is_array($customs) || empty($customs) ) {
 			return array();
 		}
-		foreach ( $customs as $key => $value ) {
+		foreach ($customs as $key => $value) {
 			if ( is_array($value) && count($value) == 1 && isset($value[0]) ) {
 				$value = $value[0];
 			}
@@ -481,7 +481,7 @@ 
 	 * @param bool $taxonomy
 	 * @return TimberPost|boolean
 	 */
-	function get_next( $taxonomy = false ) {
+	function get_next($taxonomy = false) {
 		if ( !isset($this->_next) || !isset($this->_next[$taxonomy]) ) {
 			global $post;
 			$this->_next = array();
@@ -512,7 +512,7 @@ 
 		$post = $this;
 		$ret = array();
 		if ( $multipage ) {
-			for ( $i = 1; $i <= $numpages; $i++ ) {
+			for ($i = 1; $i <= $numpages; $i++) {
 				$link = self::get_wp_link_page($i);
 				$data = array('name' => $i, 'title' => $i, 'text' => $i, 'link' => $link);
 				if ( $i == $page ) {
@@ -564,7 +564,7 @@ 
 	 * @param bool $taxonomy
 	 * @return TimberPost|boolean
 	 */
-	function get_prev( $taxonomy = false ) {
+	function get_prev($taxonomy = false) {
 		if ( isset($this->_prev) && isset($this->_prev[$taxonomy]) ) {
 			return $this->_prev[$taxonomy];
 		}
@@ -631,7 +631,7 @@ 
 		$post->slug = $post->post_name;
 		$customs = $this->get_post_custom($post->ID);
 		$post->custom = $customs;
-		$post = (object) array_merge((array)$customs, (array)$post);
+		$post = (object) array_merge((array) $customs, (array) $post);
 		return $post;
 	}
 
@@ -642,7 +642,7 @@ 
 	 * @param string $use
 	 * @return string
 	 */
-	function get_display_date( $use = 'post_date' ) {
+	function get_display_date($use = 'post_date') {
 		return date(get_option('date_format'), strtotime($this->$use));
 	}
 
@@ -652,9 +652,9 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	function get_date( $date_format = '' ) {
+	function get_date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->post_date);
+		$the_date = (string) mysql2date($df, $this->post_date);
 		return apply_filters('get_the_date', $the_date, $df);
 	}
 
@@ -663,7 +663,7 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	function get_modified_date( $date_format = '' ) {
+	function get_modified_date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
 		$the_time = $this->get_modified_time($df);
 		return apply_filters('get_the_modified_date', $the_time, $date_format);
@@ -674,7 +674,7 @@ 
 	 * @param  string $time_format
 	 * @return string
 	 */
-	function get_modified_time( $time_format = '' ) {
+	function get_modified_time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
 		$the_time = get_post_modified_time($tf, false, $this->ID, true);
 		return apply_filters('get_the_modified_time', $the_time, $time_format);
@@ -687,7 +687,7 @@ 
 	 * @param bool|string 	$childPostClass
 	 * @return array
 	 */
-	function get_children( $post_type = 'any', $childPostClass = false ) {
+	function get_children($post_type = 'any', $childPostClass = false) {
 		if ( $childPostClass === false ) {
 			$childPostClass = $this->PostClass;
 		}
@@ -695,7 +695,7 @@ 
 			$post_type = $this->post_type;
 		}
 		$children = get_children('post_parent=' . $this->ID . '&post_type=' . $post_type . '&numberposts=-1&orderby=menu_order title&order=ASC');
-		foreach ( $children as &$child ) {
+		foreach ($children as &$child) {
 			$child = new $childPostClass($child->ID);
 		}
 		$children = array_values($children);
@@ -731,16 +731,16 @@ 
 		$timber_comments = array();
 
 		if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
-			set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+			set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 			$overridden_cpage = true;
 		}
 
-        foreach( $comments as $key => &$comment ) {
+        foreach ($comments as $key => &$comment) {
             $timber_comment = new $CommentClass($comment);
             $timber_comments[$timber_comment->id] = $timber_comment;
         }
 
-		foreach( $timber_comments as $key => $comment ) {
+		foreach ($timber_comments as $key => $comment) {
 			if ( $comment->is_child() ) {
 				unset($timber_comments[$comment->id]);
 
@@ -784,7 +784,7 @@ 
 	 * @param string $TermClass
 	 * @return array
 	 */
-	function get_terms( $tax = '', $merge = true, $TermClass = '' ) {
+	function get_terms($tax = '', $merge = true, $TermClass = '') {
 
 		$TermClass = $TermClass ?: $this->TermClass;
 
@@ -795,7 +795,7 @@ 
 			$taxonomies = $tax;
 		}
 		if ( is_string($tax) ) {
-			if ( in_array($tax, array('all','any','')) ) {
+			if ( in_array($tax, array('all', 'any', '')) ) {
 				$taxonomies = get_object_taxonomies($this->post_type);
 			} else {
 				$taxonomies = array($tax);
@@ -804,8 +804,8 @@ 
 
 		$term_class_objects = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( in_array($taxonomy, array('tag','tags')) ) {
+		foreach ($taxonomies as $taxonomy) {
+			if ( in_array($taxonomy, array('tag', 'tags')) ) {
 				$taxonomy = 'post_tag';
 			}
 			if ( $taxonomy == 'categories' ) {
@@ -843,11 +843,11 @@ 
 	 * @param string $taxonomy
 	 * @return bool
 	 */
-	function has_term( $term_name_or_id, $taxonomy = 'all' ) {
+	function has_term($term_name_or_id, $taxonomy = 'all') {
 		if ( $taxonomy == 'all' || $taxonomy == 'any' ) {
 			$taxes = get_object_taxonomies($this->post_type, 'names');
 			$ret = false;
-			foreach ( $taxes as $tax ) {
+			foreach ($taxes as $tax) {
 				if ( has_term($term_name_or_id, $tax, $this->ID) ) {
 					$ret = true;
 					break;
@@ -862,7 +862,7 @@ 
 	 * @param string $field
 	 * @return TimberImage
 	 */
-	function get_image( $field ) {
+	function get_image($field) {
 		return new $this->ImageClass($this->$field);
 	}
 
@@ -912,7 +912,7 @@ 
 	 * @param int $page
 	 * @return string
 	 */
-	function get_content( $len = 0, $page = 0 ) {
+	function get_content($len = 0, $page = 0) {
 		if ( $len == 0 && $page == 0 && $this->_content ) {
 			return $this->_content;
 		}
@@ -973,7 +973,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function get_field( $field_name ) {
+	public function get_field($field_name) {
 		$value = apply_filters('timber_post_get_meta_field_pre', null, $this->ID, $field_name, $this);
 		if ( $value === null ) {
 			$value = get_post_meta($this->ID, $field_name);
@@ -991,7 +991,7 @@ 
 	/**
 	 * @param string $field_name
 	 */
-	function import_field( $field_name ) {
+	function import_field($field_name) {
 		$this->$field_name = $this->get_field($field_name);
 	}
 
@@ -1022,13 +1022,13 @@ 
 	 * ```
 	 * @return string a space-seperated list of classes
 	 */
-	public function post_class( $class='' ) {
+	public function post_class($class = '') {
 		global $post;
 		$old_global_post = $post;
 		$post = $this;
 		$class_array = get_post_class($class, $this->ID);
 		$post = $old_global_post;
-		if ( is_array($class_array) ){
+		if ( is_array($class_array) ) {
 			return implode(' ', $class_array);
 		}
 		return $class_array;
@@ -1130,8 +1130,8 @@ 
 	 * @param string|bool $childPostClass _optional_ a custom post class (ex: 'MyTimberPost') to return the objects as. By default (false) it will use TimberPost::$post_class value.
 	 * @return array
 	 */
-	public function children( $post_type = 'any', $childPostClass = false ) {
-		return $this->get_children( $post_type, $childPostClass );
+	public function children($post_type = 'any', $childPostClass = false) {
+		return $this->get_children($post_type, $childPostClass);
 	}
 
 	/**
@@ -1155,7 +1155,7 @@ 
 	 * ```
 	 * @return bool|array
 	 */
-	public function comments( $count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment' ) {
+	public function comments($count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment') {
 		return $this->get_comments($count, $order, $type, $status, $CommentClass);
 	}
 
@@ -1172,7 +1172,7 @@ 
 	 * @param int $page
 	 * @return string
 	 */
-	public function content( $page = 0 ) {
+	public function content($page = 0) {
 		return $this->get_content(0, $page);
 	}
 
@@ -1201,7 +1201,7 @@ 
 	 * @param string $date_format
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	public function date($date_format = '') {
 		return $this->get_date($date_format);
 	}
 
@@ -1237,7 +1237,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function meta( $field_name = null ) {
+	public function meta($field_name = null) {
 		if ( $field_name === null ) {
 			//on the off-chance the field is actually named meta
 			$field_name = 'meta';
@@ -1248,7 +1248,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		return $this->title();
 	}
 
@@ -1256,7 +1256,7 @@ 
 	 * @param string $date_format
 	 * @return string
 	 */
-	public function modified_date( $date_format = '' ) {
+	public function modified_date($date_format = '') {
 		return $this->get_modified_date($date_format);
 	}
 
@@ -1264,7 +1264,7 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function modified_time( $time_format = '' ) {
+	public function modified_time($time_format = '') {
 		return $this->get_modified_time($time_format);
 	}
 
@@ -1273,7 +1273,7 @@ 
 	 * @param bool $in_same_cat
 	 * @return mixed
 	 */
-	public function next( $in_same_cat = false ) {
+	public function next($in_same_cat = false) {
 		return $this->get_next($in_same_cat);
 	}
 
@@ -1331,7 +1331,7 @@ 
 	 * @param bool $in_same_cat
 	 * @return mixed
 	 */
-	public function prev( $in_same_cat = false ) {
+	public function prev($in_same_cat = false) {
 		return $this->get_prev($in_same_cat);
 	}
 
@@ -1343,7 +1343,7 @@ 
 	 * @param bool $merge Should the resulting array be one big one (true)? Or should it be an array of sub-arrays for each taxonomy (false)?
 	 * @return array
 	 */
-	public function terms( $tax = '', $merge = true ) {
+	public function terms($tax = '', $merge = true) {
 		return $this->get_terms($tax, $merge);
 	}
 

lib/timber-posts-collection.php

Spacing +23 added lines, -23 removed lines

@@ -1,50 +1,50 @@ 
 <?php
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) )
+if ( !defined('ABSPATH') )
     exit;
 
 class TimberPostsCollection extends ArrayObject {
 
-    public function __construct( $posts = array(), $post_class = 'TimberPost' ) {
+    public function __construct($posts = array(), $post_class = 'TimberPost') {
         $returned_posts = array();
-        if ( is_null( $posts ) ){
+        if ( is_null($posts) ) {
             $posts = array();
         }
-        foreach ( $posts as $post_object ) {
+        foreach ($posts as $post_object) {
             $post_class_use = $post_class;
 
-            if ( is_array( $post_class ) ) {
-                $post_type      = get_post_type( $post_object );
+            if ( is_array($post_class) ) {
+                $post_type      = get_post_type($post_object);
                 $post_class_use = 'TimberPost';
 
-                if ( isset( $post_class[$post_type] ) ) {
+                if ( isset($post_class[$post_type]) ) {
                     $post_class_use = $post_class[$post_type];
 
                 } else {
-                    if ( is_array( $post_class ) ) {
-                        TimberHelper::error_log( $post_type . ' of ' . $post_object->ID . ' not found in ' . print_r( $post_class, true ) );
+                    if ( is_array($post_class) ) {
+                        TimberHelper::error_log($post_type . ' of ' . $post_object->ID . ' not found in ' . print_r($post_class, true));
                     } else {
-                        TimberHelper::error_log( $post_type . ' not found in ' . $post_class );
+                        TimberHelper::error_log($post_type . ' not found in ' . $post_class);
                     }
                 }
             }
 
             // Don't create yet another object if $post_object is already of the right type
-            if ( is_a( $post_object, $post_class_use ) ) {
+            if ( is_a($post_object, $post_class_use) ) {
                 $post = $post_object;
             } else {
-                $post = new $post_class_use( $post_object );
+                $post = new $post_class_use($post_object);
             }
 
-            if ( isset( $post->ID ) ) {
+            if ( isset($post->ID) ) {
                 $returned_posts[] = $post;
             }
         }
 
         $returned_posts = self::maybe_set_preview($returned_posts);
 
-        parent::__construct( $returned_posts, $flags = 0, 'TimberPostsIterator' );
+        parent::__construct($returned_posts, $flags = 0, 'TimberPostsIterator');
     }
 
     public function get_posts() {
@@ -55,17 +55,17 @@ 
      * @param array $posts
      * @return array
      */
-    static function maybe_set_preview( $posts ) {
-        if ( is_array( $posts ) && isset( $_GET['preview'] ) && $_GET['preview']
-               && isset( $_GET['preview_id'] ) && $_GET['preview_id']
-               && current_user_can( 'edit_post', $_GET['preview_id'] ) ) {
+    static function maybe_set_preview($posts) {
+        if ( is_array($posts) && isset($_GET['preview']) && $_GET['preview']
+               && isset($_GET['preview_id']) && $_GET['preview_id']
+               && current_user_can('edit_post', $_GET['preview_id']) ) {
             // No need to check the nonce, that already happened in _show_post_preview on init
 
             $preview_id = $_GET['preview_id'];
-            foreach( $posts as &$post ) {
-                if ( is_object( $post ) && $post->ID == $preview_id ) {
+            foreach ($posts as &$post) {
+                if ( is_object($post) && $post->ID == $preview_id ) {
                     // Based on _set_preview( $post ), but adds import_custom
-                    $preview = wp_get_post_autosave( $preview_id );
+                    $preview = wp_get_post_autosave($preview_id);
                     if ( is_object($preview) ) {
 
                         $preview = sanitize_post($preview);
@@ -73,9 +73,9 @@ 
                         $post->post_content = $preview->post_content;
                         $post->post_title = $preview->post_title;
                         $post->post_excerpt = $preview->post_excerpt;
-                        $post->import_custom( $preview_id );
+                        $post->import_custom($preview_id);
 
-                        add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
+                        add_filter('get_the_terms', '_wp_preview_terms_filter', 10, 3);
                     }
                 }
             }

lib/timber-query-iterator.php

Spacing +35 added lines, -35 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) )
+if ( !defined('ABSPATH') )
     exit;
 
 class TimberQueryIterator implements Iterator {
@@ -13,38 +13,38 @@ 
     private $_query = null;
     private $_posts_class = 'TimberPost';
 
-    public function __construct( $query = false, $posts_class = 'TimberPost' ) {
-        add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
+    public function __construct($query = false, $posts_class = 'TimberPost') {
+        add_action('pre_get_posts', array($this, 'fix_number_posts_wp_quirk'));
         if ( $posts_class )
             $this->_posts_class = $posts_class;
 
-        if ( is_a( $query, 'WP_Query' ) ) {
+        if ( is_a($query, 'WP_Query') ) {
             // We got a full-fledged WP Query, look no further!
             $the_query = $query;
 
         } elseif ( false === $query ) {
             // If query is explicitly set to false, use the main loop
             global $wp_query;
-            $the_query =& $wp_query;
+            $the_query = & $wp_query;
             //if we're on a custom posts page?
             $the_query = self::handle_maybe_custom_posts_page($the_query);
-        } elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
+        } elseif ( TimberHelper::is_array_assoc($query) || (is_string($query) && strstr($query, '=')) ) {
             // We have a regularly formed WP query string or array to use
-            $the_query = new WP_Query( $query );
+            $the_query = new WP_Query($query);
 
-        } elseif ( is_numeric( $query ) || is_string( $query ) ) {
+        } elseif ( is_numeric($query) || is_string($query) ) {
             // We have what could be a post name or post ID to pull out
-            $the_query = self::get_query_from_string( $query );
+            $the_query = self::get_query_from_string($query);
 
-        } elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
+        } elseif ( is_array($query) && count($query) && (is_integer($query[0]) || is_string($query[0])) ) {
             // We have a list of pids (post IDs) to extract from
-            $the_query = self::get_query_from_array_of_ids( $query );
-        } elseif ( is_array($query) && empty($query)) {
+            $the_query = self::get_query_from_array_of_ids($query);
+        } elseif ( is_array($query) && empty($query) ) {
             // it's an empty array
             $the_query = array();
         } else {
-            TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
-            TimberHelper::error_log( $query );
+            TimberHelper::error_log('I have failed you! in ' . basename(__FILE__) . '::' . __LINE__);
+            TimberHelper::error_log($query);
 
             // We have failed hard, at least let get something.
             $the_query = new WP_Query();
@@ -54,49 +54,49 @@ 
 
     }
 
-    public function get_posts( $return_collection = false ) {
-        if (isset($this->_query->posts)){
-            $posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
-            return ( $return_collection ) ? $posts : $posts->get_posts();
+    public function get_posts($return_collection = false) {
+        if ( isset($this->_query->posts) ) {
+            $posts = new TimberPostsCollection($this->_query->posts, $this->_posts_class);
+            return ($return_collection) ? $posts : $posts->get_posts();
         }
     }
 
     //
     // GET POSTS
     //
-    public static function get_query_from_array_of_ids( $query = array() ) {
-        if ( !is_array( $query ) || !count( $query ) )
+    public static function get_query_from_array_of_ids($query = array()) {
+        if ( !is_array($query) || !count($query) )
             return null;
 
-        return new WP_Query( array(
+        return new WP_Query(array(
                 'post_type'=> 'any',
                 'ignore_sticky_posts' => true,
                 'post__in' => $query,
                 'orderby'  => 'post__in',
                 'nopaging' => true
-            ) );
+            ));
     }
 
-    public static function get_query_from_string( $string = '' ) {
+    public static function get_query_from_string($string = '') {
         $post_type = false;
 
-        if ( is_string( $string ) && strstr( $string, '#' ) ) {
+        if ( is_string($string) && strstr($string, '#') ) {
             //we have a post_type directive here
-            list( $post_type, $string ) = explode( '#', $string );
+            list($post_type, $string) = explode('#', $string);
         }
 
         $query = array(
-            'post_type' => ( $post_type ) ? $post_type : 'any'
+            'post_type' => ($post_type) ? $post_type : 'any'
         );
 
-        if ( is_numeric( $string ) ) {
+        if ( is_numeric($string) ) {
             $query['p'] = $string;
 
         } else {
             $query['name'] = $string;
         }
 
-        return new WP_Query( $query );
+        return new WP_Query($query);
     }
 
     //
@@ -114,7 +114,7 @@ 
 
         // Sets up the global post, but also return the post, for use in Twig template
         $posts_class = $this->_posts_class;
-        return new $posts_class( $post );
+        return new $posts_class($post);
     }
 
     /**
@@ -131,10 +131,10 @@ 
     }
 
     //get_posts users numberposts
-    static function fix_number_posts_wp_quirk( $query ) {
-        if (isset($query->query) && isset($query->query['numberposts'])
-                && !isset($query->query['posts_per_page'])) {
-            $query->set( 'posts_per_page', $query->query['numberposts'] );
+    static function fix_number_posts_wp_quirk($query) {
+        if ( isset($query->query) && isset($query->query['numberposts'])
+                && !isset($query->query['posts_per_page']) ) {
+            $query->set('posts_per_page', $query->query['numberposts']);
         }
         return $query;
     }
@@ -144,8 +144,8 @@ 
      * @param  WP_Query $query the original query recived from WordPress
      * @return WP_Query
      */
-    static function handle_maybe_custom_posts_page( $query ) {
-    	if ($custom_posts_page = get_option('page_for_posts')) {
+    static function handle_maybe_custom_posts_page($query) {
+    	if ( $custom_posts_page = get_option('page_for_posts') ) {
         	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
         		return new WP_Query(array('post_type' => 'post'));
         	}

lib/timber-routes.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 	/**
 	 * @deprecated since 0.21.1 use Upstatement/routes instead
 	 */
-	public static function init( $timber ) {
+	public static function init($timber) {
 		// Install ourselves in Timber
 		$timber->routes = new TimberRoutes();
 	}

lib/timber-site.php

Spacing +33 added lines, -33 removed lines

@@ -101,10 +101,10 @@ 
 	 * ```
 	 * @param string|int $site_name_or_id
 	 */
-	function __construct( $site_name_or_id = null ) {
+	function __construct($site_name_or_id = null) {
 		$this->init();
 		if ( is_multisite() ) {
-			$this->init_as_multisite( $site_name_or_id );
+			$this->init_as_multisite($site_name_or_id);
 		} else {
 			$this->init_as_singlesite();
 		}
@@ -114,7 +114,7 @@ 
 	 * @internal
 	 * @param string|int $site_name_or_id
 	 */
-	protected function init_as_multisite( $site_name_or_id ) {
+	protected function init_as_multisite($site_name_or_id) {
 		if ( $site_name_or_id === null ) {
 			//this is necessary for some reason, otherwise returns 1 all the time
 			if ( is_multisite() ) {
@@ -122,17 +122,17 @@ 
 				$site_name_or_id = get_current_blog_id();
 			}
 		}
-		$info = get_blog_details( $site_name_or_id );
-		$this->import( $info );
+		$info = get_blog_details($site_name_or_id);
+		$this->import($info);
 		$this->ID = $info->blog_id;
 		$this->id = $this->ID;
 		$this->name = $this->blogname;
 		$this->title = $this->blogname;
 		$this->url = $this->siteurl;
-		$theme_slug = get_blog_option( $info->blog_id, 'stylesheet' );
-		$this->theme = new TimberTheme( $theme_slug );
-		$this->description = get_blog_option( $info->blog_id, 'blogdescription' );
-		$this->admin_email = get_blog_option( $info->blog_id, 'admin_email' );
+		$theme_slug = get_blog_option($info->blog_id, 'stylesheet');
+		$this->theme = new TimberTheme($theme_slug);
+		$this->description = get_blog_option($info->blog_id, 'blogdescription');
+		$this->admin_email = get_blog_option($info->blog_id, 'admin_email');
 		$this->multisite = true;
 	}
 
@@ -141,13 +141,13 @@ 
 	 * @internal
 	 */
 	protected function init_as_singlesite() {
-		$this->admin_email = get_bloginfo( 'admin_email' );
-		$this->name = get_bloginfo( 'name' );
+		$this->admin_email = get_bloginfo('admin_email');
+		$this->name = get_bloginfo('name');
 		$this->title = $this->name;
-		$this->description = get_bloginfo( 'description' );
-		$this->url = get_bloginfo( 'url' );
+		$this->description = get_bloginfo('description');
+		$this->url = get_bloginfo('url');
 		$this->theme = new TimberTheme();
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
+		$this->language_attributes = TimberHelper::function_wrapper('language_attributes');
 		$this->multisite = false;
 	}
 
@@ -156,16 +156,16 @@ 
 	 * @internal
 	 */
 	protected function init() {
-		$this->rdf = get_bloginfo( 'rdf_url' );
-		$this->rss = get_bloginfo( 'rss_url' );
-		$this->rss2 = get_bloginfo( 'rss2_url' );
-		$this->atom = get_bloginfo( 'atom_url' );
-		$this->language = get_bloginfo( 'language' );
-		$this->charset = get_bloginfo( 'charset' );
-		$this->pingback = get_bloginfo( 'pingback_url' );
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
+		$this->rdf = get_bloginfo('rdf_url');
+		$this->rss = get_bloginfo('rss_url');
+		$this->rss2 = get_bloginfo('rss2_url');
+		$this->atom = get_bloginfo('atom_url');
+		$this->language = get_bloginfo('language');
+		$this->charset = get_bloginfo('charset');
+		$this->pingback = get_bloginfo('pingback_url');
+		$this->language_attributes = TimberHelper::function_wrapper('language_attributes');
 		/* deprecated benath this comment */
-		$this->pingback_url = get_bloginfo( 'pingback_url' );
+		$this->pingback_url = get_bloginfo('pingback_url');
 	}
 
 	/**
@@ -174,12 +174,12 @@ 
 	 * @param string  $field
 	 * @return mixed
 	 */
-	function __get( $field ) {
-		if ( !isset( $this->$field ) ) {
+	function __get($field) {
+		if ( !isset($this->$field) ) {
 			if ( is_multisite() ) {
-				$this->$field = get_blog_option( $this->ID, $field );
+				$this->$field = get_blog_option($this->ID, $field);
 			} else {
-				$this->$field = get_option( $field );
+				$this->$field = get_option($field);
 			}
 		}
 		return $this->$field;
@@ -226,8 +226,8 @@ 
 	/**
 	 * @ignore
 	 */
-	public function meta( $field ) {
-		return $this->__get( $field );
+	public function meta($field) {
+		return $this->__get($field);
 	}
 
 	/**
@@ -236,12 +236,12 @@ 
 	 * @param string  $key
 	 * @param mixed   $value
 	 */
-	public function update( $key, $value ) {
-		$value = apply_filters( 'timber_site_set_meta', $value, $key, $this->ID, $this );
+	public function update($key, $value) {
+		$value = apply_filters('timber_site_set_meta', $value, $key, $this->ID, $this);
 		if ( is_multisite() ) {
-			update_blog_option( $this->ID, $key, $value );
+			update_blog_option($this->ID, $key, $value);
 		} else {
-			update_option( $key, $value );
+			update_option($key, $value);
 		}
 		$this->$key = $value;
 	}

lib/timber-term-getter.php

Spacing +29 added lines, -29 removed lines

@@ -9,40 +9,40 @@ 
      * @param string $TermClass
      * @return mixed
      */
-    public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
-        if (is_string($maybe_args) && !strstr($maybe_args, '=')){
+    public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+        if ( is_string($maybe_args) && !strstr($maybe_args, '=') ) {
             //the user is sending the $TermClass in the second argument
             $TermClass = $maybe_args;
         }
-        if (is_string($maybe_args) && strstr($maybe_args, '=')){
+        if ( is_string($maybe_args) && strstr($maybe_args, '=') ) {
             parse_str($maybe_args, $maybe_args);
         }
-        if (is_string($args) && strstr($args, '=')){
+        if ( is_string($args) && strstr($args, '=') ) {
             //a string and a query string!
             $parsed = TimberTermGetter::get_term_query_from_query_string($args);
-            if (is_array($maybe_args)){
+            if ( is_array($maybe_args) ) {
                 $parsed->args = array_merge($parsed->args, $maybe_args);
             }
             return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } else if (is_string($args)){
+        } else if ( is_string($args) ) {
             //its just a string with a single taxonomy
             $parsed = TimberTermGetter::get_term_query_from_string($args);
-            if (is_array($maybe_args)){
+            if ( is_array($maybe_args) ) {
                 $parsed->args = array_merge($parsed->args, $maybe_args);
             }
             return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } else if (is_array($args) && TimberHelper::is_array_assoc($args)){
+        } else if ( is_array($args) && TimberHelper::is_array_assoc($args) ) {
             //its an associative array, like a good ole query
             $parsed = TimberTermGetter::get_term_query_from_assoc_array($args);
             return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } else if (is_array($args)){
+        } else if ( is_array($args) ) {
             //its just an array of strings or IDs (hopefully)
             $parsed = TimberTermGetter::get_term_query_from_array($args);
-            if (is_array($maybe_args)){
+            if ( is_array($maybe_args) ) {
                 $parsed->args = array_merge($parsed->args, $maybe_args);
             }
             return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } else if (is_null($args)) {
+        } else if ( is_null($args) ) {
             return self::handle_term_query(get_taxonomies(), array(), $TermClass);
         }
         return null;
@@ -54,18 +54,18 @@ 
      * @param string $TermClass
      * @return mixed
      */
-    public static function handle_term_query($taxonomies, $args, $TermClass){
-        if (!isset($args['hide_empty'])){
+    public static function handle_term_query($taxonomies, $args, $TermClass) {
+        if ( !isset($args['hide_empty']) ) {
             $args['hide_empty'] = false;
         }
-        if (isset($args['term_id']) && is_int($args['term_id'])){
+        if ( isset($args['term_id']) && is_int($args['term_id']) ) {
             $args['term_id'] = array($args['term_id']);
         }
-        if (isset($args['term_id'])){
+        if ( isset($args['term_id']) ) {
             $args['include'] = $args['term_id'];
         }
         $terms = get_terms($taxonomies, $args);
-        foreach($terms as &$term){
+        foreach ($terms as &$term) {
             $term = new $TermClass($term->term_id, $term->taxonomy);
         }
         return $terms;
@@ -89,7 +89,7 @@ 
     public static function get_term_query_from_string($taxs) {
         $ret = new stdClass();
         $ret->args = array();
-        if (is_string($taxs)) {
+        if ( is_string($taxs) ) {
             $taxs = array($taxs);
         }
         $ret->taxonomies = self::correct_taxonomy_names($taxs);
@@ -103,17 +103,17 @@ 
     public static function get_term_query_from_assoc_array($args) {
         $ret = new stdClass();
         $ret->args = $args;
-        if (isset($ret->args['tax'])) {
+        if ( isset($ret->args['tax']) ) {
             $ret->taxonomies = $ret->args['tax'];
-        } else if (isset($ret->args['taxonomies'])) {
+        } else if ( isset($ret->args['taxonomies']) ) {
             $ret->taxonomies = $ret->args['taxonomies'];
-        } else if (isset($ret->args['taxs'])) {
+        } else if ( isset($ret->args['taxs']) ) {
             $ret->taxonomies = $ret->args['taxs'];
-        } else if (isset($ret->args['taxonomy'])) {
+        } else if ( isset($ret->args['taxonomy']) ) {
             $ret->taxonomies = $ret->args['taxonomy'];
         }
-        if (isset($ret->taxonomies)) {
-            if (is_string($ret->taxonomies)) {
+        if ( isset($ret->taxonomies) ) {
+            if ( is_string($ret->taxonomies) ) {
                 $ret->taxonomies = array($ret->taxonomies);
             }
             $ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
@@ -128,11 +128,11 @@ 
      * @return stdClass
      */
     public static function get_term_query_from_array($args) {
-        if (is_array($args) && !empty($args)) {
+        if ( is_array($args) && !empty($args) ) {
             //okay its an array with content
-            if (is_int($args[0])) {
+            if ( is_int($args[0]) ) {
                 return self::get_term_query_from_array_of_ids($args);
-            } else if (is_string($args[0])) {
+            } else if ( is_string($args[0]) ) {
                 return self::get_term_query_from_array_of_strings($args);
             }
         }
@@ -166,13 +166,13 @@ 
      * @return array
      */
     private static function correct_taxonomy_names($taxs) {
-        if (is_string($taxs)) {
+        if ( is_string($taxs) ) {
             $taxs = array($taxs);
         }
         foreach ($taxs as &$tax) {
-            if ($tax == 'tags' || $tax == 'tag') {
+            if ( $tax == 'tags' || $tax == 'tag' ) {
                 $tax = 'post_tag';
-            } else if ($tax == 'categories') {
+            } else if ( $tax == 'categories' ) {
                 $tax = 'category';
             }
         }