jarednova / timber

lib/timber-term-getter.php

Indentation +167 added lines, -167 removed lines

@@ -3,180 +3,180 @@
 class TimberTermGetter
 {
 
-    /**
-     * @param string|array $args
-     * @param array $maybe_args
-     * @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, '=')){
-            //the user is sending the $TermClass in the second argument
-            $TermClass = $maybe_args;
-        }
-        if (is_string($maybe_args) && strstr($maybe_args, '=')){
-            parse_str($maybe_args, $maybe_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)){
-                $parsed->args = array_merge($parsed->args, $maybe_args);
-            }
-            return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } 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)){
-                $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)){
-            //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)){
-            //its just an array of strings or IDs (hopefully)
-            $parsed = TimberTermGetter::get_term_query_from_array($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)) {
-            return self::handle_term_query(get_taxonomies(), array(), $TermClass);
-        }
-        return null;
-    }
+	/**
+	 * @param string|array $args
+	 * @param array $maybe_args
+	 * @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, '=')){
+			//the user is sending the $TermClass in the second argument
+			$TermClass = $maybe_args;
+		}
+		if (is_string($maybe_args) && strstr($maybe_args, '=')){
+			parse_str($maybe_args, $maybe_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)){
+				$parsed->args = array_merge($parsed->args, $maybe_args);
+			}
+			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
+		} 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)){
+				$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)){
+			//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)){
+			//its just an array of strings or IDs (hopefully)
+			$parsed = TimberTermGetter::get_term_query_from_array($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)) {
+			return self::handle_term_query(get_taxonomies(), array(), $TermClass);
+		}
+		return null;
+	}
 
-    /**
-     * @param string|array $taxonomies
-     * @param string|array $args
-     * @param string $TermClass
-     * @return mixed
-     */
-    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'])){
-            $args['term_id'] = array($args['term_id']);
-        }
-        if (isset($args['term_id'])){
-            $args['include'] = $args['term_id'];
-        }
-        $terms = get_terms($taxonomies, $args);
-        foreach($terms as &$term){
-            $term = new $TermClass($term->term_id, $term->taxonomy);
-        }
-        return $terms;
-    }
+	/**
+	 * @param string|array $taxonomies
+	 * @param string|array $args
+	 * @param string $TermClass
+	 * @return mixed
+	 */
+	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'])){
+			$args['term_id'] = array($args['term_id']);
+		}
+		if (isset($args['term_id'])){
+			$args['include'] = $args['term_id'];
+		}
+		$terms = get_terms($taxonomies, $args);
+		foreach($terms as &$term){
+			$term = new $TermClass($term->term_id, $term->taxonomy);
+		}
+		return $terms;
+	}
 
-    /**
-     * @param string $query_string
-     * @return stdClass
-     */
-    public static function get_term_query_from_query_string($query_string) {
-        $args = array();
-        parse_str($query_string, $args);
-        $ret = self::get_term_query_from_assoc_array($args);
-        return $ret;
-    }
+	/**
+	 * @param string $query_string
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_query_string($query_string) {
+		$args = array();
+		parse_str($query_string, $args);
+		$ret = self::get_term_query_from_assoc_array($args);
+		return $ret;
+	}
 
-    /**
-     * @param string $taxs
-     * @return stdClass
-     */
-    public static function get_term_query_from_string($taxs) {
-        $ret = new stdClass();
-        $ret->args = array();
-        if (is_string($taxs)) {
-            $taxs = array($taxs);
-        }
-        $ret->taxonomies = self::correct_taxonomy_names($taxs);
-        return $ret;
-    }
+	/**
+	 * @param string $taxs
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_string($taxs) {
+		$ret = new stdClass();
+		$ret->args = array();
+		if (is_string($taxs)) {
+			$taxs = array($taxs);
+		}
+		$ret->taxonomies = self::correct_taxonomy_names($taxs);
+		return $ret;
+	}
 
-    /**
-     * @param array $args
-     * @return stdClass
-     */
-    public static function get_term_query_from_assoc_array($args) {
-        $ret = new stdClass();
-        $ret->args = $args;
-        if (isset($ret->args['tax'])) {
-            $ret->taxonomies = $ret->args['tax'];
-        } else if (isset($ret->args['taxonomies'])) {
-            $ret->taxonomies = $ret->args['taxonomies'];
-        } else if (isset($ret->args['taxs'])) {
-            $ret->taxonomies = $ret->args['taxs'];
-        } else if (isset($ret->args['taxonomy'])) {
-            $ret->taxonomies = $ret->args['taxonomy'];
-        }
-        if (isset($ret->taxonomies)) {
-            if (is_string($ret->taxonomies)) {
-                $ret->taxonomies = array($ret->taxonomies);
-            }
-            $ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
-        } else {
-            $ret->taxonomies = get_taxonomies();
-        }
-        return $ret;
-    }
+	/**
+	 * @param array $args
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_assoc_array($args) {
+		$ret = new stdClass();
+		$ret->args = $args;
+		if (isset($ret->args['tax'])) {
+			$ret->taxonomies = $ret->args['tax'];
+		} else if (isset($ret->args['taxonomies'])) {
+			$ret->taxonomies = $ret->args['taxonomies'];
+		} else if (isset($ret->args['taxs'])) {
+			$ret->taxonomies = $ret->args['taxs'];
+		} else if (isset($ret->args['taxonomy'])) {
+			$ret->taxonomies = $ret->args['taxonomy'];
+		}
+		if (isset($ret->taxonomies)) {
+			if (is_string($ret->taxonomies)) {
+				$ret->taxonomies = array($ret->taxonomies);
+			}
+			$ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
+		} else {
+			$ret->taxonomies = get_taxonomies();
+		}
+		return $ret;
+	}
 
-    /**
-     * @param array $args
-     * @return stdClass
-     */
-    public static function get_term_query_from_array($args) {
-        if (is_array($args) && !empty($args)) {
-            //okay its an array with content
-            if (is_int($args[0])) {
-                return self::get_term_query_from_array_of_ids($args);
-            } else if (is_string($args[0])) {
-                return self::get_term_query_from_array_of_strings($args);
-            }
-        }
-        return null;
-    }
+	/**
+	 * @param array $args
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_array($args) {
+		if (is_array($args) && !empty($args)) {
+			//okay its an array with content
+			if (is_int($args[0])) {
+				return self::get_term_query_from_array_of_ids($args);
+			} else if (is_string($args[0])) {
+				return self::get_term_query_from_array_of_strings($args);
+			}
+		}
+		return null;
+	}
 
-    /**
-     * @param integer[] $args
-     * @return stdClass
-     */
-    public static function get_term_query_from_array_of_ids($args) {
-        $ret = new stdClass();
-        $ret->taxonomies = get_taxonomies();
-        $ret->args['include'] = $args;
-        return $ret;
-    }
+	/**
+	 * @param integer[] $args
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_array_of_ids($args) {
+		$ret = new stdClass();
+		$ret->taxonomies = get_taxonomies();
+		$ret->args['include'] = $args;
+		return $ret;
+	}
 
-    /**
-     * @param string[] $args
-     * @return stdClass
-     */
-    public static function get_term_query_from_array_of_strings($args) {
-        $ret = new stdClass();
-        $ret->taxonomies = self::correct_taxonomy_names($args);
-        $ret->args = array();
-        return $ret;
-    }
+	/**
+	 * @param string[] $args
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_array_of_strings($args) {
+		$ret = new stdClass();
+		$ret->taxonomies = self::correct_taxonomy_names($args);
+		$ret->args = array();
+		return $ret;
+	}
 
-    /**
-     * @param string|array $taxs
-     * @return array
-     */
-    private static function correct_taxonomy_names($taxs) {
-        if (is_string($taxs)) {
-            $taxs = array($taxs);
-        }
-        foreach ($taxs as &$tax) {
-            if ($tax == 'tags' || $tax == 'tag') {
-                $tax = 'post_tag';
-            } else if ($tax == 'categories') {
-                $tax = 'category';
-            }
-        }
-        return $taxs;
-    }
+	/**
+	 * @param string|array $taxs
+	 * @return array
+	 */
+	private static function correct_taxonomy_names($taxs) {
+		if (is_string($taxs)) {
+			$taxs = array($taxs);
+		}
+		foreach ($taxs as &$tax) {
+			if ($tax == 'tags' || $tax == 'tag') {
+				$tax = 'post_tag';
+			} else if ($tax == 'categories') {
+				$tax = 'category';
+			}
+		}
+		return $taxs;
+	}
 
 }

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

Braces +16 added lines, -17 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class TimberTermGetter
-{
+class TimberTermGetter {
 
     /**
      * @param string|array $args
@@ -9,36 +8,36 @@ 
      * @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);
@@ -54,18 +53,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;

lib/timber-term.php

Indentation +1 added lines, -1 removed lines

@@ -333,7 +333,7 @@
 		$suffix = '</p>';
 		$desc = term_description( $this->ID, $this->taxonomy );
 		if (substr($desc, 0, strlen($prefix)) == $prefix) {
-    		$desc = substr($desc, strlen($prefix));
+			$desc = substr($desc, strlen($prefix));
 		}
 		$desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc);
 		return trim($desc);

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

Braces +1 added lines, -1 removed lines

@@ -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) ) {

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-twig.php

Spacing +149 added lines, -149 removed lines

@@ -12,8 +12,8 @@ 
 	}
 
 	function __construct() {
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters_deprecated' ) );
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters' ) );
+		add_action('timber/twig/filters', array($this, 'add_timber_filters_deprecated'));
+		add_action('timber/twig/filters', array($this, 'add_timber_filters'));
 	}
 
 	/**
@@ -23,14 +23,14 @@ 
 	 * @deprecated since 0.20.7
 	 * @return Twig_Environment
 	 */
-	function add_timber_filters_deprecated( $twig ) {
-		$twig->addFilter( new Twig_SimpleFilter( 'get_src_from_attachment_id', 'twig_get_src_from_attachment_id' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'wp_body_class', array( $this, 'body_class' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterify', array( 'TimberHelper', 'twitterify' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterfy', array( 'TimberHelper', 'twitterify' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'string', function($arr, $glue = ' '){
+	function add_timber_filters_deprecated($twig) {
+		$twig->addFilter(new Twig_SimpleFilter('get_src_from_attachment_id', 'twig_get_src_from_attachment_id'));
+		$twig->addFilter(new Twig_SimpleFilter('wp_body_class', array($this, 'body_class')));
+		$twig->addFilter(new Twig_SimpleFilter('twitterify', array('TimberHelper', 'twitterify')));
+		$twig->addFilter(new Twig_SimpleFilter('twitterfy', array('TimberHelper', 'twitterify')));
+		$twig->addFilter(new Twig_SimpleFilter('string', function($arr, $glue = ' ') {
 			return twig_join_filter($arr, $glue);
-		} ) );
+		} ));
 		return $twig;
 	}
 
@@ -40,151 +40,151 @@ 
 	 * @param Twig_Environment $twig
 	 * @return Twig_Environment
 	 */
-	function add_timber_filters( $twig ) {
+	function add_timber_filters($twig) {
 		/* image filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'resize', array( 'TimberImageHelper', 'resize' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'retina', array( 'TimberImageHelper', 'retina_resize' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'letterbox', array( 'TimberImageHelper', 'letterbox' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'tojpg', array( 'TimberImageHelper', 'img_to_jpg' ) ) );
+		$twig->addFilter(new Twig_SimpleFilter('resize', array('TimberImageHelper', 'resize')));
+		$twig->addFilter(new Twig_SimpleFilter('retina', array('TimberImageHelper', 'retina_resize')));
+		$twig->addFilter(new Twig_SimpleFilter('letterbox', array('TimberImageHelper', 'letterbox')));
+		$twig->addFilter(new Twig_SimpleFilter('tojpg', array('TimberImageHelper', 'img_to_jpg')));
 
 		/* debugging filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'docs', 'twig_object_docs' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'get_class',  'get_class' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'get_type', 'get_type' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'print_r', function( $arr ) {
-					return print_r( $arr, true );
-				} ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'print_a', function( $arr ) {
-					return '<pre>' . self::object_docs( $arr, true ) . '</pre>';
-				} ) );
+		$twig->addFilter(new Twig_SimpleFilter('docs', 'twig_object_docs'));
+		$twig->addFilter(new Twig_SimpleFilter('get_class', 'get_class'));
+		$twig->addFilter(new Twig_SimpleFilter('get_type', 'get_type'));
+		$twig->addFilter(new Twig_SimpleFilter('print_r', function($arr) {
+					return print_r($arr, true);
+				} ));
+		$twig->addFilter(new Twig_SimpleFilter('print_a', function($arr) {
+					return '<pre>' . self::object_docs($arr, true) . '</pre>';
+				} ));
 
 		/* other filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'stripshortcodes', 'strip_shortcodes' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'array', array( $this, 'to_array' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'excerpt', 'wp_trim_words' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'function', array( $this, 'exec_function' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'pretags', array( $this, 'twig_pretags' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'sanitize', 'sanitize_title' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'shortcodes', 'do_shortcode' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'time_ago', array( $this, 'time_ago' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'wpautop', 'wpautop' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'list', array( $this, 'add_list_separators' ) ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'relative', function ( $link ) {
-					return TimberURLHelper::get_rel_url( $link, true );
-				} ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'date', array( $this, 'intl_date' ) ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'truncate', function ( $text, $len ) {
-					return TimberHelper::trim_words( $text, $len );
-				} ) );
+		$twig->addFilter(new Twig_SimpleFilter('stripshortcodes', 'strip_shortcodes'));
+		$twig->addFilter(new Twig_SimpleFilter('array', array($this, 'to_array')));
+		$twig->addFilter(new Twig_SimpleFilter('excerpt', 'wp_trim_words'));
+		$twig->addFilter(new Twig_SimpleFilter('function', array($this, 'exec_function')));
+		$twig->addFilter(new Twig_SimpleFilter('pretags', array($this, 'twig_pretags')));
+		$twig->addFilter(new Twig_SimpleFilter('sanitize', 'sanitize_title'));
+		$twig->addFilter(new Twig_SimpleFilter('shortcodes', 'do_shortcode'));
+		$twig->addFilter(new Twig_SimpleFilter('time_ago', array($this, 'time_ago')));
+		$twig->addFilter(new Twig_SimpleFilter('wpautop', 'wpautop'));
+		$twig->addFilter(new Twig_SimpleFilter('list', array($this, 'add_list_separators')));
+
+		$twig->addFilter(new Twig_SimpleFilter('relative', function($link) {
+					return TimberURLHelper::get_rel_url($link, true);
+				} ));
+
+		$twig->addFilter(new Twig_SimpleFilter('date', array($this, 'intl_date')));
+
+		$twig->addFilter(new Twig_SimpleFilter('truncate', function($text, $len) {
+					return TimberHelper::trim_words($text, $len);
+				} ));
 
 		/* actions and filters */
-		$twig->addFunction( new Twig_SimpleFunction( 'action', function ( $context ) {
+		$twig->addFunction(new Twig_SimpleFunction('action', function($context) {
 					$args = func_get_args();
-					array_shift( $args );
+					array_shift($args);
 					$args[] = $context;
-					call_user_func_array( 'do_action', $args );
-				}, array( 'needs_context' => true ) ) );
+					call_user_func_array('do_action', $args);
+				}, array('needs_context' => true)));
 
-		$twig->addFilter( new Twig_SimpleFilter( 'apply_filters', function () {
+		$twig->addFilter(new Twig_SimpleFilter('apply_filters', function() {
 					$args = func_get_args();
-					$tag = current( array_splice( $args, 1, 1 ) );
+					$tag = current(array_splice($args, 1, 1));
 
-					return apply_filters_ref_array( $tag, $args );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'function', array( &$this, 'exec_function' ) ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'fn', array( &$this, 'exec_function' ) ) );
+					return apply_filters_ref_array($tag, $args);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('function', array(&$this, 'exec_function')));
+		$twig->addFunction(new Twig_SimpleFunction('fn', array(&$this, 'exec_function')));
 
-		$twig->addFunction( new Twig_SimpleFunction( 'shortcode', 'do_shortcode' ) );
+		$twig->addFunction(new Twig_SimpleFunction('shortcode', 'do_shortcode'));
 
 		/* TimberObjects */
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberPost', function ( $pid, $PostClass = 'TimberPost' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $PostClass( $p );
+		$twig->addFunction(new Twig_SimpleFunction('TimberPost', function($pid, $PostClass = 'TimberPost') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $PostClass($p);
 						}
 						return $pid;
 					}
-					return new $PostClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberImage', function ( $pid, $ImageClass = 'TimberImage' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $ImageClass( $p );
+					return new $PostClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberImage', function($pid, $ImageClass = 'TimberImage') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $ImageClass($p);
 						}
 						return $pid;
 					}
-					return new $ImageClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberTerm', function ( $pid, $TermClass = 'TimberTerm' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $TermClass( $p );
+					return new $ImageClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberTerm', function($pid, $TermClass = 'TimberTerm') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $TermClass($p);
 						}
 						return $pid;
 					}
-					return new $TermClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberUser', function ( $pid, $UserClass = 'TimberUser' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $UserClass( $p );
+					return new $TermClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberUser', function($pid, $UserClass = 'TimberUser') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $UserClass($p);
 						}
 						return $pid;
 					}
-					return new $UserClass( $pid );
-				} ) );
+					return new $UserClass($pid);
+				} ));
 
 		/* TimberObjects Alias */
-		$twig->addFunction( new Twig_SimpleFunction( 'Post', function ( $pid, $PostClass = 'TimberPost' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $PostClass( $p );
+		$twig->addFunction(new Twig_SimpleFunction('Post', function($pid, $PostClass = 'TimberPost') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $PostClass($p);
 						}
 						return $pid;
 					}
-					return new $PostClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'Image', function ( $pid, $ImageClass = 'TimberImage' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $ImageClass( $p );
+					return new $PostClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('Image', function($pid, $ImageClass = 'TimberImage') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $ImageClass($p);
 						}
 						return $pid;
 					}
-					return new $ImageClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'Term', function ( $pid, $TermClass = 'TimberTerm' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $TermClass( $p );
+					return new $ImageClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('Term', function($pid, $TermClass = 'TimberTerm') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $TermClass($p);
 						}
 						return $pid;
 					}
-					return new $TermClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'User', function ( $pid, $UserClass = 'TimberUser' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $UserClass( $p );
+					return new $TermClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('User', function($pid, $UserClass = 'TimberUser') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $UserClass($p);
 						}
 						return $pid;
 					}
-					return new $UserClass( $pid );
-				} ) );
+					return new $UserClass($pid);
+				} ));
 
 		/* bloginfo and translate */
-		$twig->addFunction( 'bloginfo', new Twig_SimpleFunction( 'bloginfo', function ( $show = '', $filter = 'raw' ) {
-					return get_bloginfo( $show, $filter );
-				} ) );
-		$twig->addFunction( '__', new Twig_SimpleFunction( '__', function ( $text, $domain = 'default' ) {
-					return __( $text, $domain );
-				} ) );
+		$twig->addFunction('bloginfo', new Twig_SimpleFunction('bloginfo', function($show = '', $filter = 'raw') {
+					return get_bloginfo($show, $filter);
+				} ));
+		$twig->addFunction('__', new Twig_SimpleFunction('__', function($text, $domain = 'default') {
+					return __($text, $domain);
+				} ));
 		/* get_twig is deprecated, use timber/twig */
-		$twig = apply_filters( 'get_twig', $twig );
-		$twig = apply_filters( 'timber/twig', $twig );
+		$twig = apply_filters('get_twig', $twig);
+		$twig = apply_filters('timber/twig', $twig);
 		return $twig;
 	}
 
@@ -194,11 +194,11 @@ 
 	 * @param mixed   $arr
 	 * @return array
 	 */
-	function to_array( $arr ) {
-		if ( is_array( $arr ) ) {
+	function to_array($arr) {
+		if ( is_array($arr) ) {
 			return $arr;
 		}
-		$arr = array( $arr );
+		$arr = array($arr);
 		return $arr;
 	}
 
@@ -208,13 +208,13 @@ 
 	 * @param string  $function_name
 	 * @return mixed
 	 */
-	function exec_function( $function_name ) {
+	function exec_function($function_name) {
 		$args = func_get_args();
-		array_shift( $args );
+		array_shift($args);
 		if ( is_string($function_name) ) {
-			$function_name = trim( $function_name );
+			$function_name = trim($function_name);
 		}
-		return call_user_func_array( $function_name, ( $args ) );
+		return call_user_func_array($function_name, ($args));
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 * @param string  $content
 	 * @return string
 	 */
-	function twig_pretags( $content ) {
-		return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
+	function twig_pretags($content) {
+		return preg_replace_callback('|<pre.*>(.*)</pre|isU', array(&$this, 'convert_pre_entities'), $content);
 	}
 
 	/**
@@ -233,8 +233,8 @@ 
 	 * @param array   $matches
 	 * @return string
 	 */
-	function convert_pre_entities( $matches ) {
-		return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
+	function convert_pre_entities($matches) {
+		return str_replace($matches[1], htmlentities($matches[1]), $matches[0]);
 	}
 
 	/**
@@ -242,12 +242,12 @@ 
 	 * @deprecated 0.20.7
 	 * @return string
 	 */
-	function body_class( $body_classes ) {
+	function body_class($body_classes) {
 		ob_start();
-		if ( is_array( $body_classes ) ) {
-			$body_classes = explode( ' ', $body_classes );
+		if ( is_array($body_classes) ) {
+			$body_classes = explode(' ', $body_classes);
 		}
-		body_class( $body_classes );
+		body_class($body_classes);
 		$return = ob_get_contents();
 		ob_end_clean();
 		return $return;
@@ -260,20 +260,20 @@ 
 	 * @param string  $format (optional)
 	 * @return string
 	 */
-	function intl_date( $date, $format = null ) {
+	function intl_date($date, $format = null) {
 		if ( $format === null ) {
-			$format = get_option( 'date_format' );
+			$format = get_option('date_format');
 		}
 
 		if ( $date instanceof DateTime ) {
 			$timestamp = $date->getTimestamp();
-		} else if (is_numeric( $date ) && strtotime( $date ) === false ) {
-			$timestamp = intval( $date );
+		} else if ( is_numeric($date) && strtotime($date) === false ) {
+			$timestamp = intval($date);
 		} else {
-			$timestamp = strtotime( $date );
+			$timestamp = strtotime($date);
 		}
 
-		return date_i18n( $format, $timestamp );
+		return date_i18n($format, $timestamp);
 	}
 
 	//debug
@@ -285,17 +285,17 @@ 
 	 * @param bool    $methods
 	 * @return string
 	 */
-	function object_docs( $obj, $methods = true ) {
-		$class = get_class( $obj );
-		$properties = (array)$obj;
+	function object_docs($obj, $methods = true) {
+		$class = get_class($obj);
+		$properties = (array) $obj;
 		if ( $methods ) {
 			/** @var array $methods */
 			$methods = $obj->get_method_values();
 		}
-		$rets = array_merge( $properties, $methods );
-		ksort( $rets );
-		$str = print_r( $rets, true );
-		$str = str_replace( 'Array', $class . ' Object', $str );
+		$rets = array_merge($properties, $methods);
+		ksort($rets);
+		$str = print_r($rets, true);
+		$str = str_replace('Array', $class . ' Object', $str);
 		return $str;
 	}
 
@@ -306,15 +306,15 @@ 
 	 * @param string $format_future
 	 * @return string
 	 */
-	function time_ago( $from, $to = null, $format_past = '%s ago', $format_future = '%s from now' ) {
+	function time_ago($from, $to = null, $format_past = '%s ago', $format_future = '%s from now') {
 		$to = $to === null ? time() : $to;
-		$to = is_int( $to ) ? $to : strtotime( $to );
-		$from = is_int( $from ) ? $from : strtotime( $from );
+		$to = is_int($to) ? $to : strtotime($to);
+		$from = is_int($from) ? $from : strtotime($from);
 
 		if ( $from < $to ) {
-			return sprintf( $format_past, human_time_diff( $from, $to ) );
+			return sprintf($format_past, human_time_diff($from, $to));
 		} else {
-			return sprintf( $format_future, human_time_diff( $to, $from ) );
+			return sprintf($format_future, human_time_diff($to, $from));
 		}
 	}
 
@@ -324,18 +324,18 @@ 
 	 * @param string $second_delimiter
 	 * @return string
 	 */
-	function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
-		$length = count( $arr );
+	function add_list_separators($arr, $first_delimiter = ',', $second_delimiter = 'and') {
+		$length = count($arr);
 		$list = '';
-		foreach( $arr as $index => $item ) {
+		foreach ($arr as $index => $item) {
 			if ( $index < $length - 2 ) {
-				$delimiter = $first_delimiter.' ';
+				$delimiter = $first_delimiter . ' ';
 			} elseif ( $index == $length - 2 ) {
-				$delimiter = ' '.$second_delimiter.' ';
+				$delimiter = ' ' . $second_delimiter . ' ';
 			} else {
 				$delimiter = '';
 			}
-			$list = $list.$item.$delimiter;
+			$list = $list . $item . $delimiter;
 		}
 		return $list;
 	}