jarednova / timber

lib/timber-comment.php

Indentation +327 added lines, -327 removed lines

@@ -21,360 +21,360 @@
  */
 class TimberComment extends TimberCore implements TimberCoreInterface {
 
-	public $PostClass = 'TimberPost';
-	public $object_type = 'comment';
+    public $PostClass = 'TimberPost';
+    public $object_type = 'comment';
 
-	public static $representation = 'comment';
+    public static $representation = 'comment';
 
-	public $ID;
-	public $id;
-	public $comment_author_email;
-	public $comment_content;
-	public $comment_date;
-	public $comment_ID;
-	public $user_id;
-	public $comment_author;
+    public $ID;
+    public $id;
+    public $comment_author_email;
+    public $comment_content;
+    public $comment_date;
+    public $comment_ID;
+    public $user_id;
+    public $comment_author;
 
-	public $children = array();
+    public $children = array();
 
-	/**
-	 * @param int $cid
-	 */
-	function __construct($cid) {
-		$this->init($cid);
-	}
+    /**
+     * @param int $cid
+     */
+    function __construct($cid) {
+        $this->init($cid);
+    }
 
-	function __toString() {
-		return $this->content();
-	}
+    function __toString() {
+        return $this->content();
+    }
 
-	/**
-	 * @internal
-	 * @param integer $cid
-	 */
-	function init($cid) {
-		$comment_data = $cid;
-		if (is_integer($cid)) {
-			$comment_data = get_comment($cid);
-		}
-		$this->import($comment_data);
-		$this->ID = $this->comment_ID;
-		$this->id = $this->comment_ID;
-		$comment_meta_data = $this->get_meta_fields($this->ID);
-		$this->import($comment_meta_data);
-	}
+    /**
+     * @internal
+     * @param integer $cid
+     */
+    function init($cid) {
+        $comment_data = $cid;
+        if (is_integer($cid)) {
+            $comment_data = get_comment($cid);
+        }
+        $this->import($comment_data);
+        $this->ID = $this->comment_ID;
+        $this->id = $this->comment_ID;
+        $comment_meta_data = $this->get_meta_fields($this->ID);
+        $this->import($comment_meta_data);
+    }
 
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * <h3>Comments by...</h3>
-	 * <ol>
-	 * {% for comment in post.comments %}
-	 * 	<li>{{comment.author.name}}, who is a {{comment.author.role}}</li>
-	 * {% endfor %}
-	 * </ol>
-	 * ```
-	 * ```html
-	 * <h3>Comments by...</h3>
-	 * <ol>
-	 * 	<li>Jared Novack, who is a contributor</li>
-	 * 	<li>Katie Ricci, who is a subscriber</li>
-	 * 	<li>Rebecca Pearl, who is a author</li>
-	 * </ol>
-	 * ```
-	 * @return TimberUser
-	 */
-	public function author() {
-		if ($this->user_id) {
-			return new TimberUser($this->user_id);
-		} else {
-			$author = new TimberUser(0);
-			if (isset($this->comment_author) && $this->comment_author) {
-				$author->name = $this->comment_author;
-			} else {
-				$author->name = 'Anonymous';
-			}
-		}
-		return $author;
-	}
+    /**
+     * @api
+     * @example
+     * ```twig
+     * <h3>Comments by...</h3>
+     * <ol>
+     * {% for comment in post.comments %}
+     * 	<li>{{comment.author.name}}, who is a {{comment.author.role}}</li>
+     * {% endfor %}
+     * </ol>
+     * ```
+     * ```html
+     * <h3>Comments by...</h3>
+     * <ol>
+     * 	<li>Jared Novack, who is a contributor</li>
+     * 	<li>Katie Ricci, who is a subscriber</li>
+     * 	<li>Rebecca Pearl, who is a author</li>
+     * </ol>
+     * ```
+     * @return TimberUser
+     */
+    public function author() {
+        if ($this->user_id) {
+            return new TimberUser($this->user_id);
+        } else {
+            $author = new TimberUser(0);
+            if (isset($this->comment_author) && $this->comment_author) {
+                $author->name = $this->comment_author;
+            } else {
+                $author->name = 'Anonymous';
+            }
+        }
+        return $author;
+    }
 
-	/**
-	 * Fetches the Gravatar
-	 * @api
-	 * @example
-	 * ```twig
-	 * <img src="{{comment.avatar(36,template_uri~"/img/dude.jpg")}}" alt="Image of {{comment.author.name}}" />
-	 * ```
-	 * ```html
-	 * <img src="http://gravatar.com/i/sfsfsdfasdfsfa.jpg" alt="Image of Katherine Rich" />
-	 * ```
-	 * @param int $size
-	 * @param string $default
-	 * @return bool|mixed|string
-	 */
-	public function avatar($size = 92, $default = '') {
-		if (!get_option('show_avatars')) {
-			return false;
-		}
-		if (!is_numeric($size)) {
-			$size = '92';
-		}
+    /**
+     * Fetches the Gravatar
+     * @api
+     * @example
+     * ```twig
+     * <img src="{{comment.avatar(36,template_uri~"/img/dude.jpg")}}" alt="Image of {{comment.author.name}}" />
+     * ```
+     * ```html
+     * <img src="http://gravatar.com/i/sfsfsdfasdfsfa.jpg" alt="Image of Katherine Rich" />
+     * ```
+     * @param int $size
+     * @param string $default
+     * @return bool|mixed|string
+     */
+    public function avatar($size = 92, $default = '') {
+        if (!get_option('show_avatars')) {
+            return false;
+        }
+        if (!is_numeric($size)) {
+            $size = '92';
+        }
 
-		$email = $this->avatar_email();
-		$email_hash = '';
-		if (!empty($email)) {
-			$email_hash = md5(strtolower(trim($email)));
-		}
-		$host = $this->avatar_host($email_hash);
-		$default = $this->avatar_default($default, $email, $size, $host);
-		if (!empty($email)) {
-			$avatar = $this->avatar_out($default, $host, $email_hash, $size);
-		} else {
-			$avatar = $default;
-		}
-		return $avatar;
-	}
+        $email = $this->avatar_email();
+        $email_hash = '';
+        if (!empty($email)) {
+            $email_hash = md5(strtolower(trim($email)));
+        }
+        $host = $this->avatar_host($email_hash);
+        $default = $this->avatar_default($default, $email, $size, $host);
+        if (!empty($email)) {
+            $avatar = $this->avatar_out($default, $host, $email_hash, $size);
+        } else {
+            $avatar = $default;
+        }
+        return $avatar;
+    }
 
-	/**
-	 * @api
-	 * @return string
-	 */
-	public function content() {
-		return apply_filters('get_comment_text ', $this->comment_content);
-	}
+    /**
+     * @api
+     * @return string
+     */
+    public function content() {
+        return apply_filters('get_comment_text ', $this->comment_content);
+    }
 
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% if comment.approved %}
-	 * 	Your comment is good
-	 * {% else %}
-	 * 	Do you kiss your mother with that mouth?
-	 * {% endif %}
-	 * ```
-	 * @return boolean
-	 */
-	public function approved() {
-		return $this->comment_approved;
-	}
+    /**
+     * @api
+     * @example
+     * ```twig
+     * {% if comment.approved %}
+     * 	Your comment is good
+     * {% else %}
+     * 	Do you kiss your mother with that mouth?
+     * {% endif %}
+     * ```
+     * @return boolean
+     */
+    public function approved() {
+        return $this->comment_approved;
+    }
 
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% for comment in post.comments %}
-	 * <article class="comment">
-	 *   <p class="date">Posted on {{ comment.date }}:</p>
-	 *   <p class="comment">{{ comment.content }}</p>
-	 * </article>
-	 * {% endfor %}
-	 * ```
-	 * ```html
-	 * <article class="comment">
-	 *   <p class="date">Posted on September 28, 2015:</p>
-	 *   <p class="comment">Happy Birthday!</p>
-	 * </article>
-	 * ```
-	 * @return string
-	 */
-	public function date( $date_format = '' ) {
-		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->comment_date);
-		return apply_filters('get_comment_date ', $the_date, $df);
-	}
+    /**
+     * @api
+     * @example
+     * ```twig
+     * {% for comment in post.comments %}
+     * <article class="comment">
+     *   <p class="date">Posted on {{ comment.date }}:</p>
+     *   <p class="comment">{{ comment.content }}</p>
+     * </article>
+     * {% endfor %}
+     * ```
+     * ```html
+     * <article class="comment">
+     *   <p class="date">Posted on September 28, 2015:</p>
+     *   <p class="comment">Happy Birthday!</p>
+     * </article>
+     * ```
+     * @return string
+     */
+    public function date( $date_format = '' ) {
+        $df = $date_format ? $date_format : get_option('date_format');
+        $the_date = (string)mysql2date($df, $this->comment_date);
+        return apply_filters('get_comment_date ', $the_date, $df);
+    }
 
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% for comment in post.comments %}
-	 * <article class="comment">
-	 *   <p class="date">Posted on {{ comment.date }} at {{comment.time}}:</p>
-	 *   <p class="comment">{{ comment.content }}</p>
-	 * </article>
-	 * {% endfor %}
-	 * ```
-	 * ```html
-	 * <article class="comment">
-	 *   <p class="date">Posted on September 28, 2015 at 12:45 am:</p>
-	 *   <p class="comment">Happy Birthday!</p>
-	 * </article>
-	 * ```
-	 * @return string
-	 */
-	public function time( $time_format = '' ) {
-		$tf = $time_format ? $time_format : get_option('time_format');
-		$the_time = (string)mysql2date($tf, $this->comment_date);
-		return apply_filters('get_comment_time', $the_time, $tf);
-	}
+    /**
+     * @api
+     * @example
+     * ```twig
+     * {% for comment in post.comments %}
+     * <article class="comment">
+     *   <p class="date">Posted on {{ comment.date }} at {{comment.time}}:</p>
+     *   <p class="comment">{{ comment.content }}</p>
+     * </article>
+     * {% endfor %}
+     * ```
+     * ```html
+     * <article class="comment">
+     *   <p class="date">Posted on September 28, 2015 at 12:45 am:</p>
+     *   <p class="comment">Happy Birthday!</p>
+     * </article>
+     * ```
+     * @return string
+     */
+    public function time( $time_format = '' ) {
+        $tf = $time_format ? $time_format : get_option('time_format');
+        $the_time = (string)mysql2date($tf, $this->comment_date);
+        return apply_filters('get_comment_time', $the_time, $tf);
+    }
 
-	/**
-	 * @param string $field_name
-	 * @return mixed
-	 */
-	public function meta($field_name) {
-		return $this->get_meta_field($field_name);
-	}
+    /**
+     * @param string $field_name
+     * @return mixed
+     */
+    public function meta($field_name) {
+        return $this->get_meta_field($field_name);
+    }
 
-	/**
-	 * @api
-	 * @return bool
-	 */
-	public function is_child() {
-		return $this->comment_parent > 0;
-	}
+    /**
+     * @api
+     * @return bool
+     */
+    public function is_child() {
+        return $this->comment_parent > 0;
+    }
 
-	/**
-	 * @internal
-	 * @param int $comment_id
-	 * @return mixed
-	 */
-	protected function get_meta_fields($comment_id = null) {
-		if ($comment_id === null) {
-			$comment_id = $this->ID;
-		}
-		//Could not find a WP function to fetch all comment meta data, so I made one.
-		apply_filters('timber_comment_get_meta_pre', array(), $comment_id);
-		$comment_metas = get_comment_meta($comment_id);
-		foreach ($comment_metas as &$cm) {
-			if (is_array($cm) && count($cm) == 1) {
-				$cm = $cm[0];
-			}
-		}
-		$comment_metas = apply_filters('timber_comment_get_meta', $comment_metas, $comment_id);
-		return $comment_metas;
-	}
+    /**
+     * @internal
+     * @param int $comment_id
+     * @return mixed
+     */
+    protected function get_meta_fields($comment_id = null) {
+        if ($comment_id === null) {
+            $comment_id = $this->ID;
+        }
+        //Could not find a WP function to fetch all comment meta data, so I made one.
+        apply_filters('timber_comment_get_meta_pre', array(), $comment_id);
+        $comment_metas = get_comment_meta($comment_id);
+        foreach ($comment_metas as &$cm) {
+            if (is_array($cm) && count($cm) == 1) {
+                $cm = $cm[0];
+            }
+        }
+        $comment_metas = apply_filters('timber_comment_get_meta', $comment_metas, $comment_id);
+        return $comment_metas;
+    }
 
-	/**
-	 * @internal
-	 * @param string $field_name
-	 * @return mixed
-	 */
-	protected function get_meta_field($field_name) {
-		$value = apply_filters('timber_comment_get_meta_field_pre', null, $this->ID, $field_name, $this);
-		if ($value === null) {
-			$value = get_comment_meta($this->ID, $field_name, true);
-		}
-		$value = apply_filters('timber_comment_get_meta_field', $value, $this->ID, $field_name, $this);
-		return $value;
-	}
+    /**
+     * @internal
+     * @param string $field_name
+     * @return mixed
+     */
+    protected function get_meta_field($field_name) {
+        $value = apply_filters('timber_comment_get_meta_field_pre', null, $this->ID, $field_name, $this);
+        if ($value === null) {
+            $value = get_comment_meta($this->ID, $field_name, true);
+        }
+        $value = apply_filters('timber_comment_get_meta_field', $value, $this->ID, $field_name, $this);
+        return $value;
+    }
 
-	/**
-	 * Enqueue the WP threaded comments javascript,
-	 * and fetch the reply link for various comments.
-	 * @api
-	 * @return string
-	 */
-	public function reply_link( $reply_text = 'Reply' ) {
-		if ( is_singular() && comments_open() && get_option('thread_comments') ) {
-			wp_enqueue_script( 'comment-reply' );
-		}
+    /**
+     * Enqueue the WP threaded comments javascript,
+     * and fetch the reply link for various comments.
+     * @api
+     * @return string
+     */
+    public function reply_link( $reply_text = 'Reply' ) {
+        if ( is_singular() && comments_open() && get_option('thread_comments') ) {
+            wp_enqueue_script( 'comment-reply' );
+        }
 
-		// Get the comments depth option from the admin panel
-		$max_depth = get_option('thread_comments_depth');
+        // Get the comments depth option from the admin panel
+        $max_depth = get_option('thread_comments_depth');
 
-		// Default args
-		$args = array(
-			'add_below' => 'comment',
-			'respond_id' => 'respond',
-			'reply_text' => $reply_text,
-			'depth' => 1,
-			'max_depth' => $max_depth,
-		);
+        // Default args
+        $args = array(
+            'add_below' => 'comment',
+            'respond_id' => 'respond',
+            'reply_text' => $reply_text,
+            'depth' => 1,
+            'max_depth' => $max_depth,
+        );
 
-		return get_comment_reply_link( $args, $this->ID, $this->post_id );
-	}
+        return get_comment_reply_link( $args, $this->ID, $this->post_id );
+    }
 
-	/* AVATAR Stuff
+    /* AVATAR Stuff
 	======================= */
 
-	/**
-	 * @internal
-	 * @return string
-	 */
-	protected function avatar_email() {
-		$id = (int)$this->user_id;
-		$user = get_userdata($id);
-		if ($user) {
-			$email = $user->user_email;
-		} else {
-			$email = $this->comment_author_email;
-		}
-		return $email;
-	}
+    /**
+     * @internal
+     * @return string
+     */
+    protected function avatar_email() {
+        $id = (int)$this->user_id;
+        $user = get_userdata($id);
+        if ($user) {
+            $email = $user->user_email;
+        } else {
+            $email = $this->comment_author_email;
+        }
+        return $email;
+    }
 
-	/**
-	 * @internal
-	 * @param string $email_hash
-	 * @return string
-	 */
-	protected function avatar_host($email_hash) {
-		if (is_ssl()) {
-			$host = 'https://secure.gravatar.com';
-		} else {
-			if (!empty($email_hash)) {
-				$host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
-			} else {
-				$host = 'http://0.gravatar.com';
-			}
-		}
-		return $host;
-	}
+    /**
+     * @internal
+     * @param string $email_hash
+     * @return string
+     */
+    protected function avatar_host($email_hash) {
+        if (is_ssl()) {
+            $host = 'https://secure.gravatar.com';
+        } else {
+            if (!empty($email_hash)) {
+                $host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
+            } else {
+                $host = 'http://0.gravatar.com';
+            }
+        }
+        return $host;
+    }
 
-	/**
-	 * @internal
-	 * @todo  what if it's relative?
-	 * @param string $default
-	 * @param string $email
-	 * @param string $size
-	 * @param string $host
-	 * @return string
-	 */
-	protected function avatar_default($default, $email, $size, $host) {
-		if (substr($default, 0, 1) == '/') {
-			$default = home_url() . $default;
-		}
+    /**
+     * @internal
+     * @todo  what if it's relative?
+     * @param string $default
+     * @param string $email
+     * @param string $size
+     * @param string $host
+     * @return string
+     */
+    protected function avatar_default($default, $email, $size, $host) {
+        if (substr($default, 0, 1) == '/') {
+            $default = home_url() . $default;
+        }
 
-		if (empty($default)) {
-			$avatar_default = get_option('avatar_default');
-			if (empty($avatar_default)) {
-				$default = 'mystery';
-			} else {
-				$default = $avatar_default;
-			}
-		}
-		if ('mystery' == $default) {
-			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
-			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ('blank' == $default) {
-			$default = $email ? 'blank' : includes_url('images/blank.gif');
-		} else if (!empty($email) && 'gravatar_default' == $default) {
-			$default = '';
-		} else if ('gravatar_default' == $default) {
-			$default = $host . '/avatar/?s=' . $size;
-		} else if (empty($email) && !strstr($default, 'http://')) {
-			$default = $host . '/avatar/?d=' . $default . '&amp;s=' . $size;
-		}
-		return $default;
-	}
+        if (empty($default)) {
+            $avatar_default = get_option('avatar_default');
+            if (empty($avatar_default)) {
+                $default = 'mystery';
+            } else {
+                $default = $avatar_default;
+            }
+        }
+        if ('mystery' == $default) {
+            $default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
+            // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
+        } else if ('blank' == $default) {
+            $default = $email ? 'blank' : includes_url('images/blank.gif');
+        } else if (!empty($email) && 'gravatar_default' == $default) {
+            $default = '';
+        } else if ('gravatar_default' == $default) {
+            $default = $host . '/avatar/?s=' . $size;
+        } else if (empty($email) && !strstr($default, 'http://')) {
+            $default = $host . '/avatar/?d=' . $default . '&amp;s=' . $size;
+        }
+        return $default;
+    }
 
-	/**
-	 * @internal
-	 * @param string $default
-	 * @param string $host
-	 * @param string $email_hash
-	 * @param string $size
-	 * @return mixed
-	 */
-	protected function avatar_out($default, $host, $email_hash, $size) {
-		$out = $host . '/avatar/' . $email_hash . '?s=' . $size . '&amp;d=' . urlencode($default);
-		$rating = get_option('avatar_rating');
-		if (!empty($rating)) {
-			$out .= '&amp;r=' . $rating;
-		}
-		return str_replace('&#038;', '&amp;', esc_url($out));
-	}
+    /**
+     * @internal
+     * @param string $default
+     * @param string $host
+     * @param string $email_hash
+     * @param string $size
+     * @return mixed
+     */
+    protected function avatar_out($default, $host, $email_hash, $size) {
+        $out = $host . '/avatar/' . $email_hash . '?s=' . $size . '&amp;d=' . urlencode($default);
+        $rating = get_option('avatar_rating');
+        if (!empty($rating)) {
+            $out .= '&amp;r=' . $rating;
+        }
+        return str_replace('&#038;', '&amp;', esc_url($out));
+    }
 
 }

Spacing +37 added lines, -37 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * @param int $cid
 	 */
-	function __construct($cid) {
+	function __construct( $cid ) {
 		$this->init($cid);
 	}
 
@@ -52,9 +52,9 @@ 
 	 * @internal
 	 * @param integer $cid
 	 */
-	function init($cid) {
+	function init( $cid ) {
 		$comment_data = $cid;
-		if (is_integer($cid)) {
+		if ( is_integer($cid) ) {
 			$comment_data = get_comment($cid);
 		}
 		$this->import($comment_data);
@@ -86,11 +86,11 @@ 
 	 * @return TimberUser
 	 */
 	public function author() {
-		if ($this->user_id) {
+		if ( $this->user_id ) {
 			return new TimberUser($this->user_id);
 		} else {
 			$author = new TimberUser(0);
-			if (isset($this->comment_author) && $this->comment_author) {
+			if ( isset($this->comment_author) && $this->comment_author ) {
 				$author->name = $this->comment_author;
 			} else {
 				$author->name = 'Anonymous';
@@ -113,22 +113,22 @@ 
 	 * @param string $default
 	 * @return bool|mixed|string
 	 */
-	public function avatar($size = 92, $default = '') {
-		if (!get_option('show_avatars')) {
+	public function avatar( $size = 92, $default = '' ) {
+		if ( !get_option('show_avatars') ) {
 			return false;
 		}
-		if (!is_numeric($size)) {
+		if ( !is_numeric($size) ) {
 			$size = '92';
 		}
 
 		$email = $this->avatar_email();
 		$email_hash = '';
-		if (!empty($email)) {
+		if ( !empty($email) ) {
 			$email_hash = md5(strtolower(trim($email)));
 		}
 		$host = $this->avatar_host($email_hash);
 		$default = $this->avatar_default($default, $email, $size, $host);
-		if (!empty($email)) {
+		if ( !empty($email) ) {
 			$avatar = $this->avatar_out($default, $host, $email_hash, $size);
 		} else {
 			$avatar = $default;
@@ -181,7 +181,7 @@ 
 	 */
 	public function date( $date_format = '' ) {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->comment_date);
+		$the_date = (string) mysql2date($df, $this->comment_date);
 		return apply_filters('get_comment_date ', $the_date, $df);
 	}
 
@@ -206,7 +206,7 @@ 
 	 */
 	public function time( $time_format = '' ) {
 		$tf = $time_format ? $time_format : get_option('time_format');
-		$the_time = (string)mysql2date($tf, $this->comment_date);
+		$the_time = (string) mysql2date($tf, $this->comment_date);
 		return apply_filters('get_comment_time', $the_time, $tf);
 	}
 
@@ -214,7 +214,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function meta($field_name) {
+	public function meta( $field_name ) {
 		return $this->get_meta_field($field_name);
 	}
 
@@ -231,15 +231,15 @@ 
 	 * @param int $comment_id
 	 * @return mixed
 	 */
-	protected function get_meta_fields($comment_id = null) {
-		if ($comment_id === null) {
+	protected function get_meta_fields( $comment_id = null ) {
+		if ( $comment_id === null ) {
 			$comment_id = $this->ID;
 		}
 		//Could not find a WP function to fetch all comment meta data, so I made one.
 		apply_filters('timber_comment_get_meta_pre', array(), $comment_id);
 		$comment_metas = get_comment_meta($comment_id);
-		foreach ($comment_metas as &$cm) {
-			if (is_array($cm) && count($cm) == 1) {
+		foreach ( $comment_metas as &$cm ) {
+			if ( is_array($cm) && count($cm) == 1 ) {
 				$cm = $cm[0];
 			}
 		}
@@ -252,9 +252,9 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	protected function get_meta_field($field_name) {
+	protected function get_meta_field( $field_name ) {
 		$value = apply_filters('timber_comment_get_meta_field_pre', null, $this->ID, $field_name, $this);
-		if ($value === null) {
+		if ( $value === null ) {
 			$value = get_comment_meta($this->ID, $field_name, true);
 		}
 		$value = apply_filters('timber_comment_get_meta_field', $value, $this->ID, $field_name, $this);
@@ -269,7 +269,7 @@ 
 	 */
 	public function reply_link( $reply_text = 'Reply' ) {
 		if ( is_singular() && comments_open() && get_option('thread_comments') ) {
-			wp_enqueue_script( 'comment-reply' );
+			wp_enqueue_script('comment-reply');
 		}
 
 		// Get the comments depth option from the admin panel
@@ -284,7 +284,7 @@ 
 			'max_depth' => $max_depth,
 		);
 
-		return get_comment_reply_link( $args, $this->ID, $this->post_id );
+		return get_comment_reply_link($args, $this->ID, $this->post_id);
 	}
 
 	/* AVATAR Stuff
@@ -295,9 +295,9 @@ 
 	 * @return string
 	 */
 	protected function avatar_email() {
-		$id = (int)$this->user_id;
+		$id = (int) $this->user_id;
 		$user = get_userdata($id);
-		if ($user) {
+		if ( $user ) {
 			$email = $user->user_email;
 		} else {
 			$email = $this->comment_author_email;
@@ -310,11 +310,11 @@ 
 	 * @param string $email_hash
 	 * @return string
 	 */
-	protected function avatar_host($email_hash) {
-		if (is_ssl()) {
+	protected function avatar_host( $email_hash ) {
+		if ( is_ssl() ) {
 			$host = 'https://secure.gravatar.com';
 		} else {
-			if (!empty($email_hash)) {
+			if ( !empty($email_hash) ) {
 				$host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
 			} else {
 				$host = 'http://0.gravatar.com';
@@ -332,29 +332,29 @@ 
 	 * @param string $host
 	 * @return string
 	 */
-	protected function avatar_default($default, $email, $size, $host) {
-		if (substr($default, 0, 1) == '/') {
+	protected function avatar_default( $default, $email, $size, $host ) {
+		if ( substr($default, 0, 1) == '/' ) {
 			$default = home_url() . $default;
 		}
 
-		if (empty($default)) {
+		if ( empty($default) ) {
 			$avatar_default = get_option('avatar_default');
-			if (empty($avatar_default)) {
+			if ( empty($avatar_default) ) {
 				$default = 'mystery';
 			} else {
 				$default = $avatar_default;
 			}
 		}
-		if ('mystery' == $default) {
+		if ( 'mystery' == $default ) {
 			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
 			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ('blank' == $default) {
+		} else if ( 'blank' == $default ) {
 			$default = $email ? 'blank' : includes_url('images/blank.gif');
-		} else if (!empty($email) && 'gravatar_default' == $default) {
+		} else if ( !empty($email) && 'gravatar_default' == $default ) {
 			$default = '';
-		} else if ('gravatar_default' == $default) {
+		} else if ( 'gravatar_default' == $default ) {
 			$default = $host . '/avatar/?s=' . $size;
-		} else if (empty($email) && !strstr($default, 'http://')) {
+		} else if ( empty($email) && !strstr($default, 'http://') ) {
 			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
 		}
 		return $default;
@@ -368,10 +368,10 @@ 
 	 * @param string $size
 	 * @return mixed
 	 */
-	protected function avatar_out($default, $host, $email_hash, $size) {
+	protected function avatar_out( $default, $host, $email_hash, $size ) {
 		$out = $host . '/avatar/' . $email_hash . '?s=' . $size . '&d=' . urlencode($default);
 		$rating = get_option('avatar_rating');
-		if (!empty($rating)) {
+		if ( !empty($rating) ) {
 			$out .= '&r=' . $rating;
 		}
 		return str_replace('&', '&', esc_url($out));

lib/timber-core-interface.php

Indentation +7 added lines, -7 removed lines

@@ -2,15 +2,15 @@
 
 interface TimberCoreInterface {
 
-	public function __call( $field, $args );
+    public function __call( $field, $args );
 
-	public function __get( $field );
+    public function __get( $field );
 
-	/**
-	 * @return boolean
-	 */
-	public function __isset( $field );
+    /**
+     * @return boolean
+     */
+    public function __isset( $field );
 
-	public function meta( $key );
+    public function meta( $key );
 
 }

lib/timber-function-wrapper.php

Indentation +73 added lines, -73 removed lines

@@ -2,91 +2,91 @@
 
 class TimberFunctionWrapper {
 
-	private $_class;
-	private $_function;
-	private $_args;
-	private $_use_ob;
+    private $_class;
+    private $_function;
+    private $_args;
+    private $_use_ob;
 
-	public function __toString() {
-		 try {
-			return (string)$this->call();
-		 } catch (Exception $e) {
-		 	return 'Caught exception: ' . $e->getMessage() . "\n";
-		 }
-	}
+    public function __toString() {
+            try {
+            return (string)$this->call();
+            } catch (Exception $e) {
+                return 'Caught exception: ' . $e->getMessage() . "\n";
+            }
+    }
 
-	/**
-	 *
-	 *
-	 * @param callable $function
-	 * @param array   $args
-	 * @param bool    $return_output_buffer
-	 */
-	public function __construct( $function, $args = array(), $return_output_buffer = false ) {
-		if( is_array( $function ) ) {
-			if( (is_string( $function[0] ) && class_exists( $function[0] ) ) || gettype( $function[0] ) === 'object' ) {
-				$this->_class = $function[0];
-			}
+    /**
+     *
+     *
+     * @param callable $function
+     * @param array   $args
+     * @param bool    $return_output_buffer
+     */
+    public function __construct( $function, $args = array(), $return_output_buffer = false ) {
+        if( is_array( $function ) ) {
+            if( (is_string( $function[0] ) && class_exists( $function[0] ) ) || gettype( $function[0] ) === 'object' ) {
+                $this->_class = $function[0];
+            }
 			
-			if( is_string( $function[1] ) ) $this->_function = $function[1];
-		} else {
-			$this->_function = $function;
-		}
+            if( is_string( $function[1] ) ) $this->_function = $function[1];
+        } else {
+            $this->_function = $function;
+        }
 
-		$this->_args = $args;
-		$this->_use_ob = $return_output_buffer;
+        $this->_args = $args;
+        $this->_use_ob = $return_output_buffer;
 
-		add_filter( 'get_twig', array( &$this, 'add_to_twig' ) );
-	}
+        add_filter( 'get_twig', array( &$this, 'add_to_twig' ) );
+    }
 
-	/**
-	 *
-	 *
-	 * @param Twig_Environment $twig
-	 * @return Twig_Environment
-	 */
-	public function add_to_twig( $twig ) {
-		$wrapper = $this;
+    /**
+     *
+     *
+     * @param Twig_Environment $twig
+     * @return Twig_Environment
+     */
+    public function add_to_twig( $twig ) {
+        $wrapper = $this;
 
-		$twig->addFunction( new Twig_SimpleFunction( $this->_function, function () use ( $wrapper ) {
-					return call_user_func_array( array( $wrapper, 'call' ), func_get_args() );
-				} ) );
+        $twig->addFunction( new Twig_SimpleFunction( $this->_function, function () use ( $wrapper ) {
+                    return call_user_func_array( array( $wrapper, 'call' ), func_get_args() );
+                } ) );
 
-		return $twig;
-	}
+        return $twig;
+    }
 
-	/**
-	 *
-	 *
-	 * @return string
-	 */
-	public function call() {
-		$args = $this->_parse_args( func_get_args(), $this->_args );
-		$callable = ( isset( $this->_class ) ) ? array( $this->_class, $this->_function ) : $this->_function;
+    /**
+     *
+     *
+     * @return string
+     */
+    public function call() {
+        $args = $this->_parse_args( func_get_args(), $this->_args );
+        $callable = ( isset( $this->_class ) ) ? array( $this->_class, $this->_function ) : $this->_function;
 
-		if ( $this->_use_ob ) {
-			return TimberHelper::ob_function( $callable, $args );
-		} else {
-			return call_user_func_array( $callable, $args );
-		}
-	}
+        if ( $this->_use_ob ) {
+            return TimberHelper::ob_function( $callable, $args );
+        } else {
+            return call_user_func_array( $callable, $args );
+        }
+    }
 
-	/**
-	 *
-	 *
-	 * @param array   $args
-	 * @param array   $defaults
-	 * @return array
-	 */
-	private function _parse_args( $args, $defaults ) {
-		$_arg = reset( $defaults );
+    /**
+     *
+     *
+     * @param array   $args
+     * @param array   $defaults
+     * @return array
+     */
+    private function _parse_args( $args, $defaults ) {
+        $_arg = reset( $defaults );
 
-		foreach ( $args as $index => $arg ) {
-			$defaults[$index] = is_null( $arg ) ? $_arg : $arg;
-			$_arg = next( $defaults );
-		}
+        foreach ( $args as $index => $arg ) {
+            $defaults[$index] = is_null( $arg ) ? $_arg : $arg;
+            $_arg = next( $defaults );
+        }
 
-		return $defaults;
-	}
+        return $defaults;
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -9,8 +9,8 @@ 
 
 	public function __toString() {
 		 try {
-			return (string)$this->call();
-		 } catch (Exception $e) {
+			return (string) $this->call();
+		 } catch ( Exception $e ) {
 		 	return 'Caught exception: ' . $e->getMessage() . "\n";
 		 }
 	}
@@ -23,12 +23,12 @@ 
 	 * @param bool    $return_output_buffer
 	 */
 	public function __construct( $function, $args = array(), $return_output_buffer = false ) {
-		if( is_array( $function ) ) {
-			if( (is_string( $function[0] ) && class_exists( $function[0] ) ) || gettype( $function[0] ) === 'object' ) {
+		if ( is_array($function) ) {
+			if ( (is_string($function[0]) && class_exists($function[0])) || gettype($function[0]) === 'object' ) {
 				$this->_class = $function[0];
 			}
 			
-			if( is_string( $function[1] ) ) $this->_function = $function[1];
+			if ( is_string($function[1]) ) $this->_function = $function[1];
 		} else {
 			$this->_function = $function;
 		}
@@ -36,7 +36,7 @@ 
 		$this->_args = $args;
 		$this->_use_ob = $return_output_buffer;
 
-		add_filter( 'get_twig', array( &$this, 'add_to_twig' ) );
+		add_filter('get_twig', array(&$this, 'add_to_twig'));
 	}
 
 	/**
@@ -48,9 +48,9 @@ 
 	public function add_to_twig( $twig ) {
 		$wrapper = $this;
 
-		$twig->addFunction( new Twig_SimpleFunction( $this->_function, function () use ( $wrapper ) {
-					return call_user_func_array( array( $wrapper, 'call' ), func_get_args() );
-				} ) );
+		$twig->addFunction(new Twig_SimpleFunction($this->_function, function() use ($wrapper) {
+					return call_user_func_array(array($wrapper, 'call'), func_get_args());
+				} ));
 
 		return $twig;
 	}
@@ -61,13 +61,13 @@ 
 	 * @return string
 	 */
 	public function call() {
-		$args = $this->_parse_args( func_get_args(), $this->_args );
-		$callable = ( isset( $this->_class ) ) ? array( $this->_class, $this->_function ) : $this->_function;
+		$args = $this->_parse_args(func_get_args(), $this->_args);
+		$callable = (isset($this->_class)) ? array($this->_class, $this->_function) : $this->_function;
 
 		if ( $this->_use_ob ) {
-			return TimberHelper::ob_function( $callable, $args );
+			return TimberHelper::ob_function($callable, $args);
 		} else {
-			return call_user_func_array( $callable, $args );
+			return call_user_func_array($callable, $args);
 		}
 	}
 
@@ -79,11 +79,11 @@ 
 	 * @return array
 	 */
 	private function _parse_args( $args, $defaults ) {
-		$_arg = reset( $defaults );
+		$_arg = reset($defaults);
 
 		foreach ( $args as $index => $arg ) {
-			$defaults[$index] = is_null( $arg ) ? $_arg : $arg;
-			$_arg = next( $defaults );
+			$defaults[$index] = is_null($arg) ? $_arg : $arg;
+			$_arg = next($defaults);
 		}
 
 		return $defaults;

Braces +3 added lines, -1 removed lines

@@ -28,7 +28,9 @@
 				$this->_class = $function[0];
 			}
 			
-			if( is_string( $function[1] ) ) $this->_function = $function[1];
+			if( is_string( $function[1] ) ) {
+			    $this->_function = $function[1];
+			}
 		} else {
 			$this->_function = $function;
 		}

lib/timber-term-getter.php

Indentation +167 added lines, -167 removed lines

@@ -2,180 +2,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 = self::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 = self::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 = self::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 = self::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 = self::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 = self::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 = self::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 = self::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
-	 */
-	protected 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
+     */
+    protected 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
-	 */
-	protected 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
+     */
+    protected 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 +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+	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;
@@ -53,7 +53,7 @@ 
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function handle_term_query($taxonomies, $args, $TermClass) {
+	public static function handle_term_query( $taxonomies, $args, $TermClass ) {
 		if ( !isset($args['hide_empty']) ) {
 			$args['hide_empty'] = false;
 		}
@@ -64,7 +64,7 @@ 
 			$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;
@@ -74,7 +74,7 @@ 
 	 * @param string $query_string
 	 * @return stdClass
 	 */
-	protected static function get_term_query_from_query_string($query_string) {
+	protected 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);
@@ -85,7 +85,7 @@ 
 	 * @param string $taxs
 	 * @return stdClass
 	 */
-	protected static function get_term_query_from_string($taxs) {
+	protected static function get_term_query_from_string( $taxs ) {
 		$ret = new stdClass();
 		$ret->args = array();
 		if ( is_string($taxs) ) {
@@ -99,7 +99,7 @@ 
 	 * @param array $args
 	 * @return stdClass
 	 */
-	public static function get_term_query_from_assoc_array($args) {
+	public static function get_term_query_from_assoc_array( $args ) {
 		$ret = new stdClass();
 		$ret->args = $args;
 		if ( isset($ret->args['tax']) ) {
@@ -126,7 +126,7 @@ 
 	 * @param array $args
 	 * @return stdClass
 	 */
-	public static function get_term_query_from_array($args) {
+	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]) ) {
@@ -142,7 +142,7 @@ 
 	 * @param integer[] $args
 	 * @return stdClass
 	 */
-	public static function get_term_query_from_array_of_ids($args) {
+	public static function get_term_query_from_array_of_ids( $args ) {
 		$ret = new stdClass();
 		$ret->taxonomies = get_taxonomies();
 		$ret->args['include'] = $args;
@@ -153,7 +153,7 @@ 
 	 * @param string[] $args
 	 * @return stdClass
 	 */
-	public static function get_term_query_from_array_of_strings($args) {
+	public static function get_term_query_from_array_of_strings( $args ) {
 		$ret = new stdClass();
 		$ret->taxonomies = self::correct_taxonomy_names($args);
 		$ret->args = array();
@@ -164,11 +164,11 @@ 
 	 * @param string|array $taxs
 	 * @return array
 	 */
-	private static function correct_taxonomy_names($taxs) {
+	private static function correct_taxonomy_names( $taxs ) {
 		if ( is_string($taxs) ) {
 			$taxs = array($taxs);
 		}
-		foreach ($taxs as &$tax) {
+		foreach ( $taxs as &$tax ) {
 			if ( $tax == 'tags' || $tax == 'tag' ) {
 				$tax = 'post_tag';
 			} else if ( $tax == 'categories' ) {

lib/timber-user.php

Indentation +225 added lines, -225 removed lines

@@ -19,230 +19,230 @@
  */
 class TimberUser extends TimberCore implements TimberCoreInterface {
 
-	public $object_type = 'user';
-	public static $representation = 'user';
-
-	public $_link;
-
-	/**
-	 * @api
-	 * @var string The description from WordPress
-	 */
-	public $description;
-	public $display_name;
-
-	/**
-	 * @api
-	 * @var  string The first name of the user
-	 */
-	public $first_name;
-
-	/**
-	 * @api
-	 * @var  string The last name of the user
-	 */
-	public $last_name;
-
-	/**
-	 * @api
-	 * @var int The ID from WordPress
-	 */
-	public $id;
-	public $user_nicename;
-
-	/**
-	 * @param int|bool $uid
-	 */
-	function __construct($uid = false) {
-		$this->init($uid);
-	}
-
-	/**
-	 * @example
-	 * ```twig
-	 * This post is by {{ post.author }}
-	 * ```
-	 * ```html
-	 * This post is by Jared Novack
-	 * ```
-	 *
-	 * @return string a fallback for TimberUser::name()
-	 */
-	function __toString() {
-		$name = $this->name();
-		if ( strlen($name) ) {
-			return $name;
-		}
-		if ( strlen($this->name) ) {
-			return $this->name;
-		}
-		return '';
-	}
-
-	/**
-	 * @internal
-	 * @param string $field_name
-	 * @return null
-	 */
-	function get_meta($field_name) {
-		return $this->get_meta_field($field_name);
-	}
-
-	/**
-	 * @internal
-	 * @param string 	$field
-	 * @param mixed 	$value
-	 */
-	function __set($field, $value) {
-		if ( $field == 'name' ) {
-			$this->display_name = $value;
-		}
-		$this->$field = $value;
-	}
-
-	/**
-	 * @internal
-	 * @param int|bool $uid The user ID to use
-	 */
-	protected function init($uid = false) {
-		if ( $uid === false ) {
-			$uid = get_current_user_id();
-		}
-		if ( is_object($uid) || is_array($uid) ) {
-			$data = $uid;
-			if ( is_array($uid) ) {
-				$data = (object) $uid;
-			}
-			$uid = $data->ID;
-		}
-		if ( is_numeric($uid) ) {
-			$data = get_userdata($uid);
-		} else if ( is_string($uid) ) {
-			$data = get_user_by('login', $uid);
-		}
-		if ( isset($data) && is_object($data) ) {
-			if ( isset($data->data) ) {
-				$this->import($data->data);
-			} else {
-				$this->import($data);
-			}
-		}
-		$this->id = $this->ID;
-		$this->name = $this->name();
-		$custom = $this->get_custom();
-		$this->import($custom);
-	}
-
-	/**
-	 * @param string $field_name
-	 * @return mixed
-	 */
-	function get_meta_field($field_name) {
-		$value = null;
-		$value = apply_filters('timber_user_get_meta_field_pre', $value, $this->ID, $field_name, $this);
-		if ( $value === null ) {
-			$value = get_user_meta($this->ID, $field_name, true);
-		}
-		$value = apply_filters('timber_user_get_meta_field', $value, $this->ID, $field_name, $this);
-		return $value;
-	}
-
-	/**
-	 * @return array|null
-	 */
-	function get_custom() {
-		if ( $this->ID ) {
-			$um = array();
-			$um = apply_filters('timber_user_get_meta_pre', $um, $this->ID, $this);
-			if ( empty($um) ) {
-				$um = get_user_meta($this->ID);
-			}
-			$custom = array();
-			foreach ($um as $key => $value) {
-				if ( is_array($value) && count($value) == 1 ) {
-					$value = $value[0];
-				}
-				$custom[$key] = maybe_unserialize($value);
-			}
-			$custom = apply_filters('timber_user_get_meta', $custom, $this->ID, $this);
-			return $custom;
-		}
-		return null;
-	}
-
-	/**
-	 * @api
-	 * @return string http://example.org/author/lincoln
-	 */
-	public function link() {
-		if ( !$this->_link ) {
-			$this->_link = untrailingslashit(get_author_posts_url($this->ID));
-		}
-		return $this->_link;
-	}
-
-	/**
-	 * @api
-	 * @return string the human-friendly name of the user (ex: "Buster Bluth")
-	 */
-	function name() {
-		return $this->display_name;
-	}
-
-	/**
-	 * @param string $field_name
-	 * @return mixed
-	 */
-	function meta($field_name) {
-		return $this->get_meta_field($field_name);
-	}
-
-	/**
-	 * @api
-	 * @return string ex: /author/lincoln
-	 */
-	public function path() {
-		return TimberURLHelper::get_rel_url($this->get_link());
-	}
-
-	/**
-	 * @api
-	 * @return string ex baberaham-lincoln
-	 */
-	public function slug() {
-		return $this->user_nicename;
-	}
-
-	/**
-	 * @deprecated 0.21.9
-	 * @return string The link to a user's profile page
-	 */
-	function get_link() {
-		return $this->link();
-	}
-
-	/**
-	 * @deprecated 0.21.8
-	 * @return string ex: /author/lincoln
-	 */
-	function get_path() {
-		return $this->path();
-	}
-
-	/**
-	 * @deprecated 0.21.8
-	 * @return string
-	 */
-	function get_permalink() {
-		return $this->get_link();
-	}
-
-	/**
-	 * @deprecated 0.21.8
-	 * @return string
-	 */
-	function permalink() {
-		return $this->get_permalink();
-	}
+    public $object_type = 'user';
+    public static $representation = 'user';
+
+    public $_link;
+
+    /**
+     * @api
+     * @var string The description from WordPress
+     */
+    public $description;
+    public $display_name;
+
+    /**
+     * @api
+     * @var  string The first name of the user
+     */
+    public $first_name;
+
+    /**
+     * @api
+     * @var  string The last name of the user
+     */
+    public $last_name;
+
+    /**
+     * @api
+     * @var int The ID from WordPress
+     */
+    public $id;
+    public $user_nicename;
+
+    /**
+     * @param int|bool $uid
+     */
+    function __construct($uid = false) {
+        $this->init($uid);
+    }
+
+    /**
+     * @example
+     * ```twig
+     * This post is by {{ post.author }}
+     * ```
+     * ```html
+     * This post is by Jared Novack
+     * ```
+     *
+     * @return string a fallback for TimberUser::name()
+     */
+    function __toString() {
+        $name = $this->name();
+        if ( strlen($name) ) {
+            return $name;
+        }
+        if ( strlen($this->name) ) {
+            return $this->name;
+        }
+        return '';
+    }
+
+    /**
+     * @internal
+     * @param string $field_name
+     * @return null
+     */
+    function get_meta($field_name) {
+        return $this->get_meta_field($field_name);
+    }
+
+    /**
+     * @internal
+     * @param string 	$field
+     * @param mixed 	$value
+     */
+    function __set($field, $value) {
+        if ( $field == 'name' ) {
+            $this->display_name = $value;
+        }
+        $this->$field = $value;
+    }
+
+    /**
+     * @internal
+     * @param int|bool $uid The user ID to use
+     */
+    protected function init($uid = false) {
+        if ( $uid === false ) {
+            $uid = get_current_user_id();
+        }
+        if ( is_object($uid) || is_array($uid) ) {
+            $data = $uid;
+            if ( is_array($uid) ) {
+                $data = (object) $uid;
+            }
+            $uid = $data->ID;
+        }
+        if ( is_numeric($uid) ) {
+            $data = get_userdata($uid);
+        } else if ( is_string($uid) ) {
+            $data = get_user_by('login', $uid);
+        }
+        if ( isset($data) && is_object($data) ) {
+            if ( isset($data->data) ) {
+                $this->import($data->data);
+            } else {
+                $this->import($data);
+            }
+        }
+        $this->id = $this->ID;
+        $this->name = $this->name();
+        $custom = $this->get_custom();
+        $this->import($custom);
+    }
+
+    /**
+     * @param string $field_name
+     * @return mixed
+     */
+    function get_meta_field($field_name) {
+        $value = null;
+        $value = apply_filters('timber_user_get_meta_field_pre', $value, $this->ID, $field_name, $this);
+        if ( $value === null ) {
+            $value = get_user_meta($this->ID, $field_name, true);
+        }
+        $value = apply_filters('timber_user_get_meta_field', $value, $this->ID, $field_name, $this);
+        return $value;
+    }
+
+    /**
+     * @return array|null
+     */
+    function get_custom() {
+        if ( $this->ID ) {
+            $um = array();
+            $um = apply_filters('timber_user_get_meta_pre', $um, $this->ID, $this);
+            if ( empty($um) ) {
+                $um = get_user_meta($this->ID);
+            }
+            $custom = array();
+            foreach ($um as $key => $value) {
+                if ( is_array($value) && count($value) == 1 ) {
+                    $value = $value[0];
+                }
+                $custom[$key] = maybe_unserialize($value);
+            }
+            $custom = apply_filters('timber_user_get_meta', $custom, $this->ID, $this);
+            return $custom;
+        }
+        return null;
+    }
+
+    /**
+     * @api
+     * @return string http://example.org/author/lincoln
+     */
+    public function link() {
+        if ( !$this->_link ) {
+            $this->_link = untrailingslashit(get_author_posts_url($this->ID));
+        }
+        return $this->_link;
+    }
+
+    /**
+     * @api
+     * @return string the human-friendly name of the user (ex: "Buster Bluth")
+     */
+    function name() {
+        return $this->display_name;
+    }
+
+    /**
+     * @param string $field_name
+     * @return mixed
+     */
+    function meta($field_name) {
+        return $this->get_meta_field($field_name);
+    }
+
+    /**
+     * @api
+     * @return string ex: /author/lincoln
+     */
+    public function path() {
+        return TimberURLHelper::get_rel_url($this->get_link());
+    }
+
+    /**
+     * @api
+     * @return string ex baberaham-lincoln
+     */
+    public function slug() {
+        return $this->user_nicename;
+    }
+
+    /**
+     * @deprecated 0.21.9
+     * @return string The link to a user's profile page
+     */
+    function get_link() {
+        return $this->link();
+    }
+
+    /**
+     * @deprecated 0.21.8
+     * @return string ex: /author/lincoln
+     */
+    function get_path() {
+        return $this->path();
+    }
+
+    /**
+     * @deprecated 0.21.8
+     * @return string
+     */
+    function get_permalink() {
+        return $this->get_link();
+    }
+
+    /**
+     * @deprecated 0.21.8
+     * @return string
+     */
+    function permalink() {
+        return $this->get_permalink();
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
 	/**
 	 * @param int|bool $uid
 	 */
-	function __construct($uid = false) {
+	function __construct( $uid = false ) {
 		$this->init($uid);
 	}
 
@@ -84,7 +84,7 @@ 
 	 * @param string $field_name
 	 * @return null
 	 */
-	function get_meta($field_name) {
+	function get_meta( $field_name ) {
 		return $this->get_meta_field($field_name);
 	}
 
@@ -93,7 +93,7 @@ 
 	 * @param string 	$field
 	 * @param mixed 	$value
 	 */
-	function __set($field, $value) {
+	function __set( $field, $value ) {
 		if ( $field == 'name' ) {
 			$this->display_name = $value;
 		}
@@ -104,7 +104,7 @@ 
 	 * @internal
 	 * @param int|bool $uid The user ID to use
 	 */
-	protected function init($uid = false) {
+	protected function init( $uid = false ) {
 		if ( $uid === false ) {
 			$uid = get_current_user_id();
 		}
@@ -137,7 +137,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	function get_meta_field($field_name) {
+	function get_meta_field( $field_name ) {
 		$value = null;
 		$value = apply_filters('timber_user_get_meta_field_pre', $value, $this->ID, $field_name, $this);
 		if ( $value === null ) {
@@ -158,7 +158,7 @@ 
 				$um = get_user_meta($this->ID);
 			}
 			$custom = array();
-			foreach ($um as $key => $value) {
+			foreach ( $um as $key => $value ) {
 				if ( is_array($value) && count($value) == 1 ) {
 					$value = $value[0];
 				}
@@ -193,7 +193,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	function meta($field_name) {
+	function meta( $field_name ) {
 		return $this->get_meta_field($field_name);
 	}
 

lib/cache/WPObjectCacheAdapter.php

Indentation +15 added lines, -15 removed lines

@@ -5,24 +5,24 @@
 
 class WPObjectCacheAdapter implements CacheProviderInterface {
 
-	private $cache_group;
+    private $cache_group;
 
-	/**
-	 * @var TimberLoader
-	 */
-	private $timberloader;
+    /**
+     * @var TimberLoader
+     */
+    private $timberloader;
 
-	public function __construct(TimberLoader $timberloader, $cache_group = 'timber') {
-		$this->cache_group = $cache_group;
-		$this->timberloader = $timberloader;
-	}
+    public function __construct(TimberLoader $timberloader, $cache_group = 'timber') {
+        $this->cache_group = $cache_group;
+        $this->timberloader = $timberloader;
+    }
 
-	public function fetch($key) {
-		return $this->timberloader->get_cache($key, $this->cache_group, TimberLoader::CACHE_USE_DEFAULT);
-	}
+    public function fetch($key) {
+        return $this->timberloader->get_cache($key, $this->cache_group, TimberLoader::CACHE_USE_DEFAULT);
+    }
 
-	public function save($key, $value, $expire = 0) {
-		return $this->timberloader->set_cache($key, $value, $this->cache_group, $expire, TimberLoader::CACHE_USE_DEFAULT);
-	}
+    public function save($key, $value, $expire = 0) {
+        return $this->timberloader->set_cache($key, $value, $this->cache_group, $expire, TimberLoader::CACHE_USE_DEFAULT);
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -12,16 +12,16 @@
 	 */
 	private $timberloader;
 
-	public function __construct(TimberLoader $timberloader, $cache_group = 'timber') {
+	public function __construct( TimberLoader $timberloader, $cache_group = 'timber' ) {
 		$this->cache_group = $cache_group;
 		$this->timberloader = $timberloader;
 	}
 
-	public function fetch($key) {
+	public function fetch( $key ) {
 		return $this->timberloader->get_cache($key, $this->cache_group, TimberLoader::CACHE_USE_DEFAULT);
 	}
 
-	public function save($key, $value, $expire = 0) {
+	public function save( $key, $value, $expire = 0 ) {
 		return $this->timberloader->set_cache($key, $value, $this->cache_group, $expire, TimberLoader::CACHE_USE_DEFAULT);
 	}
 

lib/cache/TimberKeyGeneratorInterface.php

Indentation +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
 
 interface TimberKeyGeneratorInterface {
 
-	public function _get_cache_key();
+    public function _get_cache_key();
 
 }

lib/cache/KeyGenerator.php

Indentation +20 added lines, -20 removed lines

@@ -6,25 +6,25 @@
 
 class KeyGenerator implements KeyGeneratorInterface {
 
-	/**
-	 * @param mixed $value
-	 * @return string
-	 */
-	public function generateKey($value) {
-		if (is_a($value, 'TimberKeyGeneratorInterface')) {
-			return $value->_get_cache_key();
-		}
-
-		if (is_array($value) && isset($value['_cache_key'])) {
-			return $value['_cache_key'];
-		}
-
-		$key = md5(json_encode($value));
-		if (is_object($value)) {
-			$key = get_class($value) . '|' . $key;
-		}
-
-		return $key;
-	}
+    /**
+     * @param mixed $value
+     * @return string
+     */
+    public function generateKey($value) {
+        if (is_a($value, 'TimberKeyGeneratorInterface')) {
+            return $value->_get_cache_key();
+        }
+
+        if (is_array($value) && isset($value['_cache_key'])) {
+            return $value['_cache_key'];
+        }
+
+        $key = md5(json_encode($value));
+        if (is_object($value)) {
+            $key = get_class($value) . '|' . $key;
+        }
+
+        return $key;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -10,17 +10,17 @@
 	 * @param mixed $value
 	 * @return string
 	 */
-	public function generateKey($value) {
-		if (is_a($value, 'TimberKeyGeneratorInterface')) {
+	public function generateKey( $value ) {
+		if ( is_a($value, 'TimberKeyGeneratorInterface') ) {
 			return $value->_get_cache_key();
 		}
 
-		if (is_array($value) && isset($value['_cache_key'])) {
+		if ( is_array($value) && isset($value['_cache_key']) ) {
 			return $value['_cache_key'];
 		}
 
 		$key = md5(json_encode($value));
-		if (is_object($value)) {
+		if ( is_object($value) ) {
 			$key = get_class($value) . '|' . $key;
 		}
 

lib/timber-theme.php

Indentation +91 added lines, -91 removed lines

@@ -19,107 +19,107 @@
  */
 class TimberTheme extends TimberCore {
 
-	/**
-	 * @api
-	 * @var string the human-friendly name of the theme (ex: `My Timber Starter Theme`)
-	 */
-	public $name;
+    /**
+     * @api
+     * @var string the human-friendly name of the theme (ex: `My Timber Starter Theme`)
+     */
+    public $name;
 
-	/**
-	 * @api
-	 * @var TimberTheme|bool the TimberTheme object for the parent theme (if it exists), false otherwise
-	 */
-	public $parent = false;
+    /**
+     * @api
+     * @var TimberTheme|bool the TimberTheme object for the parent theme (if it exists), false otherwise
+     */
+    public $parent = false;
 
-	/**
-	 * @api
-	 * @var string the slug of the parent theme (ex: `_s`)
-	 */
-	public $parent_slug;
+    /**
+     * @api
+     * @var string the slug of the parent theme (ex: `_s`)
+     */
+    public $parent_slug;
 
-	/**
-	 * @api
-	 * @var string the slug of the theme (ex: `my-super-theme`)
-	 */
-	public $slug;
-	public $uri;
+    /**
+     * @api
+     * @var string the slug of the theme (ex: `my-super-theme`)
+     */
+    public $slug;
+    public $uri;
 
-	/**
-	 * Constructs a new TimberTheme object. NOTE the TimberTheme object of the current theme comes in the default `Timber::get_context()` call. You can access this in your twig template via `{{site.theme}}.
-	 * @param string $slug
-	 * @example
-	 * ```php
-	 * <?php
-	 *     $theme = new TimberTheme("my-theme");
-	 *     $context['theme_stuff'] = $theme;
-	 *     Timber::render('single.')
-	 * ?>
-	 * ```
-	 * ```twig
-	 * We are currently using the {{ theme_stuff.name }} theme.
-	 * ```
-	 * ```html
-	 * We are currently using the My Theme theme.
-	 * ```
-	 */
-	function __construct($slug = null) {
-		$this->init($slug);
-	}
+    /**
+     * Constructs a new TimberTheme object. NOTE the TimberTheme object of the current theme comes in the default `Timber::get_context()` call. You can access this in your twig template via `{{site.theme}}.
+     * @param string $slug
+     * @example
+     * ```php
+     * <?php
+     *     $theme = new TimberTheme("my-theme");
+     *     $context['theme_stuff'] = $theme;
+     *     Timber::render('single.')
+     * ?>
+     * ```
+     * ```twig
+     * We are currently using the {{ theme_stuff.name }} theme.
+     * ```
+     * ```html
+     * We are currently using the My Theme theme.
+     * ```
+     */
+    function __construct($slug = null) {
+        $this->init($slug);
+    }
 
-	/**
-	 * @internal
-	 * @param string $slug
-	 */
-	protected function init($slug = null) {
-		$data = wp_get_theme($slug);
-		$this->name = $data->get('Name');
-		$ss = $data->get_stylesheet();
-		$this->slug = $ss;
+    /**
+     * @internal
+     * @param string $slug
+     */
+    protected function init($slug = null) {
+        $data = wp_get_theme($slug);
+        $this->name = $data->get('Name');
+        $ss = $data->get_stylesheet();
+        $this->slug = $ss;
 
-		if ( ! function_exists( 'get_home_path' ) ) {
-			require_once(ABSPATH . 'wp-admin/includes/file.php');
-		}
+        if ( ! function_exists( 'get_home_path' ) ) {
+            require_once(ABSPATH . 'wp-admin/includes/file.php');
+        }
 
-		$this->uri = get_stylesheet_directory_uri();
-		$this->parent_slug = $data->get('Template');
-		if ( !$this->parent_slug ) {
-			$this->uri = get_template_directory_uri();
-		}
-		if ( $this->parent_slug && $this->parent_slug != $this->slug ) {
-			$this->parent = new TimberTheme($this->parent_slug);
-		}
-	}
+        $this->uri = get_stylesheet_directory_uri();
+        $this->parent_slug = $data->get('Template');
+        if ( !$this->parent_slug ) {
+            $this->uri = get_template_directory_uri();
+        }
+        if ( $this->parent_slug && $this->parent_slug != $this->slug ) {
+            $this->parent = new TimberTheme($this->parent_slug);
+        }
+    }
 
-	/**
-	 * @api
-	 * @return string the absolute path to the theme (ex: `http://example.org/wp-content/themes/my-timber-theme`)
-	 */
-	public function link() {
-		return $this->uri;
-	}
+    /**
+     * @api
+     * @return string the absolute path to the theme (ex: `http://example.org/wp-content/themes/my-timber-theme`)
+     */
+    public function link() {
+        return $this->uri;
+    }
 
-	/**
-	 * @api
-	 * @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() );
-	}
+    /**
+     * @api
+     * @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() );
+    }
 
-	/**
-	 * @param string $name
-	 * @param bool $default
-	 * @return string
-	 */
-	public function theme_mod($name, $default = false) {
-		return get_theme_mod($name, $default);
-	}
+    /**
+     * @param string $name
+     * @param bool $default
+     * @return string
+     */
+    public function theme_mod($name, $default = false) {
+        return get_theme_mod($name, $default);
+    }
 
-	/**
-	 * @return array
-	 */
-	public function theme_mods() {
-		return get_theme_mods();
-	}
+    /**
+     * @return array
+     */
+    public function theme_mods() {
+        return get_theme_mods();
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
 	 * We are currently using the My Theme theme.
 	 * ```
 	 */
-	function __construct($slug = null) {
+	function __construct( $slug = null ) {
 		$this->init($slug);
 	}
 
@@ -70,13 +70,13 @@ 
 	 * @internal
 	 * @param string $slug
 	 */
-	protected function init($slug = null) {
+	protected function init( $slug = null ) {
 		$data = wp_get_theme($slug);
 		$this->name = $data->get('Name');
 		$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());
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @param bool $default
 	 * @return string
 	 */
-	public function theme_mod($name, $default = false) {
+	public function theme_mod( $name, $default = false ) {
 		return get_theme_mod($name, $default);
 	}