jarednova / timber

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

lib/timber-request.php

Spacing +4 added lines, -4 removed lines

@@ -21,14 +21,14 @@
 		$this->get = $_GET;
 	}
 
-	public function __call( $field, $args ) {}
+	public function __call($field, $args) {}
 
-	public function __get( $field ) {}
+	public function __get($field) {}
 
 	/**
 	 * @return boolean
 	 */
-	public function __isset( $field ) {}
+	public function __isset($field) {}
 
-	public function meta( $key ) {}
+	public function meta($key) {}
 }

lib/timber-function-wrapper.php

Spacing +19 added lines, -19 removed lines

@@ -9,7 +9,7 @@ 
 
 	public function __toString() {
 		 try {
-			return (string)$this->call();
+			return (string) $this->call();
 		 } catch (Exception $e) {
 		 	return 'Caught exception: ' . $e->getMessage() . "\n";
 		 }
@@ -22,13 +22,13 @@ 
 	 * @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' ) {
+	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];
+			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'));
 	}
 
 	/**
@@ -45,12 +45,12 @@ 
 	 * @param Twig_Environment $twig
 	 * @return Twig_Environment
 	 */
-	public function add_to_twig( $twig ) {
+	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);
 		}
 	}
 
@@ -78,12 +78,12 @@ 
 	 * @param array   $defaults
 	 * @return array
 	 */
-	private function _parse_args( $args, $defaults ) {
-		$_arg = reset( $defaults );
+	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;

lib/timber-image-helper.php

Spacing +84 added lines, -84 removed lines

@@ -43,9 +43,9 @@ 
 	 * ```
 	 * @return string (ex: )
 	 */
-	public static function resize( $src, $w, $h = 0, $crop = 'default', $force = false ) {
-		if (!is_numeric($w) && is_string($w)) {
-			if ($sizes = self::find_wp_dimensions($w)) {
+	public static function resize($src, $w, $h = 0, $crop = 'default', $force = false) {
+		if ( !is_numeric($w) && is_string($w) ) {
+			if ( $sizes = self::find_wp_dimensions($w) ) {
 				$w = $sizes['w'];
 				$h = $sizes['h'];
 			} else {
@@ -66,16 +66,16 @@ 
 	 *     @type int h
 	 * }
 	 */
-	private static function find_wp_dimensions( $size ) {
+	private static function find_wp_dimensions($size) {
 		global $_wp_additional_image_sizes;
-		if (isset($_wp_additional_image_sizes[$size])) {
+		if ( isset($_wp_additional_image_sizes[$size]) ) {
 			$w = $_wp_additional_image_sizes[$size]['width'];
 			$h = $_wp_additional_image_sizes[$size]['height'];
-		} else if (in_array($size, array('thumbnail', 'medium', 'large'))) {
-			$w = get_option($size.'_size_w');
-			$h = get_option($size.'_size_h');
+		} else if ( in_array($size, array('thumbnail', 'medium', 'large')) ) {
+			$w = get_option($size . '_size_w');
+			$h = get_option($size . '_size_h');
 		}
-		if (isset($w) && isset($h) && ($w || $h)) {
+		if ( isset($w) && isset($h) && ($w || $h) ) {
 			return array('w' => $w, 'h' => $h);
 		}
 		return false;
@@ -90,7 +90,7 @@ 
 	 *
 	 * @return string url to the new image
 	 */
-	public static function retina_resize( $src, $multiplier = 2, $force = false ) {
+	public static function retina_resize($src, $multiplier = 2, $force = false) {
 		$op = new TimberImageOperationRetina($multiplier);
 		return self::_operate($src, $op, $force);
 	}
@@ -100,13 +100,13 @@ 
 	 * @param  string  $file local filepath to a file, not a URL
 	 * @return boolean true if it's an animated gif, false if not
 	 */
-	public static function is_animated_gif( $file ) {
+	public static function is_animated_gif($file) {
 		if ( strpos(strtolower($file), '.gif') == -1 ) {
 			//doesn't have .gif, bail
 			return false;
 		}
 		//its a gif so test
-		if( !($fh = @fopen($file, 'rb')) ) {
+		if ( !($fh = @fopen($file, 'rb')) ) {
 		  	return false;
 	    }
 	    $count = 0;
@@ -118,7 +118,7 @@ 
 
 	    // We read through the file til we reach the end of the file, or we've found
 	    // at least 2 frame headers
-	    while(!feof($fh) && $count < 2) {
+	    while (!feof($fh) && $count < 2) {
 	        $chunk = fread($fh, 1024 * 100); //read 100kb at a time
 	        $count += preg_match_all('#\x00\x21\xF9\x04.{4}\x00[\x2C\x21]#s', $chunk, $matches);
 	    }
@@ -138,7 +138,7 @@ 
 	 * @param bool    $force
 	 * @return mixed|null|string
 	 */
-	public static function letterbox( $src, $w, $h, $color = '#000000', $force = false ) {
+	public static function letterbox($src, $w, $h, $color = '#000000', $force = false) {
 		$op = new TimberImageOperationLetterbox($w, $h, $color);
 		return self::_operate($src, $op, $force);
 	}
@@ -150,7 +150,7 @@ 
 	 * @param string  $bghex
 	 * @return string
 	 */
-	public static function img_to_jpg( $src, $bghex = '#FFFFFF', $force = false ) {
+	public static function img_to_jpg($src, $bghex = '#FFFFFF', $force = false) {
 		$op = new TimberImageOperationToJpg($bghex);
 		return self::_operate($src, $op, $force);
 	}
@@ -159,13 +159,13 @@ 
 	 * Deletes all resized versions of an image when the source is deleted
 	 */
 	protected static function add_actions() {
-		add_action( 'delete_attachment', function ( $post_id ) {
-			$post = get_post( $post_id );
-			$image_types = array( 'image/jpeg', 'image/png', 'image/gif', 'image/jpg' );
-			if ( in_array( $post->post_mime_type, $image_types ) ) {
-				$attachment = new TimberImage( $post_id );
+		add_action('delete_attachment', function($post_id) {
+			$post = get_post($post_id);
+			$image_types = array('image/jpeg', 'image/png', 'image/gif', 'image/jpg');
+			if ( in_array($post->post_mime_type, $image_types) ) {
+				$attachment = new TimberImage($post_id);
 				if ( $attachment->file_loc ) {
-					TimberImageHelper::delete_generated_files( $attachment->file_loc );
+					TimberImageHelper::delete_generated_files($attachment->file_loc);
 				}
 			}
 		} );
@@ -176,9 +176,9 @@ 
 	 * for example /wp-content or /content
 	 */
 	protected static function add_constants() {
-		if ( !defined( 'WP_CONTENT_SUBDIR' ) ) {
-			$wp_content_path = str_replace( home_url(), '', WP_CONTENT_URL );
-			define( 'WP_CONTENT_SUBDIR', $wp_content_path );
+		if ( !defined('WP_CONTENT_SUBDIR') ) {
+			$wp_content_path = str_replace(home_url(), '', WP_CONTENT_URL);
+			define('WP_CONTENT_SUBDIR', $wp_content_path);
 		}
 	}
 
@@ -188,8 +188,8 @@ 
 	 * @return void
 	 */
 	static function add_filters() {
-		add_filter( 'upload_dir', function ( $arr ) {
-			$arr['relative'] = str_replace( home_url(), '', $arr['baseurl'] );
+		add_filter('upload_dir', function($arr) {
+			$arr['relative'] = str_replace(home_url(), '', $arr['baseurl']);
 			return $arr;
 		} );
 	}
@@ -200,16 +200,16 @@ 
 	 * @param string  $local_file   ex: /var/www/wp-content/uploads/2015/my-pic.jpg
 	 *                              or: http://example.org/wp-content/uploads/2015/my-pic.jpg
 	 */
-	static function delete_generated_files( $local_file ) {
-		if (TimberURLHelper::is_absolute( $local_file ) ) {
-			$local_file = TimberURLHelper::url_to_file_system( $local_file );
+	static function delete_generated_files($local_file) {
+		if ( TimberURLHelper::is_absolute($local_file) ) {
+			$local_file = TimberURLHelper::url_to_file_system($local_file);
 		}
-		$info = pathinfo( $local_file );
+		$info = pathinfo($local_file);
 		$dir = $info['dirname'];
 		$ext = $info['extension'];
 		$filename = $info['filename'];
-		self::process_delete_generated_files( $filename, $ext, $dir, '-[0-9999999]*', '-[0-9]*x[0-9]*-c-[a-z]*.' );
-		self::process_delete_generated_files( $filename, $ext, $dir, '-lbox-[0-9999999]*', '-lbox-[0-9]*x[0-9]*-[a-zA-Z0-9]*.' );
+		self::process_delete_generated_files($filename, $ext, $dir, '-[0-9999999]*', '-[0-9]*x[0-9]*-c-[a-z]*.');
+		self::process_delete_generated_files($filename, $ext, $dir, '-lbox-[0-9999999]*', '-lbox-[0-9]*x[0-9]*-[a-zA-Z0-9]*.');
 	}
 
 	/**
@@ -226,14 +226,14 @@ 
 	 * @param string 	$search_pattern pattern of files to pluck from
 	 * @param string 	$match_pattern pattern of files to go forth and delete
 	 */
-	protected static function process_delete_generated_files( $filename, $ext, $dir, $search_pattern, $match_pattern ) {
+	protected static function process_delete_generated_files($filename, $ext, $dir, $search_pattern, $match_pattern) {
 		$searcher = '/' . $filename . $search_pattern;
-		foreach ( glob( $dir . $searcher ) as $found_file ) {
-			$regexdir = str_replace( '/', '\/', $dir );
-			$pattern = '/' . ( $regexdir ) . '\/' . $filename . $match_pattern . $ext . '/';
-			$match = preg_match( $pattern, $found_file );
+		foreach (glob($dir . $searcher) as $found_file) {
+			$regexdir = str_replace('/', '\/', $dir);
+			$pattern = '/' . ($regexdir) . '\/' . $filename . $match_pattern . $ext . '/';
+			$match = preg_match($pattern, $found_file);
 			if ( $match ) {
-				unlink( $found_file );
+				unlink($found_file);
 			}
 		}
 	}
@@ -245,9 +245,9 @@ 
 	 * @param string  $url
 	 * @return string
 	 */
-	public static function get_server_location( $url ) {
+	public static function get_server_location($url) {
 		// if we're already an absolute dir, just return
-		if ( 0 === strpos( $url, ABSPATH ) ) {
+		if ( 0 === strpos($url, ABSPATH) ) {
 			return $url;
 		}
 		// otherwise, analyze URL then build mapping path
@@ -262,15 +262,15 @@ 
 	 * @param string  $file
 	 * @return string
 	 */
-	public static function get_sideloaded_file_loc( $file ) {
+	public static function get_sideloaded_file_loc($file) {
 		$upload = wp_upload_dir();
 		$dir = $upload['path'];
 		$filename = $file;
-		$file = parse_url( $file );
-		$path_parts = pathinfo( $file['path'] );
-		$basename = md5( $filename );
+		$file = parse_url($file);
+		$path_parts = pathinfo($file['path']);
+		$basename = md5($filename);
 		$ext = 'jpg';
-		if ( isset( $path_parts['extension'] ) ) {
+		if ( isset($path_parts['extension']) ) {
 			$ext = $path_parts['extension'];
 		}
 		return $dir . '/' . $basename . '.' . $ext;
@@ -282,28 +282,28 @@ 
 	 * @param string  $file the URL to the original file
 	 * @return string the URL to the downloaded file
 	 */
-	public static function sideload_image( $file ) {
-		$loc = self::get_sideloaded_file_loc( $file );
-		if ( file_exists( $loc ) ) {
-			return TimberURLHelper::preslashit( TimberURLHelper::get_rel_path( $loc ) );
+	public static function sideload_image($file) {
+		$loc = self::get_sideloaded_file_loc($file);
+		if ( file_exists($loc) ) {
+			return TimberURLHelper::preslashit(TimberURLHelper::get_rel_path($loc));
 		}
 		// Download file to temp location
-		if ( !function_exists( 'download_url' ) ) {
+		if ( !function_exists('download_url') ) {
 			require_once ABSPATH . '/wp-admin/includes/file.php';
 		}
-		$tmp = download_url( $file );
-		preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+		$tmp = download_url($file);
+		preg_match('/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches);
 		$file_array = array();
-		$file_array['name'] = basename( $matches[0] );
+		$file_array['name'] = basename($matches[0]);
 		$file_array['tmp_name'] = $tmp;
 		// If error storing temporarily, unlink
-		if ( is_wp_error( $tmp ) ) {
-			@unlink( $file_array['tmp_name'] );
+		if ( is_wp_error($tmp) ) {
+			@unlink($file_array['tmp_name']);
 			$file_array['tmp_name'] = '';
 		}
 		// do the validation and storage stuff
-		$locinfo = pathinfo( $loc );
-		$file = wp_upload_bits( $locinfo['basename'], null, file_get_contents( $file_array['tmp_name'] ) );
+		$locinfo = pathinfo($loc);
+		$file = wp_upload_bits($locinfo['basename'], null, file_get_contents($file_array['tmp_name']));
 		return $file['url'];
 	}
 
@@ -330,23 +330,23 @@ 
 		if ( 0 === strpos($tmp, ABSPATH) ) { // we've been given a dir, not an url
 			$result['absolute'] = true;
 			if ( 0 === strpos($tmp, $upload_dir['basedir']) ) {
-				$result['base']= self::BASE_UPLOADS; // upload based
+				$result['base'] = self::BASE_UPLOADS; // upload based
 				$tmp = str_replace($upload_dir['basedir'], '', $tmp);
 			}
 			if ( 0 === strpos($tmp, WP_CONTENT_DIR) ) {
-				$result['base']= self::BASE_CONTENT; // content based
+				$result['base'] = self::BASE_CONTENT; // content based
 				$tmp = str_replace(WP_CONTENT_DIR, '', $tmp);
 			}
 		} else {
-			if (!$result['absolute']) {
-				$tmp = home_url().$tmp;
+			if ( !$result['absolute'] ) {
+				$tmp = home_url() . $tmp;
 			}
-			if (0 === strpos($tmp, $upload_dir['baseurl'])) {
-				$result['base']= self::BASE_UPLOADS; // upload based
+			if ( 0 === strpos($tmp, $upload_dir['baseurl']) ) {
+				$result['base'] = self::BASE_UPLOADS; // upload based
 				$tmp = str_replace($upload_dir['baseurl'], '', $tmp);
 			}
-			if (0 === strpos($tmp, content_url())) {
-				$result['base']= self::BASE_CONTENT; // content-based
+			if ( 0 === strpos($tmp, content_url()) ) {
+				$result['base'] = self::BASE_CONTENT; // content-based
 				$tmp = str_replace(content_url(), '', $tmp);
 			}
 		}
@@ -370,18 +370,18 @@ 
 	 */
 	private static function _get_file_url($base, $subdir, $filename, $absolute) {
 		$url = '';
-		if( self::BASE_UPLOADS == $base ) {
+		if ( self::BASE_UPLOADS == $base ) {
 			$upload_dir = wp_upload_dir();
 			$url = $upload_dir['baseurl'];
 		}
-		if( self::BASE_CONTENT == $base ) {
+		if ( self::BASE_CONTENT == $base ) {
 			$url = content_url();
 		}
-		if(!empty($subdir)) {
+		if ( !empty($subdir) ) {
 			$url .= $subdir;
 		}
-		$url .= '/'.$filename;
-		if(!$absolute) {
+		$url .= '/' . $filename;
+		if ( !$absolute ) {
 			$url = str_replace(home_url(), '', $url);
 		}
 		// $url = TimberURLHelper::remove_double_slashes( $url);
@@ -398,17 +398,17 @@ 
 	 */
 	private static function _get_file_path($base, $subdir, $filename) {
 		$path = '';
-		if(self::BASE_UPLOADS == $base) {
+		if ( self::BASE_UPLOADS == $base ) {
 			$upload_dir = wp_upload_dir();
 			$path = $upload_dir['basedir'];
 		}
-		if(self::BASE_CONTENT == $base) {
+		if ( self::BASE_CONTENT == $base ) {
 			$path = WP_CONTENT_DIR;
 		}
-		if(!empty($subdir)) {
+		if ( !empty($subdir) ) {
 			$path .= $subdir;
 		}
-		$path .= '/'.$filename;
+		$path .= '/' . $filename;
 		return $path;
 	}
 
@@ -426,15 +426,15 @@ 
 	 * @return string         URL to the new image - or the source one if error
 	 *
 	 */
-	private static function _operate( $src, $op, $force = false ) {
-		if ( empty( $src ) ) {
+	private static function _operate($src, $op, $force = false) {
+		if ( empty($src) ) {
 			return '';
 		}
 		$external = false;
 
 		// if external image, load it first
-		if ( TimberURLHelper::is_external_content( $src ) ) {
-			$src = self::sideload_image( $src );
+		if ( TimberURLHelper::is_external_content($src) ) {
+			$src = self::sideload_image($src);
 			$external = true;
 		}
 		// break down URL into components
@@ -457,19 +457,19 @@ 
 			$au['basename']
 		);
 		// if already exists...
-		if ( file_exists( $new_server_path ) ) {
+		if ( file_exists($new_server_path) ) {
 			if ( $force ) {
 				// Force operation - warning: will regenerate the image on every pageload, use for testing purposes only!
-				unlink( $new_server_path );
+				unlink($new_server_path);
 			} else {
 				// return existing file (caching)
 				return $new_url;
 			}
 		}
 		// otherwise generate result file
-		if($op->run($old_server_path, $new_server_path)) {
-			if( get_class( $op ) === 'TimberImageOperationResize' && $external ) {
-				$new_url = strtolower( $new_url );
+		if ( $op->run($old_server_path, $new_server_path) ) {
+			if ( get_class($op) === 'TimberImageOperationResize' && $external ) {
+				$new_url = strtolower($new_url);
 			}
 			return $new_url;
 		} else {
@@ -492,7 +492,7 @@ 
 		);
 		return $new_url;
 	}
-	public static function get_letterbox_file_path($url, $w, $h, $color ) {
+	public static function get_letterbox_file_path($url, $w, $h, $color) {
 		$au = self::analyze_url($url);
 		$op = new TimberImageOperationLetterbox($w, $h, $color);
 		$new_path = self::_get_file_path(