jarednova / timber

lib/image/timber-image-operation-resize.php

Doc Comments +4 added lines, -1 removed lines

@@ -75,6 +75,9 @@ 
 		return $image->writeImages($save_filename, true);
 	}
 
+	/**
+	 * @param string $load_filename
+	 */
 	protected function get_target_sizes( $load_filename ) {
 		$image = wp_get_image_editor( $load_filename );
 		$w = $this->w;
@@ -142,7 +145,7 @@ 
 	 *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
 	 * @param  string $save_filename filepath (not URL) where result file should be saved
 	 *                               (ex: /src/var/www/wp-content/uploads/my-pic-300x200-c-default.jpg)
-	 * @return bool                  true if everything went fine, false otherwise
+	 * @return boolean|null                  true if everything went fine, false otherwise
 	 */
 	public function run($load_filename, $save_filename) {
 		//should be resized by gif resizer

lib/timber-comment.php

Spacing +30 added lines, -30 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	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';
@@ -114,21 +114,21 @@ 
 	 * @return bool|mixed|string
 	 */
 	public function avatar($size = 92, $default = '') {
-		if (!get_option('show_avatars')) {
+		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;
@@ -179,9 +179,9 @@ 
 	 * ```
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	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);
 	}
 
@@ -204,9 +204,9 @@ 
 	 * ```
 	 * @return string
 	 */
-	public function time( $time_format = '' ) {
+	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);
 	}
 
@@ -232,14 +232,14 @@ 
 	 * @return mixed
 	 */
 	protected function get_meta_fields($comment_id = null) {
-		if ($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) {
+			if ( is_array($cm) && count($cm) == 1 ) {
 				$cm = $cm[0];
 			}
 		}
@@ -254,7 +254,7 @@ 
 	 */
 	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);
@@ -267,9 +267,9 @@ 
 	 * @api
 	 * @return string
 	 */
-	public function reply_link( $reply_text = 'Reply' ) {
+	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;
@@ -311,10 +311,10 @@ 
 	 * @return string
 	 */
 	protected function avatar_host($email_hash) {
-		if (is_ssl()) {
+		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';
@@ -333,28 +333,28 @@ 
 	 * @return string
 	 */
 	protected function avatar_default($default, $email, $size, $host) {
-		if (substr($default, 0, 1) == '/') {
+		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;
@@ -371,7 +371,7 @@ 
 	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-image.php

Spacing +17 added lines, -17 removed lines

@@ -141,27 +141,27 @@ 
 	 * @internal
 	 * @param  int $iid the id number of the image in the WP database
 	 */
-	protected function get_image_info( $iid ) {
+	protected function get_image_info($iid) {
 		$image_info = $iid;
-		if (is_numeric($iid)) {
+		if ( is_numeric($iid) ) {
 			$image_info = wp_get_attachment_metadata($iid);
-			if (!is_array($image_info)) {
+			if ( !is_array($image_info) ) {
 				$image_info = array();
 			}
 			$image_custom = get_post_custom($iid);
 			$basic = get_post($iid);
-			if ($basic) {
-				if (isset($basic->post_excerpt)) {
+			if ( $basic ) {
+				if ( isset($basic->post_excerpt) ) {
 					$this->caption = $basic->post_excerpt;
 				}
 				$image_custom = array_merge($image_custom, get_object_vars($basic));
 			}
 			return array_merge($image_info, $image_custom);
 		}
-		if (is_array($image_info) && isset($image_info['image'])) {
+		if ( is_array($image_info) && isset($image_info['image']) ) {
 			return $image_info['image'];
 		}
-		if (is_object($image_info)) {
+		if ( is_object($image_info) ) {
 		   return get_object_vars($image_info);
 		}
 		return $iid;
@@ -193,9 +193,9 @@ 
 	 * @internal
 	 * @param int $iid
 	 */
-	function init( $iid = false ) {
-		if ( !is_numeric( $iid ) && is_string( $iid ) ) {
-			if (strstr($iid, '://')) {
+	function init($iid = false) {
+		if ( !is_numeric($iid) && is_string($iid) ) {
+			if ( strstr($iid, '://') ) {
 				$this->init_with_url($iid);
 				return;
 			}
@@ -244,9 +244,9 @@ 
 	 * @internal
 	 * @param string $relative_path
 	 */
-	protected function init_with_relative_path( $relative_path ) {
-		$this->abs_url = home_url( $relative_path );
-		$file_path = TimberURLHelper::get_full_path( $relative_path );
+	protected function init_with_relative_path($relative_path) {
+		$this->abs_url = home_url($relative_path);
+		$file_path = TimberURLHelper::get_full_path($relative_path);
 		$this->file_loc = $file_path;
 		$this->file = $file_path;
 	}
@@ -255,8 +255,8 @@ 
 	 * @internal
 	 * @param string $file_path
 	 */
-	protected function init_with_file_path( $file_path ) {
-		$url = TimberURLHelper::file_system_to_url( $file_path );
+	protected function init_with_file_path($file_path) {
+		$url = TimberURLHelper::file_system_to_url($file_path);
 		$this->abs_url = $url;
 		$this->file_loc = $file_path;
 		$this->file = $file_path;
@@ -455,8 +455,8 @@ 
 	 * @param string $size
 	 * @return bool|string
 	 */
-	function get_src( $size = '' ) {
-		return $this->src( $size );
+	function get_src($size = '') {
+		return $this->src($size);
 	}
 
 	/**

lib/timber-post.php

Spacing +57 added lines, -57 removed lines

@@ -168,7 +168,7 @@ 
 	 * @param mixed $pid
 	 */
 	public function __construct($pid = null) {
-		$pid = $this->determine_id( $pid );
+		$pid = $this->determine_id($pid);
 		$this->init($pid);
 	}
 
@@ -260,7 +260,7 @@ 
 	 * @param string $field
 	 * @param mixed $value
 	 */
-	public function update( $field, $value ) {
+	public function update($field, $value) {
 		if ( isset($this->ID) ) {
 			update_post_meta($this->ID, $field, $value);
 			$this->$field = $value;
@@ -275,7 +275,7 @@ 
 	 * @param mixed $pid
 	 * @return WP_Post on success
 	 */
-	protected function prepare_post_info( $pid = 0 ) {
+	protected function prepare_post_info($pid = 0) {
 		if ( is_string($pid) || is_numeric($pid) || (is_object($pid) && !isset($pid->post_title)) || $pid === 0 ) {
 			$pid = self::check_post_id($pid);
 			$post = get_post($pid);
@@ -294,7 +294,7 @@ 
 	 * @internal
 	 * @return integer ID number of a post
 	 */
-	protected function check_post_id( $pid ) {
+	protected function check_post_id($pid) {
 		if ( is_numeric($pid) && $pid === 0 ) {
 			$pid = get_the_ID();
 			return $pid;
@@ -320,7 +320,7 @@ 
 		global $wpdb;
 		$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $post_name);
 		$result = $wpdb->get_row($query);
-		if (!$result) {
+		if ( !$result ) {
 			return null;
 		}
 		return $result->ID;
@@ -359,7 +359,7 @@ 
 				$text = TimberHelper::trim_words($text, $len, false);
 				$trimmed = true;
 			}
-			$text = do_shortcode( $text );
+			$text = do_shortcode($text);
 		}
 		if ( !strlen($text) ) {
 			$text = TimberHelper::trim_words($this->get_content(), $len, false);
@@ -388,11 +388,11 @@ 
 			}
 			$read_more_class = apply_filters('timber/post/get_preview/read_more_class', "read-more");
 			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore_matches[1]) . '</a>';
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore_matches[1]) . '</a>';
 			} elseif ( $readmore ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore) . '</a>';
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore) . '</a>';
 			}
-			if ( !$strip && $last_p_tag && ( strpos($text, '<p>') || strpos($text, '<p ') ) ) {
+			if ( !$strip && $last_p_tag && (strpos($text, '<p>') || strpos($text, '<p ')) ) {
 				$text .= '</p>';
 			}
 		}
@@ -404,7 +404,7 @@ 
 	 * @internal
 	 * @param bool|int $pid a post ID number
 	 */
-	function import_custom( $pid = false ) {
+	function import_custom($pid = false) {
 		if ( !$pid ) {
 			$pid = $this->ID;
 		}
@@ -419,13 +419,13 @@ 
 	 * @param int $pid
 	 * @return array
 	 */
-	protected function get_post_custom( $pid ) {
+	protected function get_post_custom($pid) {
 		apply_filters('timber_post_get_meta_pre', array(), $pid, $this);
 		$customs = get_post_custom($pid);
 		if ( !is_array($customs) || empty($customs) ) {
 			return array();
 		}
-		foreach ( $customs as $key => $value ) {
+		foreach ($customs as $key => $value) {
 			if ( is_array($value) && count($value) == 1 && isset($value[0]) ) {
 				$value = $value[0];
 			}
@@ -479,7 +479,7 @@ 
 	 * @param bool $taxonomy
 	 * @return TimberPost|boolean
 	 */
-	function get_next( $taxonomy = false ) {
+	function get_next($taxonomy = false) {
 		if ( !isset($this->_next) || !isset($this->_next[$taxonomy]) ) {
 			global $post;
 			$this->_next = array();
@@ -510,7 +510,7 @@ 
 		$post = $this;
 		$ret = array();
 		if ( $multipage ) {
-			for ( $i = 1; $i <= $numpages; $i++ ) {
+			for ($i = 1; $i <= $numpages; $i++) {
 				$link = self::get_wp_link_page($i);
 				$data = array('name' => $i, 'title' => $i, 'text' => $i, 'link' => $link);
 				if ( $i == $page ) {
@@ -562,7 +562,7 @@ 
 	 * @param bool $taxonomy
 	 * @return TimberPost|boolean
 	 */
-	function get_prev( $taxonomy = false ) {
+	function get_prev($taxonomy = false) {
 		if ( isset($this->_prev) && isset($this->_prev[$taxonomy]) ) {
 			return $this->_prev[$taxonomy];
 		}
@@ -629,7 +629,7 @@ 
 		$post->slug = $post->post_name;
 		$customs = $this->get_post_custom($post->ID);
 		$post->custom = $customs;
-		$post = (object) array_merge((array)$customs, (array)$post);
+		$post = (object) array_merge((array) $customs, (array) $post);
 		return $post;
 	}
 
@@ -640,7 +640,7 @@ 
 	 * @param string $use
 	 * @return string
 	 */
-	function get_display_date( $use = 'post_date' ) {
+	function get_display_date($use = 'post_date') {
 		return date(get_option('date_format'), strtotime($this->$use));
 	}
 
@@ -650,9 +650,9 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	function get_date( $date_format = '' ) {
+	function get_date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->post_date);
+		$the_date = (string) mysql2date($df, $this->post_date);
 		return apply_filters('get_the_date', $the_date, $df);
 	}
 
@@ -661,7 +661,7 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	function get_modified_date( $date_format = '' ) {
+	function get_modified_date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
 		$the_time = $this->get_modified_time($df);
 		return apply_filters('get_the_modified_date', $the_time, $date_format);
@@ -672,7 +672,7 @@ 
 	 * @param  string $time_format
 	 * @return string
 	 */
-	function get_modified_time( $time_format = '' ) {
+	function get_modified_time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
 		$the_time = get_post_modified_time($tf, false, $this->ID, true);
 		return apply_filters('get_the_modified_time', $the_time, $time_format);
@@ -685,7 +685,7 @@ 
 	 * @param bool|string 	$childPostClass
 	 * @return array
 	 */
-	function get_children( $post_type = 'any', $childPostClass = false ) {
+	function get_children($post_type = 'any', $childPostClass = false) {
 		if ( $childPostClass === false ) {
 			$childPostClass = $this->PostClass;
 		}
@@ -693,7 +693,7 @@ 
 			$post_type = $this->post_type;
 		}
 		$children = get_children('post_parent=' . $this->ID . '&post_type=' . $post_type . '&numberposts=-1&orderby=menu_order title&order=ASC');
-		foreach ( $children as &$child ) {
+		foreach ($children as &$child) {
 			$child = new $childPostClass($child->ID);
 		}
 		$children = array_values($children);
@@ -729,20 +729,20 @@ 
 		}
 
 		if ( $user_ID ) {
-			$args['include_unapproved'] = array( $user_ID );
-		} elseif ( ! empty( $comment_author_email ) ) {
-			$args['include_unapproved'] = array( $comment_author_email );
+			$args['include_unapproved'] = array($user_ID);
+		} elseif ( !empty($comment_author_email) ) {
+			$args['include_unapproved'] = array($comment_author_email);
 		}
 
 		$comments = get_comments($args);
 		$timber_comments = array();
 
 		if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
-			set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+			set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 			$overridden_cpage = true;
 		}
 
-		foreach($comments as $key => &$comment) {
+		foreach ($comments as $key => &$comment) {
 			$timber_comment = new $CommentClass($comment);
 			$timber_comment->reply_link = $this->TimberComment_reply_link($comment->comment_ID, $this->ID);
 			$timber_comments[$timber_comment->id] = $timber_comment;
@@ -750,22 +750,22 @@ 
 
 		// Build a flattened (depth=1) comment tree
 		$comments_tree = array();
-		foreach( $timber_comments as $key => $comment ) {
-			if ( ! $comment->is_child() ) {
+		foreach ($timber_comments as $key => $comment) {
+			if ( !$comment->is_child() ) {
 				continue;
 			}
 
 			$tree_element = $comment;
 			do {
 				$tree_element = $timber_comments[$tree_element->comment_parent];
-			} while( $tree_element->is_child() );
+			} while ($tree_element->is_child());
 
 			$comments_tree[$tree_element->id][] = $comment->id;
 		}
 
 		// Add child comments to the relative "super parents"
-		foreach($comments_tree as $comment_parent => $comment_children) {
-			foreach($comment_children as $comment_child) {
+		foreach ($comments_tree as $comment_parent => $comment_children) {
+			foreach ($comment_children as $comment_child) {
 				$timber_comments[$comment_parent]->children[] = $timber_comments[$comment_child];
 				unset($timber_comments[$comment_child]);
 			}
@@ -805,7 +805,7 @@ 
 	 * @param string $TermClass
 	 * @return array
 	 */
-	function get_terms( $tax = '', $merge = true, $TermClass = '' ) {
+	function get_terms($tax = '', $merge = true, $TermClass = '') {
 
 		$TermClass = $TermClass ?: $this->TermClass;
 
@@ -816,7 +816,7 @@ 
 			$taxonomies = $tax;
 		}
 		if ( is_string($tax) ) {
-			if ( in_array($tax, array('all','any','')) ) {
+			if ( in_array($tax, array('all', 'any', '')) ) {
 				$taxonomies = get_object_taxonomies($this->post_type);
 			} else {
 				$taxonomies = array($tax);
@@ -825,8 +825,8 @@ 
 
 		$term_class_objects = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( in_array($taxonomy, array('tag','tags')) ) {
+		foreach ($taxonomies as $taxonomy) {
+			if ( in_array($taxonomy, array('tag', 'tags')) ) {
 				$taxonomy = 'post_tag';
 			}
 			if ( $taxonomy == 'categories' ) {
@@ -863,11 +863,11 @@ 
 	 * @param string $taxonomy
 	 * @return bool
 	 */
-	function has_term( $term_name_or_id, $taxonomy = 'all' ) {
+	function has_term($term_name_or_id, $taxonomy = 'all') {
 		if ( $taxonomy == 'all' || $taxonomy == 'any' ) {
 			$taxes = get_object_taxonomies($this->post_type, 'names');
 			$ret = false;
-			foreach ( $taxes as $tax ) {
+			foreach ($taxes as $tax) {
 				if ( has_term($term_name_or_id, $tax, $this->ID) ) {
 					$ret = true;
 					break;
@@ -882,7 +882,7 @@ 
 	 * @param string $field
 	 * @return TimberImage
 	 */
-	function get_image( $field ) {
+	function get_image($field) {
 		return new $this->ImageClass($this->$field);
 	}
 
@@ -932,7 +932,7 @@ 
 	 * @param int $page
 	 * @return string
 	 */
-	function get_content( $len = 0, $page = 0 ) {
+	function get_content($len = 0, $page = 0) {
 		if ( $len == 0 && $page == 0 && $this->_content ) {
 			return $this->_content;
 		}
@@ -989,7 +989,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function get_field( $field_name ) {
+	public function get_field($field_name) {
 		$value = apply_filters('timber_post_get_meta_field_pre', null, $this->ID, $field_name, $this);
 		if ( $value === null ) {
 			$value = get_post_meta($this->ID, $field_name);
@@ -1007,7 +1007,7 @@ 
 	/**
 	 * @param string $field_name
 	 */
-	function import_field( $field_name ) {
+	function import_field($field_name) {
 		$this->$field_name = $this->get_field($field_name);
 	}
 
@@ -1038,7 +1038,7 @@ 
 	 * ```
 	 * @return string a space-seperated list of classes
 	 */
-	public function post_class( $class='' ) {
+	public function post_class($class = '') {
 		global $post;
 		$old_global_post = $post;
 		$post = $this;
@@ -1146,8 +1146,8 @@ 
 	 * @param string|bool $childPostClass _optional_ a custom post class (ex: 'MyTimberPost') to return the objects as. By default (false) it will use TimberPost::$post_class value.
 	 * @return array
 	 */
-	public function children( $post_type = 'any', $childPostClass = false ) {
-		return $this->get_children( $post_type, $childPostClass );
+	public function children($post_type = 'any', $childPostClass = false) {
+		return $this->get_children($post_type, $childPostClass);
 	}
 
 	/**
@@ -1171,7 +1171,7 @@ 
 	 * ```
 	 * @return bool|array
 	 */
-	public function comments( $count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment' ) {
+	public function comments($count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment') {
 		return $this->get_comments($count, $order, $type, $status, $CommentClass);
 	}
 
@@ -1188,7 +1188,7 @@ 
 	 * @param int $page
 	 * @return string
 	 */
-	public function content( $page = 0 ) {
+	public function content($page = 0) {
 		return $this->get_content(0, $page);
 	}
 
@@ -1217,7 +1217,7 @@ 
 	 * @param string $date_format
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	public function date($date_format = '') {
 		return $this->get_date($date_format);
 	}
 
@@ -1239,9 +1239,9 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function time( $time_format = '' ) {
+	public function time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
-	 	$the_time = (string)mysql2date($tf, $this->post_date);
+	 	$the_time = (string) mysql2date($tf, $this->post_date);
 	 	return apply_filters('get_the_time', $the_time, $tf);
 	}
 
@@ -1277,7 +1277,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function meta( $field_name = null ) {
+	public function meta($field_name = null) {
 		if ( $field_name === null ) {
 			//on the off-chance the field is actually named meta
 			$field_name = 'meta';
@@ -1296,7 +1296,7 @@ 
 	 * @param string $date_format
 	 * @return string
 	 */
-	public function modified_date( $date_format = '' ) {
+	public function modified_date($date_format = '') {
 		return $this->get_modified_date($date_format);
 	}
 
@@ -1304,7 +1304,7 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function modified_time( $time_format = '' ) {
+	public function modified_time($time_format = '') {
 		return $this->get_modified_time($time_format);
 	}
 
@@ -1313,7 +1313,7 @@ 
 	 * @param bool $in_same_cat
 	 * @return mixed
 	 */
-	public function next( $in_same_cat = false ) {
+	public function next($in_same_cat = false) {
 		return $this->get_next($in_same_cat);
 	}
 
@@ -1371,7 +1371,7 @@ 
 	 * @param bool $in_same_cat
 	 * @return mixed
 	 */
-	public function prev( $in_same_cat = false ) {
+	public function prev($in_same_cat = false) {
 		return $this->get_prev($in_same_cat);
 	}
 
@@ -1383,7 +1383,7 @@ 
 	 * @param bool $merge Should the resulting array be one big one (true)? Or should it be an array of sub-arrays for each taxonomy (false)?
 	 * @return array
 	 */
-	public function terms( $tax = '', $merge = true ) {
+	public function terms($tax = '', $merge = true) {
 		return $this->get_terms($tax, $merge);
 	}
 

lib/image/timber-image-operation-tojpg.php

Spacing +11 added lines, -11 removed lines

@@ -36,14 +36,14 @@ 
 	 * @return bool                  true if everything went fine, false otherwise
 	 */
 	function run($load_filename, $save_filename) {
-		$input = self::image_create( $load_filename );
-		list( $width, $height ) = getimagesize( $load_filename );
-		$output = imagecreatetruecolor( $width, $height );
-		$c = self::hexrgb( $this->color );
-		$color = imagecolorallocate( $output, $c['red'], $c['green'], $c['blue'] );
-		imagefilledrectangle( $output, 0, 0, $width, $height, $color );
-		imagecopy( $output, $input, 0, 0, 0, 0, $width, $height );
-		imagejpeg( $output, $save_filename );
+		$input = self::image_create($load_filename);
+		list($width, $height) = getimagesize($load_filename);
+		$output = imagecreatetruecolor($width, $height);
+		$c = self::hexrgb($this->color);
+		$color = imagecolorallocate($output, $c['red'], $c['green'], $c['blue']);
+		imagefilledrectangle($output, 0, 0, $width, $height, $color);
+		imagecopy($output, $input, 0, 0, 0, 0, $width, $height);
+		imagejpeg($output, $save_filename);
 		return true;
 	}
 
@@ -52,10 +52,10 @@ 
 	 * @return resource an image identifier representing the image obtained from the given filename
 	 *                  will return the same data type regardless of whether the source is gif or png
 	 */
-	function image_create( $filename, $ext = 'auto' ) {
+	function image_create($filename, $ext = 'auto') {
 		if ( $ext == 'auto' ) {
 			$ext = wp_check_filetype($filename);
-			if (isset($ext['ext'])) {
+			if ( isset($ext['ext']) ) {
 				$ext = $ext['ext'];
 			}
 		}
@@ -69,6 +69,6 @@ 
 		if ( $ext == 'jpg' || $ext == 'jpeg' ) {
 			return imagecreatefromjpeg($filename);
 		}
-		throw new InvalidArgumentException( 'image_create only accepts PNG, GIF and JPGs. File extension was: '.$ext );
+		throw new InvalidArgumentException('image_create only accepts PNG, GIF and JPGs. File extension was: ' . $ext);
 	}
 }