jarednova / timber

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

lib/timber-term.php

Spacing +24 added lines, -24 removed lines

@@ -54,11 +54,11 @@ 
 	 * @param int $tid
 	 * @param string $tax
 	 */
-	public function __construct( $tid = null, $tax = '' ) {
-		if ($tid === null) {
+	public function __construct($tid = null, $tax = '') {
+		if ( $tid === null ) {
 			$tid = $this->get_term_from_query();
 		}
-		if (strlen($tax)) {
+		if ( strlen($tax) ) {
 			$this->taxonomy = $tax;
 		}
 		$this->init($tid);
@@ -77,7 +77,7 @@ 
 	 *
 	 * @return static
 	 */
-	public static function from( $tid, $taxonomy ) {
+	public static function from($tid, $taxonomy) {
 		return new static($tid, $taxonomy);
 	}
 
@@ -93,7 +93,7 @@ 
 		global $wp_query;
 		if ( isset($wp_query->queried_object) ) {
 			$qo = $wp_query->queried_object;
-			if (isset($qo->term_id)) {
+			if ( isset($qo->term_id) ) {
 				return $qo->term_id;
 			}
 		}
@@ -106,7 +106,7 @@ 
 	 * @internal
 	 * @param int $tid
 	 */
-	protected function init( $tid ) {
+	protected function init($tid) {
 		$term = $this->get_term($tid);
 		if ( isset($term->id) ) {
 			$term->ID = $term->id;
@@ -116,7 +116,7 @@ 
 			//echo 'bad call using '.$tid;
 			//TimberHelper::error_log(debug_backtrace());
 		}
-		if ( isset($term->ID) ){
+		if ( isset($term->ID) ) {
 			$term->id = $term->ID;
 			$this->import($term);
 			if ( isset($term->term_id) ) {
@@ -142,7 +142,7 @@ 
 	 * @param int $tid
 	 * @return mixed
 	 */
-	protected function get_term( $tid ) {
+	protected function get_term($tid) {
 		if ( is_object($tid) || is_array($tid) ) {
 			return $tid;
 		}
@@ -154,7 +154,7 @@ 
 			global $wpdb;
 			$query = $wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $tid);
 			$tax = $wpdb->get_var($query);
-			if (isset($tax) && strlen($tax)) {
+			if ( isset($tax) && strlen($tax) ) {
 				$this->taxonomy = $tax;
 				return get_term($tid, $tax);
 			}
@@ -167,7 +167,7 @@ 
 	 * @param int $tid
 	 * @return int
 	 */
-	protected function get_tid( $tid ) {
+	protected function get_tid($tid) {
 		global $wpdb;
 		if ( is_numeric($tid) ) {
 			return $tid;
@@ -205,8 +205,8 @@ 
 	 * @param string $field_name
 	 * @return string
 	 */
-	public function get_meta_field( $field_name ) {
-		if (!isset($this->$field_name)) {
+	public function get_meta_field($field_name) {
+		if ( !isset($this->$field_name) ) {
 			$field_value = '';
 			$field_value = apply_filters('timber_term_get_meta_field', $field_value, $this->ID, $field_name, $this);
 			$field_value = apply_filters('timber/term/meta/field', $field_value, $this->ID, $field_name, $this);
@@ -244,8 +244,8 @@ 
 	 * @param string $PostClass
 	 * @return array|bool|null
 	 */
-	public function get_posts( $numberposts = 10, $post_type = 'any', $PostClass = '' ) {
-		if (!strlen($PostClass)) {
+	public function get_posts($numberposts = 10, $post_type = 'any', $PostClass = '') {
+		if ( !strlen($PostClass) ) {
 			$PostClass = $this->PostClass;
 		}
 		$default_tax_query = array(array(
@@ -259,10 +259,10 @@ 
 			parse_str($args, $new_args);
 			$args = $new_args;
 			$args['tax_query'] = $default_tax_query;
-			if (!isset($args['post_type'])) {
+			if ( !isset($args['post_type']) ) {
 				$args['post_type'] = 'any';
 			}
-			if (class_exists($post_type)) {
+			if ( class_exists($post_type) ) {
 				$PostClass = $post_type;
 			}
 		} else if ( is_array($numberposts) ) {
@@ -308,8 +308,8 @@ 
 	 * @param string  $key
 	 * @param mixed   $value
 	 */
-	function update( $key, $value ) {
-		$value = apply_filters( 'timber_term_set_meta', $value, $key, $this->ID, $this );
+	function update($key, $value) {
+		$value = apply_filters('timber_term_set_meta', $value, $key, $this->ID, $this);
 		$this->$key = $value;
 	}
 
@@ -331,11 +331,11 @@ 
 	public function description() {
 		$prefix = '<p>';
 		$suffix = '</p>';
-		$desc = term_description( $this->ID, $this->taxonomy );
-		if (substr($desc, 0, strlen($prefix)) == $prefix) {
+		$desc = term_description($this->ID, $this->taxonomy);
+		if ( substr($desc, 0, strlen($prefix)) == $prefix ) {
     		$desc = substr($desc, strlen($prefix));
 		}
-		$desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc);
+		$desc = preg_replace('/' . preg_quote('</p>', '/') . '$/', '', $desc);
 		return trim($desc);
 	}
 
@@ -369,7 +369,7 @@ 
 	 * @param string $field_name
 	 * @return string
 	 */
-	public function meta( $field_name ) {
+	public function meta($field_name) {
 		return $this->get_meta_field($field_name);
 	}
 
@@ -397,7 +397,7 @@ 
 	 * ```
 	 * @return array|bool|null
 	 */
-	public function posts( $numberposts_or_args = 10, $post_type_or_class = 'any', $post_class = '' ) {
+	public function posts($numberposts_or_args = 10, $post_type_or_class = 'any', $post_class = '') {
 		return $this->get_posts($numberposts_or_args, $post_type_or_class, $post_class);
 	}
 
@@ -422,7 +422,7 @@ 
 	 * @param int $i
 	 * @return string
 	 */
-	function get_page( $i ) {
+	function get_page($i) {
 		return $this->get_path() . '/page/' . $i;
 	}
 

lib/timber-theme.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 		$ss = $data->get_stylesheet();
 		$this->slug = $ss;
 
-		if ( ! function_exists( 'get_home_path' ) ) {
+		if ( !function_exists('get_home_path') ) {
 			require_once(ABSPATH . 'wp-admin/includes/file.php');
 		}
 
@@ -103,7 +103,7 @@ 
 	 * @return  string the relative path to the theme (ex: `/wp-content/themes/my-timber-theme`)
 	 */
 	public function path() {
-		return TimberURLHelper::get_rel_url( $this->link() );
+		return TimberURLHelper::get_rel_url($this->link());
 	}
 
 	/**

lib/timber-url-helper.php

Spacing +72 added lines, -72 removed lines

@@ -9,8 +9,8 @@ 
 	 */
 	public static function get_current_url() {
 		$pageURL = "http://";
-		if ( isset( $_SERVER['HTTPS'] ) && $_SERVER["HTTPS"] == "on" ) {
-			$pageURL = "https://";;
+		if ( isset($_SERVER['HTTPS']) && $_SERVER["HTTPS"] == "on" ) {
+			$pageURL = "https://"; ;
 		}
 		if ( isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] && $_SERVER["SERVER_PORT"] != "80" ) {
 			$pageURL .= self::get_host() . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
@@ -26,12 +26,12 @@ 
 	 * @param string  $url
 	 * @return bool
 	 */
-	public static function is_url( $url ) {
-		if ( !is_string( $url ) ) {
+	public static function is_url($url) {
+		if ( !is_string($url) ) {
 			return false;
 		}
-		$url = strtolower( $url );
-		if ( strstr( $url, '://' ) ) {
+		$url = strtolower($url);
+		if ( strstr($url, '://') ) {
 			return true;
 		}
 		return false;
@@ -43,11 +43,11 @@ 
 	 * @return string
 	 */
 	public static function get_path_base() {
-		$struc = get_option( 'permalink_structure' );
-		$struc = explode( '/', $struc );
+		$struc = get_option('permalink_structure');
+		$struc = explode('/', $struc);
 		$p = '/';
-		foreach ( $struc as $s ) {
-			if ( !strstr( $s, '%' ) && strlen( $s ) ) {
+		foreach ($struc as $s) {
+			if ( !strstr($s, '%') && strlen($s) ) {
 				$p .= $s . '/';
 			}
 		}
@@ -61,22 +61,22 @@ 
 	 * @param bool    $force
 	 * @return string
 	 */
-	public static function get_rel_url( $url, $force = false ) {
-		$url_info = parse_url( $url );
-		if ( isset( $url_info['host'] ) && $url_info['host'] != self::get_host() && !$force ) {
+	public static function get_rel_url($url, $force = false) {
+		$url_info = parse_url($url);
+		if ( isset($url_info['host']) && $url_info['host'] != self::get_host() && !$force ) {
 			return $url;
 		}
 		$link = '';
-		if ( isset( $url_info['path'] ) ) {
+		if ( isset($url_info['path']) ) {
 			$link = $url_info['path'];
 		}
-		if ( isset( $url_info['query'] ) && strlen( $url_info['query'] ) ) {
+		if ( isset($url_info['query']) && strlen($url_info['query']) ) {
 			$link .= '?' . $url_info['query'];
 		}
-		if ( isset( $url_info['fragment'] ) && strlen( $url_info['fragment'] ) ) {
+		if ( isset($url_info['fragment']) && strlen($url_info['fragment']) ) {
 			$link .= '#' . $url_info['fragment'];
 		}
-		$link = TimberURLHelper::remove_double_slashes( $link );
+		$link = TimberURLHelper::remove_double_slashes($link);
 		return $link;
 	}
 
@@ -86,10 +86,10 @@ 
 	 * @return string the HTTP_HOST or SERVER_NAME
 	 */
 	public static function get_host() {
-		if (isset($_SERVER['HTTP_HOST'])) {
+		if ( isset($_SERVER['HTTP_HOST']) ) {
 			return $_SERVER['HTTP_HOST'];
 		}
-		if (isset($_SERVER['SERVER_NAME'])) {
+		if ( isset($_SERVER['SERVER_NAME']) ) {
 			return $_SERVER['SERVER_NAME'];
 		}
 		return '';
@@ -101,8 +101,8 @@ 
 	 * @param string  $url
 	 * @return bool
 	 */
-	public static function is_local( $url ) {
-		if ( strstr( $url, self::get_host() ) ) {
+	public static function is_local($url) {
+		if ( strstr($url, self::get_host()) ) {
 			return true;
 		}
 		return false;
@@ -114,10 +114,10 @@ 
 	 * @param string  $src
 	 * @return string
 	 */
-	public static function get_full_path( $src ) {
+	public static function get_full_path($src) {
 		$root = ABSPATH;
 		$old_root_path = $root . $src;
-		$old_root_path = str_replace( '//', '/', $old_root_path );
+		$old_root_path = str_replace('//', '/', $old_root_path);
 		return $old_root_path;
 	}
 
@@ -129,16 +129,16 @@ 
 	 * @param string  $url
 	 * @return string
 	 */
-	public static function url_to_file_system( $url ) {
-		$url_parts = parse_url( $url );
+	public static function url_to_file_system($url) {
+		$url_parts = parse_url($url);
 		$path = ABSPATH . $url_parts['path'];
-		$path = str_replace( '//', '/', $path );
+		$path = str_replace('//', '/', $path);
 		return $path;
 	}
 
-	public static function file_system_to_url( $fs ) {
-		$relative_path = self::get_rel_path( $fs );
-		$home = home_url( '/'.$relative_path );
+	public static function file_system_to_url($fs) {
+		$relative_path = self::get_rel_path($fs);
+		$home = home_url('/' . $relative_path);
 		return $home;
 	}
 
@@ -148,12 +148,12 @@ 
 	 * @param string  $src
 	 * @return string
 	 */
-	public static function get_rel_path( $src ) {
-		if ( strstr( $src, ABSPATH ) ) {
-			return str_replace( ABSPATH, '', $src );
+	public static function get_rel_path($src) {
+		if ( strstr($src, ABSPATH) ) {
+			return str_replace(ABSPATH, '', $src);
 		}
 		//its outside the wordpress directory, alternate setups:
-		$src = str_replace( WP_CONTENT_DIR, '', $src );
+		$src = str_replace(WP_CONTENT_DIR, '', $src);
 		return WP_CONTENT_SUBDIR . $src;
 	}
 
@@ -163,10 +163,10 @@ 
 	 * @param string  $url
 	 * @return string
 	 */
-	public static function remove_double_slashes( $url ) {
-		$url = str_replace( '//', '/', $url );
-		if ( strstr( $url, 'http:' ) && !strstr( $url, 'http://' ) ) {
-			$url = str_replace( 'http:/', 'http://', $url );
+	public static function remove_double_slashes($url) {
+		$url = str_replace('//', '/', $url);
+		if ( strstr($url, 'http:') && !strstr($url, 'http://') ) {
+			$url = str_replace('http:/', 'http://', $url);
 		}
 		return $url;
 	}
@@ -178,20 +178,20 @@ 
 	 * @param string  $path
 	 * @return string
 	 */
-	public static function prepend_to_url( $url, $path ) {
-		if ( strstr( strtolower( $url ), 'http' ) ) {
-			$url_parts = parse_url( $url );
+	public static function prepend_to_url($url, $path) {
+		if ( strstr(strtolower($url), 'http') ) {
+			$url_parts = parse_url($url);
 			$url = $url_parts['scheme'] . '://' . $url_parts['host'] . $path . $url_parts['path'];
-			if ( isset( $url_parts['query'] ) ) {
+			if ( isset($url_parts['query']) ) {
 				$url .= $url_parts['query'];
 			}
-			if ( isset( $url_parts['fragment'] ) ) {
+			if ( isset($url_parts['fragment']) ) {
 				$url .= $url_parts['fragment'];
 			}
 		} else {
 			$url = $url . $path;
 		}
-		return self::remove_double_slashes( $url );
+		return self::remove_double_slashes($url);
 	}
 
 	/**
@@ -200,8 +200,8 @@ 
 	 * @param string  $path
 	 * @return string
 	 */
-	public static function preslashit( $path ) {
-		if ( strpos( $path, '/' ) != 0 ) {
+	public static function preslashit($path) {
+		if ( strpos($path, '/') != 0 ) {
 			$path = '/' . $path;
 		}
 		return $path;
@@ -212,8 +212,8 @@ 
 	 *
 	 * @return boolean true if $path is an absolute url, false if relative.
 	 */
-	public static function is_absolute( $path ) {
-		return (boolean) ( strstr( $path, 'http' ) );
+	public static function is_absolute($path) {
+		return (boolean) (strstr($path, 'http'));
 	}
 
 	/**
@@ -224,8 +224,8 @@ 
 	 * @param string  $url a URL to evaluate against
 	 * @return boolean if $url points to an external location returns true
 	 */
-	public static function is_external_content( $url ) {
-		$is_external = TimberURLHelper::is_absolute( $url ) && ! TimberURLHelper::is_internal_content( $url );
+	public static function is_external_content($url) {
+		$is_external = TimberURLHelper::is_absolute($url) && !TimberURLHelper::is_internal_content($url);
 
 		return $is_external;
 	}
@@ -235,11 +235,11 @@ 
 		// otherwise you run into errors with sites that:
 		// 1. use WPML plugin
 		// 2. or redefine content directory
-		$is_content_url = strstr( $url, content_url() );
+		$is_content_url = strstr($url, content_url());
 
 		// this case covers when the upload directory has been redefined
 		$upload_dir = wp_upload_dir();
-		$is_upload_url = strstr( $url, $upload_dir['baseurl'] );
+		$is_upload_url = strstr($url, $upload_dir['baseurl']);
 
 		return $is_content_url || $is_upload_url;
 	}
@@ -251,9 +251,9 @@ 
 	 * @return bool     true if $path is an external url, false if relative or local.
 	 *                  true if it's a subdomain (http://cdn.example.org = true)
 	 */
-	public static function is_external( $url ) {
-		$has_http = strstr( strtolower( $url ), 'http' );
-		$on_domain = strstr( $url, self::get_host() );
+	public static function is_external($url) {
+		$has_http = strstr(strtolower($url), 'http');
+		$on_domain = strstr($url, self::get_host());
 		if ( $has_http && !$on_domain ) {
 			return true;
 		}
@@ -266,9 +266,9 @@ 
 	 * @param string  $link
 	 * @return string
 	 */
-	public static function remove_trailing_slash( $link ) {
+	public static function remove_trailing_slash($link) {
 		if ( $link != "/" )
-			$link = untrailingslashit( $link );
+			$link = untrailingslashit($link);
 		return $link;
 	}
 
@@ -280,25 +280,25 @@ 
 	 * @return string|WP_Error the location of the temporay file name or an error
 	 * @deprecated since 0.20.0
 	 */
-	static function download_url( $url, $timeout = 300 ) {
+	static function download_url($url, $timeout = 300) {
 		if ( !$url ) {
-			return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
+			return new WP_Error('http_no_url', __('Invalid URL Provided.'));
 		}
 
-		$tmpfname = wp_tempnam( $url );
+		$tmpfname = wp_tempnam($url);
 		if ( !$tmpfname ) {
-			return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
+			return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 		}
 
-		$response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+		$response = wp_remote_get($url, array('timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname));
 
-		if ( is_wp_error( $response ) ) {
-			unlink( $tmpfname );
+		if ( is_wp_error($response) ) {
+			unlink($tmpfname);
 			return $response;
 		}
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $tmpfname );
-			return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+		if ( 200 != wp_remote_retrieve_response_code($response) ) {
+			unlink($tmpfname);
+			return new WP_Error('http_404', trim(wp_remote_retrieve_response_message($response)));
 		}
 		return $tmpfname;
 	}
@@ -311,11 +311,11 @@ 
 	 * @param int $i the position of the parameter to grab.
 	 * @return array|string
 	 */
-	public static function get_params( $i = false ) {
-		$args = explode( '/', trim( strtolower( $_SERVER['REQUEST_URI'] ) ) );
+	public static function get_params($i = false) {
+		$args = explode('/', trim(strtolower($_SERVER['REQUEST_URI'])));
 		$newargs = array();
-		foreach ( $args as $arg ) {
-			if ( strlen( $arg ) ) {
+		foreach ($args as $arg) {
+			if ( strlen($arg) ) {
 				$newargs[] = $arg;
 			}
 		}
@@ -324,9 +324,9 @@ 
 		}
 		if ( $i < 0 ) {
 			//count from end
-			$i = count( $newargs ) + $i;
+			$i = count($newargs) + $i;
 		}
-		if ( isset( $newargs[$i] ) ) {
+		if ( isset($newargs[$i]) ) {
 			return $newargs[$i];
 		}
 	}

timber.php

Spacing +119 added lines, -119 removed lines

@@ -14,11 +14,11 @@ 
 // we look for Composer files first in the plugins dir.
 // then in the wp-content dir (site install).
 // and finally in the current themes directories.
-if (   file_exists( $composer_autoload = __DIR__ . '/vendor/autoload.php' ) /* check in self */
-	|| file_exists( $composer_autoload = WP_CONTENT_DIR.'/vendor/autoload.php') /* check in wp-content */
-	|| file_exists( $composer_autoload = plugin_dir_path( __FILE__ ).'vendor/autoload.php') /* check in plugin directory */
-	|| file_exists( $composer_autoload = get_stylesheet_directory().'/vendor/autoload.php') /* check in child theme */
-	|| file_exists( $composer_autoload = get_template_directory().'/vendor/autoload.php') /* check in parent theme */
+if ( file_exists($composer_autoload = __DIR__ . '/vendor/autoload.php') /* check in self */
+	|| file_exists($composer_autoload = WP_CONTENT_DIR . '/vendor/autoload.php') /* check in wp-content */
+	|| file_exists($composer_autoload = plugin_dir_path(__FILE__) . 'vendor/autoload.php') /* check in plugin directory */
+	|| file_exists($composer_autoload = get_stylesheet_directory() . '/vendor/autoload.php') /* check in child theme */
+	|| file_exists($composer_autoload = get_template_directory() . '/vendor/autoload.php') /* check in parent theme */
 	) {
 	require_once $composer_autoload;
 }
@@ -63,21 +63,21 @@ 
 		if ( is_admin() || $_SERVER['PHP_SELF'] == '/wp-login.php' ) {
 			return;
 		}
-		if ( version_compare( phpversion(), '5.3.0', '<' ) && !is_admin() ) {
-			trigger_error( 'Timber requires PHP 5.3.0 or greater. You have '.phpversion(), E_USER_ERROR );
+		if ( version_compare(phpversion(), '5.3.0', '<') && !is_admin() ) {
+			trigger_error('Timber requires PHP 5.3.0 or greater. You have ' . phpversion(), E_USER_ERROR);
 		}
-		if ( !class_exists( 'Twig_Autoloader' ) ) {
-			trigger_error( 'You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR );
+		if ( !class_exists('Twig_Autoloader') ) {
+			trigger_error('You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR);
 		}
 	}
 
 	function init_constants() {
-		defined( "TIMBER_LOC" ) or define( "TIMBER_LOC", realpath( __DIR__ ) );
+		defined("TIMBER_LOC") or define("TIMBER_LOC", realpath(__DIR__));
 	}
 
 	protected function init() {
 		TimberTwig::init();
-		TimberRoutes::init( $this );
+		TimberRoutes::init($this);
 		TimberImageHelper::init();
 		TimberAdmin::init();
 		TimberIntegrations::init();
@@ -93,8 +93,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function get_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_post( $query, $PostClass );
+	public static function get_post($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::get_post($query, $PostClass);
 	}
 
 	/**
@@ -104,8 +104,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
-		return TimberPostGetter::get_posts( $query, $PostClass, $return_collection );
+	public static function get_posts($query = false, $PostClass = 'TimberPost', $return_collection = false) {
+		return TimberPostGetter::get_posts($query, $PostClass, $return_collection);
 	}
 
 	/**
@@ -115,8 +115,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function query_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_post( $query, $PostClass );
+	public static function query_post($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::query_post($query, $PostClass);
 	}
 
 	/**
@@ -126,8 +126,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function query_posts( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_posts( $query, $PostClass );
+	public static function query_posts($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::query_posts($query, $PostClass);
 	}
 
 	/**
@@ -137,8 +137,8 @@ 
 	 * @return array
 	 * @deprecated since 0.20.0
 	 */
-	static function get_pids( $query = null ) {
-		return TimberPostGetter::get_pids( $query );
+	static function get_pids($query = null) {
+		return TimberPostGetter::get_pids($query);
 	}
 
 	/**
@@ -148,8 +148,8 @@ 
 	 * @return array
 	 * @deprecated since 0.20.0
 	 */
-	static function get_posts_from_loop( $PostClass ) {
-		return TimberPostGetter::get_posts( $PostClass );
+	static function get_posts_from_loop($PostClass) {
+		return TimberPostGetter::get_posts($PostClass);
 	}
 
 	/**
@@ -160,8 +160,8 @@ 
 	 * @return array
 	 * @deprecated since 0.20.0
 	 */
-	static function get_posts_from_slug( $slug, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_posts( $slug, $PostClass );
+	static function get_posts_from_slug($slug, $PostClass = 'TimberPost') {
+		return TimberPostGetter::get_posts($slug, $PostClass);
 	}
 
 	/**
@@ -172,8 +172,8 @@ 
 	 * @return array
 	 * @deprecated since 0.20.0
 	 */
-	static function get_posts_from_wp_query( $query = array(), $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_posts( $query, $PostClass );
+	static function get_posts_from_wp_query($query = array(), $PostClass = 'TimberPost') {
+		return TimberPostGetter::query_posts($query, $PostClass);
 	}
 
 	/**
@@ -184,8 +184,8 @@ 
 	 * @return array|null
 	 * @deprecated since 0.20.0
 	 */
-	static function get_posts_from_array_of_ids( $query = array(), $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_posts( $query, $PostClass );
+	static function get_posts_from_array_of_ids($query = array(), $PostClass = 'TimberPost') {
+		return TimberPostGetter::get_posts($query, $PostClass);
 	}
 
 	/**
@@ -195,9 +195,9 @@ 
 	 * @return int
 	 * @deprecated since 0.20.0
 	 */
-	static function get_pid( $query ) {
-		$pids = TimberPostGetter::get_pids( $query );
-		if ( is_array( $pids ) && count( $pids ) ) {
+	static function get_pid($query) {
+		$pids = TimberPostGetter::get_pids($query);
+		if ( is_array($pids) && count($pids) ) {
 			return $pids[0];
 		}
 	}
@@ -223,8 +223,8 @@ 
 	 * @param string  $TermClass
 	 * @return mixed
 	 */
-	public static function get_terms( $args = null, $maybe_args = array(), $TermClass = 'TimberTerm' ) {
-		return TimberTermGetter::get_terms( $args, $maybe_args, $TermClass );
+	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+		return TimberTermGetter::get_terms($args, $maybe_args, $TermClass);
 	}
 
 	/* Site Retrieval
@@ -236,14 +236,14 @@ 
 	 * @param array|bool $blog_ids
 	 * @return array
 	 */
-	public static function get_sites( $blog_ids = false ) {
-		if ( !is_array( $blog_ids ) ) {
+	public static function get_sites($blog_ids = false) {
+		if ( !is_array($blog_ids) ) {
 			global $wpdb;
-			$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC" );
+			$blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC");
 		}
 		$return = array();
-		foreach ( $blog_ids as $blog_id ) {
-			$return[] = new TimberSite( $blog_id );
+		foreach ($blog_ids as $blog_id) {
+			$return[] = new TimberSite($blog_id);
 		}
 		return $return;
 	}
@@ -261,29 +261,29 @@ 
 		$data = array();
 		$data['http_host'] = 'http://' . TimberURLHelper::get_host();
 		$data['wp_title'] = TimberHelper::get_wp_title();
-		$data['wp_head'] = TimberHelper::function_wrapper( 'wp_head' );
-		$data['wp_footer'] = TimberHelper::function_wrapper( 'wp_footer' );
-		$data['body_class'] = implode( ' ', get_body_class() );
+		$data['wp_head'] = TimberHelper::function_wrapper('wp_head');
+		$data['wp_footer'] = TimberHelper::function_wrapper('wp_footer');
+		$data['body_class'] = implode(' ', get_body_class());
 
 		$data['site'] = new TimberSite();
 		$data['theme'] = $data['site']->theme;
 		//deprecated, these should be fetched via TimberSite or TimberTheme
-		$data['theme_dir'] = WP_CONTENT_SUBDIR.str_replace( WP_CONTENT_DIR, '', get_stylesheet_directory() );
-		$data['language_attributes'] = TimberHelper::function_wrapper( 'language_attributes' );
+		$data['theme_dir'] = WP_CONTENT_SUBDIR . str_replace(WP_CONTENT_DIR, '', get_stylesheet_directory());
+		$data['language_attributes'] = TimberHelper::function_wrapper('language_attributes');
 		$data['stylesheet_uri'] = get_stylesheet_uri();
 		$data['template_uri'] = get_template_directory_uri();
 
 		$data['posts'] = Timber::query_posts();
 
 		//deprecated, this should be fetched via TimberMenu
-		if ( function_exists( 'wp_nav_menu' ) ) {
+		if ( function_exists('wp_nav_menu') ) {
 			$locations = get_nav_menu_locations();
-			if ( count( $locations ) ) {
-				$data['wp_nav_menu'] = wp_nav_menu( array( 'container_class' => 'menu-header', 'echo' => false, 'menu_class' => 'nav-menu' ) );
+			if ( count($locations) ) {
+				$data['wp_nav_menu'] = wp_nav_menu(array('container_class' => 'menu-header', 'echo' => false, 'menu_class' => 'nav-menu'));
 			}
 		}
-		$data = apply_filters( 'timber_context', $data );
-		$data = apply_filters( 'timber/context', $data );
+		$data = apply_filters('timber_context', $data);
+		$data = apply_filters('timber/context', $data);
 		return $data;
 	}
 
@@ -297,27 +297,27 @@ 
 	 * @param bool    $via_render
 	 * @return bool|string
 	 */
-	public static function compile( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT, $via_render = false ) {
+	public static function compile($filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT, $via_render = false) {
 		$caller = self::get_calling_script_dir();
 		$caller_file = self::get_calling_script_file();
-		$caller_file = apply_filters( 'timber_calling_php_file', $caller_file );
-		$loader = new TimberLoader( $caller );
-		$file = $loader->choose_template( $filenames );
+		$caller_file = apply_filters('timber_calling_php_file', $caller_file);
+		$loader = new TimberLoader($caller);
+		$file = $loader->choose_template($filenames);
 		$output = '';
-		if ( is_null( $data ) ) {
+		if ( is_null($data) ) {
 			$data = array();
 		}
-		if ( strlen( $file ) ) {
+		if ( strlen($file) ) {
 			if ( $via_render ) {
-				$file = apply_filters( 'timber_render_file', $file );
-				$data = apply_filters( 'timber_render_data', $data );
+				$file = apply_filters('timber_render_file', $file);
+				$data = apply_filters('timber_render_data', $data);
 			} else {
-				$file = apply_filters( 'timber_compile_file', $file );
-				$data = apply_filters( 'timber_compile_data', $data );
+				$file = apply_filters('timber_compile_file', $file);
+				$data = apply_filters('timber_compile_data', $data);
 			}
-			$output = $loader->render( $file, $data, $expires, $cache_mode );
+			$output = $loader->render($file, $data, $expires, $cache_mode);
 		}
-		do_action( 'timber_compile_done' );
+		do_action('timber_compile_done');
 		return $output;
 	}
 
@@ -328,14 +328,14 @@ 
 	 * @param array   $data   an array with data in it.
 	 * @return  bool|string
 	 */
-	public static function compile_string( $string, $data = array() ) {
+	public static function compile_string($string, $data = array()) {
 		$dummy_loader = new TimberLoader();
 		$dummy_loader->get_twig();
 		$loader = new Twig_Loader_String();
-		$twig = new Twig_Environment( $loader );
-		$twig = apply_filters( 'timber/twig/filters', $twig );
-		$twig = apply_filters( 'twig_apply_filters', $twig );
-		return $twig->render( $string, $data );
+		$twig = new Twig_Environment($loader);
+		$twig = apply_filters('timber/twig/filters', $twig);
+		$twig = apply_filters('twig_apply_filters', $twig);
+		return $twig->render($string, $data);
 	}
 
 	/**
@@ -347,15 +347,15 @@ 
 	 * @param string  $cache_mode
 	 * @return bool|string
 	 */
-	public static function fetch( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
+	public static function fetch($filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT) {
 		if ( $expires === true ) {
 			//if this is reading as true; the user probably is using the old $echo param
 			//so we should move all vars up by a spot
 			$expires = $cache_mode;
 			$cache_mode = TimberLoader::CACHE_USE_DEFAULT;
 		}
-		$output = self::compile( $filenames, $data, $expires, $cache_mode, true );
-		$output = apply_filters( 'timber_compile_result', $output );
+		$output = self::compile($filenames, $data, $expires, $cache_mode, true);
+		$output = apply_filters('timber_compile_result', $output);
 		return $output;
 	}
 
@@ -368,8 +368,8 @@ 
 	 * @param string  $cache_mode
 	 * @return bool|string
 	 */
-	public static function render( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
-		$output = static::fetch( $filenames, $data, $expires, $cache_mode );
+	public static function render($filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT) {
+		$output = static::fetch($filenames, $data, $expires, $cache_mode);
 		echo $output;
 		return $output;
 	}
@@ -381,8 +381,8 @@ 
 	 * @param array   $data   an array with data in it.
 	 * @return  bool|string
 	 */
-	public static function render_string( $string, $data = array() ) {
-		$compiled = self::compile_string( $string, $data );
+	public static function render_string($string, $data = array()) {
+		$compiled = self::compile_string($string, $data);
 		echo $compiled;
 		return $compiled;
 	}
@@ -398,14 +398,14 @@ 
 	 * @param array   $data
 	 * @return bool|string
 	 */
-	public static function get_sidebar( $sidebar = '', $data = array() ) {
+	public static function get_sidebar($sidebar = '', $data = array()) {
 		if ( $sidebar == '' ) {
 			$sidebar = 'sidebar.php';
 		}
-		if ( strstr( strtolower( $sidebar ), '.php' ) ) {
-			return self::get_sidebar_from_php( $sidebar, $data );
+		if ( strstr(strtolower($sidebar), '.php') ) {
+			return self::get_sidebar_from_php($sidebar, $data);
 		}
-		return self::compile( $sidebar, $data );
+		return self::compile($sidebar, $data);
 	}
 
 	/**
@@ -415,21 +415,21 @@ 
 	 * @param array   $data
 	 * @return string
 	 */
-	public static function get_sidebar_from_php( $sidebar = '', $data ) {
+	public static function get_sidebar_from_php($sidebar = '', $data) {
 		$caller = self::get_calling_script_dir();
 		$loader = new TimberLoader();
-		$uris = $loader->get_locations( $caller );
+		$uris = $loader->get_locations($caller);
 		ob_start();
 		$found = false;
-		foreach ( $uris as $uri ) {
-			if ( file_exists( trailingslashit( $uri ) . $sidebar ) ) {
-				include trailingslashit( $uri ) . $sidebar;
+		foreach ($uris as $uri) {
+			if ( file_exists(trailingslashit($uri) . $sidebar) ) {
+				include trailingslashit($uri) . $sidebar;
 				$found = true;
 				break;
 			}
 		}
 		if ( !$found ) {
-			TimberHelper::error_log( 'error loading your sidebar, check to make sure the file exists' );
+			TimberHelper::error_log('error loading your sidebar, check to make sure the file exists');
 		}
 		$ret = ob_get_contents();
 		ob_end_clean();
@@ -445,8 +445,8 @@ 
 	 * @param int     $widget_id
 	 * @return TimberFunctionWrapper
 	 */
-	public static function get_widgets( $widget_id ) {
-		return TimberHelper::function_wrapper( 'dynamic_sidebar', array( $widget_id ), true );
+	public static function get_widgets($widget_id) {
+		return TimberHelper::function_wrapper('dynamic_sidebar', array($widget_id), true);
 	}
 
 
@@ -461,12 +461,12 @@ 
 	 * @param array   $args
 	 * @deprecated since 0.20.0
 	 */
-	public static function add_route( $route, $callback, $args = array() ) {
-		Routes::map( $route, $callback, $args );
+	public static function add_route($route, $callback, $args = array()) {
+		Routes::map($route, $callback, $args);
 	}
 
 	public function cancel_query() {
-		add_action( 'posts_request', array( $this, 'cancel_query_posts_request' ) );
+		add_action('posts_request', array($this, 'cancel_query_posts_request'));
 	}
 
 	function cancel_query_posts_request() {
@@ -480,8 +480,8 @@ 
 	 *
 	 * @deprecated since 0.20.0
 	 */
-	public static function load_template( $template, $query = false, $status_code = 200, $tparams = false ) {
-		return Routes::load( $template, $tparams, $query, $status_code );
+	public static function load_template($template, $query = false, $status_code = 200, $tparams = false) {
+		return Routes::load($template, $tparams, $query, $status_code);
 	}
 
 	/**
@@ -489,8 +489,8 @@ 
 	 *
 	 * @deprecated since 0.20.2
 	 */
-	public static function load_view( $template, $query = false, $status_code = 200, $tparams = false ) {
-		return Routes::load( $template, $tparams, $query, $status_code );
+	public static function load_view($template, $query = false, $status_code = 200, $tparams = false) {
+		return Routes::load($template, $tparams, $query, $status_code);
 	}
 
 
@@ -503,44 +503,44 @@ 
 	 * @param array   $prefs
 	 * @return array mixed
 	 */
-	public static function get_pagination( $prefs = array() ) {
+	public static function get_pagination($prefs = array()) {
 		global $wp_query;
 		global $paged;
 		global $wp_rewrite;
 		$args = array();
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
 		if ( $wp_rewrite->using_permalinks() ) {
-			$url = explode( '?', get_pagenum_link( 0 ) );
-			if ( isset( $url[1] ) ) {
-				parse_str( $url[1], $query );
+			$url = explode('?', get_pagenum_link(0));
+			if ( isset($url[1]) ) {
+				parse_str($url[1], $query);
 				$args['add_args'] = $query;
 			}
 			$args['format'] = 'page/%#%';
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
+			$args['base'] = trailingslashit($url[0]) . '%_%';
 		} else {
 			$big = 999999999;
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
 		}
 		$args['type'] = 'array';
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
+		$args['current'] = max(1, get_query_var('paged'));
+		$args['mid_size'] = max(9 - $args['current'], 3);
 		$args['prev_next'] = false;
-		if ( is_int( $prefs ) ) {
+		if ( is_int($prefs) ) {
 			$args['mid_size'] = $prefs - 2;
 		} else {
-			$args = array_merge( $args, $prefs );
+			$args = array_merge($args, $prefs);
 		}
 		$data = array();
 		$data['current'] = $args['current'];
 		$data['total'] = $args['total'];
-		$data['pages'] = TimberHelper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
+		$data['pages'] = TimberHelper::paginate_links($args);
+		$next = get_next_posts_page_link($args['total']);
 		if ( $next ) {
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
 		}
-		$prev = previous_posts( false );
+		$prev = previous_posts(false);
 		if ( $prev ) {
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
 		}
 		if ( $paged < 2 ) {
 			$data['prev'] = '';
@@ -558,9 +558,9 @@ 
 	 * @return string
 	 * @deprecated since 0.20.0
 	 */
-	public static function get_calling_script_path( $offset = 0 ) {
-		$dir = self::get_calling_script_dir( $offset );
-		return str_replace( ABSPATH, '', realpath( $dir ) );
+	public static function get_calling_script_path($offset = 0) {
+		$dir = self::get_calling_script_dir($offset);
+		return str_replace(ABSPATH, '', realpath($dir));
 	}
 
 	/**
@@ -568,10 +568,10 @@ 
 	 *
 	 * @return boolean|string
 	 */
-	public static function get_calling_script_dir( $offset = 0 ) {
-		$caller = self::get_calling_script_file( $offset );
-		if ( !is_null( $caller ) ) {
-			$pathinfo = pathinfo( $caller );
+	public static function get_calling_script_dir($offset = 0) {
+		$caller = self::get_calling_script_file($offset);
+		if ( !is_null($caller) ) {
+			$pathinfo = pathinfo($caller);
 			$dir = $pathinfo['dirname'];
 			return $dir;
 		}
@@ -585,11 +585,11 @@ 
 	 * @return string|null
 	 * @deprecated since 0.20.0
 	 */
-	public static function get_calling_script_file( $offset = 0 ) {
+	public static function get_calling_script_file($offset = 0) {
 		$caller = null;
 		$backtrace = debug_backtrace();
 		$i = 0;
-		foreach ( $backtrace as $trace ) {
+		foreach ($backtrace as $trace) {
 			if ( $trace['file'] != __FILE__ ) {
 				$caller = $trace['file'];
 				break;
@@ -609,8 +609,8 @@ 
 	 * @return bool
 	 * @deprecated since 0.20.0
 	 */
-	public static function is_post_class_or_class_map( $args ) {
-		return TimberPostGetter::is_post_class_or_class_map( $args );
+	public static function is_post_class_or_class_map($args) {
+		return TimberPostGetter::is_post_class_or_class_map($args);
 	}
 
 }