jarednova / timber

lib/timber-helper.php

Doc Comments +2 added lines, -2 removed lines

@@ -176,7 +176,7 @@ 
 	 *
 	 *
 	 * @param mixed $arg that you want to error_log
-	 * @return void
+	 * @return null|boolean
 	 */
 	public static function error_log( $arg ) {
 		if ( !WP_DEBUG ) {
@@ -208,7 +208,7 @@ 
 	 *
 	 * @param string  $text
 	 * @param int     $num_words
-	 * @param string|null|false  $more text to appear in "Read more...". Null to use default, false to hide
+	 * @param boolean  $more text to appear in "Read more...". Null to use default, false to hide
 	 * @param string  $allowed_tags
 	 * @return string
 	 */

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
 
 			// 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 );
+			if ( $enable_transients ) {
+							self::_lock_transient( $slug, $lock_timeout );
+			}
 
 			$data = $callback();
 

Spacing +101 added lines, -101 removed lines

@@ -26,17 +26,17 @@ 
 	 * @return mixed
 	 */
 	public static function transient( $slug, $callback, $transient_time = 0, $lock_timeout = 5, $force = false ) {
-		$slug = apply_filters( 'timber/transient/slug', $slug );
+		$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);
 			}
 
 		}
@@ -71,7 +71,7 @@ 
 	 * @param integer $lock_timeout
 	 */
 	static function _lock_transient( $slug, $lock_timeout ) {
-		set_transient( $slug . '_lock', true, $lock_timeout );
+		set_transient($slug . '_lock', true, $lock_timeout);
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 * @param string $slug
 	 */
 	static function _unlock_transient( $slug ) {
-		delete_transient( $slug . '_lock', true );
+		delete_transient($slug . '_lock', true);
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 * @param string $slug
 	 */
 	static function _is_transient_locked( $slug ) {
-		return (bool)get_transient( $slug . '_lock' );
+		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;
 	}
@@ -117,10 +117,10 @@ 
 	 */
 	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;
@@ -170,7 +170,7 @@ 
 	 * @return TimberFunctionWrapper
 	 */
 	public static function function_wrapper( $function_name, $defaults = array(), $return_output_buffer = false ) {
-		return new TimberFunctionWrapper( $function_name, $defaults, $return_output_buffer );
+		return new TimberFunctionWrapper($function_name, $defaults, $return_output_buffer);
 	}
 
 	/**
@@ -183,10 +183,10 @@ 
 		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);
 	}
 
 	/**
@@ -197,8 +197,8 @@ 
 	 * @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 ) );
+		$separator = apply_filters('timber_wp_title_seperator', $separator);
+		return trim(wp_title($separator, false, $seplocation));
 	}
 
 	/* Text Utilities
@@ -215,33 +215,33 @@ 
 	 */
 	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);
 	}
 
 	/**
@@ -252,27 +252,27 @@ 
 	 */
 	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 ) ) {
+			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;
 	}
 
@@ -287,15 +287,15 @@ 
 	 */
 	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 ) ) {
+			if ( get_post($result) ) {
 				$pids[] = $result;
 			}
 		}
-		if ( count( $pids ) ) {
+		if ( count($pids) ) {
 			return $pids;
 		}
 		return 0;
@@ -311,10 +311,10 @@ 
 	 */
 	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 );
+		$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 ) ) {
+			if ( $result && get_post($result) ) {
 				return $result;
 			}
 		}
@@ -329,8 +329,8 @@ 
 	 */
 	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
@@ -344,7 +344,7 @@ 
 	 * @return void
 	 */
 	public static function osort( &$array, $prop ) {
-		usort( $array, function ( $a, $b ) use ( $prop ) {
+		usort($array, function( $a, $b ) use ($prop) {
 				return $a->$prop > $b->$prop ? 1 : -1;
 			} );
 	}
@@ -356,10 +356,10 @@ 
 	 * @return bool
 	 */
 	public static function is_array_assoc( $arr ) {
-		if ( !is_array( $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'));
 	}
 
 	/**
@@ -371,8 +371,8 @@ 
 	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
+			if ( is_array($v) ) {
+				$obj->{$k} = self::array_to_object($v); //RECURSION
 			} else {
 				$obj->{$k} = $v;
 			}
@@ -389,10 +389,10 @@ 
 	 * @return bool|int
 	 */
 	public static function get_object_index_by_property( $array, $key, $value ) {
-		if ( is_array( $array ) ) {
+		if ( is_array($array) ) {
 			$i = 0;
 			foreach ( $array as $arr ) {
-				if ( is_array( $arr ) ) {
+				if ( is_array($arr) ) {
 					if ( $arr[$key] == $value ) {
 						return $i;
 					}
@@ -417,15 +417,15 @@ 
 	 * @throws Exception
 	 */
 	public static function get_object_by_property( $array, $key, $value ) {
-		if ( is_array( $array ) ) {
+		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);
 		}
 	}
 
@@ -437,8 +437,8 @@ 
 	 * @return array
 	 */
 	public static function array_truncate( $array, $len ) {
-		if ( sizeof( $array ) > $len ) {
-			$array = array_splice( $array, 0, $len );
+		if ( sizeof($array) > $len ) {
+			$array = array_splice($array, 0, $len);
 		}
 		return $array;
 	}
@@ -453,11 +453,11 @@ 
 	 * @return bool
 	 */
 	public static function is_true( $value ) {
-		if ( isset( $value ) ) {
-			if (is_string($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;
 			}
 		}
@@ -471,7 +471,7 @@ 
 	 * @return bool
 	 */
 	public static function iseven( $i ) {
-		return ( $i % 2 ) == 0;
+		return ($i % 2) == 0;
 	}
 
 	/**
@@ -481,7 +481,7 @@ 
 	 * @return bool
 	 */
 	public static function isodd( $i ) {
-		return ( $i % 2 ) != 0;
+		return ($i % 2) != 0;
 	}
 
 	/* Links, Forms, Etc. Utilities
@@ -496,7 +496,7 @@ 
 	 * @return string
 	 */
 	public static function get_comment_form( $post_id = null, $args = array() ) {
-		return self::ob_function( 'comment_form', array( $args, $post_id ) );
+		return self::ob_function('comment_form', array($args, $post_id));
 	}
 
 	/**
@@ -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 );
+			$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;
 				}
@@ -585,7 +585,7 @@ 
 	 * @deprecated 0.18.0
 	 */
 	static function is_url( $url ) {
-		return TimberURLHelper::is_url( $url );
+		return TimberURLHelper::is_url($url);
 	}
 
 	/**
@@ -599,70 +599,70 @@ 
 	 * @deprecated 0.18.0
 	 */
 	static function get_rel_url( $url, $force = false ) {
-		return TimberURLHelper::get_rel_url( $url, $force );
+		return TimberURLHelper::get_rel_url($url, $force);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
 	static function is_local( $url ) {
-		return TimberURLHelper::is_local( $url );
+		return TimberURLHelper::is_local($url);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
 	static function get_full_path( $src ) {
-		return TimberURLHelper::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 );
+		return TimberURLHelper::get_rel_path($src);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
 	static function remove_double_slashes( $url ) {
-		return TimberURLHelper::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 );
+		return TimberURLHelper::prepend_to_url($url, $path);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
 	static function preslashit( $path ) {
-		return TimberURLHelper::preslashit( $path );
+		return TimberURLHelper::preslashit($path);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
 	static function is_external( $url ) {
-		return TimberURLHelper::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 );
+		return TimberURLHelper::download_url($url, $timeout);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
 	static function get_params( $i = -1 ) {
-		return TimberURLHelper::get_params( $i );
+		return TimberURLHelper::get_params($i);
 	}
 
 }

lib/timber-image-helper.php

Doc Comments +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	 * Generates a new image with increased size, for display on Retina screens.
 	 *
 	 * @param string  $src
-	 * @param float   $multiplier
+	 * @param integer   $multiplier
 	 * @param boolean $force
 	 *
 	 * @return string url to the new image
@@ -136,7 +136,7 @@ 
 	 * @param int     $h
 	 * @param string  $color
 	 * @param bool    $force
-	 * @return mixed|null|string
+	 * @return string
 	 */
 	public static function letterbox( $src, $w, $h, $color = '#000000', $force = false ) {
 		$op = new TimberImageOperationLetterbox($w, $h, $color);

Braces +2 added lines, -1 removed lines

@@ -325,7 +325,8 @@
 		);
 		$upload_dir = wp_upload_dir();
 		$tmp = $url;
-		if ( 0 === strpos($tmp, ABSPATH) ) { // we've been given a dir, not an url
+		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

Indentation +3 added lines, -3 removed lines

@@ -121,10 +121,10 @@
 		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);
-	    }
+		}
 
-	    fclose($fh);
-	    return $count > 1;
+		fclose($fh);
+		return $count > 1;
 	}
 
 	/**

Spacing +76 added lines, -76 removed lines

@@ -72,8 +72,8 @@ 
 			$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');
+			$w = get_option($size . '_size_w');
+			$h = get_option($size . '_size_h');
 		}
 		if ( isset($w) && isset($h) && ($w || $h) ) {
 			return array('w' => $w, 'h' => $h);
@@ -106,7 +106,7 @@ 
 			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);
 	    }
@@ -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;
 		} );
 	}
@@ -201,17 +201,17 @@ 
 	 *	                            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 );
+		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, 'jpg', $dir, '-tojpg.*' );
-		self::process_delete_generated_files( $filename, 'jpg', $dir, '-tojpg-[0-9999999]*' );
+		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, 'jpg', $dir, '-tojpg.*');
+		self::process_delete_generated_files($filename, 'jpg', $dir, '-tojpg-[0-9999999]*');
 	}
 
 	/**
@@ -230,12 +230,12 @@ 
 	 */
 	protected static function process_delete_generated_files( $filename, $ext, $dir, $search_pattern, $match_pattern = null ) {
 		$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 );
-			if ( ! $match_pattern || $match ) {
-				unlink( $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_pattern || $match ) {
+				unlink($found_file);
 			}
 		}
 	}
@@ -249,7 +249,7 @@ 
 	 */
 	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
@@ -268,11 +268,11 @@ 
 		$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;
@@ -285,27 +285,27 @@ 
 	 * @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 ) );
+		$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'];
 	}
 
@@ -317,7 +317,7 @@ 
 	 * @param  string $url an URL (absolute or relative) pointing to an image
 	 * @return array       an array (see keys in code below)
 	 */
-	private static function analyze_url($url) {
+	private static function analyze_url( $url ) {
 		$result = array(
 			'url' => $url, // the initial url
 			'absolute' => TimberURLHelper::is_absolute($url), // is the url absolute or relative (to home_url)
@@ -332,23 +332,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,20 +370,20 @@ 
 	 * @param  bool   $absolute should the returned URL be absolute (include protocol+host), or relative
 	 * @return string           the URL
 	 */
-	private static function _get_file_url($base, $subdir, $filename, $absolute) {
+	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,19 +398,19 @@ 
 	 * @param  string $filename file name, including extension (but no path)
 	 * @return string           the file location
 	 */
-	private static function _get_file_path($base, $subdir, $filename) {
+	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;
 	}
 
@@ -429,14 +429,14 @@ 
 	 *
 	 */
 	private static function _operate( $src, $op, $force = false ) {
-		if ( empty( $src ) ) {
+		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
@@ -459,19 +459,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 {
@@ -483,7 +483,7 @@ 
 
 // -- the below methods are just used for unit testing the URL generation code
 //
-	static function get_letterbox_file_url($url, $w, $h, $color) {
+	static function get_letterbox_file_url( $url, $w, $h, $color ) {
 		$au = self::analyze_url($url);
 		$op = new TimberImageOperationLetterbox($w, $h, $color);
 		$new_url = self::_get_file_url(
@@ -494,7 +494,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(
@@ -504,7 +504,7 @@ 
 		);
 		return $new_path;
 	}
-	static function get_resize_file_url($url, $w, $h, $crop) {
+	static function get_resize_file_url( $url, $w, $h, $crop ) {
 		$au = self::analyze_url($url);
 		$op = new TimberImageOperationResize($w, $h, $crop);
 		$new_url = self::_get_file_url(
@@ -515,7 +515,7 @@ 
 		);
 		return $new_url;
 	}
-	static function get_resize_file_path($url, $w, $h, $crop) {
+	static function get_resize_file_path( $url, $w, $h, $crop ) {
 		$au = self::analyze_url($url);
 		$op = new TimberImageOperationResize($w, $h, $crop);
 		$new_path = self::_get_file_path(

lib/timber-image.php

Doc Comments +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
 	 * 	   <img src="{{ post.thumbnail.src|resize(500) }}" alt="A sumo wrestler" />
 	 * {% endif %}
 	 * ```
-	 * @return float
+	 * @return integer
 	 */
 	public function aspect() {
 		$w = intval($this->width());

Spacing +22 added lines, -22 removed lines

@@ -88,7 +88,7 @@ 
 	 * ```
 	 * @param int|string $iid
 	 */
-	public function __construct($iid) {
+	public function __construct( $iid ) {
 		$this->init($iid);
 	}
 
@@ -115,7 +115,7 @@ 
 	 * @param string $dim
 	 * @return array|int
 	 */
-	protected function get_dimensions($dim = null) {
+	protected function get_dimensions( $dim = null ) {
 		if ( isset($this->_dimensions) ) {
 			return $this->get_dimensions_loaded($dim);
 		}
@@ -133,7 +133,7 @@ 
 	 * @param string|null $dim
 	 * @return array|int
 	 */
-	protected function get_dimensions_loaded($dim) {
+	protected function get_dimensions_loaded( $dim ) {
 		if ( $dim === null ) {
 			return $this->_dimensions;
 		}
@@ -152,25 +152,25 @@ 
 	 */
 	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;
@@ -181,7 +181,7 @@ 
 	 * @param  string $url for evaluation
 	 * @return string with http/https corrected depending on what's appropriate for server
 	 */
-	protected static function _maybe_secure_url($url) {
+	protected static function _maybe_secure_url( $url ) {
 		if ( is_ssl() && strpos($url, 'https') !== 0 && strpos($url, 'http') === 0 ) {
 			$url = 'https' . substr($url, strlen('http'));
 		}
@@ -203,8 +203,8 @@ 
 	 * @param int $iid
 	 */
 	function init( $iid = false ) {
-		if ( !is_numeric( $iid ) && is_string( $iid ) ) {
-			if (strstr($iid, '://')) {
+		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($iid->ID);
@@ -254,7 +254,7 @@ 
 		}
 		if ( isset($this->ID) ) {
 			$custom = get_post_custom($this->ID);
-			foreach ($custom as $key => $value) {
+			foreach ( $custom as $key => $value ) {
 				$this->$key = $value[0];
 			}
 			$this->id = $this->ID;
@@ -273,8 +273,8 @@ 
 	 * @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 );
+		$this->abs_url = home_url($relative_path);
+		$file_path = TimberURLHelper::get_full_path($relative_path);
 		$this->file_loc = $file_path;
 		$this->file = $file_path;
 	}
@@ -284,7 +284,7 @@ 
 	 * @param string $file_path
 	 */
 	protected function init_with_file_path( $file_path ) {
-		$url = TimberURLHelper::file_system_to_url( $file_path );
+		$url = TimberURLHelper::file_system_to_url($file_path);
 		$this->abs_url = $url;
 		$this->file_loc = $file_path;
 		$this->file = $file_path;
@@ -294,7 +294,7 @@ 
 	 * @internal
 	 * @param string $url
 	 */
-	protected function init_with_url($url) {
+	protected function init_with_url( $url ) {
 		$this->abs_url = $url;
 		if ( TimberURLHelper::is_local($url) ) {
 			$this->file = ABSPATH . TimberURLHelper::get_rel_url($url);
@@ -409,7 +409,7 @@ 
 	 * ```
 	 * @return bool|string
 	 */
-	public function src($size = '') {
+	public function src( $size = '' ) {
 		if ( isset($this->abs_url) ) {
 			return $this->_maybe_secure_url($this->abs_url);
 		}
@@ -484,7 +484,7 @@ 
 	 * @return bool|string
 	 */
 	function get_src( $size = '' ) {
-		return $this->src( $size );
+		return $this->src($size);
 	}
 
 	/**

lib/timber-menu-item.php

Doc Comments +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 	/**
 	 *
 	 * @internal
-	 * @return bool 
+	 * @return boolean|null 
 	 */
 	function update_child_levels() {
 		if (is_array($this->children)) {

Spacing +28 added lines, -28 removed lines

@@ -26,13 +26,13 @@ 
 	 */
 	public function __construct( $data ) {
 		$data = (object) $data;
-		$this->import( $data );
-		$this->import_classes( $data );
-		if ( isset( $this->name ) ) {
+		$this->import($data);
+		$this->import_classes($data);
+		if ( isset($this->name) ) {
 			$this->_name = $this->name;
 		}
 		$this->name = $this->name();
-		$this->add_class( 'menu-item-' . $this->ID );
+		$this->add_class('menu-item-' . $this->ID);
 		$this->menu_object = $data;
 	}
 
@@ -61,7 +61,7 @@ 
 		if ( $title = $this->title() ) {
 			return $title;
 		}
-		if ( isset( $this->_name ) ) {
+		if ( isset($this->_name) ) {
 			return $this->_name;
 		}
 		return '';
@@ -82,10 +82,10 @@ 
 	 * @return string the slug of the menu item kinda-like-this
 	 */
 	public function slug() {
-		if ( !isset( $this->master_object ) ) {
+		if ( !isset($this->master_object) ) {
 			$this->master_object = $this->get_master_object();
 		}
-		if ( isset( $this->master_object->post_name ) && $this->master_object->post_name ) {
+		if ( isset($this->master_object->post_name) && $this->master_object->post_name ) {
 			return $this->master_object->post_name;
 		}
 		return $this->post_name;
@@ -96,8 +96,8 @@ 
 	 * @return mixed whatever object (Post, Term, etc.) the menu item represents
 	 */
 	protected function get_master_object() {
-		if ( isset( $this->_menu_item_object_id ) ) {
-			return new $this->PostClass( $this->_menu_item_object_id );
+		if ( isset($this->_menu_item_object_id) ) {
+			return new $this->PostClass($this->_menu_item_object_id);
 		}
 	}
 
@@ -107,10 +107,10 @@ 
 	 * @return string an absolute URL http://example.org/my-page
 	 */
 	function get_link() {
-		if ( !isset( $this->url ) || !$this->url ) {
-			if ( isset( $this->_menu_item_type ) && $this->_menu_item_type == 'custom' ) {
+		if ( !isset($this->url) || !$this->url ) {
+			if ( isset($this->_menu_item_type) && $this->_menu_item_type == 'custom' ) {
 				$this->url = $this->_menu_item_url;
-			} else if ( isset( $this->menu_object ) && method_exists( $this->menu_object, 'get_link' ) ) {
+			} else if ( isset($this->menu_object) && method_exists($this->menu_object, 'get_link') ) {
 					$this->url = $this->menu_object->get_link();
 				}
 		}
@@ -123,7 +123,7 @@ 
 	 * @return string a relative url /my-page
 	 */
 	function get_path() {
-		return TimberURLHelper::get_rel_url( $this->get_link() );
+		return TimberURLHelper::get_rel_url($this->get_link());
 	}
 
 	/**
@@ -133,15 +133,15 @@ 
 	 */
 	function add_child( $item ) {
 		if ( !$this->has_child_class ) {
-			$this->add_class( 'menu-item-has-children' );
+			$this->add_class('menu-item-has-children');
 			$this->has_child_class = true;
 		}
-		if ( !isset( $this->children ) ) {
+		if ( !isset($this->children) ) {
 			$this->children = array();
 		}
 		$this->children[] = $item;
 		$item->level = $this->level + 1;
-		if ($item->children) {
+		if ( $item->children ) {
 			$this->update_child_levels();
 		}
 	}
@@ -152,8 +152,8 @@ 
 	 * @return bool 
 	 */
 	function update_child_levels() {
-		if (is_array($this->children)) {
-			foreach( $this->children as $child ) {
+		if ( is_array($this->children) ) {
+			foreach ( $this->children as $child ) {
 				$child->level = $this->level + 1;
 				$child->update_child_levels();
 			}
@@ -170,10 +170,10 @@ 
 		if ( is_array($data) ) {
 			$data = (object) $data;
 		}
-		$this->classes = array_merge( $this->classes, $data->classes );
-		$this->classes = array_unique( $this->classes );
-		$this->classes = apply_filters( 'nav_menu_css_class', $this->classes, $this );
-		$this->class = trim( implode( ' ', $this->classes ) );
+		$this->classes = array_merge($this->classes, $data->classes);
+		$this->classes = array_unique($this->classes);
+		$this->classes = apply_filters('nav_menu_css_class', $this->classes, $this);
+		$this->class = trim(implode(' ', $this->classes));
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 * @return array|bool
 	 */
 	function get_children() {
-		if ( isset( $this->children ) ) {
+		if ( isset($this->children) ) {
 			return $this->children;
 		}
 		return false;
@@ -201,7 +201,7 @@ 
 		if ( $this->type != 'custom' ) {
 			return false;
 		}
-		return TimberURLHelper::is_external( $this->url );
+		return TimberURLHelper::is_external($this->url);
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	 * @return mixed whatever value is storied in the database
 	 */
 	public function meta( $key ) {
-		if ( is_object( $this->menu_object ) && method_exists( $this->menu_object, 'meta' ) ) {
-			return $this->menu_object->meta( $key );
+		if ( is_object($this->menu_object) && method_exists($this->menu_object, 'meta') ) {
+			return $this->menu_object->meta($key);
 		}
-		if ( isset( $this->$key ) ) {
+		if ( isset($this->$key) ) {
 			return $this->$key;
 		}
 	}
@@ -299,7 +299,7 @@ 
 	 * @return string the public label like Foo
 	 */
 	public function title() {
-		if ( isset( $this->__title ) ) {
+		if ( isset($this->__title) ) {
 			return $this->__title;
 		}
 	}

lib/timber-menu.php

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	public $title;
 
 	/**
-	 * @param int|string $slug
+	 * @param integer $slug
 	 */
 	function __construct($slug = 0) {
 		$locations = get_nav_menu_locations();

Braces +5 added lines, -5 removed lines

@@ -101,7 +101,7 @@ 
 		$menu = wp_get_nav_menu_items($menu_id);
 		if ($menu) {
 			_wp_menu_item_classes_by_context($menu);
-			if (is_array($menu)){
+			if (is_array($menu)) {
 				$menu = self::order_children($menu);
 			}
 			$this->items = $menu;
@@ -123,7 +123,7 @@ 
 				$mi->__title = $mi->post_title;
 			}
 			_wp_menu_item_classes_by_context($menu);
-			if (is_array($menu)){
+			if (is_array($menu)) {
 				$menu = self::order_children($menu);
 			}
 			$this->items = $menu;
@@ -201,13 +201,13 @@ 
 				$item->__title = $item->title;
 				unset($item->title);
 			}
-			if(isset($item->ID)){
-				if (is_object($item) && get_class($item) == 'WP_Post'){
+			if(isset($item->ID)) {
+				if (is_object($item) && get_class($item) == 'WP_Post') {
 					$old_menu_item = $item;
 					$item = new $this->PostClass($item);
 				}
 				$menu_item = new $this->MenuItemClass($item);
-				if (isset($old_menu_item)){
+				if (isset($old_menu_item)) {
 					$menu_item->import_classes($old_menu_item);
 				}
 				$index[$item->ID] = $menu_item;

Spacing +33 added lines, -33 removed lines

@@ -75,18 +75,18 @@ 
 	/**
 	 * @param int|string $slug
 	 */
-	function __construct($slug = 0) {
+	function __construct( $slug = 0 ) {
 		$locations = get_nav_menu_locations();
-		if ($slug != 0 && is_numeric($slug)) {
+		if ( $slug != 0 && is_numeric($slug) ) {
 			$menu_id = $slug;
-		} else if (is_array($locations) && count($locations)) {
+		} else if ( is_array($locations) && count($locations) ) {
 			$menu_id = $this->get_menu_id_from_locations($slug, $locations);
-		} else if ($slug === false) {
+		} else if ( $slug === false ) {
 			$menu_id = false;
 		} else {
 			$menu_id = $this->get_menu_id_from_terms($slug);
 		}
-		if ($menu_id) {
+		if ( $menu_id ) {
 			$this->init($menu_id);
 		} else {
 			$this->init_as_page_menu();
@@ -97,11 +97,11 @@ 
 	 * @internal
 	 * @param int $menu_id
 	 */
-	protected function init($menu_id) {
+	protected function init( $menu_id ) {
 		$menu = wp_get_nav_menu_items($menu_id);
-		if ($menu) {
+		if ( $menu ) {
 			_wp_menu_item_classes_by_context($menu);
-			if (is_array($menu)){
+			if ( is_array($menu) ) {
 				$menu = self::order_children($menu);
 			}
 			$this->items = $menu;
@@ -118,12 +118,12 @@ 
 	 */
 	protected function init_as_page_menu() {
 		$menu = get_pages();
-		if ($menu) {
-			foreach($menu as $mi) {
+		if ( $menu ) {
+			foreach ( $menu as $mi ) {
 				$mi->__title = $mi->post_title;
 			}
 			_wp_menu_item_classes_by_context($menu);
-			if (is_array($menu)){
+			if ( is_array($menu) ) {
 				$menu = self::order_children($menu);
 			}
 			$this->items = $menu;
@@ -136,14 +136,14 @@ 
 	 * @param array $locations
 	 * @return integer
 	 */
-	protected function get_menu_id_from_locations($slug, $locations) {
-		if ($slug === 0) {
+	protected function get_menu_id_from_locations( $slug, $locations ) {
+		if ( $slug === 0 ) {
 			$slug = $this->get_menu_id_from_terms($slug);
 		}
-		if (is_numeric($slug)) {
+		if ( is_numeric($slug) ) {
 			$slug = array_search($slug, $locations);
 		}
-		if (isset($locations[$slug])) {
+		if ( isset($locations[$slug]) ) {
 			$menu_id = $locations[$slug];
 			return $menu_id;
 		}
@@ -154,21 +154,21 @@ 
 	 * @param int $slug
 	 * @return int
 	 */
-	protected function get_menu_id_from_terms($slug = 0) {
-		if (!is_numeric($slug) && is_string($slug)) {
+	protected function get_menu_id_from_terms( $slug = 0 ) {
+		if ( !is_numeric($slug) && is_string($slug) ) {
 			//we have a string so lets search for that
 			$menu_id = get_term_by('slug', $slug, 'nav_menu');
-			if ($menu_id) {
+			if ( $menu_id ) {
 				return $menu_id;
 			}
 			$menu_id = get_term_by('name', $slug, 'nav_menu');
-			if ($menu_id) {
+			if ( $menu_id ) {
 				return $menu_id;
 			}
 		}
 		$menus = get_terms('nav_menu', array('hide_empty' => true));
-		if (is_array($menus) && count($menus)) {
-			if (isset($menus[0]->term_id)) {
+		if ( is_array($menus) && count($menus) ) {
+			if ( isset($menus[0]->term_id) ) {
 				return $menus[0]->term_id;
 			}
 		}
@@ -180,9 +180,9 @@ 
 	 * @param int $parent_id
 	 * @return TimberMenuItem|null
 	 */
-	function find_parent_item_in_menu($menu_items, $parent_id) {
-		foreach ($menu_items as &$item) {
-			if ($item->ID == $parent_id) {
+	function find_parent_item_in_menu( $menu_items, $parent_id ) {
+		foreach ( $menu_items as &$item ) {
+			if ( $item->ID == $parent_id ) {
 				return $item;
 			}
 		}
@@ -193,29 +193,29 @@ 
 	 * @param array $items
 	 * @return array
 	 */
-	protected function order_children($items) {
+	protected function order_children( $items ) {
 		$index = array();
 		$menu = array();
-		foreach ($items as $item) {
-			if (isset($item->title)) {
+		foreach ( $items as $item ) {
+			if ( isset($item->title) ) {
 				//items from wp can come with a $title property which conflicts with methods
 				$item->__title = $item->title;
 				unset($item->title);
 			}
-			if(isset($item->ID)){
-				if (is_object($item) && get_class($item) == 'WP_Post'){
+			if ( isset($item->ID) ) {
+				if ( is_object($item) && get_class($item) == 'WP_Post' ) {
 					$old_menu_item = $item;
 					$item = new $this->PostClass($item);
 				}
 				$menu_item = new $this->MenuItemClass($item);
-				if (isset($old_menu_item)){
+				if ( isset($old_menu_item) ) {
 					$menu_item->import_classes($old_menu_item);
 				}
 				$index[$item->ID] = $menu_item;
 			}
 		}
-		foreach ($index as $item) {
-			if (isset($item->menu_item_parent) && $item->menu_item_parent && isset($index[$item->menu_item_parent])) {
+		foreach ( $index as $item ) {
+			if ( isset($item->menu_item_parent) && $item->menu_item_parent && isset($index[$item->menu_item_parent]) ) {
 				$index[$item->menu_item_parent]->add_child($item);
 			} else {
 				$menu[] = $item;
@@ -228,7 +228,7 @@ 
 	 * @return array
 	 */
 	function get_items() {
-		if (is_array($this->items)) {
+		if ( is_array($this->items) ) {
 			return $this->items;
 		}
 		return array();

lib/timber-post.php

Doc Comments +6 added lines, -6 removed lines

@@ -225,7 +225,7 @@ 
 	/**
 	 * Initializes a TimberPost
 	 * @internal
-	 * @param int|bool $pid
+	 * @param integer $pid
 	 */
 	protected function init($pid = false) {
 		if ( $pid === false ) {
@@ -272,7 +272,7 @@ 
 	 * takes a mix of integer (post ID), string (post slug),
 	 * or object to return a WordPress post object from WP's built-in get_post() function
 	 * @internal
-	 * @param mixed $pid
+	 * @param integer $pid
 	 * @return WP_Post on success
 	 */
 	protected function prepare_post_info( $pid = 0 ) {
@@ -598,7 +598,7 @@ 
 	 * Gets a User object from the author of the post
 	 * @internal
 	 * @see TimberPost::author
-	 * @return bool|TimberUser
+	 * @return TimberUser|null
 	 */
 	function get_author() {
 		if ( isset($this->post_author) ) {
@@ -608,7 +608,7 @@ 
 
 	/**
 	 * @internal
-	 * @return bool|TimberUser
+	 * @return TimberUser|null
 	 */
 	function get_modified_author() {
 		$user_id = get_post_meta($this->ID, '_edit_last', true);
@@ -1073,7 +1073,7 @@ 
 	 *     <a href="{{post.author.link}}">{{post.author.name}}</a>
 	 * </p>
 	 * ```
-	 * @return TimberUser|bool A TimberUser object if found, false if not
+	 * @return TimberUser|null A TimberUser object if found, false if not
 	 */
 	public function author() {
 		return $this->get_author();
@@ -1088,7 +1088,7 @@ 
 	 * ```html
 	 * Last updated by Harper Lee
 	 * ```
-	 * @return TimberUser|bool A TimberUser object if found, false if not
+	 * @return TimberUser|null A TimberUser object if found, false if not
 	 */
 	public function modified_author() {
 		return $this->get_modified_author();

Braces +4 added lines, -4 removed lines

@@ -188,13 +188,13 @@ 
 			&& get_class($wp_query->queried_object) == 'WP_Post'
 			) {
 			$pid = $wp_query->queried_object_id;
-		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id )  {
+		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id ) {
 			//hack for static page as home page
 			$pid = $wp_query->queried_object_id;
 		} else if ( $pid === null ) {
 			$gtid = false;
 			$maybe_post = get_post();
-			if ( isset($maybe_post->ID) ){
+			if ( isset($maybe_post->ID) ) {
 				$gtid = true;
 			}
 			if ( $gtid ) {
@@ -1028,7 +1028,7 @@ 
 		$post = $this;
 		$class_array = get_post_class($class, $this->ID);
 		$post = $old_global_post;
-		if ( is_array($class_array) ){
+		if ( is_array($class_array) ) {
 			return implode(' ', $class_array);
 		}
 		return $class_array;
@@ -1248,7 +1248,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		return $this->title();
 	}
 

Indentation +4 added lines, -4 removed lines

@@ -231,13 +231,13 @@
 	 	$can_preview = array();
 
 		foreach( $can as $type ) {
-		     if( current_user_can( $type ) ) {
-		        $can_preview[] = true;
-		     }
+			 if( current_user_can( $type ) ) {
+				$can_preview[] = true;
+			 }
 		}
 
 		if ( count( $can_preview ) !== count( $can ) ) {
-		     return;
+			 return;
 		}
 
 		$revisions = wp_get_post_revisions( $query->queried_object_id );

Spacing +43 added lines, -43 removed lines

@@ -161,8 +161,8 @@ 
 	 * ```
 	 * @param mixed $pid
 	 */
-	public function __construct($pid = null) {
-		$pid = $this->determine_id( $pid );
+	public function __construct( $pid = null ) {
+		$pid = $this->determine_id($pid);
 		$this->init($pid);
 	}
 
@@ -172,7 +172,7 @@ 
 	 * @param mixed a value to test against
 	 * @return int the numberic id we should be using for this post object
 	 */
-	protected function determine_id($pid) {
+	protected function determine_id( $pid ) {
 		global $wp_query;
 		if ( $pid === null &&
 			isset($wp_query->queried_object_id)
@@ -181,18 +181,18 @@ 
 			&& is_object($wp_query->queried_object)
 			&& get_class($wp_query->queried_object) == 'WP_Post'
 			) {
-				if( isset( $_GET['preview'] ) && isset( $_GET['preview_nonce'] ) && wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $wp_query->queried_object_id ) ) {
-					$pid = $this->get_post_preview_id( $wp_query );
+				if ( isset($_GET['preview']) && isset($_GET['preview_nonce']) && wp_verify_nonce($_GET['preview_nonce'], 'post_preview_' . $wp_query->queried_object_id) ) {
+					$pid = $this->get_post_preview_id($wp_query);
 				} else if ( !$pid ) {
 					$pid = $wp_query->queried_object_id;
 				}
-		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id )  {
+		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id ) {
 			//hack for static page as home page
 			$pid = $wp_query->queried_object_id;
 		} else if ( $pid === null ) {
 			$gtid = false;
 			$maybe_post = get_post();
-			if ( isset($maybe_post->ID) ){
+			if ( isset($maybe_post->ID) ) {
 				$gtid = true;
 			}
 			if ( $gtid ) {
@@ -230,19 +230,19 @@ 
 
 	 	$can_preview = array();
 
-		foreach( $can as $type ) {
-		     if( current_user_can( $type ) ) {
+		foreach ( $can as $type ) {
+		     if ( current_user_can($type) ) {
 		        $can_preview[] = true;
 		     }
 		}
 
-		if ( count( $can_preview ) !== count( $can ) ) {
+		if ( count($can_preview) !== count($can) ) {
 		     return;
 		}
 
-		$revisions = wp_get_post_revisions( $query->queried_object_id );
+		$revisions = wp_get_post_revisions($query->queried_object_id);
 
-		if( !empty( $revisions ) ) {
+		if ( !empty($revisions) ) {
 			$last = end($revisions);
 			return $last->ID;
 		}
@@ -255,7 +255,7 @@ 
 	 * @internal
 	 * @param int|bool $pid
 	 */
-	protected function init($pid = false) {
+	protected function init( $pid = false ) {
 		if ( $pid === false ) {
 			$pid = get_the_ID();
 		}
@@ -342,11 +342,11 @@ 
 	 * @param string $post_name
 	 * @return int
 	 */
-	static function get_post_id_by_name($post_name) {
+	static function get_post_id_by_name( $post_name ) {
 		global $wpdb;
 		$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $post_name);
 		$result = $wpdb->get_row($query);
-		if (!$result) {
+		if ( !$result ) {
 			return null;
 		}
 		return $result->ID;
@@ -368,7 +368,7 @@ 
 	 * @param string $end The text to end the preview with (defaults to ...)
 	 * @return string of the post preview
 	 */
-	function get_preview($len = 50, $force = false, $readmore = 'Read More', $strip = true, $end = '…') {
+	function get_preview( $len = 50, $force = false, $readmore = 'Read More', $strip = true, $end = '…' ) {
 		$text = '';
 		$trimmed = false;
 		if ( isset($this->post_excerpt) && strlen($this->post_excerpt) ) {
@@ -386,7 +386,7 @@ 
 				$text = TimberHelper::trim_words($text, $len, false);
 				$trimmed = true;
 			}
-			$text = do_shortcode( $text );
+			$text = do_shortcode($text);
 		}
 		if ( !strlen($text) ) {
 			$text = TimberHelper::trim_words($this->get_content(), $len, false);
@@ -416,11 +416,11 @@ 
 			}
 			$read_more_class = apply_filters('timber/post/get_preview/read_more_class', "read-more");
 			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore_matches[1]) . '</a>';
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore_matches[1]) . '</a>';
 			} elseif ( $readmore ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore) . '</a>';
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore) . '</a>';
 			}
-			if ( !$strip && $last_p_tag && ( strpos($text, '<p>') || strpos($text, '<p ') ) ) {
+			if ( !$strip && $last_p_tag && (strpos($text, '<p>') || strpos($text, '<p ')) ) {
 				$text .= '</p>';
 			}
 		}
@@ -564,7 +564,7 @@ 
 	 * @param int $i
 	 * @return string
 	 */
-	protected static function get_wp_link_page($i) {
+	protected static function get_wp_link_page( $i ) {
 		$link = _wp_link_page($i);
 		$link = new SimpleXMLElement($link . '</a>');
 		if ( isset($link['href']) ) {
@@ -647,7 +647,7 @@ 
 	 * @param  int $pid
 	 * @return null|object|WP_Post
 	 */
-	protected function get_info($pid) {
+	protected function get_info( $pid ) {
 		$post = $this->prepare_post_info($pid);
 		if ( !isset($post->post_status) ) {
 			return null;
@@ -657,7 +657,7 @@ 
 		$post->slug = $post->post_name;
 		$customs = $this->get_post_custom($post->ID);
 		$post->custom = $customs;
-		$post = (object) array_merge((array)$customs, (array)$post);
+		$post = (object) array_merge((array) $customs, (array) $post);
 		return $post;
 	}
 
@@ -669,7 +669,7 @@ 
 	 */
 	function get_date( $date_format = '' ) {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->post_date);
+		$the_date = (string) mysql2date($df, $this->post_date);
 		return apply_filters('get_the_date', $the_date, $df);
 	}
 
@@ -730,7 +730,7 @@ 
 	 * @return array|mixed
 	 */
 
-	function get_comments($ct = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment') {
+	function get_comments( $ct = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment' ) {
 
 		global $overridden_cpage, $user_ID;
 		$overridden_cpage = false;
@@ -747,42 +747,42 @@ 
 		}
 
 		if ( $user_ID ) {
-			$args['include_unapproved'] = array( $user_ID );
-		} elseif ( ! empty( $comment_author_email ) ) {
-			$args['include_unapproved'] = array( $comment_author_email );
+			$args['include_unapproved'] = array($user_ID);
+		} elseif ( !empty($comment_author_email) ) {
+			$args['include_unapproved'] = array($comment_author_email);
 		}
 
 		$comments = get_comments($args);
 		$timber_comments = array();
 
 		if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
-			set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+			set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 			$overridden_cpage = true;
 		}
 
-		foreach($comments as $key => &$comment) {
+		foreach ( $comments as $key => &$comment ) {
 			$timber_comment = new $CommentClass($comment);
 			$timber_comments[$timber_comment->id] = $timber_comment;
 		}
 
 		// Build a flattened (depth=1) comment tree
 		$comments_tree = array();
-		foreach( $timber_comments as $key => $comment ) {
-			if ( ! $comment->is_child() ) {
+		foreach ( $timber_comments as $key => $comment ) {
+			if ( !$comment->is_child() ) {
 				continue;
 			}
 
 			$tree_element = $comment;
 			do {
 				$tree_element = $timber_comments[$tree_element->comment_parent];
-			} while( $tree_element->is_child() );
+			} while ( $tree_element->is_child() );
 
 			$comments_tree[$tree_element->id][] = $comment->id;
 		}
 
 		// Add child comments to the relative "super parents"
-		foreach($comments_tree as $comment_parent => $comment_children) {
-			foreach($comment_children as $comment_child) {
+		foreach ( $comments_tree as $comment_parent => $comment_children ) {
+			foreach ( $comment_children as $comment_child ) {
 				$timber_comments[$comment_parent]->children[] = $timber_comments[$comment_child];
 				unset($timber_comments[$comment_child]);
 			}
@@ -833,7 +833,7 @@ 
 			$taxonomies = $tax;
 		}
 		if ( is_string($tax) ) {
-			if ( in_array($tax, array('all','any','')) ) {
+			if ( in_array($tax, array('all', 'any', '')) ) {
 				$taxonomies = get_object_taxonomies($this->post_type);
 			} else {
 				$taxonomies = array($tax);
@@ -843,7 +843,7 @@ 
 		$term_class_objects = array();
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( in_array($taxonomy, array('tag','tags')) ) {
+			if ( in_array($taxonomy, array('tag', 'tags')) ) {
 				$taxonomy = 'post_tag';
 			}
 			if ( $taxonomy == 'categories' ) {
@@ -862,7 +862,7 @@ 
 			}
 
 			// map over array of wordpress terms, and transform them into instances of the TermClass
-			$terms = array_map(function($term) use ($TermClass, $taxonomy) {
+			$terms = array_map(function( $term ) use ($TermClass, $taxonomy) {
 				return call_user_func(array($TermClass, 'from'), $term->term_id, $taxonomy);
 			}, $terms);
 
@@ -1055,13 +1055,13 @@ 
 	 * ```
 	 * @return string a space-seperated list of classes
 	 */
-	public function post_class( $class='' ) {
+	public function post_class( $class = '' ) {
 		global $post;
 		$old_global_post = $post;
 		$post = $this;
 		$class_array = get_post_class($class, $this->ID);
 		$post = $old_global_post;
-		if ( is_array($class_array) ){
+		if ( is_array($class_array) ) {
 			return implode(' ', $class_array);
 		}
 		return $class_array;
@@ -1164,7 +1164,7 @@ 
 	 * @return array
 	 */
 	public function children( $post_type = 'any', $childPostClass = false ) {
-		return $this->get_children( $post_type, $childPostClass );
+		return $this->get_children($post_type, $childPostClass);
 	}
 
 	/**
@@ -1258,7 +1258,7 @@ 
 	 */
 	public function time( $time_format = '' ) {
 		$tf = $time_format ? $time_format : get_option('time_format');
-	 	$the_time = (string)mysql2date($tf, $this->post_date);
+	 	$the_time = (string) mysql2date($tf, $this->post_date);
 	 	return apply_filters('get_the_time', $the_time, $tf);
 	}
 
@@ -1305,7 +1305,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		return $this->title();
 	}
 

lib/timber-routes.php

Doc Comments +2 added lines, -1 removed lines

@@ -4,6 +4,7 @@ 
 
 	/**
 	 * @deprecated since 0.21.1 use Upstatement/routes instead
+	 * @param Timber $timber
 	 */
 	public static function init( $timber ) {
 		// Install ourselves in Timber
@@ -24,7 +25,7 @@ 
 	 * @param mixed $query
 	 * @param int $status_code
 	 * @param bool $tparams
-	 * @return bool
+	 * @return boolean|null
 	 * @deprecated since 0.21.1 use Upstatement/routes instead
 	 */
 	public static function load_view($template, $query = false, $status_code = 200, $tparams = false) {

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 	 * @param callable $callback
 	 * @deprecated since 0.21.1 use Upstatement/routes instead
 	 */
-	public static function add_route($route, $callback, $args = array()) {
+	public static function add_route( $route, $callback, $args = array() ) {
 		Routes::map($route, $callback, $args);
 	}
 
@@ -27,7 +27,7 @@ 
 	 * @return bool
 	 * @deprecated since 0.21.1 use Upstatement/routes instead
 	 */
-	public static function load_view($template, $query = false, $status_code = 200, $tparams = false) {
+	public static function load_view( $template, $query = false, $status_code = 200, $tparams = false ) {
 		Routes::load($template, $tparams, $query, $status_code);
 	}
 }

lib/timber-url-helper.php

Doc Comments +7 added lines

@@ -136,6 +136,9 @@ 
 		return $path;
 	}
 
+	/**
+	 * @param string $fs
+	 */
 	public static function file_system_to_url( $fs ) {
 		$relative_path = self::get_rel_path( $fs );
 		$home = home_url( '/'.$relative_path );
@@ -210,6 +213,7 @@ 
 	/**
 	 * This will evaluate wheter a URL is at an aboslute location (like http://example.org/whatever)
 	 *
+	 * @param string $path
 	 * @return boolean true if $path is an absolute url, false if relative.
 	 */
 	public static function is_absolute( $path ) {
@@ -230,6 +234,9 @@ 
 		return $is_external;
 	}
 
+	/**
+	 * @param string $url
+	 */
 	private static function is_internal_content($url) {
 		// using content_url() instead of site_url or home_url is IMPORTANT
 		// otherwise you run into errors with sites that:

Braces +3 added lines, -2 removed lines

@@ -267,8 +267,9 @@
 	 * @return string
 	 */
 	public static function remove_trailing_slash( $link ) {
-		if ( $link != "/" )
-			$link = untrailingslashit( $link );
+		if ( $link != "/" ) {
+					$link = untrailingslashit( $link );
+		}
 		return $link;
 	}
 

Spacing +55 added lines, -55 removed lines

@@ -9,8 +9,8 @@ 
 	 */
 	public static function get_current_url() {
 		$pageURL = "http://";
-		if ( isset( $_SERVER['HTTPS'] ) && $_SERVER["HTTPS"] == "on" ) {
-			$pageURL = "https://";;
+		if ( isset($_SERVER['HTTPS']) && $_SERVER["HTTPS"] == "on" ) {
+			$pageURL = "https://"; ;
 		}
 		if ( isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] && $_SERVER["SERVER_PORT"] != "80" ) {
 			$pageURL .= self::get_host() . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
@@ -27,11 +27,11 @@ 
 	 * @return bool
 	 */
 	public static function is_url( $url ) {
-		if ( !is_string( $url ) ) {
+		if ( !is_string($url) ) {
 			return false;
 		}
-		$url = strtolower( $url );
-		if ( strstr( $url, '://' ) ) {
+		$url = strtolower($url);
+		if ( strstr($url, '://') ) {
 			return true;
 		}
 		return false;
@@ -43,11 +43,11 @@ 
 	 * @return string
 	 */
 	public static function get_path_base() {
-		$struc = get_option( 'permalink_structure' );
-		$struc = explode( '/', $struc );
+		$struc = get_option('permalink_structure');
+		$struc = explode('/', $struc);
 		$p = '/';
 		foreach ( $struc as $s ) {
-			if ( !strstr( $s, '%' ) && strlen( $s ) ) {
+			if ( !strstr($s, '%') && strlen($s) ) {
 				$p .= $s . '/';
 			}
 		}
@@ -62,21 +62,21 @@ 
 	 * @return string
 	 */
 	public static function get_rel_url( $url, $force = false ) {
-		$url_info = parse_url( $url );
-		if ( isset( $url_info['host'] ) && $url_info['host'] != self::get_host() && !$force ) {
+		$url_info = parse_url($url);
+		if ( isset($url_info['host']) && $url_info['host'] != self::get_host() && !$force ) {
 			return $url;
 		}
 		$link = '';
-		if ( isset( $url_info['path'] ) ) {
+		if ( isset($url_info['path']) ) {
 			$link = $url_info['path'];
 		}
-		if ( isset( $url_info['query'] ) && strlen( $url_info['query'] ) ) {
+		if ( isset($url_info['query']) && strlen($url_info['query']) ) {
 			$link .= '?' . $url_info['query'];
 		}
-		if ( isset( $url_info['fragment'] ) && strlen( $url_info['fragment'] ) ) {
+		if ( isset($url_info['fragment']) && strlen($url_info['fragment']) ) {
 			$link .= '#' . $url_info['fragment'];
 		}
-		$link = TimberURLHelper::remove_double_slashes( $link );
+		$link = TimberURLHelper::remove_double_slashes($link);
 		return $link;
 	}
 
@@ -86,10 +86,10 @@ 
 	 * @return string the HTTP_HOST or SERVER_NAME
 	 */
 	public static function get_host() {
-		if (isset($_SERVER['HTTP_HOST'])) {
+		if ( isset($_SERVER['HTTP_HOST']) ) {
 			return $_SERVER['HTTP_HOST'];
 		}
-		if (isset($_SERVER['SERVER_NAME'])) {
+		if ( isset($_SERVER['SERVER_NAME']) ) {
 			return $_SERVER['SERVER_NAME'];
 		}
 		return '';
@@ -102,7 +102,7 @@ 
 	 * @return bool
 	 */
 	public static function is_local( $url ) {
-		if ( strstr( $url, self::get_host() ) ) {
+		if ( strstr($url, self::get_host()) ) {
 			return true;
 		}
 		return false;
@@ -117,7 +117,7 @@ 
 	public static function get_full_path( $src ) {
 		$root = ABSPATH;
 		$old_root_path = $root . $src;
-		$old_root_path = str_replace( '//', '/', $old_root_path );
+		$old_root_path = str_replace('//', '/', $old_root_path);
 		return $old_root_path;
 	}
 
@@ -130,15 +130,15 @@ 
 	 * @return string
 	 */
 	public static function url_to_file_system( $url ) {
-		$url_parts = parse_url( $url );
+		$url_parts = parse_url($url);
 		$path = ABSPATH . $url_parts['path'];
-		$path = str_replace( '//', '/', $path );
+		$path = str_replace('//', '/', $path);
 		return $path;
 	}
 
 	public static function file_system_to_url( $fs ) {
-		$relative_path = self::get_rel_path( $fs );
-		$home = home_url( '/'.$relative_path );
+		$relative_path = self::get_rel_path($fs);
+		$home = home_url('/' . $relative_path);
 		return $home;
 	}
 
@@ -149,11 +149,11 @@ 
 	 * @return string
 	 */
 	public static function get_rel_path( $src ) {
-		if ( strstr( $src, ABSPATH ) ) {
-			return str_replace( ABSPATH, '', $src );
+		if ( strstr($src, ABSPATH) ) {
+			return str_replace(ABSPATH, '', $src);
 		}
 		//its outside the wordpress directory, alternate setups:
-		$src = str_replace( WP_CONTENT_DIR, '', $src );
+		$src = str_replace(WP_CONTENT_DIR, '', $src);
 		return WP_CONTENT_SUBDIR . $src;
 	}
 
@@ -164,9 +164,9 @@ 
 	 * @return string
 	 */
 	public static function remove_double_slashes( $url ) {
-		$url = str_replace( '//', '/', $url );
-		if ( strstr( $url, 'http:' ) && !strstr( $url, 'http://' ) ) {
-			$url = str_replace( 'http:/', 'http://', $url );
+		$url = str_replace('//', '/', $url);
+		if ( strstr($url, 'http:') && !strstr($url, 'http://') ) {
+			$url = str_replace('http:/', 'http://', $url);
 		}
 		return $url;
 	}
@@ -179,19 +179,19 @@ 
 	 * @return string
 	 */
 	public static function prepend_to_url( $url, $path ) {
-		if ( strstr( strtolower( $url ), 'http' ) ) {
-			$url_parts = parse_url( $url );
+		if ( strstr(strtolower($url), 'http') ) {
+			$url_parts = parse_url($url);
 			$url = $url_parts['scheme'] . '://' . $url_parts['host'] . $path . $url_parts['path'];
-			if ( isset( $url_parts['query'] ) ) {
+			if ( isset($url_parts['query']) ) {
 				$url .= $url_parts['query'];
 			}
-			if ( isset( $url_parts['fragment'] ) ) {
+			if ( isset($url_parts['fragment']) ) {
 				$url .= $url_parts['fragment'];
 			}
 		} else {
 			$url = $url . $path;
 		}
-		return self::remove_double_slashes( $url );
+		return self::remove_double_slashes($url);
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 * @return string
 	 */
 	public static function preslashit( $path ) {
-		if ( strpos( $path, '/' ) != 0 ) {
+		if ( strpos($path, '/') != 0 ) {
 			$path = '/' . $path;
 		}
 		return $path;
@@ -213,7 +213,7 @@ 
 	 * @return boolean true if $path is an absolute url, false if relative.
 	 */
 	public static function is_absolute( $path ) {
-		return (boolean) ( strstr( $path, 'http' ) );
+		return (boolean) (strstr($path, 'http'));
 	}
 
 	/**
@@ -225,21 +225,21 @@ 
 	 * @return boolean if $url points to an external location returns true
 	 */
 	public static function is_external_content( $url ) {
-		$is_external = TimberURLHelper::is_absolute( $url ) && ! TimberURLHelper::is_internal_content( $url );
+		$is_external = TimberURLHelper::is_absolute($url) && !TimberURLHelper::is_internal_content($url);
 
 		return $is_external;
 	}
 
-	private static function is_internal_content($url) {
+	private static function is_internal_content( $url ) {
 		// using content_url() instead of site_url or home_url is IMPORTANT
 		// otherwise you run into errors with sites that:
 		// 1. use WPML plugin
 		// 2. or redefine content directory
-		$is_content_url = strstr( $url, content_url() );
+		$is_content_url = strstr($url, content_url());
 
 		// this case covers when the upload directory has been redefined
 		$upload_dir = wp_upload_dir();
-		$is_upload_url = strstr( $url, $upload_dir['baseurl'] );
+		$is_upload_url = strstr($url, $upload_dir['baseurl']);
 
 		return $is_content_url || $is_upload_url;
 	}
@@ -252,8 +252,8 @@ 
 	 *                  true if it's a subdomain (http://cdn.example.org = true)
 	 */
 	public static function is_external( $url ) {
-		$has_http = strstr( strtolower( $url ), 'http' );
-		$on_domain = strstr( $url, self::get_host() );
+		$has_http = strstr(strtolower($url), 'http');
+		$on_domain = strstr($url, self::get_host());
 		if ( $has_http && !$on_domain ) {
 			return true;
 		}
@@ -268,7 +268,7 @@ 
 	 */
 	public static function remove_trailing_slash( $link ) {
 		if ( $link != "/" )
-			$link = untrailingslashit( $link );
+			$link = untrailingslashit($link);
 		return $link;
 	}
 
@@ -282,23 +282,23 @@ 
 	 */
 	static function download_url( $url, $timeout = 300 ) {
 		if ( !$url ) {
-			return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
+			return new WP_Error('http_no_url', __('Invalid URL Provided.'));
 		}
 
-		$tmpfname = wp_tempnam( $url );
+		$tmpfname = wp_tempnam($url);
 		if ( !$tmpfname ) {
-			return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
+			return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 		}
 
-		$response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+		$response = wp_remote_get($url, array('timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname));
 
-		if ( is_wp_error( $response ) ) {
-			unlink( $tmpfname );
+		if ( is_wp_error($response) ) {
+			unlink($tmpfname);
 			return $response;
 		}
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $tmpfname );
-			return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+		if ( 200 != wp_remote_retrieve_response_code($response) ) {
+			unlink($tmpfname);
+			return new WP_Error('http_404', trim(wp_remote_retrieve_response_message($response)));
 		}
 		return $tmpfname;
 	}
@@ -312,10 +312,10 @@ 
 	 * @return array|string
 	 */
 	public static function get_params( $i = false ) {
-		$args = explode( '/', trim( strtolower( $_SERVER['REQUEST_URI'] ) ) );
+		$args = explode('/', trim(strtolower($_SERVER['REQUEST_URI'])));
 		$newargs = array();
 		foreach ( $args as $arg ) {
-			if ( strlen( $arg ) ) {
+			if ( strlen($arg) ) {
 				$newargs[] = $arg;
 			}
 		}
@@ -324,9 +324,9 @@ 
 		}
 		if ( $i < 0 ) {
 			//count from end
-			$i = count( $newargs ) + $i;
+			$i = count($newargs) + $i;
 		}
-		if ( isset( $newargs[$i] ) ) {
+		if ( isset($newargs[$i]) ) {
 			return $newargs[$i];
 		}
 	}

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

Braces +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      *                               (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){
+    function run($load_filename, $save_filename) {
         $image = wp_get_image_editor( $load_filename );
         if ( !is_wp_error( $image ) ) {
             $current_size = $image->get_size();

Indentation +55 added lines, -55 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Contains the class for running image retina-izing operations
- */
+	 * Contains the class for running image retina-izing operations
+	 */
 
 /**
  * Increases image size by a given factor
@@ -11,64 +11,64 @@ 
  */
 class TimberImageOperationRetina extends TimberImageOperation {
 
-    private $factor;
+	private $factor;
 
-    /**
-     * Construct our operation
-     * @param float   $factor to multiply original dimensions by
-     */
-    function __construct($factor) {
-        $this->factor = $factor;
-    }
+	/**
+	 * Construct our operation
+	 * @param float   $factor to multiply original dimensions by
+	 */
+	function __construct($factor) {
+		$this->factor = $factor;
+	}
 
-    /**
-     * Generates the final filename based on the source's name and extension
-     *
-     * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
-     * @param   string    $src_extension    the extension (ex: .jpg)
-     * @return  string    the final filename to be used (ex: my-awesome-pic@2x.jpg)
-     */
-    function filename($src_filename, $src_extension) {
-        $newbase = $src_filename . '@' . $this->factor . 'x'; // add @2x, @3x, @1.5x, etc.
-        $new_name = $newbase . '.' . $src_extension;
-        return $new_name;
-    }
+	/**
+	 * Generates the final filename based on the source's name and extension
+	 *
+	 * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
+	 * @param   string    $src_extension    the extension (ex: .jpg)
+	 * @return  string    the final filename to be used (ex: my-awesome-pic@2x.jpg)
+	 */
+	function filename($src_filename, $src_extension) {
+		$newbase = $src_filename . '@' . $this->factor . 'x'; // add @2x, @3x, @1.5x, etc.
+		$new_name = $newbase . '.' . $src_extension;
+		return $new_name;
+	}
 
-    /**
-     * Performs the actual image manipulation,
-     * including saving the target file.
-     *
-     * @param  string $load_filename filepath (not URL) to source file
-     *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
-     * @param  string $save_filename filepath (not URL) where result file should be saved
-     *                               (ex: /src/var/www/wp-content/uploads/my-pic@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 ) ) {
-            $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 ) ) {
-            	// @codeCoverageIgnoreStart
+	/**
+	 * Performs the actual image manipulation,
+	 * including saving the target file.
+	 *
+	 * @param  string $load_filename filepath (not URL) to source file
+	 *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
+	 * @param  string $save_filename filepath (not URL) where result file should be saved
+	 *                               (ex: /src/var/www/wp-content/uploads/my-pic@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 ) ) {
+			$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 ) ) {
+				// @codeCoverageIgnoreStart
 				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 {
-            TimberHelper::error_log( $image );
-        }
-        return false;
-    }
+			} else {
+				return true;
+			}
+		} 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 );
+		}
+		return false;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
      * Construct our operation
      * @param float   $factor to multiply original dimensions by
      */
-    function __construct($factor) {
+    function __construct( $factor ) {
         $this->factor = $factor;
     }
 
@@ -28,7 +28,7 @@ 
      * @param   string    $src_extension    the extension (ex: .jpg)
      * @return  string    the final filename to be used (ex: my-awesome-pic@2x.jpg)
      */
-    function filename($src_filename, $src_extension) {
+    function filename( $src_filename, $src_extension ) {
         $newbase = $src_filename . '@' . $this->factor . 'x'; // add @2x, @3x, @1.5x, etc.
         $new_name = $newbase . '.' . $src_extension;
         return $new_name;
@@ -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;
     }