jarednova / timber

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

Spacing +11 added lines, -11 removed lines

@@ -44,30 +44,30 @@
      *                               (ex: /src/var/www/wp-content/uploads/my-pic@2x.jpg)
      * @return bool                  true if everything went fine, false otherwise
      */
-    function run($load_filename, $save_filename){
-        $image = wp_get_image_editor( $load_filename );
-        if ( !is_wp_error( $image ) ) {
+    function run($load_filename, $save_filename) {
+        $image = wp_get_image_editor($load_filename);
+        if ( !is_wp_error($image) ) {
             $current_size = $image->get_size();
             $src_w = $current_size['width'];
             $src_h = $current_size['height'];
             // Get ratios
             $w = $src_w * $this->factor;
             $h = $src_h * $this->factor;
-            $image->crop( 0, 0, $src_w, $src_h, $w, $h );
-            $result = $image->save( $save_filename );
-            if ( is_wp_error( $result ) ) {
+            $image->crop(0, 0, $src_w, $src_h, $w, $h);
+            $result = $image->save($save_filename);
+            if ( is_wp_error($result) ) {
             	// @codeCoverageIgnoreStart
-				TimberHelper::error_log( 'Error resizing image' );
-				TimberHelper::error_log( $result );
+				TimberHelper::error_log('Error resizing image');
+				TimberHelper::error_log($result);
 				return false;
 				// @codeCoverageIgnoreEnd
             } else {
                 return true;
             }
-        } else if ( isset( $image->error_data['error_loading_image'] ) ) {
-            TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
+        } else if ( isset($image->error_data['error_loading_image']) ) {
+            TimberHelper::error_log('Error loading ' . $image->error_data['error_loading_image']);
         } else {
-            TimberHelper::error_log( $image );
+            TimberHelper::error_log($image);
         }
         return false;
     }

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

lib/timber-archives.php

Spacing +25 added lines, -25 removed lines

@@ -54,7 +54,7 @@ 
 	 * }
 	 * @param string $base any additional paths that need to be prepended to the URLs that are generated, for example: "tags"
 	 */
-	function __construct( $args = null, $base = '' ) {
+	function __construct($args = null, $base = '') {
 		$this->init($args, $base);
 	}
 
@@ -63,7 +63,7 @@ 
 	 * @param array|string $args
 	 * @param string $base
 	 */
-	function init( $args = null, $base = '' ) {
+	function init($args = null, $base = '') {
 		$this->base = $base;
 		$this->items = $this->get_items($args);
 	}
@@ -74,7 +74,7 @@ 
 	 * @param string $text
 	 * @return mixed
 	 */
-	protected function get_archives_link( $url, $text ) {
+	protected function get_archives_link($url, $text) {
 		$ret = array();
 		$ret['text'] = $ret['title'] = $ret['name'] = wptexturize($text);
 		$ret['url'] = $ret['link'] = esc_url(TimberURLHelper::prepend_to_url($url, $this->base));
@@ -91,19 +91,19 @@ 
 	 * @param string $limit
 	 * @return array
 	 */
-	protected function get_items_yearly( $args, $last_changed, $join, $where, $order, $limit ) {
+	protected function get_items_yearly($args, $last_changed, $join, $where, $order, $limit) {
 		global $wpdb;
 		$output = array();
 		$query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM {$wpdb->posts} $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
 		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if (!$results = wp_cache_get($key, 'posts')) {
+		if ( !$results = wp_cache_get($key, 'posts') ) {
 			$results = $wpdb->get_results($query);
 			wp_cache_set($key, $results, 'posts');
 		}
-		if ($results) {
-			foreach ( (array)$results as $result ) {
-				$url = get_year_link( $result->year );
+		if ( $results ) {
+			foreach ((array) $results as $result) {
+				$url = get_year_link($result->year);
 				$text = sprintf('%d', $result->year);
 				$output[] = $this->get_archives_link($url, $text);
 			}
@@ -122,7 +122,7 @@ 
 	 * @param bool $nested
 	 * @return array
 	 */
-	protected function get_items_monthly( $args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true ) {
+	protected function get_items_monthly($args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true) {
 		global $wpdb, $wp_locale;
 		$output = array();
 		$defaults = array(
@@ -137,26 +137,26 @@ 
 			. "ORDER BY post_date $order $limit";
 		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if (!$results = wp_cache_get($key, 'posts')) {
+		if ( !$results = wp_cache_get($key, 'posts') ) {
 			$results = $wpdb->get_results($query);
 			wp_cache_set($key, $results, 'posts');
 		}
-		if ($results) {
-			foreach ((array)$results as $result) {
+		if ( $results ) {
+			foreach ((array) $results as $result) {
 				$url = get_month_link($result->year, $result->month);
-				if ($show_year && !$nested) {
+				if ( $show_year && !$nested ) {
 					$text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year);
 				} else {
 					$text = sprintf(__('%1$s'), $wp_locale->get_month($result->month));
 				}
-				if ($nested) {
+				if ( $nested ) {
 					$output[$result->year][] = $this->get_archives_link($url, $text);
 				} else {
 					$output[] = $this->get_archives_link($url, $text);
 				}
 			}
 		}
-		if ($nested) {
+		if ( $nested ) {
 			$out2 = array();
 			foreach ($output as $year => $months) {
 				$out2[] = array('name' => $year, 'children' => $months);
@@ -171,7 +171,7 @@ 
 	 * @param array|string $args
 	 * @return array|string
 	 */
-	function get_items( $args = null ) {
+	function get_items($args = null) {
 		global $wpdb;
 
 		$defaults = array(
@@ -220,7 +220,7 @@ 
 		$archive_week_start_date_format = 'Y/m/d';
 		$archive_week_end_date_format = 'Y/m/d';
 
-		if (!$archive_date_format_over_ride) {
+		if ( !$archive_date_format_over_ride ) {
 			$archive_day_date_format = get_option('date_format');
 			$archive_week_start_date_format = get_option('date_format');
 			$archive_week_end_date_format = get_option('date_format');
@@ -232,7 +232,7 @@ 
 
 		$output = array();
 		$last_changed = wp_cache_get('last_changed', 'posts');
-		if (!$last_changed) {
+		if ( !$last_changed ) {
 			$last_changed = microtime();
 			wp_cache_set('last_changed', $last_changed, 'posts');
 		}
@@ -246,14 +246,14 @@ 
 			$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
 			$key = md5($query);
 			$key = "wp_get_archives:$key:$last_changed";
-			if (!$results = wp_cache_get($key, 'posts')) {
+			if ( !$results = wp_cache_get($key, 'posts') ) {
 				$results = $wpdb->get_results($query);
 				$cache = array();
 				$cache[$key] = $results;
 				wp_cache_set($key, $results, 'posts');
 			}
 			if ( $results ) {
-				foreach ( (array)$results as $result ) {
+				foreach ((array) $results as $result) {
 					$url = get_day_link($result->year, $result->month, $result->dayofmonth);
 					$date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth);
 					$text = mysql2date($archive_day_date_format, $date);
@@ -266,13 +266,13 @@ 
 				. "count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
 			$key = md5($query);
 			$key = "wp_get_archives:$key:$last_changed";
-			if (!$results = wp_cache_get($key, 'posts')) {
+			if ( !$results = wp_cache_get($key, 'posts') ) {
 				$results = $wpdb->get_results($query);
 				wp_cache_set($key, $results, 'posts');
 			}
 			$arc_w_last = '';
 			if ( $results ) {
-				foreach ( (array)$results as $result ) {
+				foreach ((array) $results as $result) {
 					if ( $result->week != $arc_w_last ) {
 						$arc_year = $result->yr;
 						$arc_w_last = $result->week;
@@ -295,10 +295,10 @@ 
 				wp_cache_set($key, $results, 'posts');
 			}
 			if ( $results ) {
-				foreach ( (array)$results as $result ) {
-					if ($result->post_date != '0000-00-00 00:00:00') {
+				foreach ((array) $results as $result) {
+					if ( $result->post_date != '0000-00-00 00:00:00' ) {
 						$url = get_permalink($result);
-						if ($result->post_title) {
+						if ( $result->post_title ) {
 							/** This filter is documented in wp-includes/post-template.php */
 							$text = strip_tags(apply_filters('the_title', $result->post_title, $result->ID));
 						} else {

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

Spacing +19 added lines, -19 removed lines

@@ -30,7 +30,7 @@ 
 	 *                    (ex: my-awesome-pic-lbox-300x200-FF3366.jpg)
 	 */
 	public function filename($src_filename, $src_extension) {
-		$color = str_replace( '#', '', $this->color );
+		$color = str_replace('#', '', $this->color);
 		$newbase = $src_filename . '-lbox-' . $this->w . 'x' . $this->h . '-' . $color;
 		$new_name = $newbase . '.' . $src_extension;
 		return $new_name;
@@ -50,12 +50,12 @@ 
 		$w = $this->w;
 		$h = $this->h;
 
-		$bg = imagecreatetruecolor( $w, $h );
-		$c = self::hexrgb( $this->color );
-		$bgColor = imagecolorallocate( $bg, $c['red'], $c['green'], $c['blue'] );
-		imagefill( $bg, 0, 0, $bgColor );
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
+		$bg = imagecreatetruecolor($w, $h);
+		$c = self::hexrgb($this->color);
+		$bgColor = imagecolorallocate($bg, $c['red'], $c['green'], $c['blue']);
+		imagefill($bg, 0, 0, $bgColor);
+		$image = wp_get_image_editor($load_filename);
+		if ( !is_wp_error($image) ) {
 			$current_size = $image->get_size();
 			$quality = $image->get_quality();
 			$ow = $current_size['width'];
@@ -69,38 +69,38 @@ 
 				$y = 0;
 				$x = $w / 2 - $owt / 2;
 				$oht = $h;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
+				$image->crop(0, 0, $ow, $oh, $owt, $oht);
 			} else {
 				$w_scale = $w / $ow;
 				$oht = $oh * $w_scale;
 				$x = 0;
 				$y = $h / 2 - $oht / 2;
 				$owt = $w;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
+				$image->crop(0, 0, $ow, $oh, $owt, $oht);
 			}
-			$result = $image->save( $save_filename );
+			$result = $image->save($save_filename);
 			$func = 'imagecreatefromjpeg';
 			$save_func = 'imagejpeg';
-			$ext = pathinfo( $save_filename, PATHINFO_EXTENSION );
+			$ext = pathinfo($save_filename, PATHINFO_EXTENSION);
 			if ( $ext == 'gif' ) {
 				$func = 'imagecreatefromgif';
 				$save_func = 'imagegif';
 			} else if ( $ext == 'png' ) {
 				$func = 'imagecreatefrompng';
 				$save_func = 'imagepng';
-				if ($quality > 9) {
-					$quality = $quality/10;
+				if ( $quality > 9 ) {
+					$quality = $quality / 10;
 					$quality = round(10 - $quality);
 				}
 			}
-			$image = $func( $save_filename );
-			imagecopy( $bg, $image, $x, $y, 0, 0, $owt, $oht );
-			if ($save_func === 'imagegif') {
-				return $save_func( $bg, $save_filename );
+			$image = $func($save_filename);
+			imagecopy($bg, $image, $x, $y, 0, 0, $owt, $oht);
+			if ( $save_func === 'imagegif' ) {
+				return $save_func($bg, $save_filename);
 			}
-			return $save_func( $bg, $save_filename, $quality );
+			return $save_func($bg, $save_filename, $quality);
 		} else {
-			TimberHelper::error_log( $image );
+			TimberHelper::error_log($image);
 		}
 		return false;
 	}

timber.php

Spacing +5 added lines, -5 removed lines

@@ -14,11 +14,11 @@
 // we look for Composer files first in the plugins dir.
 // then in the wp-content dir (site install).
 // and finally in the current themes directories.
-if (   file_exists( $composer_autoload = __DIR__ . '/vendor/autoload.php' ) /* check in self */
-    || file_exists( $composer_autoload = WP_CONTENT_DIR.'/vendor/autoload.php') /* check in wp-content */
-    || file_exists( $composer_autoload = plugin_dir_path( __FILE__ ).'vendor/autoload.php') /* check in plugin directory */
-    || file_exists( $composer_autoload = get_stylesheet_directory().'/vendor/autoload.php') /* check in child theme */
-    || file_exists( $composer_autoload = get_template_directory().'/vendor/autoload.php') /* check in parent theme */
+if ( file_exists($composer_autoload = __DIR__ . '/vendor/autoload.php') /* check in self */
+    || file_exists($composer_autoload = WP_CONTENT_DIR . '/vendor/autoload.php') /* check in wp-content */
+    || file_exists($composer_autoload = plugin_dir_path(__FILE__) . 'vendor/autoload.php') /* check in plugin directory */
+    || file_exists($composer_autoload = get_stylesheet_directory() . '/vendor/autoload.php') /* check in child theme */
+    || file_exists($composer_autoload = get_template_directory() . '/vendor/autoload.php') /* check in parent theme */
 ) {
     require_once $composer_autoload;
 }

lib/timber-post-getter.php

Spacing +23 added lines, -23 removed lines

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

lib/timber-helper.php

Spacing +143 added lines, -143 removed lines

@@ -25,18 +25,18 @@ 
 	 * @param bool    $force          (optional) Force callback to be executed when transient is locked
 	 * @return mixed
 	 */
-	public static function transient( $slug, $callback, $transient_time = 0, $lock_timeout = 5, $force = false ) {
-		$slug = apply_filters( 'timber/transient/slug', $slug );
+	public static function transient($slug, $callback, $transient_time = 0, $lock_timeout = 5, $force = false) {
+		$slug = apply_filters('timber/transient/slug', $slug);
 
-		$enable_transients = ( $transient_time === false || ( defined( 'WP_DISABLE_TRANSIENTS' ) && WP_DISABLE_TRANSIENTS ) ) ? false : true;
-		$data = $enable_transients ? get_transient( $slug ) : false;
+		$enable_transients = ($transient_time === false || (defined('WP_DISABLE_TRANSIENTS') && WP_DISABLE_TRANSIENTS)) ? false : true;
+		$data = $enable_transients ? get_transient($slug) : false;
 
 		if ( false === $data ) {
 
-			if ( $enable_transients && self::_is_transient_locked( $slug ) ) {
+			if ( $enable_transients && self::_is_transient_locked($slug) ) {
 
-				$force = apply_filters( 'timber_force_transients', $force );
-				$force = apply_filters( 'timber_force_transient_' . $slug, $force );
+				$force = apply_filters('timber_force_transients', $force);
+				$force = apply_filters('timber_force_transient_' . $slug, $force);
 
 				if ( !$force ) {
 					//the server is currently executing the process.
@@ -50,13 +50,13 @@ 
 			// lock timeout shouldn't be higher than 5 seconds, unless
 			// remote calls with high timeouts are made here
 			if ( $enable_transients )
-				self::_lock_transient( $slug, $lock_timeout );
+				self::_lock_transient($slug, $lock_timeout);
 
 			$data = $callback();
 
 			if ( $enable_transients ) {
-				set_transient( $slug, $data, $transient_time );
-				self::_unlock_transient( $slug );
+				set_transient($slug, $data, $transient_time);
+				self::_unlock_transient($slug);
 			}
 
 		}
@@ -70,24 +70,24 @@ 
 	 * @param string $slug
 	 * @param integer $lock_timeout
 	 */
-	static function _lock_transient( $slug, $lock_timeout ) {
-		set_transient( $slug . '_lock', true, $lock_timeout );
+	static function _lock_transient($slug, $lock_timeout) {
+		set_transient($slug . '_lock', true, $lock_timeout);
 	}
 
 	/**
 	 * @internal
 	 * @param string $slug
 	 */
-	static function _unlock_transient( $slug ) {
-		delete_transient( $slug . '_lock', true );
+	static function _unlock_transient($slug) {
+		delete_transient($slug . '_lock', true);
 	}
 
 	/**
 	 * @internal
 	 * @param string $slug
 	 */
-	static function _is_transient_locked( $slug ) {
-		return (bool)get_transient( $slug . '_lock' );
+	static function _is_transient_locked($slug) {
+		return (bool) get_transient($slug . '_lock');
 	}
 
 	/* These are for measuring page render time */
@@ -99,7 +99,7 @@ 
 	 */
 	public static function start_timer() {
 		$time = microtime();
-		$time = explode( ' ', $time );
+		$time = explode(' ', $time);
 		$time = $time[1] + $time[0];
 		return $time;
 	}
@@ -115,12 +115,12 @@ 
 	 * @param int     $start
 	 * @return string
 	 */
-	public static function stop_timer( $start ) {
+	public static function stop_timer($start) {
 		$time = microtime();
-		$time = explode( ' ', $time );
+		$time = explode(' ', $time);
 		$time = $time[1] + $time[0];
 		$finish = $time;
-		$total_time = round( ( $finish - $start ), 4 );
+		$total_time = round(($finish - $start), 4);
 		return $total_time . ' seconds.';
 	}
 
@@ -153,9 +153,9 @@ 
 	 * @param array   $args
 	 * @return string
 	 */
-	public static function ob_function( $function, $args = array( null ) ) {
+	public static function ob_function($function, $args = array(null)) {
 		ob_start();
-		call_user_func_array( $function, $args );
+		call_user_func_array($function, $args);
 		$data = ob_get_contents();
 		ob_end_clean();
 		return $data;
@@ -169,8 +169,8 @@ 
 	 * @param bool    $return_output_buffer
 	 * @return TimberFunctionWrapper
 	 */
-	public static function function_wrapper( $function_name, $defaults = array(), $return_output_buffer = false ) {
-		return new TimberFunctionWrapper( $function_name, $defaults, $return_output_buffer );
+	public static function function_wrapper($function_name, $defaults = array(), $return_output_buffer = false) {
+		return new TimberFunctionWrapper($function_name, $defaults, $return_output_buffer);
 	}
 
 	/**
@@ -179,14 +179,14 @@ 
 	 * @param mixed $arg that you want to error_log
 	 * @return void
 	 */
-	public static function error_log( $arg ) {
+	public static function error_log($arg) {
 		if ( !WP_DEBUG ) {
 			return;
 		}
-		if ( is_object( $arg ) || is_array( $arg ) ) {
-			$arg = print_r( $arg, true );
+		if ( is_object($arg) || is_array($arg) ) {
+			$arg = print_r($arg, true);
 		}
-		return error_log( $arg );
+		return error_log($arg);
 	}
 
 	/**
@@ -196,9 +196,9 @@ 
 	 * @param string  $seplocation
 	 * @return string
 	 */
-	public static function get_wp_title( $separator = ' ', $seplocation = 'left' ) {
-		$separator = apply_filters( 'timber_wp_title_seperator', $separator );
-		return trim( wp_title( $separator, false, $seplocation ) );
+	public static function get_wp_title($separator = ' ', $seplocation = 'left') {
+		$separator = apply_filters('timber_wp_title_seperator', $separator);
+		return trim(wp_title($separator, false, $seplocation));
 	}
 
 	/* Text Utilities
@@ -213,35 +213,35 @@ 
 	 * @param string  $allowed_tags
 	 * @return string
 	 */
-	public static function trim_words( $text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote' ) {
+	public static function trim_words($text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote') {
 		if ( null === $more ) {
-			$more = __( '…' );
+			$more = __('…');
 		}
 		$original_text = $text;
 		$allowed_tag_string = '';
-		foreach ( explode( ' ', apply_filters( 'timber/trim_words/allowed_tags', $allowed_tags ) ) as $tag ) {
+		foreach (explode(' ', apply_filters('timber/trim_words/allowed_tags', $allowed_tags)) as $tag) {
 			$allowed_tag_string .= '<' . $tag . '>';
 		}
-		$text = strip_tags( $text, $allowed_tag_string );
+		$text = strip_tags($text, $allowed_tag_string);
 		/* translators: If your word count is based on single characters (East Asian characters), enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
-		if ( 'characters' == _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-			$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-			preg_match_all( '/./u', $text, $words_array );
-			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+		if ( 'characters' == _x('words', 'word count: words or characters?') && preg_match('/^utf\-?8$/i', get_option('blog_charset')) ) {
+			$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+			preg_match_all('/./u', $text, $words_array);
+			$words_array = array_slice($words_array[0], 0, $num_words + 1);
 			$sep = '';
 		} else {
-			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+			$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 			$sep = ' ';
 		}
-		if ( count( $words_array ) > $num_words ) {
-			array_pop( $words_array );
-			$text = implode( $sep, $words_array );
+		if ( count($words_array) > $num_words ) {
+			array_pop($words_array);
+			$text = implode($sep, $words_array);
 			$text = $text . $more;
 		} else {
-			$text = implode( $sep, $words_array );
+			$text = implode($sep, $words_array);
 		}
-		$text = self::close_tags( $text );
-		return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+		$text = self::close_tags($text);
+		return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 	}
 
 	/**
@@ -250,29 +250,29 @@ 
 	 * @param string  $html
 	 * @return string
 	 */
-	public static function close_tags( $html ) {
+	public static function close_tags($html) {
 		//put all opened tags into an array
-		preg_match_all( '#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result );
+		preg_match_all('#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
 		$openedtags = $result[1];
 		//put all closed tags into an array
-		preg_match_all( '#</([a-z]+)>#iU', $html, $result );
+		preg_match_all('#</([a-z]+)>#iU', $html, $result);
 		$closedtags = $result[1];
-		$len_opened = count( $openedtags );
+		$len_opened = count($openedtags);
 		// all tags are closed
-		if ( count( $closedtags ) == $len_opened ) {
+		if ( count($closedtags) == $len_opened ) {
 			return $html;
 		}
-		$openedtags = array_reverse( $openedtags );
+		$openedtags = array_reverse($openedtags);
 		// close tags
-		for ( $i = 0; $i < $len_opened; $i++ ) {
-			if ( !in_array( $openedtags[$i], $closedtags ) ) {
+		for ($i = 0; $i < $len_opened; $i++) {
+			if ( !in_array($openedtags[$i], $closedtags) ) {
 				$html .= '</' . $openedtags[$i] . '>';
 			} else {
-				unset( $closedtags[array_search( $openedtags[$i], $closedtags )] );
+				unset($closedtags[array_search($openedtags[$i], $closedtags)]);
 			}
 		}
-		$html = str_replace(array('</br>','</hr>','</wbr>'), '', $html);
-		$html = str_replace(array('<br>','<hr>','<wbr>'), array('<br />','<hr />','<wbr />'), $html);
+		$html = str_replace(array('</br>', '</hr>', '</wbr>'), '', $html);
+		$html = str_replace(array('<br>', '<hr>', '<wbr>'), array('<br />', '<hr />', '<wbr />'), $html);
 		return $html;
 	}
 
@@ -285,17 +285,17 @@ 
 	 * @return array|int
 	 * @deprecated 0.20.0
 	 */
-	public static function get_posts_by_meta( $key, $value ) {
+	public static function get_posts_by_meta($key, $value) {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s", $key, $value );
-		$results = $wpdb->get_col( $query );
+		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s", $key, $value);
+		$results = $wpdb->get_col($query);
 		$pids = array();
-		foreach ( $results as $result ) {
-			if ( get_post( $result ) ) {
+		foreach ($results as $result) {
+			if ( get_post($result) ) {
 				$pids[] = $result;
 			}
 		}
-		if ( count( $pids ) ) {
+		if ( count($pids) ) {
 			return $pids;
 		}
 		return 0;
@@ -309,12 +309,12 @@ 
 	 * @return int
 	 * @deprecated 0.20.0
 	 */
-	public static function get_post_by_meta( $key, $value ) {
+	public static function get_post_by_meta($key, $value) {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s ORDER BY post_id", $key, $value );
-		$results = $wpdb->get_col( $query );
-		foreach ( $results as $result ) {
-			if ( $result && get_post( $result ) ) {
+		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s ORDER BY post_id", $key, $value);
+		$results = $wpdb->get_col($query);
+		foreach ($results as $result) {
+			if ( $result && get_post($result) ) {
 				return $result;
 			}
 		}
@@ -327,10 +327,10 @@ 
 	 * @param int     $ttid
 	 * @return mixed
 	 */
-	public static function get_term_id_by_term_taxonomy_id( $ttid ) {
+	public static function get_term_id_by_term_taxonomy_id($ttid) {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %s", $ttid );
-		return $wpdb->get_var( $query );
+		$query = $wpdb->prepare("SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %s", $ttid);
+		return $wpdb->get_var($query);
 	}
 
 	/* Object Utilities
@@ -343,8 +343,8 @@ 
 	 * @param string  $prop
 	 * @return void
 	 */
-	public static function osort( &$array, $prop ) {
-		usort( $array, function ( $a, $b ) use ( $prop ) {
+	public static function osort(&$array, $prop) {
+		usort($array, function($a, $b) use ($prop) {
 				return $a->$prop > $b->$prop ? 1 : -1;
 			} );
 	}
@@ -355,11 +355,11 @@ 
 	 * @param array   $arr
 	 * @return bool
 	 */
-	public static function is_array_assoc( $arr ) {
-		if ( !is_array( $arr ) ) {
+	public static function is_array_assoc($arr) {
+		if ( !is_array($arr) ) {
 			return false;
 		}
-		return (bool)count( array_filter( array_keys( $arr ), 'is_string' ) );
+		return (bool) count(array_filter(array_keys($arr), 'is_string'));
 	}
 
 	/**
@@ -368,11 +368,11 @@ 
 	 * @param array   $array
 	 * @return stdClass
 	 */
-	public static function array_to_object( $array ) {
+	public static function array_to_object($array) {
 		$obj = new stdClass;
-		foreach ( $array as $k => $v ) {
-			if ( is_array( $v ) ) {
-				$obj->{$k} = self::array_to_object( $v ); //RECURSION
+		foreach ($array as $k => $v) {
+			if ( is_array($v) ) {
+				$obj->{$k} = self::array_to_object($v); //RECURSION
 			} else {
 				$obj->{$k} = $v;
 			}
@@ -388,11 +388,11 @@ 
 	 * @param mixed   $value
 	 * @return bool|int
 	 */
-	public static function get_object_index_by_property( $array, $key, $value ) {
-		if ( is_array( $array ) ) {
+	public static function get_object_index_by_property($array, $key, $value) {
+		if ( is_array($array) ) {
 			$i = 0;
-			foreach ( $array as $arr ) {
-				if ( is_array( $arr ) ) {
+			foreach ($array as $arr) {
+				if ( is_array($arr) ) {
 					if ( $arr[$key] == $value ) {
 						return $i;
 					}
@@ -416,16 +416,16 @@ 
 	 * @return array|null
 	 * @throws Exception
 	 */
-	public static function get_object_by_property( $array, $key, $value ) {
-		if ( is_array( $array ) ) {
-			foreach ( $array as $arr ) {
+	public static function get_object_by_property($array, $key, $value) {
+		if ( is_array($array) ) {
+			foreach ($array as $arr) {
 				if ( $arr->$key == $value ) {
 					return $arr;
 				}
 			}
 		} else {
-			throw new InvalidArgumentException( '$array is not an array, got:' );
-			TimberHelper::error_log( $array );
+			throw new InvalidArgumentException('$array is not an array, got:');
+			TimberHelper::error_log($array);
 		}
 	}
 
@@ -436,9 +436,9 @@ 
 	 * @param int     $len
 	 * @return array
 	 */
-	public static function array_truncate( $array, $len ) {
-		if ( sizeof( $array ) > $len ) {
-			$array = array_splice( $array, 0, $len );
+	public static function array_truncate($array, $len) {
+		if ( sizeof($array) > $len ) {
+			$array = array_splice($array, 0, $len);
 		}
 		return $array;
 	}
@@ -452,12 +452,12 @@ 
 	 * @param mixed   $value
 	 * @return bool
 	 */
-	public static function is_true( $value ) {
-		if ( isset( $value ) ) {
-			if (is_string($value)) {
+	public static function is_true($value) {
+		if ( isset($value) ) {
+			if ( is_string($value) ) {
 				$value = strtolower($value);
 			}
-			if ( ($value == 'true' || $value === 1 || $value === '1' || $value == true) && $value !== false && $value !== 'false') {
+			if ( ($value == 'true' || $value === 1 || $value === '1' || $value == true) && $value !== false && $value !== 'false' ) {
 				return true;
 			}
 		}
@@ -470,8 +470,8 @@ 
 	 * @param int     $i
 	 * @return bool
 	 */
-	public static function iseven( $i ) {
-		return ( $i % 2 ) == 0;
+	public static function iseven($i) {
+		return ($i % 2) == 0;
 	}
 
 	/**
@@ -480,8 +480,8 @@ 
 	 * @param int     $i
 	 * @return bool
 	 */
-	public static function isodd( $i ) {
-		return ( $i % 2 ) != 0;
+	public static function isodd($i) {
+		return ($i % 2) != 0;
 	}
 
 	/* Links, Forms, Etc. Utilities
@@ -495,8 +495,8 @@ 
 	 * @param array   $args this $args thing is a fucking mess, [fix at some point](http://codex.wordpress.org/Function_Reference/comment_form)
 	 * @return string
 	 */
-	public static function get_comment_form( $post_id = null, $args = array() ) {
-		return self::ob_function( 'comment_form', array( $args, $post_id ) );
+	public static function get_comment_form($post_id = null, $args = array()) {
+		return self::ob_function('comment_form', array($args, $post_id));
 	}
 
 	/**
@@ -505,7 +505,7 @@ 
 	 * @param string  $args
 	 * @return array
 	 */
-	public static function paginate_links( $args = '' ) {
+	public static function paginate_links($args = '') {
 		$defaults = array(
 			'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
 			'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
@@ -513,28 +513,28 @@ 
 			'current' => 0,
 			'show_all' => false,
 			'prev_next' => false,
-			'prev_text' => __( '&laquo; Previous' ),
-			'next_text' => __( 'Next &raquo;' ),
+			'prev_text' => __('&laquo; Previous'),
+			'next_text' => __('Next &raquo;'),
 			'end_size' => 1,
 			'mid_size' => 2,
 			'type' => 'array',
 			'add_args' => false, // array of query args to add
 			'add_fragment' => ''
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 		// Who knows what else people pass in $args
-		$args['total'] = intval( (int)$args['total'] );
+		$args['total'] = intval((int) $args['total']);
 		if ( $args['total'] < 2 ) {
 			return array();
 		}
-		$args['current'] = (int)$args['current'];
-		$args['end_size'] = 0 < (int)$args['end_size'] ? (int)$args['end_size'] : 1; // Out of bounds?  Make it the default.
-		$args['mid_size'] = 0 <= (int)$args['mid_size'] ? (int)$args['mid_size'] : 2;
-		$args['add_args'] = is_array( $args['add_args'] ) ? $args['add_args'] : false;
+		$args['current'] = (int) $args['current'];
+		$args['end_size'] = 0 < (int) $args['end_size'] ? (int) $args['end_size'] : 1; // Out of bounds?  Make it the default.
+		$args['mid_size'] = 0 <= (int) $args['mid_size'] ? (int) $args['mid_size'] : 2;
+		$args['add_args'] = is_array($args['add_args']) ? $args['add_args'] : false;
 		$page_links = array();
 		$dots = false;
-		for ( $n = 1; $n <= $args['total']; $n++ ) {
-			$n_display = number_format_i18n( $n );
+		for ($n = 1; $n <= $args['total']; $n++) {
+			$n_display = number_format_i18n($n);
 			if ( $n == $args['current'] ) {
 				$page_links[] = array(
 					'class' => 'page-number page-numbers current',
@@ -545,18 +545,18 @@ 
 				);
 				$dots = true;
 			} else {
-				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
-					$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
-					$link = str_replace( '%#%', $n, $link );
-					$link = trailingslashit( $link ) . ltrim( $args['add_fragment'], '/' );
+				if ( $args['show_all'] || ($n <= $args['end_size'] || ($args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size']) || $n > $args['total'] - $args['end_size']) ) {
+					$link = str_replace('%_%', 1 == $n ? '' : $args['format'], $args['base']);
+					$link = str_replace('%#%', $n, $link);
+					$link = trailingslashit($link) . ltrim($args['add_fragment'], '/');
 					if ( $args['add_args'] ) {
-						$link = rtrim( add_query_arg( $args['add_args'], $link ), '/' );
+						$link = rtrim(add_query_arg($args['add_args'], $link), '/');
 					}
 					$link = str_replace(' ', '+', $link);
-					$link = untrailingslashit( $link );
+					$link = untrailingslashit($link);
 					$page_links[] = array(
 						'class' => 'page-number page-numbers',
-						'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+						'link' => esc_url(apply_filters('paginate_links', $link)),
 						'title' => $n_display,
 						'name' => $n_display,
 						'current' => $args['current'] == $n
@@ -565,7 +565,7 @@ 
 				} elseif ( $dots && !$args['show_all'] ) {
 					$page_links[] = array(
 						'class' => 'dots',
-						'title' => __( '&hellip;' )
+						'title' => __('&hellip;')
 					);
 					$dots = false;
 				}
@@ -584,8 +584,8 @@ 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function is_url( $url ) {
-		return TimberURLHelper::is_url( $url );
+	static function is_url($url) {
+		return TimberURLHelper::is_url($url);
 	}
 
 	/**
@@ -598,71 +598,71 @@ 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function get_rel_url( $url, $force = false ) {
-		return TimberURLHelper::get_rel_url( $url, $force );
+	static function get_rel_url($url, $force = false) {
+		return TimberURLHelper::get_rel_url($url, $force);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function is_local( $url ) {
-		return TimberURLHelper::is_local( $url );
+	static function is_local($url) {
+		return TimberURLHelper::is_local($url);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function get_full_path( $src ) {
-		return TimberURLHelper::get_full_path( $src );
+	static function get_full_path($src) {
+		return TimberURLHelper::get_full_path($src);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function get_rel_path( $src ) {
-		return TimberURLHelper::get_rel_path( $src );
+	static function get_rel_path($src) {
+		return TimberURLHelper::get_rel_path($src);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function remove_double_slashes( $url ) {
-		return TimberURLHelper::remove_double_slashes( $url );
+	static function remove_double_slashes($url) {
+		return TimberURLHelper::remove_double_slashes($url);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function prepend_to_url( $url, $path ) {
-		return TimberURLHelper::prepend_to_url( $url, $path );
+	static function prepend_to_url($url, $path) {
+		return TimberURLHelper::prepend_to_url($url, $path);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function preslashit( $path ) {
-		return TimberURLHelper::preslashit( $path );
+	static function preslashit($path) {
+		return TimberURLHelper::preslashit($path);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function is_external( $url ) {
-		return TimberURLHelper::is_external( $url );
+	static function is_external($url) {
+		return TimberURLHelper::is_external($url);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function download_url( $url, $timeout = 300 ) {
-		return TimberURLHelper::download_url( $url, $timeout );
+	static function download_url($url, $timeout = 300) {
+		return TimberURLHelper::download_url($url, $timeout);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function get_params( $i = -1 ) {
-		return TimberURLHelper::get_params( $i );
+	static function get_params($i = -1) {
+		return TimberURLHelper::get_params($i);
 	}
 
 }

lib/timber-image.php

Spacing +20 added lines, -20 removed lines

@@ -150,27 +150,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;
@@ -202,9 +202,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;
 			}
@@ -215,15 +215,15 @@ 
 			
 			$relative = false;
 			$iid_lower = strtolower($iid);
-			foreach( $this->file_types as $type ) { if( strstr( $iid_lower, $type ) ) { $relative = true; break; } };
+			foreach ($this->file_types as $type) { if ( strstr($iid_lower, $type) ) { $relative = true; break; } };
 			if ( $relative ) {
-				$this->init_with_relative_path( $iid );
+				$this->init_with_relative_path($iid);
 				return;
 			}
 		} else if ( $iid instanceof WP_Post ) {
 			$ref = new ReflectionClass($this);
 			$post = $ref->getParentClass()->newInstance($iid->ID);
-			if (isset($post->_thumbnail_id) && $post->_thumbnail_id) {
+			if ( isset($post->_thumbnail_id) && $post->_thumbnail_id ) {
 				return $this->init((int) $post->_thumbnail_id);
 			}
 			return $this->init($post->ID);
@@ -265,9 +265,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;
 	}
@@ -276,8 +276,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;
@@ -476,8 +476,8 @@ 
 	 * @param string $size
 	 * @return bool|string
 	 */
-	function get_src( $size = '' ) {
-		return $this->src( $size );
+	function get_src($size = '') {
+		return $this->src($size);
 	}
 
 	/**