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();
 

Indentation +647 added lines, -647 removed lines

@@ -5,664 +5,664 @@
  */
 class TimberHelper {
 
-	/**
-	 * A utility for a one-stop shop for Transients
-	 * @api
-	 * @example
-	 * ```php
-	 * $favorites = Timber::transient('user-'.$uid.'-favorites', function() use ($uid) {
-	 *  	//some expensive query here that's doing something you want to store to a transient
-	 *  	return $favorites;
-	 * }, 600);
-	 * Timber::context['favorites'] = $favorites;
-	 * Timber::render('single.twig', $context);
-	 * ```
-	 *
-	 * @param string  $slug           Unique identifier for transient
-	 * @param callable $callback      Callback that generates the data that's to be cached
-	 * @param int     $transient_time (optional) Expiration of transients in seconds
-	 * @param int     $lock_timeout   (optional) How long (in seconds) to lock the transient to prevent race conditions
-	 * @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 );
-
-		$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 ) ) {
-
-				$force = apply_filters( 'timber_force_transients', $force );
-				$force = apply_filters( 'timber_force_transient_' . $slug, $force );
-
-				if ( !$force ) {
-					//the server is currently executing the process.
-					//We're just gonna dump these users. Sorry!
-					return false;
-				}
-
-				$enable_transients = false;
-			}
-
-			// 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 );
-
-			$data = $callback();
-
-			if ( $enable_transients ) {
-				set_transient( $slug, $data, $transient_time );
-				self::_unlock_transient( $slug );
-			}
-
-		}
-
-		return $data;
-
-	}
-
-	/**
-	 * @internal
-	 * @param string $slug
-	 * @param integer $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 );
-	}
-
-	/**
-	 * @internal
-	 * @param string $slug
-	 */
-	static function _is_transient_locked( $slug ) {
-		return (bool)get_transient( $slug . '_lock' );
-	}
-
-	/* These are for measuring page render time */
-
-	/**
-	 * For measuring time, this will start a timer
-	 * @api
-	 * @return float
-	 */
-	public static function start_timer() {
-		$time = microtime();
-		$time = explode( ' ', $time );
-		$time = $time[1] + $time[0];
-		return $time;
-	}
-
-	/**
-	 * For stopping time and getting the data
-	 * @example
-	 * ```php
-	 * $start = TimberHelper::start_timer();
-	 * // do some stuff that takes awhile
-	 * echo TimberHelper::stop_timer( $start );
-	 * ```
-	 * @param int     $start
-	 * @return string
-	 */
-	public static function stop_timer( $start ) {
-		$time = microtime();
-		$time = explode( ' ', $time );
-		$time = $time[1] + $time[0];
-		$finish = $time;
-		$total_time = round( ( $finish - $start ), 4 );
-		return $total_time . ' seconds.';
-	}
-
-	/* Function Utilities
+    /**
+     * A utility for a one-stop shop for Transients
+     * @api
+     * @example
+     * ```php
+     * $favorites = Timber::transient('user-'.$uid.'-favorites', function() use ($uid) {
+     *  	//some expensive query here that's doing something you want to store to a transient
+     *  	return $favorites;
+     * }, 600);
+     * Timber::context['favorites'] = $favorites;
+     * Timber::render('single.twig', $context);
+     * ```
+     *
+     * @param string  $slug           Unique identifier for transient
+     * @param callable $callback      Callback that generates the data that's to be cached
+     * @param int     $transient_time (optional) Expiration of transients in seconds
+     * @param int     $lock_timeout   (optional) How long (in seconds) to lock the transient to prevent race conditions
+     * @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 );
+
+        $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 ) ) {
+
+                $force = apply_filters( 'timber_force_transients', $force );
+                $force = apply_filters( 'timber_force_transient_' . $slug, $force );
+
+                if ( !$force ) {
+                    //the server is currently executing the process.
+                    //We're just gonna dump these users. Sorry!
+                    return false;
+                }
+
+                $enable_transients = false;
+            }
+
+            // 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 );
+
+            $data = $callback();
+
+            if ( $enable_transients ) {
+                set_transient( $slug, $data, $transient_time );
+                self::_unlock_transient( $slug );
+            }
+
+        }
+
+        return $data;
+
+    }
+
+    /**
+     * @internal
+     * @param string $slug
+     * @param integer $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 );
+    }
+
+    /**
+     * @internal
+     * @param string $slug
+     */
+    static function _is_transient_locked( $slug ) {
+        return (bool)get_transient( $slug . '_lock' );
+    }
+
+    /* These are for measuring page render time */
+
+    /**
+     * For measuring time, this will start a timer
+     * @api
+     * @return float
+     */
+    public static function start_timer() {
+        $time = microtime();
+        $time = explode( ' ', $time );
+        $time = $time[1] + $time[0];
+        return $time;
+    }
+
+    /**
+     * For stopping time and getting the data
+     * @example
+     * ```php
+     * $start = TimberHelper::start_timer();
+     * // do some stuff that takes awhile
+     * echo TimberHelper::stop_timer( $start );
+     * ```
+     * @param int     $start
+     * @return string
+     */
+    public static function stop_timer( $start ) {
+        $time = microtime();
+        $time = explode( ' ', $time );
+        $time = $time[1] + $time[0];
+        $finish = $time;
+        $total_time = round( ( $finish - $start ), 4 );
+        return $total_time . ' seconds.';
+    }
+
+    /* Function Utilities
 	======================== */
 
-	/**
-	 * Calls a function with an output buffer. This is useful if you have a function that outputs text that you want to capture and use within a twig template.
-	 * @example
-	 * ```php
-	 * function the_form() {
-	 *     echo '<form action="form.php"><input type="text" /><input type="submit /></form>';
-	 * }
-	 *
-	 * $context = Timber::get_context();
-	 * $context['post'] = new TimberPost();
-	 * $context['my_form'] = TimberHelper::ob_function('the_form');
-	 * Timber::render('single-form.twig', $context);
-	 * ```
-	 * ```twig
-	 * <h1>{{ post.title }}</h1>
-	 * {{ my_form }}
-	 * ```
-	 * ```html
-	 * <h1>Apply to my contest!</h1>
-	 * <form action="form.php"><input type="text" /><input type="submit /></form>
-	 * ```
-	 * @api
-	 * @param callback $function
-	 * @param array   $args
-	 * @return string
-	 */
-	public static function ob_function( $function, $args = array( null ) ) {
-		ob_start();
-		call_user_func_array( $function, $args );
-		$data = ob_get_contents();
-		ob_end_clean();
-		return $data;
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $function_name
-	 * @param integer[]   $defaults
-	 * @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 );
-	}
-
-	/**
-	 *
-	 *
-	 * @param mixed $arg that you want to error_log
-	 * @return void
-	 */
-	public static function error_log( $arg ) {
-		if ( !WP_DEBUG ) {
-			return;
-		}
-		if ( is_object( $arg ) || is_array( $arg ) ) {
-			$arg = print_r( $arg, true );
-		}
-		return error_log( $arg );
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $separator
-	 * @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 ) );
-	}
-
-	/* Text Utilities
+    /**
+     * Calls a function with an output buffer. This is useful if you have a function that outputs text that you want to capture and use within a twig template.
+     * @example
+     * ```php
+     * function the_form() {
+     *     echo '<form action="form.php"><input type="text" /><input type="submit /></form>';
+     * }
+     *
+     * $context = Timber::get_context();
+     * $context['post'] = new TimberPost();
+     * $context['my_form'] = TimberHelper::ob_function('the_form');
+     * Timber::render('single-form.twig', $context);
+     * ```
+     * ```twig
+     * <h1>{{ post.title }}</h1>
+     * {{ my_form }}
+     * ```
+     * ```html
+     * <h1>Apply to my contest!</h1>
+     * <form action="form.php"><input type="text" /><input type="submit /></form>
+     * ```
+     * @api
+     * @param callback $function
+     * @param array   $args
+     * @return string
+     */
+    public static function ob_function( $function, $args = array( null ) ) {
+        ob_start();
+        call_user_func_array( $function, $args );
+        $data = ob_get_contents();
+        ob_end_clean();
+        return $data;
+    }
+
+    /**
+     *
+     *
+     * @param string  $function_name
+     * @param integer[]   $defaults
+     * @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 );
+    }
+
+    /**
+     *
+     *
+     * @param mixed $arg that you want to error_log
+     * @return void
+     */
+    public static function error_log( $arg ) {
+        if ( !WP_DEBUG ) {
+            return;
+        }
+        if ( is_object( $arg ) || is_array( $arg ) ) {
+            $arg = print_r( $arg, true );
+        }
+        return error_log( $arg );
+    }
+
+    /**
+     *
+     *
+     * @param string  $separator
+     * @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 ) );
+    }
+
+    /* Text Utilities
 	======================== */
 
-	/**
-	 *
-	 *
-	 * @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 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' ) {
-		if ( null === $more ) {
-			$more = __( '&hellip;' );
-		}
-		$original_text = $text;
-		$allowed_tag_string = '';
-		foreach ( explode( ' ', apply_filters( 'timber/trim_words/allowed_tags', $allowed_tags ) ) as $tag ) {
-			$allowed_tag_string .= '<' . $tag . '>';
-		}
-		$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 );
-			$sep = '';
-		} else {
-			$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 );
-			$text = $text . $more;
-		} else {
-			$text = implode( $sep, $words_array );
-		}
-		$text = self::close_tags( $text );
-		return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $html
-	 * @return string
-	 */
-	public static function close_tags( $html ) {
-		//put all opened tags into an array
-		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 );
-		$closedtags = $result[1];
-		$len_opened = count( $openedtags );
-		// all tags are closed
-		if ( count( $closedtags ) == $len_opened ) {
-			return $html;
-		}
-		$openedtags = array_reverse( $openedtags );
-		// close tags
-		for ( $i = 0; $i < $len_opened; $i++ ) {
-			if ( !in_array( $openedtags[$i], $closedtags ) ) {
-				$html .= '</' . $openedtags[$i] . '>';
-			} else {
-				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);
-		return $html;
-	}
-
-	/* WordPress Query Utilities
+    /**
+     *
+     *
+     * @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 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' ) {
+        if ( null === $more ) {
+            $more = __( '&hellip;' );
+        }
+        $original_text = $text;
+        $allowed_tag_string = '';
+        foreach ( explode( ' ', apply_filters( 'timber/trim_words/allowed_tags', $allowed_tags ) ) as $tag ) {
+            $allowed_tag_string .= '<' . $tag . '>';
+        }
+        $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 );
+            $sep = '';
+        } else {
+            $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 );
+            $text = $text . $more;
+        } else {
+            $text = implode( $sep, $words_array );
+        }
+        $text = self::close_tags( $text );
+        return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+    }
+
+    /**
+     *
+     *
+     * @param string  $html
+     * @return string
+     */
+    public static function close_tags( $html ) {
+        //put all opened tags into an array
+        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 );
+        $closedtags = $result[1];
+        $len_opened = count( $openedtags );
+        // all tags are closed
+        if ( count( $closedtags ) == $len_opened ) {
+            return $html;
+        }
+        $openedtags = array_reverse( $openedtags );
+        // close tags
+        for ( $i = 0; $i < $len_opened; $i++ ) {
+            if ( !in_array( $openedtags[$i], $closedtags ) ) {
+                $html .= '</' . $openedtags[$i] . '>';
+            } else {
+                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);
+        return $html;
+    }
+
+    /* WordPress Query Utilities
 	======================== */
 
-	/**
-	 * @param string  $key
-	 * @param string  $value
-	 * @return array|int
-	 * @deprecated 0.20.0
-	 */
-	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 );
-		$pids = array();
-		foreach ( $results as $result ) {
-			if ( get_post( $result ) ) {
-				$pids[] = $result;
-			}
-		}
-		if ( count( $pids ) ) {
-			return $pids;
-		}
-		return 0;
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $key
-	 * @param string  $value
-	 * @return int
-	 * @deprecated 0.20.0
-	 */
-	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 ) ) {
-				return $result;
-			}
-		}
-		return 0;
-	}
-
-	/**
-	 *
-	 * @deprecated 0.21.8
-	 * @param int     $ttid
-	 * @return mixed
-	 */
-	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 );
-	}
-
-	/* Object Utilities
+    /**
+     * @param string  $key
+     * @param string  $value
+     * @return array|int
+     * @deprecated 0.20.0
+     */
+    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 );
+        $pids = array();
+        foreach ( $results as $result ) {
+            if ( get_post( $result ) ) {
+                $pids[] = $result;
+            }
+        }
+        if ( count( $pids ) ) {
+            return $pids;
+        }
+        return 0;
+    }
+
+    /**
+     *
+     *
+     * @param string  $key
+     * @param string  $value
+     * @return int
+     * @deprecated 0.20.0
+     */
+    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 ) ) {
+                return $result;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     *
+     * @deprecated 0.21.8
+     * @param int     $ttid
+     * @return mixed
+     */
+    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 );
+    }
+
+    /* Object Utilities
 	======================== */
 
-	/**
-	 *
-	 *
-	 * @param array   $array
-	 * @param string  $prop
-	 * @return void
-	 */
-	public static function osort( &$array, $prop ) {
-		usort( $array, function ( $a, $b ) use ( $prop ) {
-				return $a->$prop > $b->$prop ? 1 : -1;
-			} );
-	}
-
-	/**
-	 *
-	 *
-	 * @param array   $arr
-	 * @return bool
-	 */
-	public static function is_array_assoc( $arr ) {
-		if ( !is_array( $arr ) ) {
-			return false;
-		}
-		return (bool)count( array_filter( array_keys( $arr ), 'is_string' ) );
-	}
-
-	/**
-	 *
-	 *
-	 * @param array   $array
-	 * @return stdClass
-	 */
-	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
-			} else {
-				$obj->{$k} = $v;
-			}
-		}
-		return $obj;
-	}
-
-	/**
-	 *
-	 *
-	 * @param array   $array
-	 * @param string  $key
-	 * @param mixed   $value
-	 * @return bool|int
-	 */
-	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 ) ) {
-					if ( $arr[$key] == $value ) {
-						return $i;
-					}
-				} else {
-					if ( $arr->$key == $value ) {
-						return $i;
-					}
-				}
-				$i++;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 *
-	 *
-	 * @param array   $array
-	 * @param string  $key
-	 * @param mixed   $value
-	 * @return array|null
-	 * @throws Exception
-	 */
-	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 );
-		}
-	}
-
-	/**
-	 *
-	 *
-	 * @param array   $array
-	 * @param int     $len
-	 * @return array
-	 */
-	public static function array_truncate( $array, $len ) {
-		if ( sizeof( $array ) > $len ) {
-			$array = array_splice( $array, 0, $len );
-		}
-		return $array;
-	}
-
-	/* Bool Utilities
+    /**
+     *
+     *
+     * @param array   $array
+     * @param string  $prop
+     * @return void
+     */
+    public static function osort( &$array, $prop ) {
+        usort( $array, function ( $a, $b ) use ( $prop ) {
+                return $a->$prop > $b->$prop ? 1 : -1;
+            } );
+    }
+
+    /**
+     *
+     *
+     * @param array   $arr
+     * @return bool
+     */
+    public static function is_array_assoc( $arr ) {
+        if ( !is_array( $arr ) ) {
+            return false;
+        }
+        return (bool)count( array_filter( array_keys( $arr ), 'is_string' ) );
+    }
+
+    /**
+     *
+     *
+     * @param array   $array
+     * @return stdClass
+     */
+    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
+            } else {
+                $obj->{$k} = $v;
+            }
+        }
+        return $obj;
+    }
+
+    /**
+     *
+     *
+     * @param array   $array
+     * @param string  $key
+     * @param mixed   $value
+     * @return bool|int
+     */
+    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 ) ) {
+                    if ( $arr[$key] == $value ) {
+                        return $i;
+                    }
+                } else {
+                    if ( $arr->$key == $value ) {
+                        return $i;
+                    }
+                }
+                $i++;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *
+     *
+     * @param array   $array
+     * @param string  $key
+     * @param mixed   $value
+     * @return array|null
+     * @throws Exception
+     */
+    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 );
+        }
+    }
+
+    /**
+     *
+     *
+     * @param array   $array
+     * @param int     $len
+     * @return array
+     */
+    public static function array_truncate( $array, $len ) {
+        if ( sizeof( $array ) > $len ) {
+            $array = array_splice( $array, 0, $len );
+        }
+        return $array;
+    }
+
+    /* Bool Utilities
 	======================== */
 
-	/**
-	 *
-	 *
-	 * @param mixed   $value
-	 * @return bool
-	 */
-	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') {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 *
-	 *
-	 * @param int     $i
-	 * @return bool
-	 */
-	public static function iseven( $i ) {
-		return ( $i % 2 ) == 0;
-	}
-
-	/**
-	 *
-	 *
-	 * @param int     $i
-	 * @return bool
-	 */
-	public static function isodd( $i ) {
-		return ( $i % 2 ) != 0;
-	}
-
-	/* Links, Forms, Etc. Utilities
+    /**
+     *
+     *
+     * @param mixed   $value
+     * @return bool
+     */
+    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') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *
+     *
+     * @param int     $i
+     * @return bool
+     */
+    public static function iseven( $i ) {
+        return ( $i % 2 ) == 0;
+    }
+
+    /**
+     *
+     *
+     * @param int     $i
+     * @return bool
+     */
+    public static function isodd( $i ) {
+        return ( $i % 2 ) != 0;
+    }
+
+    /* Links, Forms, Etc. Utilities
 	======================== */
 
-	/**
-	 *
-	 * Gets the comment form for use on a single article page
-	 * @deprecated 0.21.8 use `{{ function('comment_form') }}` instead
-	 * @param int     $post_id which post_id should the form be tied to?
-	 * @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 ) );
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $args
-	 * @return array
-	 */
-	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
-			'total' => 1,
-			'current' => 0,
-			'show_all' => false,
-			'prev_next' => false,
-			'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 );
-		// Who knows what else people pass in $args
-		$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;
-		$page_links = array();
-		$dots = false;
-		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',
-					'title' => $n_display,
-					'text' => $n_display,
-					'name' => $n_display,
-					'current' => true
-				);
-				$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['add_args'] ) {
-						$link = rtrim( add_query_arg( $args['add_args'], $link ), '/' );
-					}
-					$link = str_replace(' ', '+', $link);
-					$link = untrailingslashit( $link );
-					$page_links[] = array(
-						'class' => 'page-number page-numbers',
-						'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
-						'title' => $n_display,
-						'name' => $n_display,
-						'current' => $args['current'] == $n
-					);
-					$dots = true;
-				} elseif ( $dots && !$args['show_all'] ) {
-					$page_links[] = array(
-						'class' => 'dots',
-						'title' => __( '&hellip;' )
-					);
-					$dots = false;
-				}
-			}
-		}
-		return $page_links;
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	static function get_current_url() {
-		return TimberURLHelper::get_current_url();
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	static function is_url( $url ) {
-		return TimberURLHelper::is_url( $url );
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	static function get_path_base() {
-		return TimberURLHelper::get_path_base();
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	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 );
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	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 );
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	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 );
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	static function preslashit( $path ) {
-		return TimberURLHelper::preslashit( $path );
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	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 );
-	}
-
-	/**
-	 * @deprecated 0.18.0
-	 */
-	static function get_params( $i = -1 ) {
-		return TimberURLHelper::get_params( $i );
-	}
+    /**
+     *
+     * Gets the comment form for use on a single article page
+     * @deprecated 0.21.8 use `{{ function('comment_form') }}` instead
+     * @param int     $post_id which post_id should the form be tied to?
+     * @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 ) );
+    }
+
+    /**
+     *
+     *
+     * @param string  $args
+     * @return array
+     */
+    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
+            'total' => 1,
+            'current' => 0,
+            'show_all' => false,
+            'prev_next' => false,
+            '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 );
+        // Who knows what else people pass in $args
+        $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;
+        $page_links = array();
+        $dots = false;
+        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',
+                    'title' => $n_display,
+                    'text' => $n_display,
+                    'name' => $n_display,
+                    'current' => true
+                );
+                $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['add_args'] ) {
+                        $link = rtrim( add_query_arg( $args['add_args'], $link ), '/' );
+                    }
+                    $link = str_replace(' ', '+', $link);
+                    $link = untrailingslashit( $link );
+                    $page_links[] = array(
+                        'class' => 'page-number page-numbers',
+                        'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+                        'title' => $n_display,
+                        'name' => $n_display,
+                        'current' => $args['current'] == $n
+                    );
+                    $dots = true;
+                } elseif ( $dots && !$args['show_all'] ) {
+                    $page_links[] = array(
+                        'class' => 'dots',
+                        'title' => __( '&hellip;' )
+                    );
+                    $dots = false;
+                }
+            }
+        }
+        return $page_links;
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    static function get_current_url() {
+        return TimberURLHelper::get_current_url();
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    static function is_url( $url ) {
+        return TimberURLHelper::is_url( $url );
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    static function get_path_base() {
+        return TimberURLHelper::get_path_base();
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    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 );
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    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 );
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    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 );
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    static function preslashit( $path ) {
+        return TimberURLHelper::preslashit( $path );
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    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 );
+    }
+
+    /**
+     * @deprecated 0.18.0
+     */
+    static function get_params( $i = -1 ) {
+        return TimberURLHelper::get_params( $i );
+    }
 
 }

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 +480 added lines, -480 removed lines

@@ -15,514 +15,514 @@
  */
 class TimberImageHelper {
 
-	const BASE_UPLOADS = 1;
-	const BASE_CONTENT = 2;
+    const BASE_UPLOADS = 1;
+    const BASE_CONTENT = 2;
 
-	public static function init() {
-		self::add_constants();
-		self::add_actions();
-		self::add_filters();
-	}
+    public static function init() {
+        self::add_constants();
+        self::add_actions();
+        self::add_filters();
+    }
 
-	/**
-	 * Generates a new image with the specified dimensions.
-	 * New dimensions are achieved by cropping to maintain ratio.
-	 *
-	 * @api
-	 * @param string  		$src an URL (absolute or relative) to the original image
-	 * @param int|string	$w target width(int) or WordPress image size (WP-set or user-defined).
-	 * @param int     		$h target height (ignored if $w is WP image size). If not set, will ignore and resize based on $w only.
-	 * @param string  		$crop your choices are 'default', 'center', 'top', 'bottom', 'left', 'right'
-	 * @param bool    		$force
-	 * @example
-	 * ```twig
-	 * <img src="{{ image.src | resize(300, 200, 'top') }}" />
-	 * ```
-	 * ```html
-	 * <img src="http://example.org/wp-content/uploads/pic-300x200-c-top.jpg" />
-	 * ```
-	 * @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) ) {
-				$w = $sizes['w'];
-				$h = $sizes['h'];
-			} else {
-				return $src;
-			}
-		}
-		$op = new TimberImageOperationResize($w, $h, $crop);
-		return self::_operate($src, $op, $force);
-	}
+    /**
+     * Generates a new image with the specified dimensions.
+     * New dimensions are achieved by cropping to maintain ratio.
+     *
+     * @api
+     * @param string  		$src an URL (absolute or relative) to the original image
+     * @param int|string	$w target width(int) or WordPress image size (WP-set or user-defined).
+     * @param int     		$h target height (ignored if $w is WP image size). If not set, will ignore and resize based on $w only.
+     * @param string  		$crop your choices are 'default', 'center', 'top', 'bottom', 'left', 'right'
+     * @param bool    		$force
+     * @example
+     * ```twig
+     * <img src="{{ image.src | resize(300, 200, 'top') }}" />
+     * ```
+     * ```html
+     * <img src="http://example.org/wp-content/uploads/pic-300x200-c-top.jpg" />
+     * ```
+     * @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) ) {
+                $w = $sizes['w'];
+                $h = $sizes['h'];
+            } else {
+                return $src;
+            }
+        }
+        $op = new TimberImageOperationResize($w, $h, $crop);
+        return self::_operate($src, $op, $force);
+    }
 
-	/**
-	 * Find the sizes of an image based on a defined image size
-	 * @param  string $size the image size to search for
-	 *                      can be WordPress-defined ("medium")
-	 *                      or user-defined ("my-awesome-size")
-	 * @return false|array {
-	 *     @type int w
-	 *     @type int h
-	 * }
-	 */
-	private static function find_wp_dimensions( $size ) {
-		global $_wp_additional_image_sizes;
-		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');
-		}
-		if ( isset($w) && isset($h) && ($w || $h) ) {
-			return array('w' => $w, 'h' => $h);
-		}
-		return false;
-	}
+    /**
+     * Find the sizes of an image based on a defined image size
+     * @param  string $size the image size to search for
+     *                      can be WordPress-defined ("medium")
+     *                      or user-defined ("my-awesome-size")
+     * @return false|array {
+     *     @type int w
+     *     @type int h
+     * }
+     */
+    private static function find_wp_dimensions( $size ) {
+        global $_wp_additional_image_sizes;
+        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');
+        }
+        if ( isset($w) && isset($h) && ($w || $h) ) {
+            return array('w' => $w, 'h' => $h);
+        }
+        return false;
+    }
 
-	/**
-	 * Generates a new image with increased size, for display on Retina screens.
-	 *
-	 * @param string  $src
-	 * @param float   $multiplier
-	 * @param boolean $force
-	 *
-	 * @return string url to the new image
-	 */
-	public static function retina_resize( $src, $multiplier = 2, $force = false ) {
-		$op = new TimberImageOperationRetina($multiplier);
-		return self::_operate($src, $op, $force);
-	}
+    /**
+     * Generates a new image with increased size, for display on Retina screens.
+     *
+     * @param string  $src
+     * @param float   $multiplier
+     * @param boolean $force
+     *
+     * @return string url to the new image
+     */
+    public static function retina_resize( $src, $multiplier = 2, $force = false ) {
+        $op = new TimberImageOperationRetina($multiplier);
+        return self::_operate($src, $op, $force);
+    }
 
-	/**
-	 * checks to see if the given file is an aimated gif
-	 * @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 ) {
-		if ( strpos(strtolower($file), '.gif') == -1 ) {
-			//doesn't have .gif, bail
-			return false;
-		}
-		//its a gif so test
-		if( !($fh = @fopen($file, 'rb')) ) {
-		  	return false;
-		}
-		$count = 0;
-		//an animated gif contains multiple "frames", with each frame having a
-		//header made up of:
-		// * a static 4-byte sequence (\x00\x21\xF9\x04)
-		// * 4 variable bytes
-		// * a static 2-byte sequence (\x00\x2C)
+    /**
+     * checks to see if the given file is an aimated gif
+     * @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 ) {
+        if ( strpos(strtolower($file), '.gif') == -1 ) {
+            //doesn't have .gif, bail
+            return false;
+        }
+        //its a gif so test
+        if( !($fh = @fopen($file, 'rb')) ) {
+                return false;
+        }
+        $count = 0;
+        //an animated gif contains multiple "frames", with each frame having a
+        //header made up of:
+        // * a static 4-byte sequence (\x00\x21\xF9\x04)
+        // * 4 variable bytes
+        // * a static 2-byte sequence (\x00\x2C)
 
-		// 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) {
-			$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);
-	    }
+        // 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) {
+            $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;
+    }
 
-	/**
-	 * Generate a new image with the specified dimensions.
-	 * New dimensions are achieved by adding colored bands to maintain ratio.
-	 *
-	 * @param string  $src
-	 * @param int     $w
-	 * @param int     $h
-	 * @param string  $color
-	 * @param bool    $force
-	 * @return mixed|null|string
-	 */
-	public static function letterbox( $src, $w, $h, $color = '#000000', $force = false ) {
-		$op = new TimberImageOperationLetterbox($w, $h, $color);
-		return self::_operate($src, $op, $force);
-	}
+    /**
+     * Generate a new image with the specified dimensions.
+     * New dimensions are achieved by adding colored bands to maintain ratio.
+     *
+     * @param string  $src
+     * @param int     $w
+     * @param int     $h
+     * @param string  $color
+     * @param bool    $force
+     * @return mixed|null|string
+     */
+    public static function letterbox( $src, $w, $h, $color = '#000000', $force = false ) {
+        $op = new TimberImageOperationLetterbox($w, $h, $color);
+        return self::_operate($src, $op, $force);
+    }
 
-	/**
-	 * Generates a new image by converting the source GIF or PNG into JPG
-	 *
-	 * @param string  $src   a url or path to the image (http://example.org/wp-content/uploads/2014/image.jpg) or (/wp-content/uploads/2014/image.jpg)
-	 * @param string  $bghex
-	 * @return string
-	 */
-	public static function img_to_jpg( $src, $bghex = '#FFFFFF', $force = false ) {
-		$op = new TimberImageOperationToJpg($bghex);
-		return self::_operate($src, $op, $force);
-	}
+    /**
+     * Generates a new image by converting the source GIF or PNG into JPG
+     *
+     * @param string  $src   a url or path to the image (http://example.org/wp-content/uploads/2014/image.jpg) or (/wp-content/uploads/2014/image.jpg)
+     * @param string  $bghex
+     * @return string
+     */
+    public static function img_to_jpg( $src, $bghex = '#FFFFFF', $force = false ) {
+        $op = new TimberImageOperationToJpg($bghex);
+        return self::_operate($src, $op, $force);
+    }
 
-	/**
-	 * 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 );
-				if ( $attachment->file_loc ) {
-					TimberImageHelper::delete_generated_files( $attachment->file_loc );
-				}
-			}
-		} );
-	}
+    /**
+     * 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 );
+                if ( $attachment->file_loc ) {
+                    TimberImageHelper::delete_generated_files( $attachment->file_loc );
+                }
+            }
+        } );
+    }
 
-	/**
-	 * Adds a constant defining the path to the content directory relative to the site
-	 * 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 );
-		}
-	}
+    /**
+     * Adds a constant defining the path to the content directory relative to the site
+     * 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 );
+        }
+    }
 
-	/**
-	 * adds a 'relative' key to wp_upload_dir() result.
-	 * It will contain the relative url to upload dir.
-	 * @return void
-	 */
-	static function add_filters() {
-		add_filter( 'upload_dir', function ( $arr ) {
-			$arr['relative'] = str_replace( home_url(), '', $arr['baseurl'] );
-			return $arr;
-		} );
-	}
+    /**
+     * adds a 'relative' key to wp_upload_dir() result.
+     * It will contain the relative url to upload dir.
+     * @return void
+     */
+    static function add_filters() {
+        add_filter( 'upload_dir', function ( $arr ) {
+            $arr['relative'] = str_replace( home_url(), '', $arr['baseurl'] );
+            return $arr;
+        } );
+    }
 
-	//-- end of public methods --//
-	/**
-	 * Deletes the auto-generated files for resize and letterboxing created by Timber
-	 * @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 );
-		}
-		$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]*.' );
-	}
+    //-- end of public methods --//
+    /**
+     * Deletes the auto-generated files for resize and letterboxing created by Timber
+     * @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 );
+        }
+        $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]*.' );
+    }
 
-	/**
-	 * Deletes resized versions of the supplied file name.
-	 * So if passed a value like my-pic.jpg, this function will delete my-pic-500x200-c-left.jpg, my-pic-400x400-c-default.jpg, etc.
-	 *
-	 * keeping these here so I know what the hell we're matching
-	 * $match = preg_match("/\/srv\/www\/wordpress-develop\/src\/wp-content\/uploads\/2014\/05\/$filename-[0-9]*x[0-9]*-c-[a-z]*.jpg/", $found_file);
-	 * $match = preg_match("/\/srv\/www\/wordpress-develop\/src\/wp-content\/uploads\/2014\/05\/arch-[0-9]*x[0-9]*-c-[a-z]*.jpg/", $filename);
-	 *
-	 * @param string 	$filename   ex: my-pic
-	 * @param string 	$ext ex: jpg
-	 * @param string 	$dir var/www/wp-content/uploads/2015/
-	 * @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 ) {
-		$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 ) {
-				unlink( $found_file );
-			}
-		}
-	}
+    /**
+     * Deletes resized versions of the supplied file name.
+     * So if passed a value like my-pic.jpg, this function will delete my-pic-500x200-c-left.jpg, my-pic-400x400-c-default.jpg, etc.
+     *
+     * keeping these here so I know what the hell we're matching
+     * $match = preg_match("/\/srv\/www\/wordpress-develop\/src\/wp-content\/uploads\/2014\/05\/$filename-[0-9]*x[0-9]*-c-[a-z]*.jpg/", $found_file);
+     * $match = preg_match("/\/srv\/www\/wordpress-develop\/src\/wp-content\/uploads\/2014\/05\/arch-[0-9]*x[0-9]*-c-[a-z]*.jpg/", $filename);
+     *
+     * @param string 	$filename   ex: my-pic
+     * @param string 	$ext ex: jpg
+     * @param string 	$dir var/www/wp-content/uploads/2015/
+     * @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 ) {
+        $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 ) {
+                unlink( $found_file );
+            }
+        }
+    }
 
 
-	/**
-	 * Determines the filepath corresponding to a given URL
-	 *
-	 * @param string  $url
-	 * @return string
-	 */
-	public static function get_server_location( $url ) {
-		// if we're already an absolute dir, just return
-		if ( 0 === strpos( $url, ABSPATH ) ) {
-			return $url;
-		}
-		// otherwise, analyze URL then build mapping path
-		$au = self::analyze_url($url);
-		$result = self::_get_file_path($au['base'], $au['subdir'], $au['basename']);
-		return $result;
-	}
+    /**
+     * Determines the filepath corresponding to a given URL
+     *
+     * @param string  $url
+     * @return string
+     */
+    public static function get_server_location( $url ) {
+        // if we're already an absolute dir, just return
+        if ( 0 === strpos( $url, ABSPATH ) ) {
+            return $url;
+        }
+        // otherwise, analyze URL then build mapping path
+        $au = self::analyze_url($url);
+        $result = self::_get_file_path($au['base'], $au['subdir'], $au['basename']);
+        return $result;
+    }
 
-	/**
-	 * Determines the filepath where a given external file will be stored.
-	 *
-	 * @param string  $file
-	 * @return string
-	 */
-	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 );
-		$ext = 'jpg';
-		if ( isset( $path_parts['extension'] ) ) {
-			$ext = $path_parts['extension'];
-		}
-		return $dir . '/' . $basename . '.' . $ext;
-	}
+    /**
+     * Determines the filepath where a given external file will be stored.
+     *
+     * @param string  $file
+     * @return string
+     */
+    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 );
+        $ext = 'jpg';
+        if ( isset( $path_parts['extension'] ) ) {
+            $ext = $path_parts['extension'];
+        }
+        return $dir . '/' . $basename . '.' . $ext;
+    }
 
-	/**
-	 * downloads an external image to the server and stores it on the server
-	 *
-	 * @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 ) );
-		}
-		// Download file to temp location
-		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 );
-		$file_array = array();
-		$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'] );
-			$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'] ) );
-		return $file['url'];
-	}
+    /**
+     * downloads an external image to the server and stores it on the server
+     *
+     * @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 ) );
+        }
+        // Download file to temp location
+        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 );
+        $file_array = array();
+        $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'] );
+            $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'] ) );
+        return $file['url'];
+    }
 
-	/**
-	 * Takes in an URL and breaks it into components,
-	 * that will then be used in the different steps of image processing.
-	 * The image is expected to be either part of a theme, plugin, or an upload.
-	 *
-	 * @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) {
-		$result = array(
-			'url' => $url, // the initial url
-			'absolute' => TimberURLHelper::is_absolute($url), // is the url absolute or relative (to home_url)
-			'base' => 0, // is the image in uploads dir, or in content dir (theme or plugin)
-			'subdir' => '', // the path between base (uploads or content) and file
-			'filename' => '', // the filename, without extension
-			'extension' => '', // the file extension
-			'basename' => '', // full file name
-		);
-		$upload_dir = wp_upload_dir();
-		$tmp = $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
-				$tmp = str_replace($upload_dir['basedir'], '', $tmp);
-			}
-			if ( 0 === strpos($tmp, WP_CONTENT_DIR) ) {
-				$result['base']= self::BASE_CONTENT; // content based
-				$tmp = str_replace(WP_CONTENT_DIR, '', $tmp);
-			}
-		} else {
-			if (!$result['absolute']) {
-				$tmp = home_url().$tmp;
-			}
-			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
-				$tmp = str_replace(content_url(), '', $tmp);
-			}
-		}
-		$parts = pathinfo($tmp);
-		$result['subdir'] = $parts['dirname'];
-		$result['filename'] = $parts['filename'];
-		$result['extension'] = $parts['extension'];
-		$result['basename'] = $parts['basename'];
-		// todo filename
-		return $result;
-	}
+    /**
+     * Takes in an URL and breaks it into components,
+     * that will then be used in the different steps of image processing.
+     * The image is expected to be either part of a theme, plugin, or an upload.
+     *
+     * @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) {
+        $result = array(
+            'url' => $url, // the initial url
+            'absolute' => TimberURLHelper::is_absolute($url), // is the url absolute or relative (to home_url)
+            'base' => 0, // is the image in uploads dir, or in content dir (theme or plugin)
+            'subdir' => '', // the path between base (uploads or content) and file
+            'filename' => '', // the filename, without extension
+            'extension' => '', // the file extension
+            'basename' => '', // full file name
+        );
+        $upload_dir = wp_upload_dir();
+        $tmp = $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
+                $tmp = str_replace($upload_dir['basedir'], '', $tmp);
+            }
+            if ( 0 === strpos($tmp, WP_CONTENT_DIR) ) {
+                $result['base']= self::BASE_CONTENT; // content based
+                $tmp = str_replace(WP_CONTENT_DIR, '', $tmp);
+            }
+        } else {
+            if (!$result['absolute']) {
+                $tmp = home_url().$tmp;
+            }
+            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
+                $tmp = str_replace(content_url(), '', $tmp);
+            }
+        }
+        $parts = pathinfo($tmp);
+        $result['subdir'] = $parts['dirname'];
+        $result['filename'] = $parts['filename'];
+        $result['extension'] = $parts['extension'];
+        $result['basename'] = $parts['basename'];
+        // todo filename
+        return $result;
+    }
 
-	/**
-	 * Builds the public URL of a file based on its different components
-	 *
-	 * @param  int    $base     one of self::BASE_UPLOADS, self::BASE_CONTENT to indicate if file is an upload or a content (theme or plugin)
-	 * @param  string $subdir   subdirectory in which file is stored, relative to $base root folder
-	 * @param  string $filename file name, including extension (but no path)
-	 * @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) {
-		$url = '';
-		if( self::BASE_UPLOADS == $base ) {
-			$upload_dir = wp_upload_dir();
-			$url = $upload_dir['baseurl'];
-		}
-		if( self::BASE_CONTENT == $base ) {
-			$url = content_url();
-		}
-		if(!empty($subdir)) {
-			$url .= $subdir;
-		}
-		$url .= '/'.$filename;
-		if(!$absolute) {
-			$url = str_replace(home_url(), '', $url);
-		}
-		// $url = TimberURLHelper::remove_double_slashes( $url);
-		return $url;
-	}
+    /**
+     * Builds the public URL of a file based on its different components
+     *
+     * @param  int    $base     one of self::BASE_UPLOADS, self::BASE_CONTENT to indicate if file is an upload or a content (theme or plugin)
+     * @param  string $subdir   subdirectory in which file is stored, relative to $base root folder
+     * @param  string $filename file name, including extension (but no path)
+     * @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) {
+        $url = '';
+        if( self::BASE_UPLOADS == $base ) {
+            $upload_dir = wp_upload_dir();
+            $url = $upload_dir['baseurl'];
+        }
+        if( self::BASE_CONTENT == $base ) {
+            $url = content_url();
+        }
+        if(!empty($subdir)) {
+            $url .= $subdir;
+        }
+        $url .= '/'.$filename;
+        if(!$absolute) {
+            $url = str_replace(home_url(), '', $url);
+        }
+        // $url = TimberURLHelper::remove_double_slashes( $url);
+        return $url;
+    }
 
-	/**
-	 * Builds the absolute file system location of a file based on its different components
-	 *
-	 * @param  int    $base     one of self::BASE_UPLOADS, self::BASE_CONTENT to indicate if file is an upload or a content (theme or plugin)
-	 * @param  string $subdir   subdirectory in which file is stored, relative to $base root folder
-	 * @param  string $filename file name, including extension (but no path)
-	 * @return string           the file location
-	 */
-	private static function _get_file_path($base, $subdir, $filename) {
-		$path = '';
-		if(self::BASE_UPLOADS == $base) {
-			$upload_dir = wp_upload_dir();
-			$path = $upload_dir['basedir'];
-		}
-		if(self::BASE_CONTENT == $base) {
-			$path = WP_CONTENT_DIR;
-		}
-		if(!empty($subdir)) {
-			$path .= $subdir;
-		}
-		$path .= '/'.$filename;
-		return $path;
-	}
+    /**
+     * Builds the absolute file system location of a file based on its different components
+     *
+     * @param  int    $base     one of self::BASE_UPLOADS, self::BASE_CONTENT to indicate if file is an upload or a content (theme or plugin)
+     * @param  string $subdir   subdirectory in which file is stored, relative to $base root folder
+     * @param  string $filename file name, including extension (but no path)
+     * @return string           the file location
+     */
+    private static function _get_file_path($base, $subdir, $filename) {
+        $path = '';
+        if(self::BASE_UPLOADS == $base) {
+            $upload_dir = wp_upload_dir();
+            $path = $upload_dir['basedir'];
+        }
+        if(self::BASE_CONTENT == $base) {
+            $path = WP_CONTENT_DIR;
+        }
+        if(!empty($subdir)) {
+            $path .= $subdir;
+        }
+        $path .= '/'.$filename;
+        return $path;
+    }
 
 
-	/**
-	 * Main method that applies operation to src image:
-	 * 1. break down supplied URL into components
-	 * 2. use components to determine result file and URL
-	 * 3. check if a result file already exists
-	 * 4. otherwise, delegate to supplied TimberImageOperation
-	 *
-	 * @param  string  $src   an URL (absolute or relative) to an image
-	 * @param  object  $op    object of class TimberImageOperation
-	 * @param  boolean $force if true, remove any already existing result file and forces file generation
-	 * @return string         URL to the new image - or the source one if error
-	 *
-	 */
-	private static function _operate( $src, $op, $force = false ) {
-		if ( empty( $src ) ) {
-			return '';
-		}
-		$external = false;
+    /**
+     * Main method that applies operation to src image:
+     * 1. break down supplied URL into components
+     * 2. use components to determine result file and URL
+     * 3. check if a result file already exists
+     * 4. otherwise, delegate to supplied TimberImageOperation
+     *
+     * @param  string  $src   an URL (absolute or relative) to an image
+     * @param  object  $op    object of class TimberImageOperation
+     * @param  boolean $force if true, remove any already existing result file and forces file generation
+     * @return string         URL to the new image - or the source one if error
+     *
+     */
+    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 );
-			$external = true;
-		}
-		// break down URL into components
-		$au = self::analyze_url($src);
-		// build URL and filenames
-		$new_url = self::_get_file_url(
-			$au['base'],
-			$au['subdir'],
-			$op->filename($au['filename'], $au['extension']),
-			$au['absolute']
-		);
-		$new_server_path = self::_get_file_path(
-			$au['base'],
-			$au['subdir'],
-			$op->filename($au['filename'], $au['extension'])
-		);
-		$old_server_path = self::_get_file_path(
-			$au['base'],
-			$au['subdir'],
-			$au['basename']
-		);
-		// if already exists...
-		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 );
-			} 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 );
-			}
-			return $new_url;
-		} else {
-			// in case of error, we return source file itself
-			return $src;
-		}
-	}
+        // if external image, load it first
+        if ( TimberURLHelper::is_external_content( $src ) ) {
+            $src = self::sideload_image( $src );
+            $external = true;
+        }
+        // break down URL into components
+        $au = self::analyze_url($src);
+        // build URL and filenames
+        $new_url = self::_get_file_url(
+            $au['base'],
+            $au['subdir'],
+            $op->filename($au['filename'], $au['extension']),
+            $au['absolute']
+        );
+        $new_server_path = self::_get_file_path(
+            $au['base'],
+            $au['subdir'],
+            $op->filename($au['filename'], $au['extension'])
+        );
+        $old_server_path = self::_get_file_path(
+            $au['base'],
+            $au['subdir'],
+            $au['basename']
+        );
+        // if already exists...
+        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 );
+            } 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 );
+            }
+            return $new_url;
+        } else {
+            // in case of error, we return source file itself
+            return $src;
+        }
+    }
 
 
 // -- the below methods are just used for unit testing the URL generation code
 //
-	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(
-			$au['base'],
-			$au['subdir'],
-			$op->filename($au['filename'], $au['extension']),
-			$au['absolute']
-		);
-		return $new_url;
-	}
-	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(
-			$au['base'],
-			$au['subdir'],
-			$op->filename($au['filename'], $au['extension'])
-		);
-		return $new_path;
-	}
-	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(
-			$au['base'],
-			$au['subdir'],
-			$op->filename($au['filename'], $au['extension']),
-			$au['absolute']
-		);
-		return $new_url;
-	}
-	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(
-			$au['base'],
-			$au['subdir'],
-			$op->filename($au['filename'], $au['extension'])
-		);
-		return $new_path;
-	}
+    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(
+            $au['base'],
+            $au['subdir'],
+            $op->filename($au['filename'], $au['extension']),
+            $au['absolute']
+        );
+        return $new_url;
+    }
+    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(
+            $au['base'],
+            $au['subdir'],
+            $op->filename($au['filename'], $au['extension'])
+        );
+        return $new_path;
+    }
+    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(
+            $au['base'],
+            $au['subdir'],
+            $op->filename($au['filename'], $au['extension']),
+            $au['absolute']
+        );
+        return $new_url;
+    }
+    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(
+            $au['base'],
+            $au['subdir'],
+            $op->filename($au['filename'], $au['extension'])
+        );
+        return $new_path;
+    }
 
 
 }

Spacing +73 added lines, -73 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,15 +201,15 @@ 
 	 *	                            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, $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]*.');
 	}
 
 	/**
@@ -228,12 +228,12 @@ 
 	 */
 	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);
 			}
 		}
 	}
@@ -247,7 +247,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
@@ -266,11 +266,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;
@@ -283,27 +283,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'];
 	}
 
@@ -315,7 +315,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)
@@ -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);
 			}
 		}
@@ -368,20 +368,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);
@@ -396,19 +396,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;
 	}
 
@@ -427,14 +427,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
@@ -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 {
@@ -481,7 +481,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(
@@ -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(
@@ -502,7 +502,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(
@@ -513,7 +513,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());

Indentation +483 added lines, -483 removed lines

@@ -39,488 +39,488 @@
  */
 class TimberImage extends TimberPost implements TimberCoreInterface {
 
-	protected $_can_edit;
-	protected $_dimensions;
-	public $abs_url;
-	/**
-	 * @var string $object_type what does this class represent in WordPress terms?
-	 */
-	public $object_type = 'image';
-	/**
-	 * @var string $representation what does this class represent in WordPress terms?
-	 */
-	public static $representation = 'image';
-	/**
-	 * @var array of supported relative file types
-	 */
-	private $file_types = array('jpg', 'jpeg', 'png', 'svg', 'bmp', 'ico', 'gif', 'tiff', 'pdf');
-	/**
-	 * @api
-	 * @var string $file_loc the location of the image file in the filesystem (ex: `/var/www/htdocs/wp-content/uploads/2015/08/my-pic.jpg`)
-	 */
-	public $file_loc;
-	public $file;
-	/**
-	 * @api
-	 * @var integer the ID of the image (which is a WP_Post)
-	 */
-	public $id;
-	public $sizes = array();
-	/**
-	 * @api
-	 * @var string $caption the string stored in the WordPress database
-	 */
-	public $caption;
-	/**
-	 * @var $_wp_attached_file the file as stored in the WordPress database
-	 */
-	protected $_wp_attached_file;
-
-	/**
-	 * Creates a new TimberImage object
-	 * @example
-	 * ```php
-	 * // You can pass it an ID number
-	 * $myImage = new TimberImage(552);
-	 *
-	 * //Or send it a URL to an image
-	 * $myImage = new TimberImage('http://google.com/logo.jpg');
-	 * ```
-	 * @param int|string $iid
-	 */
-	public function __construct($iid) {
-		$this->init($iid);
-	}
-
-	/**
-	 * @return string the src of the file
-	 */
-	public function __toString() {
-		if ( $this->get_src() ) {
-			return $this->get_src();
-		}
-		return '';
-	}
-
-	/**
-	 * Get a PHP array with pathinfo() info from the file
-	 * @return array
-	 */
-	function get_pathinfo() {
-		return pathinfo($this->file);
-	}
-
-	/**
-	 * @internal
-	 * @param string $dim
-	 * @return array|int
-	 */
-	protected function get_dimensions($dim = null) {
-		if ( isset($this->_dimensions) ) {
-			return $this->get_dimensions_loaded($dim);
-		}
-		if ( file_exists($this->file_loc) && filesize($this->file_loc) ) {
-			list($width, $height) = getimagesize($this->file_loc);
-			$this->_dimensions = array();
-			$this->_dimensions[0] = $width;
-			$this->_dimensions[1] = $height;
-			return $this->get_dimensions_loaded($dim);
-		}
-	}
-
-	/**
-	 * @internal
-	 * @param string|null $dim
-	 * @return array|int
-	 */
-	protected function get_dimensions_loaded($dim) {
-		if ( $dim === null ) {
-			return $this->_dimensions;
-		}
-		if ( $dim == 'w' || $dim == 'width' ) {
-			return $this->_dimensions[0];
-		}
-		if ( $dim == 'h' || $dim == 'height' ) {
-			return $this->_dimensions[1];
-		}
-		return null;
-	}
-
-	/**
-	 * @internal
-	 * @param  int $iid the id number of the image in the WP database
-	 */
-	protected function get_image_info( $iid ) {
-		$image_info = $iid;
-		if (is_numeric($iid)) {
-			$image_info = wp_get_attachment_metadata($iid);
-			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)) {
-					$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'])) {
-			return $image_info['image'];
-		}
-		if (is_object($image_info)) {
-		   return get_object_vars($image_info);
-		}
-		return $iid;
-	}
-
-	/**
-	 * @internal
-	 * @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) {
-		if ( is_ssl() && strpos($url, 'https') !== 0 && strpos($url, 'http') === 0 ) {
-			$url = 'https' . substr($url, strlen('http'));
-		}
-		return $url;
-	}
-
-	public static function wp_upload_dir() {
-		static $wp_upload_dir = false;
-
-		if ( !$wp_upload_dir ) {
-			$wp_upload_dir = wp_upload_dir();
-		}
-
-		return $wp_upload_dir;
-	}
-
-	/**
-	 * @internal
-	 * @param int $iid
-	 */
-	function init( $iid = false ) {
-		if ( !is_numeric( $iid ) && is_string( $iid ) ) {
-			if (strstr($iid, '://')) {
-				$this->init_with_url($iid);
-				return;
-			}
-			if ( strstr($iid, ABSPATH) ) {
-				$this->init_with_file_path($iid);
-				return;
-			}
-
-			$relative = false;
-			$iid_lower = strtolower($iid);
-			foreach( $this->file_types as $type ) { if( strstr( $iid_lower, $type ) ) { $relative = true; break; } };
-			if ( $relative ) {
-				$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) {
-				return $this->init((int) $post->_thumbnail_id);
-			}
-			return $this->init($iid->ID);
-		} else if ( $iid instanceof TimberPost ) {
-			/**
-			 * This will catch TimberPost and any post classes that extend TimberPost,
-			 * see http://php.net/manual/en/internals2.opcodes.instanceof.php#109108
-			 * and https://github.com/jarednova/timber/wiki/Extending-Timber
-			 */
-			$iid = (int) $iid->_thumbnail_id;
-		}
-
-		$image_info = $this->get_image_info($iid);
-
-		$this->import($image_info);
-		$basedir = self::wp_upload_dir();
-		$basedir = $basedir['basedir'];
-		if ( isset($this->file) ) {
-			$this->file_loc = $basedir . DIRECTORY_SEPARATOR . $this->file;
-		} else if ( isset($this->_wp_attached_file) ) {
-			$this->file = reset($this->_wp_attached_file);
-			$this->file_loc = $basedir . DIRECTORY_SEPARATOR . $this->file;
-		}
-		if ( isset($image_info['id']) ) {
-			$this->ID = $image_info['id'];
-		} else if ( is_numeric($iid) ) {
-			$this->ID = $iid;
-		}
-		if ( isset($this->ID) ) {
-			$custom = get_post_custom($this->ID);
-			foreach ($custom as $key => $value) {
-				$this->$key = $value[0];
-			}
-			$this->id = $this->ID;
-		} else {
-			if ( is_array($iid) || is_object($iid) ) {
-				TimberHelper::error_log('Not able to init in TimberImage with iid=');
-				TimberHelper::error_log($iid);
-			} else {
-				TimberHelper::error_log('Not able to init in TimberImage with iid=' . $iid);
-			}
-		}
-	}
-
-	/**
-	 * @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 );
-		$this->file_loc = $file_path;
-		$this->file = $file_path;
-	}
-
-	/**
-	 * @internal
-	 * @param string $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;
-	}
-
-	/**
-	 * @internal
-	 * @param string $url
-	 */
-	protected function init_with_url($url) {
-		$this->abs_url = $url;
-		if ( TimberURLHelper::is_local($url) ) {
-			$this->file = ABSPATH . TimberURLHelper::get_rel_url($url);
-			$this->file_loc = ABSPATH . TimberURLHelper::get_rel_url($url);
-		}
-	}
-
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * <img src="{{ image.src }}" alt="{{ image.alt }}" />
-	 * ```
-	 * ```html
-	 * <img src="http://example.org/wp-content/uploads/2015/08/pic.jpg" alt="W3 Checker told me to add alt text, so I am" />
-	 * ```
-	 * @return string alt text stored in WordPress
-	 */
-	public function alt() {
-		$alt = trim(strip_tags(get_post_meta($this->ID, '_wp_attachment_image_alt', true)));
-		return $alt;
-	}
-
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% if post.thumbnail.aspect < 1 %}
-	 *     {# handle vertical image #}
-	 *     <img src="{{ post.thumbnail.src|resize(300, 500) }}" alt="A basketball player" />
-	 * {% else %}
-	 * 	   <img src="{{ post.thumbnail.src|resize(500) }}" alt="A sumo wrestler" />
-	 * {% endif %}
-	 * ```
-	 * @return float
-	 */
-	public function aspect() {
-		$w = intval($this->width());
-		$h = intval($this->height());
-		return $w / $h;
-	}
-
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * <img src="{{ image.src }}" height="{{ image.height }}" />
-	 * ```
-	 * ```html
-	 * <img src="http://example.org/wp-content/uploads/2015/08/pic.jpg" height="900" />
-	 * ```
-	 * @return int
-	 */
-	public function height() {
-		return $this->get_dimensions('height');
-	}
-
-	/**
-	 * Returns the link to an image attachment's Permalink page (NOT the link for the image itself!!)
-	 * @api
-	 * @example
-	 * ```twig
-	 * <a href="{{ image.link }}"><img src="{{ image.src }} "/></a>
-	 * ```
-	 * ```html
-	 * <a href="http://example.org/my-cool-picture"><img src="http://example.org/wp-content/uploads/2015/whatever.jpg"/></a>
-	 * ```
-	 */
-	public function link() {
-		if ( strlen($this->abs_url) ) {
-			return $this->abs_url;
-		}
-		return get_permalink($this->ID);
-	}
-
-	/**
-	 * @api
-	 * @return bool|TimberPost
-	 */
-	public function parent() {
-		if ( !$this->post_parent ) {
-			return false;
-		}
-		return new $this->PostClass($this->post_parent);
-	}
-
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * <img src="{{ image.path }}" />
-	 * ```
-	 * ```html
-	 * <img src="/wp-content/uploads/2015/08/pic.jpg" />
-	 * ```
-	 * @return  string the /relative/path/to/the/file
-	 */
-	public function path() {
-		return TimberURLHelper::get_rel_path($this->src());
-	}
-
-	/**
-	 * @param string $size a size known to WordPress (like "medium")
-	 * @api
-	 * @example
-	 * ```twig
-	 * <h1>{{post.title}}</h1>
-	 * <img src="{{post.thumbnail.src}}" />
-	 * ```
-	 * ```html
-	 * <img src="http://example.org/wp-content/uploads/2015/08/pic.jpg" />
-	 * ```
-	 * @return bool|string
-	 */
-	public function src($size = '') {
-		if ( isset($this->abs_url) ) {
-			return $this->_maybe_secure_url($this->abs_url);
-		}
-
-		if ( $size && is_string($size) && isset($this->sizes[$size]) ) {
-			$image = image_downsize($this->ID, $size);
-			return $this->_maybe_secure_url(reset($image));
-		}
-
-		if ( !isset($this->file) && isset($this->_wp_attached_file) ) {
-			$this->file = $this->_wp_attached_file;
-		}
-
-		if ( !isset($this->file) ) {
-			return false;
-		}
-
-		$dir = self::wp_upload_dir();
-		$base = $dir['baseurl'];
-
-		$src = trailingslashit($this->_maybe_secure_url($base)) . $this->file;
-		$src = apply_filters('timber/image/src', $src, $this->ID);
-		return apply_filters('timber_image_src', $src, $this->ID);
-	}
-
-	/**
-	 * @deprecated use src() instead
-	 * @return string
-	 */
-	function url() {
-		return $this->get_src();
-	}
-
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * <img src="{{ image.src }}" width="{{ image.width }}" />
-	 * ```
-	 * ```html
-	 * <img src="http://example.org/wp-content/uploads/2015/08/pic.jpg" width="1600" />
-	 * ```
-	 * @return int
-	 */
-	public function width() {
-		return $this->get_dimensions('width');
-	}
-
-
-	/**
-	 * @deprecated 0.21.9 use TimberImage::width() instead
-	 * @internal
-	 * @return int
-	 */
-	function get_width() {
-		return $this->width();
-	}
-
-	/**
-	 * @deprecated 0.21.9 use TimberImage::height() instead
-	 * @internal
-	 * @return int
-	 */
-	function get_height() {
-		return $this->height();
-	}
-
-	/**
-	 * @deprecated 0.21.9 use TimberImage::src
-	 * @internal
-	 * @param string $size
-	 * @return bool|string
-	 */
-	function get_src( $size = '' ) {
-		return $this->src( $size );
-	}
-
-	/**
-	 * @deprecated 0.21.9 use TimberImage::path()
-	 * @internal
-	 * @return string
-	 */
-	function get_path() {
-		return $this->link();
-	}
-
-	/**
-	 * @deprecated use src() instead
-	 * @return string
-	 */
-	function get_url() {
-		return $this->get_src();
-	}
-
-	/**
-	 * @internal
-	 * @deprecated 0.21.8
-	 * @return bool|TimberPost
-	 */
-	function get_parent() {
-		return $this->parent();
-	}
-
-	/**
-	 * @internal
-	 * @deprecated 0.21.9
-	 * @see TimberImage::alt
-	 * @return string
-	 */
-	function get_alt() {
-		return $this->alt();
-	}
+    protected $_can_edit;
+    protected $_dimensions;
+    public $abs_url;
+    /**
+     * @var string $object_type what does this class represent in WordPress terms?
+     */
+    public $object_type = 'image';
+    /**
+     * @var string $representation what does this class represent in WordPress terms?
+     */
+    public static $representation = 'image';
+    /**
+     * @var array of supported relative file types
+     */
+    private $file_types = array('jpg', 'jpeg', 'png', 'svg', 'bmp', 'ico', 'gif', 'tiff', 'pdf');
+    /**
+     * @api
+     * @var string $file_loc the location of the image file in the filesystem (ex: `/var/www/htdocs/wp-content/uploads/2015/08/my-pic.jpg`)
+     */
+    public $file_loc;
+    public $file;
+    /**
+     * @api
+     * @var integer the ID of the image (which is a WP_Post)
+     */
+    public $id;
+    public $sizes = array();
+    /**
+     * @api
+     * @var string $caption the string stored in the WordPress database
+     */
+    public $caption;
+    /**
+     * @var $_wp_attached_file the file as stored in the WordPress database
+     */
+    protected $_wp_attached_file;
+
+    /**
+     * Creates a new TimberImage object
+     * @example
+     * ```php
+     * // You can pass it an ID number
+     * $myImage = new TimberImage(552);
+     *
+     * //Or send it a URL to an image
+     * $myImage = new TimberImage('http://google.com/logo.jpg');
+     * ```
+     * @param int|string $iid
+     */
+    public function __construct($iid) {
+        $this->init($iid);
+    }
+
+    /**
+     * @return string the src of the file
+     */
+    public function __toString() {
+        if ( $this->get_src() ) {
+            return $this->get_src();
+        }
+        return '';
+    }
+
+    /**
+     * Get a PHP array with pathinfo() info from the file
+     * @return array
+     */
+    function get_pathinfo() {
+        return pathinfo($this->file);
+    }
+
+    /**
+     * @internal
+     * @param string $dim
+     * @return array|int
+     */
+    protected function get_dimensions($dim = null) {
+        if ( isset($this->_dimensions) ) {
+            return $this->get_dimensions_loaded($dim);
+        }
+        if ( file_exists($this->file_loc) && filesize($this->file_loc) ) {
+            list($width, $height) = getimagesize($this->file_loc);
+            $this->_dimensions = array();
+            $this->_dimensions[0] = $width;
+            $this->_dimensions[1] = $height;
+            return $this->get_dimensions_loaded($dim);
+        }
+    }
+
+    /**
+     * @internal
+     * @param string|null $dim
+     * @return array|int
+     */
+    protected function get_dimensions_loaded($dim) {
+        if ( $dim === null ) {
+            return $this->_dimensions;
+        }
+        if ( $dim == 'w' || $dim == 'width' ) {
+            return $this->_dimensions[0];
+        }
+        if ( $dim == 'h' || $dim == 'height' ) {
+            return $this->_dimensions[1];
+        }
+        return null;
+    }
+
+    /**
+     * @internal
+     * @param  int $iid the id number of the image in the WP database
+     */
+    protected function get_image_info( $iid ) {
+        $image_info = $iid;
+        if (is_numeric($iid)) {
+            $image_info = wp_get_attachment_metadata($iid);
+            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)) {
+                    $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'])) {
+            return $image_info['image'];
+        }
+        if (is_object($image_info)) {
+            return get_object_vars($image_info);
+        }
+        return $iid;
+    }
+
+    /**
+     * @internal
+     * @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) {
+        if ( is_ssl() && strpos($url, 'https') !== 0 && strpos($url, 'http') === 0 ) {
+            $url = 'https' . substr($url, strlen('http'));
+        }
+        return $url;
+    }
+
+    public static function wp_upload_dir() {
+        static $wp_upload_dir = false;
+
+        if ( !$wp_upload_dir ) {
+            $wp_upload_dir = wp_upload_dir();
+        }
+
+        return $wp_upload_dir;
+    }
+
+    /**
+     * @internal
+     * @param int $iid
+     */
+    function init( $iid = false ) {
+        if ( !is_numeric( $iid ) && is_string( $iid ) ) {
+            if (strstr($iid, '://')) {
+                $this->init_with_url($iid);
+                return;
+            }
+            if ( strstr($iid, ABSPATH) ) {
+                $this->init_with_file_path($iid);
+                return;
+            }
+
+            $relative = false;
+            $iid_lower = strtolower($iid);
+            foreach( $this->file_types as $type ) { if( strstr( $iid_lower, $type ) ) { $relative = true; break; } };
+            if ( $relative ) {
+                $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) {
+                return $this->init((int) $post->_thumbnail_id);
+            }
+            return $this->init($iid->ID);
+        } else if ( $iid instanceof TimberPost ) {
+            /**
+             * This will catch TimberPost and any post classes that extend TimberPost,
+             * see http://php.net/manual/en/internals2.opcodes.instanceof.php#109108
+             * and https://github.com/jarednova/timber/wiki/Extending-Timber
+             */
+            $iid = (int) $iid->_thumbnail_id;
+        }
+
+        $image_info = $this->get_image_info($iid);
+
+        $this->import($image_info);
+        $basedir = self::wp_upload_dir();
+        $basedir = $basedir['basedir'];
+        if ( isset($this->file) ) {
+            $this->file_loc = $basedir . DIRECTORY_SEPARATOR . $this->file;
+        } else if ( isset($this->_wp_attached_file) ) {
+            $this->file = reset($this->_wp_attached_file);
+            $this->file_loc = $basedir . DIRECTORY_SEPARATOR . $this->file;
+        }
+        if ( isset($image_info['id']) ) {
+            $this->ID = $image_info['id'];
+        } else if ( is_numeric($iid) ) {
+            $this->ID = $iid;
+        }
+        if ( isset($this->ID) ) {
+            $custom = get_post_custom($this->ID);
+            foreach ($custom as $key => $value) {
+                $this->$key = $value[0];
+            }
+            $this->id = $this->ID;
+        } else {
+            if ( is_array($iid) || is_object($iid) ) {
+                TimberHelper::error_log('Not able to init in TimberImage with iid=');
+                TimberHelper::error_log($iid);
+            } else {
+                TimberHelper::error_log('Not able to init in TimberImage with iid=' . $iid);
+            }
+        }
+    }
+
+    /**
+     * @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 );
+        $this->file_loc = $file_path;
+        $this->file = $file_path;
+    }
+
+    /**
+     * @internal
+     * @param string $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;
+    }
+
+    /**
+     * @internal
+     * @param string $url
+     */
+    protected function init_with_url($url) {
+        $this->abs_url = $url;
+        if ( TimberURLHelper::is_local($url) ) {
+            $this->file = ABSPATH . TimberURLHelper::get_rel_url($url);
+            $this->file_loc = ABSPATH . TimberURLHelper::get_rel_url($url);
+        }
+    }
+
+    /**
+     * @api
+     * @example
+     * ```twig
+     * <img src="{{ image.src }}" alt="{{ image.alt }}" />
+     * ```
+     * ```html
+     * <img src="http://example.org/wp-content/uploads/2015/08/pic.jpg" alt="W3 Checker told me to add alt text, so I am" />
+     * ```
+     * @return string alt text stored in WordPress
+     */
+    public function alt() {
+        $alt = trim(strip_tags(get_post_meta($this->ID, '_wp_attachment_image_alt', true)));
+        return $alt;
+    }
+
+    /**
+     * @api
+     * @example
+     * ```twig
+     * {% if post.thumbnail.aspect < 1 %}
+     *     {# handle vertical image #}
+     *     <img src="{{ post.thumbnail.src|resize(300, 500) }}" alt="A basketball player" />
+     * {% else %}
+     * 	   <img src="{{ post.thumbnail.src|resize(500) }}" alt="A sumo wrestler" />
+     * {% endif %}
+     * ```
+     * @return float
+     */
+    public function aspect() {
+        $w = intval($this->width());
+        $h = intval($this->height());
+        return $w / $h;
+    }
+
+    /**
+     * @api
+     * @example
+     * ```twig
+     * <img src="{{ image.src }}" height="{{ image.height }}" />
+     * ```
+     * ```html
+     * <img src="http://example.org/wp-content/uploads/2015/08/pic.jpg" height="900" />
+     * ```
+     * @return int
+     */
+    public function height() {
+        return $this->get_dimensions('height');
+    }
+
+    /**
+     * Returns the link to an image attachment's Permalink page (NOT the link for the image itself!!)
+     * @api
+     * @example
+     * ```twig
+     * <a href="{{ image.link }}"><img src="{{ image.src }} "/></a>
+     * ```
+     * ```html
+     * <a href="http://example.org/my-cool-picture"><img src="http://example.org/wp-content/uploads/2015/whatever.jpg"/></a>
+     * ```
+     */
+    public function link() {
+        if ( strlen($this->abs_url) ) {
+            return $this->abs_url;
+        }
+        return get_permalink($this->ID);
+    }
+
+    /**
+     * @api
+     * @return bool|TimberPost
+     */
+    public function parent() {
+        if ( !$this->post_parent ) {
+            return false;
+        }
+        return new $this->PostClass($this->post_parent);
+    }
+
+    /**
+     * @api
+     * @example
+     * ```twig
+     * <img src="{{ image.path }}" />
+     * ```
+     * ```html
+     * <img src="/wp-content/uploads/2015/08/pic.jpg" />
+     * ```
+     * @return  string the /relative/path/to/the/file
+     */
+    public function path() {
+        return TimberURLHelper::get_rel_path($this->src());
+    }
+
+    /**
+     * @param string $size a size known to WordPress (like "medium")
+     * @api
+     * @example
+     * ```twig
+     * <h1>{{post.title}}</h1>
+     * <img src="{{post.thumbnail.src}}" />
+     * ```
+     * ```html
+     * <img src="http://example.org/wp-content/uploads/2015/08/pic.jpg" />
+     * ```
+     * @return bool|string
+     */
+    public function src($size = '') {
+        if ( isset($this->abs_url) ) {
+            return $this->_maybe_secure_url($this->abs_url);
+        }
+
+        if ( $size && is_string($size) && isset($this->sizes[$size]) ) {
+            $image = image_downsize($this->ID, $size);
+            return $this->_maybe_secure_url(reset($image));
+        }
+
+        if ( !isset($this->file) && isset($this->_wp_attached_file) ) {
+            $this->file = $this->_wp_attached_file;
+        }
+
+        if ( !isset($this->file) ) {
+            return false;
+        }
+
+        $dir = self::wp_upload_dir();
+        $base = $dir['baseurl'];
+
+        $src = trailingslashit($this->_maybe_secure_url($base)) . $this->file;
+        $src = apply_filters('timber/image/src', $src, $this->ID);
+        return apply_filters('timber_image_src', $src, $this->ID);
+    }
+
+    /**
+     * @deprecated use src() instead
+     * @return string
+     */
+    function url() {
+        return $this->get_src();
+    }
+
+    /**
+     * @api
+     * @example
+     * ```twig
+     * <img src="{{ image.src }}" width="{{ image.width }}" />
+     * ```
+     * ```html
+     * <img src="http://example.org/wp-content/uploads/2015/08/pic.jpg" width="1600" />
+     * ```
+     * @return int
+     */
+    public function width() {
+        return $this->get_dimensions('width');
+    }
+
+
+    /**
+     * @deprecated 0.21.9 use TimberImage::width() instead
+     * @internal
+     * @return int
+     */
+    function get_width() {
+        return $this->width();
+    }
+
+    /**
+     * @deprecated 0.21.9 use TimberImage::height() instead
+     * @internal
+     * @return int
+     */
+    function get_height() {
+        return $this->height();
+    }
+
+    /**
+     * @deprecated 0.21.9 use TimberImage::src
+     * @internal
+     * @param string $size
+     * @return bool|string
+     */
+    function get_src( $size = '' ) {
+        return $this->src( $size );
+    }
+
+    /**
+     * @deprecated 0.21.9 use TimberImage::path()
+     * @internal
+     * @return string
+     */
+    function get_path() {
+        return $this->link();
+    }
+
+    /**
+     * @deprecated use src() instead
+     * @return string
+     */
+    function get_url() {
+        return $this->get_src();
+    }
+
+    /**
+     * @internal
+     * @deprecated 0.21.8
+     * @return bool|TimberPost
+     */
+    function get_parent() {
+        return $this->parent();
+    }
+
+    /**
+     * @internal
+     * @deprecated 0.21.9
+     * @see TimberImage::alt
+     * @return string
+     */
+    function get_alt() {
+        return $this->alt();
+    }
 
 }

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)) {

Indentation +277 added lines, -277 removed lines

@@ -2,306 +2,306 @@
 
 class TimberMenuItem extends TimberCore implements TimberCoreInterface {
 
-	public $children;
-	public $has_child_class = false;
-	public $classes = array();
-	public $class = '';
-	public $level = 0;
-	public $post_name;
-	public $type;
-	public $url;
+    public $children;
+    public $has_child_class = false;
+    public $classes = array();
+    public $class = '';
+    public $level = 0;
+    public $post_name;
+    public $type;
+    public $url;
 
-	public $PostClass = 'TimberPost';
+    public $PostClass = 'TimberPost';
 
-	protected $_name;
-	protected $_menu_item_object_id;
-	protected $_menu_item_url;
-	protected $menu_object;
-	protected $master_object;
+    protected $_name;
+    protected $_menu_item_object_id;
+    protected $_menu_item_url;
+    protected $menu_object;
+    protected $master_object;
 
-	/**
-	 *
-	 *
-	 * @param array|object $data
-	 */
-	public function __construct( $data ) {
-		$data = (object) $data;
-		$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->menu_object = $data;
-	}
+    /**
+     *
+     *
+     * @param array|object $data
+     */
+    public function __construct( $data ) {
+        $data = (object) $data;
+        $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->menu_object = $data;
+    }
 
-	/**
-	 * @return string the label for the menu item
-	 */
-	public function __toString() {
-		return $this->name();
-	}
+    /**
+     * @return string the label for the menu item
+     */
+    public function __toString() {
+        return $this->name();
+    }
 
-	/**
-	 * add a class the menu item should have
-	 * @param string  $class_name to be added
-	 */
-	public function add_class( $class_name ) {
-		$this->classes[] = $class_name;
-		$this->class .= ' ' . $class_name;
-	}
+    /**
+     * add a class the menu item should have
+     * @param string  $class_name to be added
+     */
+    public function add_class( $class_name ) {
+        $this->classes[] = $class_name;
+        $this->class .= ' ' . $class_name;
+    }
 
-	/**
-	 * The label for the menu item
-	 * @api
-	 * @return string
-	 */
-	public function name() {
-		if ( $title = $this->title() ) {
-			return $title;
-		}
-		if ( isset( $this->_name ) ) {
-			return $this->_name;
-		}
-		return '';
-	}
+    /**
+     * The label for the menu item
+     * @api
+     * @return string
+     */
+    public function name() {
+        if ( $title = $this->title() ) {
+            return $title;
+        }
+        if ( isset( $this->_name ) ) {
+            return $this->_name;
+        }
+        return '';
+    }
 
-	/**
-	 * The slug for the menu item
-	 * @api
-	 * @example
-	 * ```twig
-	 * <ul>
-	 *     {% for item in menu.items %}
-	 *         <li class="{{item.slug}}">
-	 *             <a href="{{item.link}}">{{item.name}}</a>
-	 *          </li>
-	 *     {% endfor %}
-	 * </ul>
-	 * @return string the slug of the menu item kinda-like-this
-	 */
-	public function slug() {
-		if ( !isset( $this->master_object ) ) {
-			$this->master_object = $this->get_master_object();
-		}
-		if ( isset( $this->master_object->post_name ) && $this->master_object->post_name ) {
-			return $this->master_object->post_name;
-		}
-		return $this->post_name;
-	}
+    /**
+     * The slug for the menu item
+     * @api
+     * @example
+     * ```twig
+     * <ul>
+     *     {% for item in menu.items %}
+     *         <li class="{{item.slug}}">
+     *             <a href="{{item.link}}">{{item.name}}</a>
+     *          </li>
+     *     {% endfor %}
+     * </ul>
+     * @return string the slug of the menu item kinda-like-this
+     */
+    public function slug() {
+        if ( !isset( $this->master_object ) ) {
+            $this->master_object = $this->get_master_object();
+        }
+        if ( isset( $this->master_object->post_name ) && $this->master_object->post_name ) {
+            return $this->master_object->post_name;
+        }
+        return $this->post_name;
+    }
 
-	/**
-	 * @internal
-	 * @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 );
-		}
-	}
+    /**
+     * @internal
+     * @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 );
+        }
+    }
 
-	/**
-	 * @internal
-	 * @see TimberMenuItem::link
-	 * @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' ) {
-				$this->url = $this->_menu_item_url;
-			} else if ( isset( $this->menu_object ) && method_exists( $this->menu_object, 'get_link' ) ) {
-					$this->url = $this->menu_object->get_link();
-				}
-		}
-		return $this->url;
-	}
+    /**
+     * @internal
+     * @see TimberMenuItem::link
+     * @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' ) {
+                $this->url = $this->_menu_item_url;
+            } else if ( isset( $this->menu_object ) && method_exists( $this->menu_object, 'get_link' ) ) {
+                    $this->url = $this->menu_object->get_link();
+                }
+        }
+        return $this->url;
+    }
 
-	/**
-	 * @internal
-	 * @see TimberMenuItem::path()
-	 * @return string a relative url /my-page
-	 */
-	function get_path() {
-		return TimberURLHelper::get_rel_url( $this->get_link() );
-	}
+    /**
+     * @internal
+     * @see TimberMenuItem::path()
+     * @return string a relative url /my-page
+     */
+    function get_path() {
+        return TimberURLHelper::get_rel_url( $this->get_link() );
+    }
 
-	/**
-	 *
-	 *
-	 * @param TimberMenuItem $item
-	 */
-	function add_child( $item ) {
-		if ( !$this->has_child_class ) {
-			$this->add_class( 'menu-item-has-children' );
-			$this->has_child_class = true;
-		}
-		if ( !isset( $this->children ) ) {
-			$this->children = array();
-		}
-		$this->children[] = $item;
-		$item->level = $this->level + 1;
-		if ($item->children) {
-			$this->update_child_levels();
-		}
-	}
+    /**
+     *
+     *
+     * @param TimberMenuItem $item
+     */
+    function add_child( $item ) {
+        if ( !$this->has_child_class ) {
+            $this->add_class( 'menu-item-has-children' );
+            $this->has_child_class = true;
+        }
+        if ( !isset( $this->children ) ) {
+            $this->children = array();
+        }
+        $this->children[] = $item;
+        $item->level = $this->level + 1;
+        if ($item->children) {
+            $this->update_child_levels();
+        }
+    }
 
-	/**
-	 *
-	 * @internal
-	 * @return bool 
-	 */
-	function update_child_levels() {
-		if (is_array($this->children)) {
-			foreach( $this->children as $child ) {
-				$child->level = $this->level + 1;
-				$child->update_child_levels();
-			}
-			return true;
-		}
-	}
+    /**
+     *
+     * @internal
+     * @return bool 
+     */
+    function update_child_levels() {
+        if (is_array($this->children)) {
+            foreach( $this->children as $child ) {
+                $child->level = $this->level + 1;
+                $child->update_child_levels();
+            }
+            return true;
+        }
+    }
 
-	/**
-	 * Imports the classes to be used in CSS
-	 * @internal
-	 * @param array|object  $data
-	 */
-	function import_classes( $data ) {
-		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 ) );
-	}
+    /**
+     * Imports the classes to be used in CSS
+     * @internal
+     * @param array|object  $data
+     */
+    function import_classes( $data ) {
+        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 ) );
+    }
 
-	/**
-	 *
-	 * @internal
-	 * @return array|bool
-	 */
-	function get_children() {
-		if ( isset( $this->children ) ) {
-			return $this->children;
-		}
-		return false;
-	}
+    /**
+     *
+     * @internal
+     * @return array|bool
+     */
+    function get_children() {
+        if ( isset( $this->children ) ) {
+            return $this->children;
+        }
+        return false;
+    }
 
-	/**
-	 * Checks to see if the menu item is an external link so if my site is `example.org`, `google.com/whatever` is an external link. Helpful when creating rules for the target of a link
-	 * @api
-	 * @example
-	 * ```twig
-	 * <a href="{{ item.link }}" target="{{ item.is_external ? '_blank' : '_self' }}">
-	 * ```
-	 * @return bool
-	 */
-	function is_external() {
-		if ( $this->type != 'custom' ) {
-			return false;
-		}
-		return TimberURLHelper::is_external( $this->url );
-	}
+    /**
+     * Checks to see if the menu item is an external link so if my site is `example.org`, `google.com/whatever` is an external link. Helpful when creating rules for the target of a link
+     * @api
+     * @example
+     * ```twig
+     * <a href="{{ item.link }}" target="{{ item.is_external ? '_blank' : '_self' }}">
+     * ```
+     * @return bool
+     */
+    function is_external() {
+        if ( $this->type != 'custom' ) {
+            return false;
+        }
+        return TimberURLHelper::is_external( $this->url );
+    }
 
-	/**
-	 * @param string $key lookup key
-	 * @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 ( isset( $this->$key ) ) {
-			return $this->$key;
-		}
-	}
+    /**
+     * @param string $key lookup key
+     * @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 ( isset( $this->$key ) ) {
+            return $this->$key;
+        }
+    }
 
-	/* Aliases */
+    /* Aliases */
 
-	/**
-	 * Get the child [TimberMenuItems](#TimberMenuItem)s of a [TimberMenuItem](#TimberMenuItem)
-	 * @api
-	 * @return array|bool
-	 */
-	public function children() {
-		return $this->get_children();
-	}
+    /**
+     * Get the child [TimberMenuItems](#TimberMenuItem)s of a [TimberMenuItem](#TimberMenuItem)
+     * @api
+     * @return array|bool
+     */
+    public function children() {
+        return $this->get_children();
+    }
 
-	/**
-	 * Checks to see if a link is external, helpful when creating rules for the target of a link
-	 * @see TimberMenuItem::is_external
-	 * @return bool
-	 */
-	public function external() {
-		return $this->is_external();
-	}
+    /**
+     * Checks to see if a link is external, helpful when creating rules for the target of a link
+     * @see TimberMenuItem::is_external
+     * @return bool
+     */
+    public function external() {
+        return $this->is_external();
+    }
 
-	/**
-	 * Get the full link to a Menu Item
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% for item in menu.items %}
-	 *     <li><a href="{{ item.link }}">{{ item.title }}</a></li>
-	 * {% endfor %}
-	 * ```
-	 * @return string a full URL like http://mysite.com/thing/
-	 */
-	public function link() {
-		return $this->get_link();
-	}
+    /**
+     * Get the full link to a Menu Item
+     * @api
+     * @example
+     * ```twig
+     * {% for item in menu.items %}
+     *     <li><a href="{{ item.link }}">{{ item.title }}</a></li>
+     * {% endfor %}
+     * ```
+     * @return string a full URL like http://mysite.com/thing/
+     */
+    public function link() {
+        return $this->get_link();
+    }
 
-	/**
-	 * Return the relative path of a Menu Item's link
-	 * @example
-	 * ```twig
-	 * {% for item in menu.items %}
-	 *     <li><a href="{{ item.path }}">{{ item.title }}</a></li>
-	 * {% endfor %}
-	 * ```
-	 * @see get_path()
-	 * @return string the path of a URL like /foo
-	 */
-	public function path() {
-		return $this->get_path();
-	}
+    /**
+     * Return the relative path of a Menu Item's link
+     * @example
+     * ```twig
+     * {% for item in menu.items %}
+     *     <li><a href="{{ item.path }}">{{ item.title }}</a></li>
+     * {% endfor %}
+     * ```
+     * @see get_path()
+     * @return string the path of a URL like /foo
+     */
+    public function path() {
+        return $this->get_path();
+    }
 
-	/**
-	 * Gets the link a menu item points at
-	 * @internal
-	 * @deprecated since 0.21.7 use link instead
-	 * @see link()
-	 * @return string a full URL like http://mysite.com/thing/
-	 */
-	public function permalink() {
-		return $this->get_link();
-	}
+    /**
+     * Gets the link a menu item points at
+     * @internal
+     * @deprecated since 0.21.7 use link instead
+     * @see link()
+     * @return string a full URL like http://mysite.com/thing/
+     */
+    public function permalink() {
+        return $this->get_link();
+    }
 
-	/**
-	 * @internal
-	 * @deprecated since 0.21.7, use link instead
-	 * @see link()
-	 * @return string a full URL like http://mysite.com/thing/
-	 */
-	public function get_permalink() {
-		return $this->get_link();
-	}
+    /**
+     * @internal
+     * @deprecated since 0.21.7, use link instead
+     * @see link()
+     * @return string a full URL like http://mysite.com/thing/
+     */
+    public function get_permalink() {
+        return $this->get_link();
+    }
 
-	/**
-	 * Gets the public label for the menu item
-	 * @example
-	 * ```twig
-	 * {% for item in menu.items %}
-	 *     <li><a href="{{ item.link }}">{{ item.title }}</a></li>
-	 * {% endfor %}
-	 * ```
-	 * @return string the public label like Foo
-	 */
-	public function title() {
-		if ( isset( $this->__title ) ) {
-			return $this->__title;
-		}
-	}
+    /**
+     * Gets the public label for the menu item
+     * @example
+     * ```twig
+     * {% for item in menu.items %}
+     *     <li><a href="{{ item.link }}">{{ item.title }}</a></li>
+     * {% endfor %}
+     * ```
+     * @return string the public label like Foo
+     */
+    public function title() {
+        if ( isset( $this->__title ) ) {
+            return $this->__title;
+        }
+    }
 
 }

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;

Indentation +181 added lines, -181 removed lines

@@ -43,196 +43,196 @@
  */
 class TimberMenu extends TimberCore {
 
-	public $MenuItemClass = 'TimberMenuItem';
-	public $PostClass = 'TimberPost';
+    public $MenuItemClass = 'TimberMenuItem';
+    public $PostClass = 'TimberPost';
 
-	/**
-	 * @api
-	 * @var TimberMenuItem[]|null $items you need to iterate through
-	 */
-	public $items = null;
-	/**
-	 * @api
-	 * @var integer $id the ID# of the menu, corresponding to the wp_terms table
-	 */
-	public $id;
-	public $ID;
-	/**
-	 * @api
-	 * @var string $name of the menu (ex: `Main Navigation`)
-	 */
-	public $name;
-	/**
-	 * @var integer $id the ID# of the menu, corresponding to the wp_terms table
-	 */
-	public $term_id;
-	/**
-	 * @api
-	 * @var string $name of the menu (ex: `Main Navigation`)
-	 */
-	public $title;
+    /**
+     * @api
+     * @var TimberMenuItem[]|null $items you need to iterate through
+     */
+    public $items = null;
+    /**
+     * @api
+     * @var integer $id the ID# of the menu, corresponding to the wp_terms table
+     */
+    public $id;
+    public $ID;
+    /**
+     * @api
+     * @var string $name of the menu (ex: `Main Navigation`)
+     */
+    public $name;
+    /**
+     * @var integer $id the ID# of the menu, corresponding to the wp_terms table
+     */
+    public $term_id;
+    /**
+     * @api
+     * @var string $name of the menu (ex: `Main Navigation`)
+     */
+    public $title;
 
-	/**
-	 * @param int|string $slug
-	 */
-	function __construct($slug = 0) {
-		$locations = get_nav_menu_locations();
-		if ($slug != 0 && is_numeric($slug)) {
-			$menu_id = $slug;
-		} else if (is_array($locations) && count($locations)) {
-			$menu_id = $this->get_menu_id_from_locations($slug, $locations);
-		} else if ($slug === false) {
-			$menu_id = false;
-		} else {
-			$menu_id = $this->get_menu_id_from_terms($slug);
-		}
-		if ($menu_id) {
-			$this->init($menu_id);
-		} else {
-			$this->init_as_page_menu();
-		}
-	}
+    /**
+     * @param int|string $slug
+     */
+    function __construct($slug = 0) {
+        $locations = get_nav_menu_locations();
+        if ($slug != 0 && is_numeric($slug)) {
+            $menu_id = $slug;
+        } else if (is_array($locations) && count($locations)) {
+            $menu_id = $this->get_menu_id_from_locations($slug, $locations);
+        } else if ($slug === false) {
+            $menu_id = false;
+        } else {
+            $menu_id = $this->get_menu_id_from_terms($slug);
+        }
+        if ($menu_id) {
+            $this->init($menu_id);
+        } else {
+            $this->init_as_page_menu();
+        }
+    }
 
-	/**
-	 * @internal
-	 * @param int $menu_id
-	 */
-	protected function init($menu_id) {
-		$menu = wp_get_nav_menu_items($menu_id);
-		if ($menu) {
-			_wp_menu_item_classes_by_context($menu);
-			if (is_array($menu)){
-				$menu = self::order_children($menu);
-			}
-			$this->items = $menu;
-			$menu_info = wp_get_nav_menu_object($menu_id);
-			$this->import($menu_info);
-			$this->ID = $this->term_id;
-			$this->id = $this->term_id;
-			$this->title = $this->name;
-		}
-	}
+    /**
+     * @internal
+     * @param int $menu_id
+     */
+    protected function init($menu_id) {
+        $menu = wp_get_nav_menu_items($menu_id);
+        if ($menu) {
+            _wp_menu_item_classes_by_context($menu);
+            if (is_array($menu)){
+                $menu = self::order_children($menu);
+            }
+            $this->items = $menu;
+            $menu_info = wp_get_nav_menu_object($menu_id);
+            $this->import($menu_info);
+            $this->ID = $this->term_id;
+            $this->id = $this->term_id;
+            $this->title = $this->name;
+        }
+    }
 
-	/**
-	 * @internal
-	 */
-	protected function init_as_page_menu() {
-		$menu = get_pages();
-		if ($menu) {
-			foreach($menu as $mi) {
-				$mi->__title = $mi->post_title;
-			}
-			_wp_menu_item_classes_by_context($menu);
-			if (is_array($menu)){
-				$menu = self::order_children($menu);
-			}
-			$this->items = $menu;
-		}
-	}
+    /**
+     * @internal
+     */
+    protected function init_as_page_menu() {
+        $menu = get_pages();
+        if ($menu) {
+            foreach($menu as $mi) {
+                $mi->__title = $mi->post_title;
+            }
+            _wp_menu_item_classes_by_context($menu);
+            if (is_array($menu)){
+                $menu = self::order_children($menu);
+            }
+            $this->items = $menu;
+        }
+    }
 
-	/**
-	 * @internal
-	 * @param string $slug
-	 * @param array $locations
-	 * @return integer
-	 */
-	protected function get_menu_id_from_locations($slug, $locations) {
-		if ($slug === 0) {
-			$slug = $this->get_menu_id_from_terms($slug);
-		}
-		if (is_numeric($slug)) {
-			$slug = array_search($slug, $locations);
-		}
-		if (isset($locations[$slug])) {
-			$menu_id = $locations[$slug];
-			return $menu_id;
-		}
-	}
+    /**
+     * @internal
+     * @param string $slug
+     * @param array $locations
+     * @return integer
+     */
+    protected function get_menu_id_from_locations($slug, $locations) {
+        if ($slug === 0) {
+            $slug = $this->get_menu_id_from_terms($slug);
+        }
+        if (is_numeric($slug)) {
+            $slug = array_search($slug, $locations);
+        }
+        if (isset($locations[$slug])) {
+            $menu_id = $locations[$slug];
+            return $menu_id;
+        }
+    }
 
-	/**
-	 * @internal
-	 * @param int $slug
-	 * @return int
-	 */
-	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) {
-				return $menu_id;
-			}
-			$menu_id = get_term_by('name', $slug, 'nav_menu');
-			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)) {
-				return $menus[0]->term_id;
-			}
-		}
-		return 0;
-	}
+    /**
+     * @internal
+     * @param int $slug
+     * @return int
+     */
+    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) {
+                return $menu_id;
+            }
+            $menu_id = get_term_by('name', $slug, 'nav_menu');
+            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)) {
+                return $menus[0]->term_id;
+            }
+        }
+        return 0;
+    }
 
-	/**
-	 * @param array $menu_items
-	 * @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) {
-				return $item;
-			}
-		}
-	}
+    /**
+     * @param array $menu_items
+     * @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) {
+                return $item;
+            }
+        }
+    }
 
-	/**
-	 * @internal
-	 * @param array $items
-	 * @return array
-	 */
-	protected function order_children($items) {
-		$index = array();
-		$menu = array();
-		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'){
-					$old_menu_item = $item;
-					$item = new $this->PostClass($item);
-				}
-				$menu_item = new $this->MenuItemClass($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])) {
-				$index[$item->menu_item_parent]->add_child($item);
-			} else {
-				$menu[] = $item;
-			}
-		}
-		return $menu;
-	}
+    /**
+     * @internal
+     * @param array $items
+     * @return array
+     */
+    protected function order_children($items) {
+        $index = array();
+        $menu = array();
+        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'){
+                    $old_menu_item = $item;
+                    $item = new $this->PostClass($item);
+                }
+                $menu_item = new $this->MenuItemClass($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])) {
+                $index[$item->menu_item_parent]->add_child($item);
+            } else {
+                $menu[] = $item;
+            }
+        }
+        return $menu;
+    }
 
-	/**
-	 * @return array
-	 */
-	function get_items() {
-		if (is_array($this->items)) {
-			return $this->items;
-		}
-		return array();
-	}
+    /**
+     * @return array
+     */
+    function get_items() {
+        if (is_array($this->items)) {
+            return $this->items;
+        }
+        return array();
+    }
 }
 
 

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 +1404 added lines, -1404 removed lines

@@ -34,1409 +34,1409 @@
  */
 class TimberPost extends TimberCore implements TimberCoreInterface {
 
-	/**
-	 * @var string $ImageClass the name of the class to handle images by default
-	 */
-	public $ImageClass = 'TimberImage';
-
-	/**
-	 * @var string $PostClass the name of the class to handle posts by default
-	 */
-	public $PostClass = 'TimberPost';
-
-	/**
-	 * @var string $TermClass the name of the class to handle terms by default
-	 */
-	public $TermClass = 'TimberTerm';
-
-	/**
-	 * @var string $object_type what does this class represent in WordPress terms?
-	 */
-	public $object_type = 'post';
-
-	/**
-	 * @var string $representation what does this class represent in WordPress terms?
-	 */
-	public static $representation = 'post';
-
-	/**
-	 * @internal
-	 * @var string $_content stores the processed content internally
-	 */
-	protected $_content;
-
-	/**
-	 * @internal
-	 * @var array $_get_terms stores the results of a get_terms method call
-	 * @deprecated
-	 */
-	protected $_get_terms;
-
-	/**
-	 * @var string $_permalink the returned permalink from WP's get_permalink function
-	 */
-	protected $_permalink;
-
-	/**
-	 * @var array $_next stores the results of the next TimberPost in a set inside an array (in order to manage by-taxonomy)
-	 */
-	protected $_next = array();
-
-	/**
-	 * @var array $_prev stores the results of the previous TimberPost in a set inside an array (in order to manage by-taxonomy)
-	 */
-	protected $_prev = array();
-
-	/**
-	 * @api
-	 * @var string $class stores the CSS classes for the post (ex: "post post-type-book post-123")
-	 */
-	public $class;
-
-	/**
-	 * @api
-	 * @var string $id the numeric WordPress id of a post
-	 */
-	public $id;
-
-	/**
-	 * @var string 	$ID 			the numeric WordPress id of a post, capitalized to match WP usage
-	 */
-	public $ID;
-
-	/**
-	 * @var int 	$post_author 	the numeric ID of the a post's author corresponding to the wp_user dtable
-	 */
-	public $post_author;
-
-	/**
-	 * @var string 	$post_content 	the raw text of a WP post as stored in the database
-	 */
-	public $post_content;
-
-	/**
-	 * @var string 	$post_date 		the raw date string as stored in the WP database, ex: 2014-07-05 18:01:39
-	 */
-	public $post_date;
-
-	/**
-	 * @var string 	$post_exceprt 	the raw text of a manual post exceprt as stored in the database
-	 */
-	public $post_excerpt;
-
-	/**
-	 * @var int 		$post_parent 	the numeric ID of a post's parent post
-	 */
-	public $post_parent;
-
-	/**
-	 * @api
-	 * @var string 		$post_status 	the status of a post ("draft", "publish", etc.)
-	 */
-	public $post_status;
-
-	/**
-	 * @var string 	$post_title 	the raw text of a post's title as stored in the database
-	 */
-	public $post_title;
-
-	/**
-	 * @api
-	 * @var string 	$post_type 		the name of the post type, this is the machine name (so "my_custom_post_type" as opposed to "My Custom Post Type")
-	 */
-	public $post_type;
-
-	/**
-	 * @api
-	 * @var string 	$slug 		the URL-safe slug, this corresponds to the poorly-named "post_name" in the WP database, ex: "hello-world"
-	 */
-	public $slug;
-
-	/**
-	 * If you send the constructor nothing it will try to figure out the current post id based on being inside The_Loop
-	 * @example
-	 * ```php
-	 * $post = new TimberPost();
-	 * $other_post = new TimberPost($random_post_id);
-	 * ```
-	 * @param mixed $pid
-	 */
-	public function __construct($pid = null) {
-		$pid = $this->determine_id( $pid );
-		$this->init($pid);
-	}
-
-	/**
-	 * tries to figure out what post you want to get if not explictly defined (or if it is, allows it to be passed through)
-	 * @internal
-	 * @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) {
-		global $wp_query;
-		if ( $pid === null &&
-			isset($wp_query->queried_object_id)
-			&& $wp_query->queried_object_id
-			&& isset($wp_query->queried_object)
-			&& 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 );
-				} 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 )  {
-			//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) ){
-				$gtid = true;
-			}
-			if ( $gtid ) {
-				$pid = get_the_ID();
-			}
-			if ( !$pid ) {
-				global $wp_query;
-				if ( isset($wp_query->query['p']) ) {
-					$pid = $wp_query->query['p'];
-				}
-			}
-		}
-		if ( $pid === null && ($pid_from_loop = TimberPostGetter::loop_to_id()) ) {
-			$pid = $pid_from_loop;
-		}
-		return $pid;
-	}
-
-	/**
-	 * Outputs the title of the post if you do something like `<h1>{{post}}</h1>`
-	 * @return string
-	 */
-	public function __toString() {
-		return $this->title();
-	}
-
-	protected function get_post_preview_id( $query ) {
-		$can = array(
-	 		'edit_' . $query->queried_object->post_type . 's',
-	 	);
-
-	 	if ( $query->queried_object->author_id !== get_current_user_id() ) {
-	 		$can[] = 'edit_others_' . $query->queried_object->post_type . 's';
-	 	}
-
-	 	$can_preview = array();
-
-		foreach( $can as $type ) {
-		     if( current_user_can( $type ) ) {
-		        $can_preview[] = true;
-		     }
-		}
-
-		if ( count( $can_preview ) !== count( $can ) ) {
-		     return;
-		}
-
-		$revisions = wp_get_post_revisions( $query->queried_object_id );
-
-		if( !empty( $revisions ) ) {
-			$last = end($revisions);
-			return $last->ID;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Initializes a TimberPost
-	 * @internal
-	 * @param int|bool $pid
-	 */
-	protected function init($pid = false) {
-		if ( $pid === false ) {
-			$pid = get_the_ID();
-		}
-		if ( is_numeric($pid) ) {
-			$this->ID = $pid;
-		}
-		$post_info = $this->get_info($pid);
-		$this->import($post_info);
-		//cant have a function, so gots to do it this way
-		$post_class = $this->post_class();
-		$this->class = $post_class;
-	}
-
-	/**
-	 * Get the URL that will edit the current post/object
-	 * @internal
-	 * @see TimberPost::edit_link
-	 * @return bool|string
-	 */
-	function get_edit_url() {
-		if ( $this->can_edit() ) {
-			return get_edit_post_link($this->ID);
-		}
-	}
-
-	/**
-	 * updates the post_meta of the current object with the given value
-	 * @param string $field
-	 * @param mixed $value
-	 */
-	public function update( $field, $value ) {
-		if ( isset($this->ID) ) {
-			update_post_meta($this->ID, $field, $value);
-			$this->$field = $value;
-		}
-	}
-
-
-	/**
-	 * 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
-	 * @return WP_Post on success
-	 */
-	protected function prepare_post_info( $pid = 0 ) {
-		if ( is_string($pid) || is_numeric($pid) || (is_object($pid) && !isset($pid->post_title)) || $pid === 0 ) {
-			$pid = self::check_post_id($pid);
-			$post = get_post($pid);
-			if ( $post ) {
-				return $post;
-			}
-		}
-		//we can skip if already is WP_Post
-		return $pid;
-	}
-
-
-	/**
-	 * helps you find the post id regardless of whether you send a string or whatever
-	 * @param integer $pid ;
-	 * @internal
-	 * @return integer ID number of a post
-	 */
-	protected function check_post_id( $pid ) {
-		if ( is_numeric($pid) && $pid === 0 ) {
-			$pid = get_the_ID();
-			return $pid;
-		}
-		if ( !is_numeric($pid) && is_string($pid) ) {
-			$pid = self::get_post_id_by_name($pid);
-			return $pid;
-		}
-		if ( !$pid ) {
-			return null;
-		}
-		return $pid;
-	}
-
-
-	/**
-	 * get_post_id_by_name($post_name)
-	 * @internal
-	 * @param string $post_name
-	 * @return int
-	 */
-	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) {
-			return null;
-		}
-		return $result->ID;
-	}
-
-	/**
-	 * get a preview of your post, if you have an excerpt it will use that,
-	 * otherwise it will pull from the post_content.
-	 * If there's a <!-- more --> tag it will use that to mark where to pull through.
-	 * @api
-	 * @example
-	 * ```twig
-	 * <p>{{post.get_preview(50)}}</p>
-	 * ```
-	 * @param int $len The number of words that WP should use to make the tease. (Isn't this better than [this mess](http://wordpress.org/support/topic/changing-the-default-length-of-the_excerpt-1?replies=14)?). If you've set a post_excerpt on a post, we'll use that for the preview text; otherwise the first X words of the post_content
-	 * @param bool $force What happens if your custom post excerpt is longer then the length requested? By default (`$force = false`) it will use the full `post_excerpt`. However, you can set this to true to *force* your excerpt to be of the desired length
-	 * @param string $readmore The text you want to use on the 'readmore' link
-	 * @param bool|string $strip true for default, false for none, string for list of custom attributes
-	 * @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 = '&hellip;') {
-		$text = '';
-		$trimmed = false;
-		if ( isset($this->post_excerpt) && strlen($this->post_excerpt) ) {
-			if ( $force ) {
-				$text = TimberHelper::trim_words($this->post_excerpt, $len, false);
-				$trimmed = true;
-			} else {
-				$text = $this->post_excerpt;
-			}
-		}
-		if ( !strlen($text) && preg_match('/<!--\s?more(.*?)?-->/', $this->post_content, $readmore_matches) ) {
-			$pieces = explode($readmore_matches[0], $this->post_content);
-			$text = $pieces[0];
-			if ( $force ) {
-				$text = TimberHelper::trim_words($text, $len, false);
-				$trimmed = true;
-			}
-			$text = do_shortcode( $text );
-		}
-		if ( !strlen($text) ) {
-			$text = TimberHelper::trim_words($this->get_content(), $len, false);
-			$trimmed = true;
-		}
-		if ( !strlen(trim($text)) ) {
-			return trim($text);
-		}
-		if ( $strip ) {
-			$allowable_tags = (is_string($strip)) ? $strip : null;
-			$text = trim(strip_tags($text, $allowable_tags));
-		}
-		if ( strlen($text) ) {
-			$text = trim($text);
-			$last = $text[strlen($text) - 1];
-			if ( $last != '.' && $trimmed ) {
-				$text .= $end;
-			}
-			if ( !$strip ) {
-				$last_p_tag = strrpos($text, '</p>');
-				if ( $last_p_tag !== false ) {
-					$text = substr($text, 0, $last_p_tag);
-				}
-				if ( $last != '.' && $trimmed ) {
-					$text .= $end . ' ';
-				}
-			}
-			$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>';
-			} elseif ( $readmore ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore) . '</a>';
-			}
-			if ( !$strip && $last_p_tag && ( strpos($text, '<p>') || strpos($text, '<p ') ) ) {
-				$text .= '</p>';
-			}
-		}
-		return trim($text);
-	}
-
-	/**
-	 * gets the post custom and attaches it to the current object
-	 * @internal
-	 * @param bool|int $pid a post ID number
-	 */
-	function import_custom( $pid = false ) {
-		if ( !$pid ) {
-			$pid = $this->ID;
-		}
-		$customs = $this->get_post_custom($pid);
-		$this->import($customs);
-	}
-
-	/**
-	 * Used internally to fetch the metadata fields (wp_postmeta table)
-	 * and attach them to our TimberPost object
-	 * @internal
-	 * @param int $pid
-	 * @return array
-	 */
-	protected function get_post_custom( $pid ) {
-		apply_filters('timber_post_get_meta_pre', array(), $pid, $this);
-		$customs = get_post_custom($pid);
-		if ( !is_array($customs) || empty($customs) ) {
-			return array();
-		}
-		foreach ( $customs as $key => $value ) {
-			if ( is_array($value) && count($value) == 1 && isset($value[0]) ) {
-				$value = $value[0];
-			}
-			$customs[$key] = maybe_unserialize($value);
-		}
-		$customs = apply_filters('timber_post_get_meta', $customs, $pid, $this);
-		return $customs;
-	}
-
-	/**
-	 * @internal
-	 * @see TimberPost::thumbnail
-	 * @return null|TimberImage
-	 */
-	function get_thumbnail() {
-		if ( function_exists('get_post_thumbnail_id') ) {
-			$tid = get_post_thumbnail_id($this->ID);
-			if ( $tid ) {
-				return new $this->ImageClass($tid);
-			}
-		}
-	}
-
-	/**
-	 * @internal
-	 * @see TimberPost::link
-	 * @return string
-	 */
-	function get_permalink() {
-		if ( isset($this->_permalink) ) {
-			return $this->_permalink;
-		}
-		$this->_permalink = get_permalink($this->ID);
-		return $this->_permalink;
-	}
-
-	/**
-	 * get the permalink for a post object
-	 * In your templates you should use link:
-	 * <a href="{{post.link}}">Read my post</a>
-	 * @internal
-	 * @return string
-	 */
-	function get_link() {
-		return $this->get_permalink();
-	}
-
-	/**
-	 * Get the next post in WordPress's ordering
-	 * @internal
-	 * @param bool $taxonomy
-	 * @return TimberPost|boolean
-	 */
-	function get_next( $taxonomy = false ) {
-		if ( !isset($this->_next) || !isset($this->_next[$taxonomy]) ) {
-			global $post;
-			$this->_next = array();
-			$old_global = $post;
-			$post = $this;
-			if ( $taxonomy ) {
-				$adjacent = get_adjacent_post(true, '', false, $taxonomy);
-			} else {
-				$adjacent = get_adjacent_post(false, '', false);
-			}
-
-			if ( $adjacent ) {
-				$this->_next[$taxonomy] = new $this->PostClass($adjacent);
-			} else {
-				$this->_next[$taxonomy] = false;
-			}
-			$post = $old_global;
-		}
-		return $this->_next[$taxonomy];
-	}
-
-	/**
-	 * Get a data array of pagination so you can navigate to the previous/next for a paginated post
-	 * @return array
-	 */
-	public function get_pagination() {
-		global $post, $page, $numpages, $multipage;
-		$post = $this;
-		$ret = array();
-		if ( $multipage ) {
-			for ( $i = 1; $i <= $numpages; $i++ ) {
-				$link = self::get_wp_link_page($i);
-				$data = array('name' => $i, 'title' => $i, 'text' => $i, 'link' => $link);
-				if ( $i == $page ) {
-					$data['current'] = true;
-				}
-				$ret['pages'][] = $data;
-			}
-			$i = $page - 1;
-			if ( $i ) {
-				$link = self::get_wp_link_page($i);
-				$ret['prev'] = array('link' => $link);
-			}
-			$i = $page + 1;
-			if ( $i <= $numpages ) {
-				$link = self::get_wp_link_page($i);
-				$ret['next'] = array('link' => $link);
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * @param int $i
-	 * @return string
-	 */
-	protected static function get_wp_link_page($i) {
-		$link = _wp_link_page($i);
-		$link = new SimpleXMLElement($link . '</a>');
-		if ( isset($link['href']) ) {
-			return $link['href'];
-		}
-		return '';
-	}
-
-	/**
-	 * Get the permalink for a post, but as a relative path
-	 * For example, where {{post.link}} would return "http://example.org/2015/07/04/my-cool-post"
-	 * this will return the relative version: "/2015/07/04/my-cool-post"
-	 * @internal
-	 * @return string
-	 */
-	function get_path() {
-		return TimberURLHelper::get_rel_url($this->get_link());
-	}
-
-	/**
-	 * Get the next post in WordPress's ordering
-	 * @internal
-	 * @param bool $taxonomy
-	 * @return TimberPost|boolean
-	 */
-	function get_prev( $taxonomy = false ) {
-		if ( isset($this->_prev) && isset($this->_prev[$taxonomy]) ) {
-			return $this->_prev[$taxonomy];
-		}
-		global $post;
-		$old_global = $post;
-		$post = $this;
-		$within_taxonomy = ($taxonomy) ? $taxonomy : 'category';
-		$adjacent = get_adjacent_post(($taxonomy), '', true, $within_taxonomy);
-		$prev_in_taxonomy = false;
-		if ( $adjacent ) {
-			$prev_in_taxonomy = new $this->PostClass($adjacent);
-		}
-		$this->_prev[$taxonomy] = $prev_in_taxonomy;
-		$post = $old_global;
-		return $this->_prev[$taxonomy];
-	}
-
-	/**
-	 * Get the parent post of the post
-	 * @internal
-	 * @return bool|TimberPost
-	 */
-	function get_parent() {
-		if ( !$this->post_parent ) {
-			return false;
-		}
-		return new $this->PostClass($this->post_parent);
-	}
-
-	/**
-	 * Gets a User object from the author of the post
-	 * @internal
-	 * @see TimberPost::author
-	 * @return bool|TimberUser
-	 */
-	function get_author() {
-		if ( isset($this->post_author) ) {
-			return new TimberUser($this->post_author);
-		}
-	}
-
-	/**
-	 * @internal
-	 * @return bool|TimberUser
-	 */
-	function get_modified_author() {
-		$user_id = get_post_meta($this->ID, '_edit_last', true);
-		return ($user_id ? new TimberUser($user_id) : $this->get_author());
-	}
-
-	/**
-	 * Used internally by init, etc. to build TimberPost object
-	 * @internal
-	 * @param  int $pid
-	 * @return null|object|WP_Post
-	 */
-	protected function get_info($pid) {
-		$post = $this->prepare_post_info($pid);
-		if ( !isset($post->post_status) ) {
-			return null;
-		}
-		$post->status = $post->post_status;
-		$post->id = $post->ID;
-		$post->slug = $post->post_name;
-		$customs = $this->get_post_custom($post->ID);
-		$post->custom = $customs;
-		$post = (object) array_merge((array)$customs, (array)$post);
-		return $post;
-	}
-
-	/**
-	 * @internal
-	 * @see TimberPost::date
-	 * @param  string $date_format
-	 * @return string
-	 */
-	function get_date( $date_format = '' ) {
-		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->post_date);
-		return apply_filters('get_the_date', $the_date, $df);
-	}
-
-	/**
-	 * @internal
-	 * @param  string $date_format
-	 * @return string
-	 */
-	function get_modified_date( $date_format = '' ) {
-		$df = $date_format ? $date_format : get_option('date_format');
-		$the_time = $this->get_modified_time($df);
-		return apply_filters('get_the_modified_date', $the_time, $date_format);
-	}
-
-	/**
-	 * @internal
-	 * @param  string $time_format
-	 * @return string
-	 */
-	function get_modified_time( $time_format = '' ) {
-		$tf = $time_format ? $time_format : get_option('time_format');
-		$the_time = get_post_modified_time($tf, false, $this->ID, true);
-		return apply_filters('get_the_modified_time', $the_time, $time_format);
-	}
-
-	/**
-	 * @internal
-	 * @see TimberPost::children
-	 * @param string 		$post_type
-	 * @param bool|string 	$childPostClass
-	 * @return array
-	 */
-	function get_children( $post_type = 'any', $childPostClass = false ) {
-		if ( $childPostClass === false ) {
-			$childPostClass = $this->PostClass;
-		}
-		if ( $post_type == 'parent' ) {
-			$post_type = $this->post_type;
-		}
-		$children = get_children('post_parent=' . $this->ID . '&post_type=' . $post_type . '&numberposts=-1&orderby=menu_order title&order=ASC&post_status=publish');
-		foreach ( $children as &$child ) {
-			$child = new $childPostClass($child->ID);
-		}
-		$children = array_values($children);
-		return $children;
-	}
-
-
-	/**
-	 * Get the comments for a post
-	 * @internal
-	 * @see TimberPost::comments
-	 * @param int $ct
-	 * @param string $order
-	 * @param string $type
-	 * @param string $status
-	 * @param string $CommentClass
-	 * @return array|mixed
-	 */
-
-	function get_comments($ct = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment') {
-
-		global $overridden_cpage, $user_ID;
-		$overridden_cpage = false;
-
-		$commenter = wp_get_current_commenter();
-		$comment_author_email = $commenter['comment_author_email'];
-
-		$args = array('post_id' => $this->ID, 'status' => $status, 'order' => $order);
-		if ( $ct > 0 ) {
-			$args['number'] = $ct;
-		}
-		if ( strtolower($order) == 'wp' || strtolower($order) == 'wordpress' ) {
-			$args['order'] = get_option('comment_order');
-		}
-
-		if ( $user_ID ) {
-			$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 );
-			$overridden_cpage = true;
-		}
-
-		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() ) {
-				continue;
-			}
-
-			$tree_element = $comment;
-			do {
-				$tree_element = $timber_comments[$tree_element->comment_parent];
-			} 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) {
-				$timber_comments[$comment_parent]->children[] = $timber_comments[$comment_child];
-				unset($timber_comments[$comment_child]);
-			}
-		}
-
-		$timber_comments = array_values($timber_comments);
-
-		return $timber_comments;
-	}
-
-	/**
-	 * Get the categories for a post
-	 * @internal
-	 * @see TimberPost::categories
-	 * @return array of TimberTerms
-	 */
-	function get_categories() {
-		return $this->get_terms('category');
-	}
-
-	/**
-	 * @internal
-	 * @see TimberPost::category
-	 * @return mixed
-	 */
-	function get_category( ) {
-		$cats = $this->get_categories();
-		if ( count($cats) && isset($cats[0]) ) {
-			return $cats[0];
-		}
-	}
-
-	/**
-	 * @internal
-	 * @param string|array $tax
-	 * @param bool $merge
-	 * @param string $TermClass
-	 * @return array
-	 */
-	function get_terms( $tax = '', $merge = true, $TermClass = '' ) {
-
-		$TermClass = $TermClass ?: $this->TermClass;
-
-		if ( is_string($merge) && class_exists($merge) ) {
-			$TermClass = $merge;
-		}
-		if ( is_array($tax) ) {
-			$taxonomies = $tax;
-		}
-		if ( is_string($tax) ) {
-			if ( in_array($tax, array('all','any','')) ) {
-				$taxonomies = get_object_taxonomies($this->post_type);
-			} else {
-				$taxonomies = array($tax);
-			}
-		}
-
-		$term_class_objects = array();
-
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( in_array($taxonomy, array('tag','tags')) ) {
-				$taxonomy = 'post_tag';
-			}
-			if ( $taxonomy == 'categories' ) {
-				$taxonomy = 'category';
-			}
-
-			$terms = wp_get_post_terms($this->ID, $taxonomy);
-
-			if ( is_wp_error($terms) ) {
-				/* @var $terms WP_Error */
-				TimberHelper::error_log("Error retrieving terms for taxonomy '$taxonomy' on a post in timber-post.php");
-				TimberHelper::error_log('tax = ' . print_r($tax, true));
-				TimberHelper::error_log('WP_Error: ' . $terms->get_error_message());
-
-				return $term_class_objects;
-			}
-
-			// map over array of wordpress terms, and transform them into instances of the TermClass
-			$terms = array_map(function($term) use ($TermClass, $taxonomy) {
-				return call_user_func(array($TermClass, 'from'), $term->term_id, $taxonomy);
-			}, $terms);
-
-			if ( $merge && is_array($terms) ) {
-				$term_class_objects = array_merge($term_class_objects, $terms);
-			} else if ( count($terms) ) {
-				$term_class_objects[$taxonomy] = $terms;
-			}
-		}
-		return $term_class_objects;
-	}
-
-	/**
-	 * @param string|int $term_name_or_id
-	 * @param string $taxonomy
-	 * @return bool
-	 */
-	function has_term( $term_name_or_id, $taxonomy = 'all' ) {
-		if ( $taxonomy == 'all' || $taxonomy == 'any' ) {
-			$taxes = get_object_taxonomies($this->post_type, 'names');
-			$ret = false;
-			foreach ( $taxes as $tax ) {
-				if ( has_term($term_name_or_id, $tax, $this->ID) ) {
-					$ret = true;
-					break;
-				}
-			}
-			return $ret;
-		}
-		return has_term($term_name_or_id, $taxonomy, $this->ID);
-	}
-
-	/**
-	 * @param string $field
-	 * @return TimberImage
-	 */
-	function get_image( $field ) {
-		return new $this->ImageClass($this->$field);
-	}
-
-	/**
-	 * Gets an array of tags for you to use
-	 * @internal
-	 * @example
-	 * ```twig
-	 * <ul class="tags">
-	 *     {% for tag in post.tags %}
-	 *         <li>{{tag.name}}</li>
-	 *     {% endfor %}
-	 * </ul>
-	 * ```
-	 * @return array
-	 */
-	function get_tags() {
-		return $this->get_terms('post_tag');
-	}
-
-	/**
-	 * Outputs the title with filters applied
-	 * @internal
-	 * @example
-	 * ```twig
-	 * <h1>{{post.get_title}}</h1>
-	 * ```
-	 * ```html
-	 * <h1>Hello World!</h1>
-	 * ```
-	 * @return string
-	 */
-	function get_title() {
-		return apply_filters('the_title', $this->post_title, $this->ID);
-	}
-
-	/**
-	 * Displays the content of the post with filters, shortcodes and wpautop applied
-	 * @example
-	 * ```twig
-	 * <div class="article-text">{{post.get_content}}</div>
-	 * ```
-	 * ```html
-	 * <div class="article-text"><p>Blah blah blah</p><p>More blah blah blah.</p></div>
-	 * ```
-	 * @param int $len
-	 * @param int $page
-	 * @return string
-	 */
-	function get_content( $len = 0, $page = 0 ) {
-		if ( $len == 0 && $page == 0 && $this->_content ) {
-			return $this->_content;
-		}
-		$content = $this->post_content;
-		if ( $len ) {
-			$content = wp_trim_words($content, $len);
-		}
-		if ( $page ) {
-			$contents = explode('<!--nextpage-->', $content);
-			$page--;
-			if ( count($contents) > $page ) {
-				$content = $contents[$page];
-			}
-		}
-		$content = apply_filters('the_content', ($content));
-		if ( $len == 0 && $page == 0 ) {
-			$this->_content = $content;
-		}
-		return $content;
-	}
-
-	/**
-	 * @return string
-	 */
-	function get_paged_content() {
-		global $page;
-		return $this->get_content(0, $page);
-	}
-	/**
-	 *
-	 * Here is my summary
-	 * @example
-	 * ```twig
-	 * This post is from <span>{{ post.get_post_type.labels.plural }}</span>
-	 * ```
-	 *
-	 * ```html
-	 * This post is from <span>Recipes</span>
-	 * ```
-	 * @return mixed
-	 */
-	public function get_post_type() {
-		return get_post_type_object($this->post_type);
-	}
-
-	/**
-	 * @return int the number of comments on a post
-	 */
-	public function get_comment_count() {
-		return get_comments_number($this->ID);
-	}
-
-	/**
-	 * @param string $field_name
-	 * @return mixed
-	 */
-	public function get_field( $field_name ) {
-		$value = apply_filters('timber_post_get_meta_field_pre', null, $this->ID, $field_name, $this);
-		if ( $value === null ) {
-			$value = get_post_meta($this->ID, $field_name);
-			if ( is_array($value) && count($value) == 1 ) {
-				$value = $value[0];
-			}
-			if ( is_array($value) && count($value) == 0 ) {
-				$value = null;
-			}
-		}
-		$value = apply_filters('timber_post_get_meta_field', $value, $this->ID, $field_name, $this);
-		return $value;
-	}
-
-	/**
-	 * @param string $field_name
-	 */
-	function import_field( $field_name ) {
-		$this->$field_name = $this->get_field($field_name);
-	}
-
-	/**
-	 * @internal
-	 * @return mixed
-	 */
-	function get_format() {
-		return get_post_format($this->ID);
-	}
-
-	/**
-	 * Get the CSS classes for a post. For usage you should use `{{post.class}}` instead of `{{post.post_class}}`
-	 * @internal
-	 * @param string $class additional classes you want to add
-	 * @see TimberPost::$class
-	 * @example
-	 * ```twig
-	 * <article class="{{ post.class }}">
-	 *    {# Some stuff here #}
-	 * </article>
-	 * ```
-	 *
-	 * ```html
-	 * <article class="post-2612 post type-post status-publish format-standard has-post-thumbnail hentry category-data tag-charleston-church-shooting tag-dylann-roof tag-gun-violence tag-hate-crimes tag-national-incident-based-reporting-system">
-	 *    {# Some stuff here #}
-	 * </article>
-	 * ```
-	 * @return string a space-seperated list of classes
-	 */
-	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) ){
-			return implode(' ', $class_array);
-		}
-		return $class_array;
-	}
-
-	// Docs
-
-	/**
-	 * @return array
-	 * @codeCoverageIgnore
-	 */
-	public function get_method_values() {
-		$ret = parent::get_method_values();
-		$ret['author'] = $this->author();
-		$ret['categories'] = $this->categories();
-		$ret['category'] = $this->category();
-		$ret['children'] = $this->children();
-		$ret['comments'] = $this->comments();
-		$ret['content'] = $this->content();
-		$ret['edit_link'] = $this->edit_link();
-		$ret['format'] = $this->format();
-		$ret['link'] = $this->link();
-		$ret['next'] = $this->next();
-		$ret['pagination'] = $this->pagination();
-		$ret['parent'] = $this->parent();
-		$ret['path'] = $this->path();
-		$ret['prev'] = $this->prev();
-		$ret['terms'] = $this->terms();
-		$ret['tags'] = $this->tags();
-		$ret['thumbnail'] = $this->thumbnail();
-		$ret['title'] = $this->title();
-		return $ret;
-	}
-
-	/**
-	 * Return the author of a post
-	 * @api
-	 * @example
-	 * ```twig
-	 * <h1>{{post.title}}</h1>
-	 * <p class="byline">
-	 *     <a href="{{post.author.link}}">{{post.author.name}}</a>
-	 * </p>
-	 * ```
-	 * @return TimberUser|bool A TimberUser object if found, false if not
-	 */
-	public function author() {
-		return $this->get_author();
-	}
-
-	/**
-	 * Get the author (WordPress user) who last modified the post
-	 * @example
-	 * ```twig
-	 * Last updated by {{ post.modified_author.name }}
-	 * ```
-	 * ```html
-	 * Last updated by Harper Lee
-	 * ```
-	 * @return TimberUser|bool A TimberUser object if found, false if not
-	 */
-	public function modified_author() {
-		return $this->get_modified_author();
-	}
-
-	/**
-	 * Get the categoires on a particular post
-	 * @api
-	 * @return array of TimberTerms
-	 */
-	public function categories() {
-		return $this->get_terms('category');
-	}
-
-	/**
-	 * Returns a category attached to a post
-	 * @api
-	 * If mulitpuile categories are set, it will return just the first one
-	 * @return TimberTerm|null
-	 */
-	public function category() {
-		return $this->get_category();
-	}
-
-	/**
-	 * Returns an array of children on the post as TimberPosts
-	 * (or other claass as you define).
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% if post.children %}
-	 *     Here are the child pages:
-	 *     {% for child in page.children %}
-	 *         <a href="{{ child.link }}">{{ child.title }}</a>
-	 *     {% endfor %}
-	 * {% endif %}
-	 * ```
-	 * @param string $post_type _optional_ use to find children of a particular post type (attachment vs. page for example). You might want to restrict to certain types of children in case other stuff gets all mucked in there. You can use 'parent' to use the parent's post type
-	 * @param string|bool $childPostClass _optional_ a custom post class (ex: 'MyTimberPost') to return the objects as. By default (false) it will use TimberPost::$post_class value.
-	 * @return array
-	 */
-	public function children( $post_type = 'any', $childPostClass = false ) {
-		return $this->get_children( $post_type, $childPostClass );
-	}
-
-	/**
-	 * Gets the comments on a TimberPost and returns them as an array of [TimberComments](#TimberComment) (or whatever comment class you set).
-	 * @api
-	 * @param int $count Set the number of comments you want to get. `0` is analogous to "all"
-	 * @param string $order use ordering set in WordPress admin, or a different scheme
-	 * @param string $type For when other plugins use the comments table for their own special purposes, might be set to 'liveblog' or other depending on what's stored in yr comments table
-	 * @param string $status Could be 'pending', etc.
-	 * @param string $CommentClass What class to use when returning Comment objects. As you become a Timber pro, you might find yourself extending TimberComment for your site or app (obviously, totally optional)
-	 * @example
-	 * ```twig
-	 * {# single.twig #}
-	 * <h4>Comments:</h4>
-	 * {% for comment in post.comments %}
-	 * 	<div class="comment-{{comment.ID}} comment-order-{{loop.index}}">
-	 * 		<p>{{comment.author.name}} said:</p>
-	 * 		<p>{{comment.content}}</p>
-	 * 	</div>
-	 * {% endfor %}
-	 * ```
-	 * @return bool|array
-	 */
-	public function comments( $count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment' ) {
-		return $this->get_comments($count, $order, $type, $status, $CommentClass);
-	}
-
-	/**
-	 * Gets the actual content of a WP Post, as opposed to post_content this will run the hooks/filters attached to the_content. \This guy will return your posts content with WordPress filters run on it (like for shortcodes and wpautop).
-	 * @api
-	 * @example
-	 * ```twig
-	 * <div class="article">
-	 *     <h2>{{post.title}}</h2>
-	 *     <div class="content">{{ post.content }}</div>
-	 * </div>
-	 * ```
-	 * @param int $page
-	 * @return string
-	 */
-	public function content( $page = 0 ) {
-		return $this->get_content(0, $page);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function paged_content() {
-		return $this->get_paged_content();
-	}
-
-	/**
-	 * Get the date to use in your template!
-	 * @api
-	 * @example
-	 * ```twig
-	 * Published on {{ post.date }} // Uses WP's formatting set in Admin
-	 * OR
-	 * Published on {{ post.date | date('F jS') }} // Jan 12th
-	 * ```
-	 *
-	 * ```html
-	 * Published on January 12, 2015
-	 * OR
-	 * Published on Jan 12th
-	 * ```
-	 * @param string $date_format
-	 * @return string
-	 */
-	public function date( $date_format = '' ) {
-		return $this->get_date($date_format);
-	}
-
-	/**
-	 * Get the time to use in your template
-	 * @api
-	 * @example
-	 * ```twig
-	 * Published at {{ post.time }} // Uses WP's formatting set in Admin
-	 * OR
-	 * Published at {{ post.time | time('G:i') }} // 13:25
-	 * ```
-	 *
-	 * ```html
-	 * Published at 1:25 pm
-	 * OR
-	 * Published at 13:25
-	 * ```
-	 * @param string $time_format
-	 * @return string
-	 */
-	public function time( $time_format = '' ) {
-		$tf = $time_format ? $time_format : get_option('time_format');
-	 	$the_time = (string)mysql2date($tf, $this->post_date);
-	 	return apply_filters('get_the_time', $the_time, $tf);
-	}
-
-	/**
-	 * @return bool|string
-	 */
-	public function edit_link() {
-		return $this->get_edit_url();
-	}
-
-	/**
-	 * @api
-	 * @return mixed
-	 */
-	public function format() {
-		return $this->get_format();
-	}
-
-	/**
-	 * get the permalink for a post object
-	 * @api
-	 * @example
-	 * ```twig
-	 * <a href="{{post.link}}">Read my post</a>
-	 * ```
-	 * @return string ex: http://example.org/2015/07/my-awesome-post
-	 */
-	public function link() {
-		return $this->get_permalink();
-	}
-
-	/**
-	 * @param string $field_name
-	 * @return mixed
-	 */
-	public function meta( $field_name = null ) {
-		if ( $field_name === null ) {
-			//on the off-chance the field is actually named meta
-			$field_name = 'meta';
-		}
-		return $this->get_field($field_name);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function name(){
-		return $this->title();
-	}
-
-	/**
-	 * @param string $date_format
-	 * @return string
-	 */
-	public function modified_date( $date_format = '' ) {
-		return $this->get_modified_date($date_format);
-	}
-
-	/**
-	 * @param string $time_format
-	 * @return string
-	 */
-	public function modified_time( $time_format = '' ) {
-		return $this->get_modified_time($time_format);
-	}
-
-	/**
-	 * @api
-	 * @param bool $in_same_cat
-	 * @return mixed
-	 */
-	public function next( $in_same_cat = false ) {
-		return $this->get_next($in_same_cat);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function pagination() {
-		return $this->get_pagination();
-	}
-
-	/**
-	 * Gets the parent (if one exists) from a post as a TimberPost object (or whatever is set in TimberPost::$PostClass)
-	 * @api
-	 * @example
-	 * ```twig
-	 * Parent page: <a href="{{ post.parent.link }}">{{ post.parent.title }}</a>
-	 * ```
-	 * @return bool|TimberPost
-	 */
-	public function parent() {
-		return $this->get_parent();
-	}
-
-	/**
-	 * Gets the relative path of a WP Post, so while link() will return http://example.org/2015/07/my-cool-post
-	 * this will return just /2015/07/my-cool-post
-	 * @api
-	 * @example
-	 * ```twig
-	 * <a href="{{post.path}}">{{post.title}}</a>
-	 * ```
-	 * @return string
-	 */
-	public function path() {
-		return $this->get_path();
-	}
-
-	/**
-	 * @deprecated 0.20.0 use link() instead
-	 * @return string
-	 */
-	public function permalink() {
-		return $this->get_permalink();
-	}
-
-	/**
-	 * Get the previous post in a set
-	 * @api
-	 * @example
-	 * ```twig
-	 * <h4>Prior Entry:</h4>
-	 * <h3>{{post.prev.title}}</h3>
-	 * <p>{{post.prev.get_preview(25)}}</p>
-	 * ```
-	 * @param bool $in_same_cat
-	 * @return mixed
-	 */
-	public function prev( $in_same_cat = false ) {
-		return $this->get_prev($in_same_cat);
-	}
-
-	/**
-	 * Get the terms associated with the post
-	 * This goes across all taxonomies by default
-	 * @api
-	 * @param string|array $tax What taxonom(y|ies) to pull from. Defaults to all registered taxonomies for the post type. You can use custom ones, or built-in WordPress taxonomies (category, tag). Timber plays nice and figures out that tag/tags/post_tag are all the same (and categories/category), for custom taxonomies you're on your own.
-	 * @param bool $merge Should the resulting array be one big one (true)? Or should it be an array of sub-arrays for each taxonomy (false)?
-	 * @return array
-	 */
-	public function terms( $tax = '', $merge = true ) {
-		return $this->get_terms($tax, $merge);
-	}
-
-	/**
-	 * Gets the tags on a post, uses WP's post_tag taxonomy
-	 * @api
-	 * @return array
-	 */
-	public function tags() {
-		return $this->get_tags();
-	}
-
-	/**
-	 * get the featured image as a TimberImage
-	 * @api
-	 * @example
-	 * ```twig
-	 * <img src="{{post.thumbnail.src}}" />
-	 * ```
-	 * @return TimberImage|null of your thumbnail
-	 */
-	public function thumbnail() {
-		return $this->get_thumbnail();
-	}
-
-	/**
-	 * Returns the processed title to be used in templates. This returns the title of the post after WP's filters have run. This is analogous to `the_title()` in standard WP template tags.
-	 * @api
-	 * @example
-	 * ```twig
-	 * <h1>{{ post.title }}</h1>
-	 * ```
-	 * @return string
-	 */
-	public function title() {
-		return $this->get_title();
-	}
+    /**
+     * @var string $ImageClass the name of the class to handle images by default
+     */
+    public $ImageClass = 'TimberImage';
+
+    /**
+     * @var string $PostClass the name of the class to handle posts by default
+     */
+    public $PostClass = 'TimberPost';
+
+    /**
+     * @var string $TermClass the name of the class to handle terms by default
+     */
+    public $TermClass = 'TimberTerm';
+
+    /**
+     * @var string $object_type what does this class represent in WordPress terms?
+     */
+    public $object_type = 'post';
+
+    /**
+     * @var string $representation what does this class represent in WordPress terms?
+     */
+    public static $representation = 'post';
+
+    /**
+     * @internal
+     * @var string $_content stores the processed content internally
+     */
+    protected $_content;
+
+    /**
+     * @internal
+     * @var array $_get_terms stores the results of a get_terms method call
+     * @deprecated
+     */
+    protected $_get_terms;
+
+    /**
+     * @var string $_permalink the returned permalink from WP's get_permalink function
+     */
+    protected $_permalink;
+
+    /**
+     * @var array $_next stores the results of the next TimberPost in a set inside an array (in order to manage by-taxonomy)
+     */
+    protected $_next = array();
+
+    /**
+     * @var array $_prev stores the results of the previous TimberPost in a set inside an array (in order to manage by-taxonomy)
+     */
+    protected $_prev = array();
+
+    /**
+     * @api
+     * @var string $class stores the CSS classes for the post (ex: "post post-type-book post-123")
+     */
+    public $class;
+
+    /**
+     * @api
+     * @var string $id the numeric WordPress id of a post
+     */
+    public $id;
+
+    /**
+     * @var string 	$ID 			the numeric WordPress id of a post, capitalized to match WP usage
+     */
+    public $ID;
+
+    /**
+     * @var int 	$post_author 	the numeric ID of the a post's author corresponding to the wp_user dtable
+     */
+    public $post_author;
+
+    /**
+     * @var string 	$post_content 	the raw text of a WP post as stored in the database
+     */
+    public $post_content;
+
+    /**
+     * @var string 	$post_date 		the raw date string as stored in the WP database, ex: 2014-07-05 18:01:39
+     */
+    public $post_date;
+
+    /**
+     * @var string 	$post_exceprt 	the raw text of a manual post exceprt as stored in the database
+     */
+    public $post_excerpt;
+
+    /**
+     * @var int 		$post_parent 	the numeric ID of a post's parent post
+     */
+    public $post_parent;
+
+    /**
+     * @api
+     * @var string 		$post_status 	the status of a post ("draft", "publish", etc.)
+     */
+    public $post_status;
+
+    /**
+     * @var string 	$post_title 	the raw text of a post's title as stored in the database
+     */
+    public $post_title;
+
+    /**
+     * @api
+     * @var string 	$post_type 		the name of the post type, this is the machine name (so "my_custom_post_type" as opposed to "My Custom Post Type")
+     */
+    public $post_type;
+
+    /**
+     * @api
+     * @var string 	$slug 		the URL-safe slug, this corresponds to the poorly-named "post_name" in the WP database, ex: "hello-world"
+     */
+    public $slug;
+
+    /**
+     * If you send the constructor nothing it will try to figure out the current post id based on being inside The_Loop
+     * @example
+     * ```php
+     * $post = new TimberPost();
+     * $other_post = new TimberPost($random_post_id);
+     * ```
+     * @param mixed $pid
+     */
+    public function __construct($pid = null) {
+        $pid = $this->determine_id( $pid );
+        $this->init($pid);
+    }
+
+    /**
+     * tries to figure out what post you want to get if not explictly defined (or if it is, allows it to be passed through)
+     * @internal
+     * @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) {
+        global $wp_query;
+        if ( $pid === null &&
+            isset($wp_query->queried_object_id)
+            && $wp_query->queried_object_id
+            && isset($wp_query->queried_object)
+            && 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 );
+                } 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 )  {
+            //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) ){
+                $gtid = true;
+            }
+            if ( $gtid ) {
+                $pid = get_the_ID();
+            }
+            if ( !$pid ) {
+                global $wp_query;
+                if ( isset($wp_query->query['p']) ) {
+                    $pid = $wp_query->query['p'];
+                }
+            }
+        }
+        if ( $pid === null && ($pid_from_loop = TimberPostGetter::loop_to_id()) ) {
+            $pid = $pid_from_loop;
+        }
+        return $pid;
+    }
+
+    /**
+     * Outputs the title of the post if you do something like `<h1>{{post}}</h1>`
+     * @return string
+     */
+    public function __toString() {
+        return $this->title();
+    }
+
+    protected function get_post_preview_id( $query ) {
+        $can = array(
+                'edit_' . $query->queried_object->post_type . 's',
+            );
+
+            if ( $query->queried_object->author_id !== get_current_user_id() ) {
+                $can[] = 'edit_others_' . $query->queried_object->post_type . 's';
+            }
+
+            $can_preview = array();
+
+        foreach( $can as $type ) {
+                if( current_user_can( $type ) ) {
+                $can_preview[] = true;
+                }
+        }
+
+        if ( count( $can_preview ) !== count( $can ) ) {
+                return;
+        }
+
+        $revisions = wp_get_post_revisions( $query->queried_object_id );
+
+        if( !empty( $revisions ) ) {
+            $last = end($revisions);
+            return $last->ID;
+        }
+
+        return false;
+    }
+
+    /**
+     * Initializes a TimberPost
+     * @internal
+     * @param int|bool $pid
+     */
+    protected function init($pid = false) {
+        if ( $pid === false ) {
+            $pid = get_the_ID();
+        }
+        if ( is_numeric($pid) ) {
+            $this->ID = $pid;
+        }
+        $post_info = $this->get_info($pid);
+        $this->import($post_info);
+        //cant have a function, so gots to do it this way
+        $post_class = $this->post_class();
+        $this->class = $post_class;
+    }
+
+    /**
+     * Get the URL that will edit the current post/object
+     * @internal
+     * @see TimberPost::edit_link
+     * @return bool|string
+     */
+    function get_edit_url() {
+        if ( $this->can_edit() ) {
+            return get_edit_post_link($this->ID);
+        }
+    }
+
+    /**
+     * updates the post_meta of the current object with the given value
+     * @param string $field
+     * @param mixed $value
+     */
+    public function update( $field, $value ) {
+        if ( isset($this->ID) ) {
+            update_post_meta($this->ID, $field, $value);
+            $this->$field = $value;
+        }
+    }
+
+
+    /**
+     * 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
+     * @return WP_Post on success
+     */
+    protected function prepare_post_info( $pid = 0 ) {
+        if ( is_string($pid) || is_numeric($pid) || (is_object($pid) && !isset($pid->post_title)) || $pid === 0 ) {
+            $pid = self::check_post_id($pid);
+            $post = get_post($pid);
+            if ( $post ) {
+                return $post;
+            }
+        }
+        //we can skip if already is WP_Post
+        return $pid;
+    }
+
+
+    /**
+     * helps you find the post id regardless of whether you send a string or whatever
+     * @param integer $pid ;
+     * @internal
+     * @return integer ID number of a post
+     */
+    protected function check_post_id( $pid ) {
+        if ( is_numeric($pid) && $pid === 0 ) {
+            $pid = get_the_ID();
+            return $pid;
+        }
+        if ( !is_numeric($pid) && is_string($pid) ) {
+            $pid = self::get_post_id_by_name($pid);
+            return $pid;
+        }
+        if ( !$pid ) {
+            return null;
+        }
+        return $pid;
+    }
+
+
+    /**
+     * get_post_id_by_name($post_name)
+     * @internal
+     * @param string $post_name
+     * @return int
+     */
+    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) {
+            return null;
+        }
+        return $result->ID;
+    }
+
+    /**
+     * get a preview of your post, if you have an excerpt it will use that,
+     * otherwise it will pull from the post_content.
+     * If there's a <!-- more --> tag it will use that to mark where to pull through.
+     * @api
+     * @example
+     * ```twig
+     * <p>{{post.get_preview(50)}}</p>
+     * ```
+     * @param int $len The number of words that WP should use to make the tease. (Isn't this better than [this mess](http://wordpress.org/support/topic/changing-the-default-length-of-the_excerpt-1?replies=14)?). If you've set a post_excerpt on a post, we'll use that for the preview text; otherwise the first X words of the post_content
+     * @param bool $force What happens if your custom post excerpt is longer then the length requested? By default (`$force = false`) it will use the full `post_excerpt`. However, you can set this to true to *force* your excerpt to be of the desired length
+     * @param string $readmore The text you want to use on the 'readmore' link
+     * @param bool|string $strip true for default, false for none, string for list of custom attributes
+     * @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 = '&hellip;') {
+        $text = '';
+        $trimmed = false;
+        if ( isset($this->post_excerpt) && strlen($this->post_excerpt) ) {
+            if ( $force ) {
+                $text = TimberHelper::trim_words($this->post_excerpt, $len, false);
+                $trimmed = true;
+            } else {
+                $text = $this->post_excerpt;
+            }
+        }
+        if ( !strlen($text) && preg_match('/<!--\s?more(.*?)?-->/', $this->post_content, $readmore_matches) ) {
+            $pieces = explode($readmore_matches[0], $this->post_content);
+            $text = $pieces[0];
+            if ( $force ) {
+                $text = TimberHelper::trim_words($text, $len, false);
+                $trimmed = true;
+            }
+            $text = do_shortcode( $text );
+        }
+        if ( !strlen($text) ) {
+            $text = TimberHelper::trim_words($this->get_content(), $len, false);
+            $trimmed = true;
+        }
+        if ( !strlen(trim($text)) ) {
+            return trim($text);
+        }
+        if ( $strip ) {
+            $allowable_tags = (is_string($strip)) ? $strip : null;
+            $text = trim(strip_tags($text, $allowable_tags));
+        }
+        if ( strlen($text) ) {
+            $text = trim($text);
+            $last = $text[strlen($text) - 1];
+            if ( $last != '.' && $trimmed ) {
+                $text .= $end;
+            }
+            if ( !$strip ) {
+                $last_p_tag = strrpos($text, '</p>');
+                if ( $last_p_tag !== false ) {
+                    $text = substr($text, 0, $last_p_tag);
+                }
+                if ( $last != '.' && $trimmed ) {
+                    $text .= $end . ' ';
+                }
+            }
+            $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>';
+            } elseif ( $readmore ) {
+                $text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore) . '</a>';
+            }
+            if ( !$strip && $last_p_tag && ( strpos($text, '<p>') || strpos($text, '<p ') ) ) {
+                $text .= '</p>';
+            }
+        }
+        return trim($text);
+    }
+
+    /**
+     * gets the post custom and attaches it to the current object
+     * @internal
+     * @param bool|int $pid a post ID number
+     */
+    function import_custom( $pid = false ) {
+        if ( !$pid ) {
+            $pid = $this->ID;
+        }
+        $customs = $this->get_post_custom($pid);
+        $this->import($customs);
+    }
+
+    /**
+     * Used internally to fetch the metadata fields (wp_postmeta table)
+     * and attach them to our TimberPost object
+     * @internal
+     * @param int $pid
+     * @return array
+     */
+    protected function get_post_custom( $pid ) {
+        apply_filters('timber_post_get_meta_pre', array(), $pid, $this);
+        $customs = get_post_custom($pid);
+        if ( !is_array($customs) || empty($customs) ) {
+            return array();
+        }
+        foreach ( $customs as $key => $value ) {
+            if ( is_array($value) && count($value) == 1 && isset($value[0]) ) {
+                $value = $value[0];
+            }
+            $customs[$key] = maybe_unserialize($value);
+        }
+        $customs = apply_filters('timber_post_get_meta', $customs, $pid, $this);
+        return $customs;
+    }
+
+    /**
+     * @internal
+     * @see TimberPost::thumbnail
+     * @return null|TimberImage
+     */
+    function get_thumbnail() {
+        if ( function_exists('get_post_thumbnail_id') ) {
+            $tid = get_post_thumbnail_id($this->ID);
+            if ( $tid ) {
+                return new $this->ImageClass($tid);
+            }
+        }
+    }
+
+    /**
+     * @internal
+     * @see TimberPost::link
+     * @return string
+     */
+    function get_permalink() {
+        if ( isset($this->_permalink) ) {
+            return $this->_permalink;
+        }
+        $this->_permalink = get_permalink($this->ID);
+        return $this->_permalink;
+    }
+
+    /**
+     * get the permalink for a post object
+     * In your templates you should use link:
+     * <a href="{{post.link}}">Read my post</a>
+     * @internal
+     * @return string
+     */
+    function get_link() {
+        return $this->get_permalink();
+    }
+
+    /**
+     * Get the next post in WordPress's ordering
+     * @internal
+     * @param bool $taxonomy
+     * @return TimberPost|boolean
+     */
+    function get_next( $taxonomy = false ) {
+        if ( !isset($this->_next) || !isset($this->_next[$taxonomy]) ) {
+            global $post;
+            $this->_next = array();
+            $old_global = $post;
+            $post = $this;
+            if ( $taxonomy ) {
+                $adjacent = get_adjacent_post(true, '', false, $taxonomy);
+            } else {
+                $adjacent = get_adjacent_post(false, '', false);
+            }
+
+            if ( $adjacent ) {
+                $this->_next[$taxonomy] = new $this->PostClass($adjacent);
+            } else {
+                $this->_next[$taxonomy] = false;
+            }
+            $post = $old_global;
+        }
+        return $this->_next[$taxonomy];
+    }
+
+    /**
+     * Get a data array of pagination so you can navigate to the previous/next for a paginated post
+     * @return array
+     */
+    public function get_pagination() {
+        global $post, $page, $numpages, $multipage;
+        $post = $this;
+        $ret = array();
+        if ( $multipage ) {
+            for ( $i = 1; $i <= $numpages; $i++ ) {
+                $link = self::get_wp_link_page($i);
+                $data = array('name' => $i, 'title' => $i, 'text' => $i, 'link' => $link);
+                if ( $i == $page ) {
+                    $data['current'] = true;
+                }
+                $ret['pages'][] = $data;
+            }
+            $i = $page - 1;
+            if ( $i ) {
+                $link = self::get_wp_link_page($i);
+                $ret['prev'] = array('link' => $link);
+            }
+            $i = $page + 1;
+            if ( $i <= $numpages ) {
+                $link = self::get_wp_link_page($i);
+                $ret['next'] = array('link' => $link);
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * @param int $i
+     * @return string
+     */
+    protected static function get_wp_link_page($i) {
+        $link = _wp_link_page($i);
+        $link = new SimpleXMLElement($link . '</a>');
+        if ( isset($link['href']) ) {
+            return $link['href'];
+        }
+        return '';
+    }
+
+    /**
+     * Get the permalink for a post, but as a relative path
+     * For example, where {{post.link}} would return "http://example.org/2015/07/04/my-cool-post"
+     * this will return the relative version: "/2015/07/04/my-cool-post"
+     * @internal
+     * @return string
+     */
+    function get_path() {
+        return TimberURLHelper::get_rel_url($this->get_link());
+    }
+
+    /**
+     * Get the next post in WordPress's ordering
+     * @internal
+     * @param bool $taxonomy
+     * @return TimberPost|boolean
+     */
+    function get_prev( $taxonomy = false ) {
+        if ( isset($this->_prev) && isset($this->_prev[$taxonomy]) ) {
+            return $this->_prev[$taxonomy];
+        }
+        global $post;
+        $old_global = $post;
+        $post = $this;
+        $within_taxonomy = ($taxonomy) ? $taxonomy : 'category';
+        $adjacent = get_adjacent_post(($taxonomy), '', true, $within_taxonomy);
+        $prev_in_taxonomy = false;
+        if ( $adjacent ) {
+            $prev_in_taxonomy = new $this->PostClass($adjacent);
+        }
+        $this->_prev[$taxonomy] = $prev_in_taxonomy;
+        $post = $old_global;
+        return $this->_prev[$taxonomy];
+    }
+
+    /**
+     * Get the parent post of the post
+     * @internal
+     * @return bool|TimberPost
+     */
+    function get_parent() {
+        if ( !$this->post_parent ) {
+            return false;
+        }
+        return new $this->PostClass($this->post_parent);
+    }
+
+    /**
+     * Gets a User object from the author of the post
+     * @internal
+     * @see TimberPost::author
+     * @return bool|TimberUser
+     */
+    function get_author() {
+        if ( isset($this->post_author) ) {
+            return new TimberUser($this->post_author);
+        }
+    }
+
+    /**
+     * @internal
+     * @return bool|TimberUser
+     */
+    function get_modified_author() {
+        $user_id = get_post_meta($this->ID, '_edit_last', true);
+        return ($user_id ? new TimberUser($user_id) : $this->get_author());
+    }
+
+    /**
+     * Used internally by init, etc. to build TimberPost object
+     * @internal
+     * @param  int $pid
+     * @return null|object|WP_Post
+     */
+    protected function get_info($pid) {
+        $post = $this->prepare_post_info($pid);
+        if ( !isset($post->post_status) ) {
+            return null;
+        }
+        $post->status = $post->post_status;
+        $post->id = $post->ID;
+        $post->slug = $post->post_name;
+        $customs = $this->get_post_custom($post->ID);
+        $post->custom = $customs;
+        $post = (object) array_merge((array)$customs, (array)$post);
+        return $post;
+    }
+
+    /**
+     * @internal
+     * @see TimberPost::date
+     * @param  string $date_format
+     * @return string
+     */
+    function get_date( $date_format = '' ) {
+        $df = $date_format ? $date_format : get_option('date_format');
+        $the_date = (string)mysql2date($df, $this->post_date);
+        return apply_filters('get_the_date', $the_date, $df);
+    }
+
+    /**
+     * @internal
+     * @param  string $date_format
+     * @return string
+     */
+    function get_modified_date( $date_format = '' ) {
+        $df = $date_format ? $date_format : get_option('date_format');
+        $the_time = $this->get_modified_time($df);
+        return apply_filters('get_the_modified_date', $the_time, $date_format);
+    }
+
+    /**
+     * @internal
+     * @param  string $time_format
+     * @return string
+     */
+    function get_modified_time( $time_format = '' ) {
+        $tf = $time_format ? $time_format : get_option('time_format');
+        $the_time = get_post_modified_time($tf, false, $this->ID, true);
+        return apply_filters('get_the_modified_time', $the_time, $time_format);
+    }
+
+    /**
+     * @internal
+     * @see TimberPost::children
+     * @param string 		$post_type
+     * @param bool|string 	$childPostClass
+     * @return array
+     */
+    function get_children( $post_type = 'any', $childPostClass = false ) {
+        if ( $childPostClass === false ) {
+            $childPostClass = $this->PostClass;
+        }
+        if ( $post_type == 'parent' ) {
+            $post_type = $this->post_type;
+        }
+        $children = get_children('post_parent=' . $this->ID . '&post_type=' . $post_type . '&numberposts=-1&orderby=menu_order title&order=ASC&post_status=publish');
+        foreach ( $children as &$child ) {
+            $child = new $childPostClass($child->ID);
+        }
+        $children = array_values($children);
+        return $children;
+    }
+
+
+    /**
+     * Get the comments for a post
+     * @internal
+     * @see TimberPost::comments
+     * @param int $ct
+     * @param string $order
+     * @param string $type
+     * @param string $status
+     * @param string $CommentClass
+     * @return array|mixed
+     */
+
+    function get_comments($ct = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment') {
+
+        global $overridden_cpage, $user_ID;
+        $overridden_cpage = false;
+
+        $commenter = wp_get_current_commenter();
+        $comment_author_email = $commenter['comment_author_email'];
+
+        $args = array('post_id' => $this->ID, 'status' => $status, 'order' => $order);
+        if ( $ct > 0 ) {
+            $args['number'] = $ct;
+        }
+        if ( strtolower($order) == 'wp' || strtolower($order) == 'wordpress' ) {
+            $args['order'] = get_option('comment_order');
+        }
+
+        if ( $user_ID ) {
+            $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 );
+            $overridden_cpage = true;
+        }
+
+        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() ) {
+                continue;
+            }
+
+            $tree_element = $comment;
+            do {
+                $tree_element = $timber_comments[$tree_element->comment_parent];
+            } 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) {
+                $timber_comments[$comment_parent]->children[] = $timber_comments[$comment_child];
+                unset($timber_comments[$comment_child]);
+            }
+        }
+
+        $timber_comments = array_values($timber_comments);
+
+        return $timber_comments;
+    }
+
+    /**
+     * Get the categories for a post
+     * @internal
+     * @see TimberPost::categories
+     * @return array of TimberTerms
+     */
+    function get_categories() {
+        return $this->get_terms('category');
+    }
+
+    /**
+     * @internal
+     * @see TimberPost::category
+     * @return mixed
+     */
+    function get_category( ) {
+        $cats = $this->get_categories();
+        if ( count($cats) && isset($cats[0]) ) {
+            return $cats[0];
+        }
+    }
+
+    /**
+     * @internal
+     * @param string|array $tax
+     * @param bool $merge
+     * @param string $TermClass
+     * @return array
+     */
+    function get_terms( $tax = '', $merge = true, $TermClass = '' ) {
+
+        $TermClass = $TermClass ?: $this->TermClass;
+
+        if ( is_string($merge) && class_exists($merge) ) {
+            $TermClass = $merge;
+        }
+        if ( is_array($tax) ) {
+            $taxonomies = $tax;
+        }
+        if ( is_string($tax) ) {
+            if ( in_array($tax, array('all','any','')) ) {
+                $taxonomies = get_object_taxonomies($this->post_type);
+            } else {
+                $taxonomies = array($tax);
+            }
+        }
+
+        $term_class_objects = array();
+
+        foreach ( $taxonomies as $taxonomy ) {
+            if ( in_array($taxonomy, array('tag','tags')) ) {
+                $taxonomy = 'post_tag';
+            }
+            if ( $taxonomy == 'categories' ) {
+                $taxonomy = 'category';
+            }
+
+            $terms = wp_get_post_terms($this->ID, $taxonomy);
+
+            if ( is_wp_error($terms) ) {
+                /* @var $terms WP_Error */
+                TimberHelper::error_log("Error retrieving terms for taxonomy '$taxonomy' on a post in timber-post.php");
+                TimberHelper::error_log('tax = ' . print_r($tax, true));
+                TimberHelper::error_log('WP_Error: ' . $terms->get_error_message());
+
+                return $term_class_objects;
+            }
+
+            // map over array of wordpress terms, and transform them into instances of the TermClass
+            $terms = array_map(function($term) use ($TermClass, $taxonomy) {
+                return call_user_func(array($TermClass, 'from'), $term->term_id, $taxonomy);
+            }, $terms);
+
+            if ( $merge && is_array($terms) ) {
+                $term_class_objects = array_merge($term_class_objects, $terms);
+            } else if ( count($terms) ) {
+                $term_class_objects[$taxonomy] = $terms;
+            }
+        }
+        return $term_class_objects;
+    }
+
+    /**
+     * @param string|int $term_name_or_id
+     * @param string $taxonomy
+     * @return bool
+     */
+    function has_term( $term_name_or_id, $taxonomy = 'all' ) {
+        if ( $taxonomy == 'all' || $taxonomy == 'any' ) {
+            $taxes = get_object_taxonomies($this->post_type, 'names');
+            $ret = false;
+            foreach ( $taxes as $tax ) {
+                if ( has_term($term_name_or_id, $tax, $this->ID) ) {
+                    $ret = true;
+                    break;
+                }
+            }
+            return $ret;
+        }
+        return has_term($term_name_or_id, $taxonomy, $this->ID);
+    }
+
+    /**
+     * @param string $field
+     * @return TimberImage
+     */
+    function get_image( $field ) {
+        return new $this->ImageClass($this->$field);
+    }
+
+    /**
+     * Gets an array of tags for you to use
+     * @internal
+     * @example
+     * ```twig
+     * <ul class="tags">
+     *     {% for tag in post.tags %}
+     *         <li>{{tag.name}}</li>
+     *     {% endfor %}
+     * </ul>
+     * ```
+     * @return array
+     */
+    function get_tags() {
+        return $this->get_terms('post_tag');
+    }
+
+    /**
+     * Outputs the title with filters applied
+     * @internal
+     * @example
+     * ```twig
+     * <h1>{{post.get_title}}</h1>
+     * ```
+     * ```html
+     * <h1>Hello World!</h1>
+     * ```
+     * @return string
+     */
+    function get_title() {
+        return apply_filters('the_title', $this->post_title, $this->ID);
+    }
+
+    /**
+     * Displays the content of the post with filters, shortcodes and wpautop applied
+     * @example
+     * ```twig
+     * <div class="article-text">{{post.get_content}}</div>
+     * ```
+     * ```html
+     * <div class="article-text"><p>Blah blah blah</p><p>More blah blah blah.</p></div>
+     * ```
+     * @param int $len
+     * @param int $page
+     * @return string
+     */
+    function get_content( $len = 0, $page = 0 ) {
+        if ( $len == 0 && $page == 0 && $this->_content ) {
+            return $this->_content;
+        }
+        $content = $this->post_content;
+        if ( $len ) {
+            $content = wp_trim_words($content, $len);
+        }
+        if ( $page ) {
+            $contents = explode('<!--nextpage-->', $content);
+            $page--;
+            if ( count($contents) > $page ) {
+                $content = $contents[$page];
+            }
+        }
+        $content = apply_filters('the_content', ($content));
+        if ( $len == 0 && $page == 0 ) {
+            $this->_content = $content;
+        }
+        return $content;
+    }
+
+    /**
+     * @return string
+     */
+    function get_paged_content() {
+        global $page;
+        return $this->get_content(0, $page);
+    }
+    /**
+     *
+     * Here is my summary
+     * @example
+     * ```twig
+     * This post is from <span>{{ post.get_post_type.labels.plural }}</span>
+     * ```
+     *
+     * ```html
+     * This post is from <span>Recipes</span>
+     * ```
+     * @return mixed
+     */
+    public function get_post_type() {
+        return get_post_type_object($this->post_type);
+    }
+
+    /**
+     * @return int the number of comments on a post
+     */
+    public function get_comment_count() {
+        return get_comments_number($this->ID);
+    }
+
+    /**
+     * @param string $field_name
+     * @return mixed
+     */
+    public function get_field( $field_name ) {
+        $value = apply_filters('timber_post_get_meta_field_pre', null, $this->ID, $field_name, $this);
+        if ( $value === null ) {
+            $value = get_post_meta($this->ID, $field_name);
+            if ( is_array($value) && count($value) == 1 ) {
+                $value = $value[0];
+            }
+            if ( is_array($value) && count($value) == 0 ) {
+                $value = null;
+            }
+        }
+        $value = apply_filters('timber_post_get_meta_field', $value, $this->ID, $field_name, $this);
+        return $value;
+    }
+
+    /**
+     * @param string $field_name
+     */
+    function import_field( $field_name ) {
+        $this->$field_name = $this->get_field($field_name);
+    }
+
+    /**
+     * @internal
+     * @return mixed
+     */
+    function get_format() {
+        return get_post_format($this->ID);
+    }
+
+    /**
+     * Get the CSS classes for a post. For usage you should use `{{post.class}}` instead of `{{post.post_class}}`
+     * @internal
+     * @param string $class additional classes you want to add
+     * @see TimberPost::$class
+     * @example
+     * ```twig
+     * <article class="{{ post.class }}">
+     *    {# Some stuff here #}
+     * </article>
+     * ```
+     *
+     * ```html
+     * <article class="post-2612 post type-post status-publish format-standard has-post-thumbnail hentry category-data tag-charleston-church-shooting tag-dylann-roof tag-gun-violence tag-hate-crimes tag-national-incident-based-reporting-system">
+     *    {# Some stuff here #}
+     * </article>
+     * ```
+     * @return string a space-seperated list of classes
+     */
+    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) ){
+            return implode(' ', $class_array);
+        }
+        return $class_array;
+    }
+
+    // Docs
+
+    /**
+     * @return array
+     * @codeCoverageIgnore
+     */
+    public function get_method_values() {
+        $ret = parent::get_method_values();
+        $ret['author'] = $this->author();
+        $ret['categories'] = $this->categories();
+        $ret['category'] = $this->category();
+        $ret['children'] = $this->children();
+        $ret['comments'] = $this->comments();
+        $ret['content'] = $this->content();
+        $ret['edit_link'] = $this->edit_link();
+        $ret['format'] = $this->format();
+        $ret['link'] = $this->link();
+        $ret['next'] = $this->next();
+        $ret['pagination'] = $this->pagination();
+        $ret['parent'] = $this->parent();
+        $ret['path'] = $this->path();
+        $ret['prev'] = $this->prev();
+        $ret['terms'] = $this->terms();
+        $ret['tags'] = $this->tags();
+        $ret['thumbnail'] = $this->thumbnail();
+        $ret['title'] = $this->title();
+        return $ret;
+    }
+
+    /**
+     * Return the author of a post
+     * @api
+     * @example
+     * ```twig
+     * <h1>{{post.title}}</h1>
+     * <p class="byline">
+     *     <a href="{{post.author.link}}">{{post.author.name}}</a>
+     * </p>
+     * ```
+     * @return TimberUser|bool A TimberUser object if found, false if not
+     */
+    public function author() {
+        return $this->get_author();
+    }
+
+    /**
+     * Get the author (WordPress user) who last modified the post
+     * @example
+     * ```twig
+     * Last updated by {{ post.modified_author.name }}
+     * ```
+     * ```html
+     * Last updated by Harper Lee
+     * ```
+     * @return TimberUser|bool A TimberUser object if found, false if not
+     */
+    public function modified_author() {
+        return $this->get_modified_author();
+    }
+
+    /**
+     * Get the categoires on a particular post
+     * @api
+     * @return array of TimberTerms
+     */
+    public function categories() {
+        return $this->get_terms('category');
+    }
+
+    /**
+     * Returns a category attached to a post
+     * @api
+     * If mulitpuile categories are set, it will return just the first one
+     * @return TimberTerm|null
+     */
+    public function category() {
+        return $this->get_category();
+    }
+
+    /**
+     * Returns an array of children on the post as TimberPosts
+     * (or other claass as you define).
+     * @api
+     * @example
+     * ```twig
+     * {% if post.children %}
+     *     Here are the child pages:
+     *     {% for child in page.children %}
+     *         <a href="{{ child.link }}">{{ child.title }}</a>
+     *     {% endfor %}
+     * {% endif %}
+     * ```
+     * @param string $post_type _optional_ use to find children of a particular post type (attachment vs. page for example). You might want to restrict to certain types of children in case other stuff gets all mucked in there. You can use 'parent' to use the parent's post type
+     * @param string|bool $childPostClass _optional_ a custom post class (ex: 'MyTimberPost') to return the objects as. By default (false) it will use TimberPost::$post_class value.
+     * @return array
+     */
+    public function children( $post_type = 'any', $childPostClass = false ) {
+        return $this->get_children( $post_type, $childPostClass );
+    }
+
+    /**
+     * Gets the comments on a TimberPost and returns them as an array of [TimberComments](#TimberComment) (or whatever comment class you set).
+     * @api
+     * @param int $count Set the number of comments you want to get. `0` is analogous to "all"
+     * @param string $order use ordering set in WordPress admin, or a different scheme
+     * @param string $type For when other plugins use the comments table for their own special purposes, might be set to 'liveblog' or other depending on what's stored in yr comments table
+     * @param string $status Could be 'pending', etc.
+     * @param string $CommentClass What class to use when returning Comment objects. As you become a Timber pro, you might find yourself extending TimberComment for your site or app (obviously, totally optional)
+     * @example
+     * ```twig
+     * {# single.twig #}
+     * <h4>Comments:</h4>
+     * {% for comment in post.comments %}
+     * 	<div class="comment-{{comment.ID}} comment-order-{{loop.index}}">
+     * 		<p>{{comment.author.name}} said:</p>
+     * 		<p>{{comment.content}}</p>
+     * 	</div>
+     * {% endfor %}
+     * ```
+     * @return bool|array
+     */
+    public function comments( $count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment' ) {
+        return $this->get_comments($count, $order, $type, $status, $CommentClass);
+    }
+
+    /**
+     * Gets the actual content of a WP Post, as opposed to post_content this will run the hooks/filters attached to the_content. \This guy will return your posts content with WordPress filters run on it (like for shortcodes and wpautop).
+     * @api
+     * @example
+     * ```twig
+     * <div class="article">
+     *     <h2>{{post.title}}</h2>
+     *     <div class="content">{{ post.content }}</div>
+     * </div>
+     * ```
+     * @param int $page
+     * @return string
+     */
+    public function content( $page = 0 ) {
+        return $this->get_content(0, $page);
+    }
+
+    /**
+     * @return string
+     */
+    public function paged_content() {
+        return $this->get_paged_content();
+    }
+
+    /**
+     * Get the date to use in your template!
+     * @api
+     * @example
+     * ```twig
+     * Published on {{ post.date }} // Uses WP's formatting set in Admin
+     * OR
+     * Published on {{ post.date | date('F jS') }} // Jan 12th
+     * ```
+     *
+     * ```html
+     * Published on January 12, 2015
+     * OR
+     * Published on Jan 12th
+     * ```
+     * @param string $date_format
+     * @return string
+     */
+    public function date( $date_format = '' ) {
+        return $this->get_date($date_format);
+    }
+
+    /**
+     * Get the time to use in your template
+     * @api
+     * @example
+     * ```twig
+     * Published at {{ post.time }} // Uses WP's formatting set in Admin
+     * OR
+     * Published at {{ post.time | time('G:i') }} // 13:25
+     * ```
+     *
+     * ```html
+     * Published at 1:25 pm
+     * OR
+     * Published at 13:25
+     * ```
+     * @param string $time_format
+     * @return string
+     */
+    public function time( $time_format = '' ) {
+        $tf = $time_format ? $time_format : get_option('time_format');
+            $the_time = (string)mysql2date($tf, $this->post_date);
+            return apply_filters('get_the_time', $the_time, $tf);
+    }
+
+    /**
+     * @return bool|string
+     */
+    public function edit_link() {
+        return $this->get_edit_url();
+    }
+
+    /**
+     * @api
+     * @return mixed
+     */
+    public function format() {
+        return $this->get_format();
+    }
+
+    /**
+     * get the permalink for a post object
+     * @api
+     * @example
+     * ```twig
+     * <a href="{{post.link}}">Read my post</a>
+     * ```
+     * @return string ex: http://example.org/2015/07/my-awesome-post
+     */
+    public function link() {
+        return $this->get_permalink();
+    }
+
+    /**
+     * @param string $field_name
+     * @return mixed
+     */
+    public function meta( $field_name = null ) {
+        if ( $field_name === null ) {
+            //on the off-chance the field is actually named meta
+            $field_name = 'meta';
+        }
+        return $this->get_field($field_name);
+    }
+
+    /**
+     * @return string
+     */
+    public function name(){
+        return $this->title();
+    }
+
+    /**
+     * @param string $date_format
+     * @return string
+     */
+    public function modified_date( $date_format = '' ) {
+        return $this->get_modified_date($date_format);
+    }
+
+    /**
+     * @param string $time_format
+     * @return string
+     */
+    public function modified_time( $time_format = '' ) {
+        return $this->get_modified_time($time_format);
+    }
+
+    /**
+     * @api
+     * @param bool $in_same_cat
+     * @return mixed
+     */
+    public function next( $in_same_cat = false ) {
+        return $this->get_next($in_same_cat);
+    }
+
+    /**
+     * @return array
+     */
+    public function pagination() {
+        return $this->get_pagination();
+    }
+
+    /**
+     * Gets the parent (if one exists) from a post as a TimberPost object (or whatever is set in TimberPost::$PostClass)
+     * @api
+     * @example
+     * ```twig
+     * Parent page: <a href="{{ post.parent.link }}">{{ post.parent.title }}</a>
+     * ```
+     * @return bool|TimberPost
+     */
+    public function parent() {
+        return $this->get_parent();
+    }
+
+    /**
+     * Gets the relative path of a WP Post, so while link() will return http://example.org/2015/07/my-cool-post
+     * this will return just /2015/07/my-cool-post
+     * @api
+     * @example
+     * ```twig
+     * <a href="{{post.path}}">{{post.title}}</a>
+     * ```
+     * @return string
+     */
+    public function path() {
+        return $this->get_path();
+    }
+
+    /**
+     * @deprecated 0.20.0 use link() instead
+     * @return string
+     */
+    public function permalink() {
+        return $this->get_permalink();
+    }
+
+    /**
+     * Get the previous post in a set
+     * @api
+     * @example
+     * ```twig
+     * <h4>Prior Entry:</h4>
+     * <h3>{{post.prev.title}}</h3>
+     * <p>{{post.prev.get_preview(25)}}</p>
+     * ```
+     * @param bool $in_same_cat
+     * @return mixed
+     */
+    public function prev( $in_same_cat = false ) {
+        return $this->get_prev($in_same_cat);
+    }
+
+    /**
+     * Get the terms associated with the post
+     * This goes across all taxonomies by default
+     * @api
+     * @param string|array $tax What taxonom(y|ies) to pull from. Defaults to all registered taxonomies for the post type. You can use custom ones, or built-in WordPress taxonomies (category, tag). Timber plays nice and figures out that tag/tags/post_tag are all the same (and categories/category), for custom taxonomies you're on your own.
+     * @param bool $merge Should the resulting array be one big one (true)? Or should it be an array of sub-arrays for each taxonomy (false)?
+     * @return array
+     */
+    public function terms( $tax = '', $merge = true ) {
+        return $this->get_terms($tax, $merge);
+    }
+
+    /**
+     * Gets the tags on a post, uses WP's post_tag taxonomy
+     * @api
+     * @return array
+     */
+    public function tags() {
+        return $this->get_tags();
+    }
+
+    /**
+     * get the featured image as a TimberImage
+     * @api
+     * @example
+     * ```twig
+     * <img src="{{post.thumbnail.src}}" />
+     * ```
+     * @return TimberImage|null of your thumbnail
+     */
+    public function thumbnail() {
+        return $this->get_thumbnail();
+    }
+
+    /**
+     * Returns the processed title to be used in templates. This returns the title of the post after WP's filters have run. This is analogous to `the_title()` in standard WP template tags.
+     * @api
+     * @example
+     * ```twig
+     * <h1>{{ post.title }}</h1>
+     * ```
+     * @return string
+     */
+    public function title() {
+        return $this->get_title();
+    }
 
 }

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) {

Indentation +26 added lines, -26 removed lines

@@ -2,32 +2,32 @@
 
 class TimberRoutes {
 
-	/**
-	 * @deprecated since 0.21.1 use Upstatement/routes instead
-	 */
-	public static function init( $timber ) {
-		// Install ourselves in Timber
-		$timber->routes = new TimberRoutes();
-	}
+    /**
+     * @deprecated since 0.21.1 use Upstatement/routes instead
+     */
+    public static function init( $timber ) {
+        // Install ourselves in Timber
+        $timber->routes = new TimberRoutes();
+    }
 
-	/**
-	 * @param string $route
-	 * @param callable $callback
-	 * @deprecated since 0.21.1 use Upstatement/routes instead
-	 */
-	public static function add_route($route, $callback, $args = array()) {
-		Routes::map($route, $callback, $args);
-	}
+    /**
+     * @param string $route
+     * @param callable $callback
+     * @deprecated since 0.21.1 use Upstatement/routes instead
+     */
+    public static function add_route($route, $callback, $args = array()) {
+        Routes::map($route, $callback, $args);
+    }
 
-	/**
-	 * @param array $template
-	 * @param mixed $query
-	 * @param int $status_code
-	 * @param bool $tparams
-	 * @return bool
-	 * @deprecated since 0.21.1 use Upstatement/routes instead
-	 */
-	public static function load_view($template, $query = false, $status_code = 200, $tparams = false) {
-		Routes::load($template, $tparams, $query, $status_code);
-	}
+    /**
+     * @param array $template
+     * @param mixed $query
+     * @param int $status_code
+     * @param bool $tparams
+     * @return bool
+     * @deprecated since 0.21.1 use Upstatement/routes instead
+     */
+    public static function load_view($template, $query = false, $status_code = 200, $tparams = false) {
+        Routes::load($template, $tparams, $query, $status_code);
+    }
 }

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

Indentation +303 added lines, -303 removed lines

@@ -2,333 +2,333 @@
 
 class TimberURLHelper {
 
-	/**
-	 *
-	 *
-	 * @return string
-	 */
-	public static function get_current_url() {
-		$pageURL = "http://";
-		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"];
-		} else {
-			$pageURL .= self::get_host() . $_SERVER["REQUEST_URI"];
-		}
-		return $pageURL;
-	}
+    /**
+     *
+     *
+     * @return string
+     */
+    public static function get_current_url() {
+        $pageURL = "http://";
+        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"];
+        } else {
+            $pageURL .= self::get_host() . $_SERVER["REQUEST_URI"];
+        }
+        return $pageURL;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @return bool
-	 */
-	public static function is_url( $url ) {
-		if ( !is_string( $url ) ) {
-			return false;
-		}
-		$url = strtolower( $url );
-		if ( strstr( $url, '://' ) ) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @return bool
+     */
+    public static function is_url( $url ) {
+        if ( !is_string( $url ) ) {
+            return false;
+        }
+        $url = strtolower( $url );
+        if ( strstr( $url, '://' ) ) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 *
-	 *
-	 * @return string
-	 */
-	public static function get_path_base() {
-		$struc = get_option( 'permalink_structure' );
-		$struc = explode( '/', $struc );
-		$p = '/';
-		foreach ( $struc as $s ) {
-			if ( !strstr( $s, '%' ) && strlen( $s ) ) {
-				$p .= $s . '/';
-			}
-		}
-		return $p;
-	}
+    /**
+     *
+     *
+     * @return string
+     */
+    public static function get_path_base() {
+        $struc = get_option( 'permalink_structure' );
+        $struc = explode( '/', $struc );
+        $p = '/';
+        foreach ( $struc as $s ) {
+            if ( !strstr( $s, '%' ) && strlen( $s ) ) {
+                $p .= $s . '/';
+            }
+        }
+        return $p;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @param bool    $force
-	 * @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 ) {
-			return $url;
-		}
-		$link = '';
-		if ( isset( $url_info['path'] ) ) {
-			$link = $url_info['path'];
-		}
-		if ( isset( $url_info['query'] ) && strlen( $url_info['query'] ) ) {
-			$link .= '?' . $url_info['query'];
-		}
-		if ( isset( $url_info['fragment'] ) && strlen( $url_info['fragment'] ) ) {
-			$link .= '#' . $url_info['fragment'];
-		}
-		$link = TimberURLHelper::remove_double_slashes( $link );
-		return $link;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @param bool    $force
+     * @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 ) {
+            return $url;
+        }
+        $link = '';
+        if ( isset( $url_info['path'] ) ) {
+            $link = $url_info['path'];
+        }
+        if ( isset( $url_info['query'] ) && strlen( $url_info['query'] ) ) {
+            $link .= '?' . $url_info['query'];
+        }
+        if ( isset( $url_info['fragment'] ) && strlen( $url_info['fragment'] ) ) {
+            $link .= '#' . $url_info['fragment'];
+        }
+        $link = TimberURLHelper::remove_double_slashes( $link );
+        return $link;
+    }
 
-	/**
-	 * Some setups like HTTP_HOST, some like SERVER_NAME, it's complicated
-	 * @link http://stackoverflow.com/questions/2297403/http-host-vs-server-name
-	 * @return string the HTTP_HOST or SERVER_NAME
-	 */
-	public static function get_host() {
-		if (isset($_SERVER['HTTP_HOST'])) {
-			return $_SERVER['HTTP_HOST'];
-		}
-		if (isset($_SERVER['SERVER_NAME'])) {
-			return $_SERVER['SERVER_NAME'];
-		}
-		return '';
-	}
+    /**
+     * Some setups like HTTP_HOST, some like SERVER_NAME, it's complicated
+     * @link http://stackoverflow.com/questions/2297403/http-host-vs-server-name
+     * @return string the HTTP_HOST or SERVER_NAME
+     */
+    public static function get_host() {
+        if (isset($_SERVER['HTTP_HOST'])) {
+            return $_SERVER['HTTP_HOST'];
+        }
+        if (isset($_SERVER['SERVER_NAME'])) {
+            return $_SERVER['SERVER_NAME'];
+        }
+        return '';
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @return bool
-	 */
-	public static function is_local( $url ) {
-		if ( strstr( $url, self::get_host() ) ) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @return bool
+     */
+    public static function is_local( $url ) {
+        if ( strstr( $url, self::get_host() ) ) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $src
-	 * @return string
-	 */
-	public static function get_full_path( $src ) {
-		$root = ABSPATH;
-		$old_root_path = $root . $src;
-		$old_root_path = str_replace( '//', '/', $old_root_path );
-		return $old_root_path;
-	}
+    /**
+     *
+     *
+     * @param string  $src
+     * @return string
+     */
+    public static function get_full_path( $src ) {
+        $root = ABSPATH;
+        $old_root_path = $root . $src;
+        $old_root_path = str_replace( '//', '/', $old_root_path );
+        return $old_root_path;
+    }
 
-	/**
-	 * Takes a url and figures out its place based in the file system based on path
-	 * NOTE: Not fool-proof, makes a lot of assumptions about the file path
-	 * matching the URL path
-	 *
-	 * @param string  $url
-	 * @return string
-	 */
-	public static function url_to_file_system( $url ) {
-		$url_parts = parse_url( $url );
-		$path = ABSPATH . $url_parts['path'];
-		$path = str_replace( '//', '/', $path );
-		return $path;
-	}
+    /**
+     * Takes a url and figures out its place based in the file system based on path
+     * NOTE: Not fool-proof, makes a lot of assumptions about the file path
+     * matching the URL path
+     *
+     * @param string  $url
+     * @return string
+     */
+    public static function url_to_file_system( $url ) {
+        $url_parts = parse_url( $url );
+        $path = ABSPATH . $url_parts['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 );
-		return $home;
-	}
+    public static function file_system_to_url( $fs ) {
+        $relative_path = self::get_rel_path( $fs );
+        $home = home_url( '/'.$relative_path );
+        return $home;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $src
-	 * @return string
-	 */
-	public static function get_rel_path( $src ) {
-		if ( strstr( $src, ABSPATH ) ) {
-			return str_replace( ABSPATH, '', $src );
-		}
-		//its outside the wordpress directory, alternate setups:
-		$src = str_replace( WP_CONTENT_DIR, '', $src );
-		return WP_CONTENT_SUBDIR . $src;
-	}
+    /**
+     *
+     *
+     * @param string  $src
+     * @return string
+     */
+    public static function get_rel_path( $src ) {
+        if ( strstr( $src, ABSPATH ) ) {
+            return str_replace( ABSPATH, '', $src );
+        }
+        //its outside the wordpress directory, alternate setups:
+        $src = str_replace( WP_CONTENT_DIR, '', $src );
+        return WP_CONTENT_SUBDIR . $src;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @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 );
-		}
-		return $url;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @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 );
+        }
+        return $url;
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @param string  $path
-	 * @return string
-	 */
-	public static function prepend_to_url( $url, $path ) {
-		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'] ) ) {
-				$url .= $url_parts['query'];
-			}
-			if ( isset( $url_parts['fragment'] ) ) {
-				$url .= $url_parts['fragment'];
-			}
-		} else {
-			$url = $url . $path;
-		}
-		return self::remove_double_slashes( $url );
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @param string  $path
+     * @return string
+     */
+    public static function prepend_to_url( $url, $path ) {
+        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'] ) ) {
+                $url .= $url_parts['query'];
+            }
+            if ( isset( $url_parts['fragment'] ) ) {
+                $url .= $url_parts['fragment'];
+            }
+        } else {
+            $url = $url . $path;
+        }
+        return self::remove_double_slashes( $url );
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $path
-	 * @return string
-	 */
-	public static function preslashit( $path ) {
-		if ( strpos( $path, '/' ) != 0 ) {
-			$path = '/' . $path;
-		}
-		return $path;
-	}
+    /**
+     *
+     *
+     * @param string  $path
+     * @return string
+     */
+    public static function preslashit( $path ) {
+        if ( strpos( $path, '/' ) != 0 ) {
+            $path = '/' . $path;
+        }
+        return $path;
+    }
 
-	/**
-	 * This will evaluate wheter a URL is at an aboslute location (like http://example.org/whatever)
-	 *
-	 * @return boolean true if $path is an absolute url, false if relative.
-	 */
-	public static function is_absolute( $path ) {
-		return (boolean) ( strstr( $path, 'http' ) );
-	}
+    /**
+     * This will evaluate wheter a URL is at an aboslute location (like http://example.org/whatever)
+     *
+     * @return boolean true if $path is an absolute url, false if relative.
+     */
+    public static function is_absolute( $path ) {
+        return (boolean) ( strstr( $path, 'http' ) );
+    }
 
-	/**
-	 * This function is slightly different from the one below in the case of:
-	 * an image hosted on the same domain BUT on a different site than the
-	 * Wordpress install will be reported as external content.
-	 *
-	 * @param string  $url a URL to evaluate against
-	 * @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 );
+    /**
+     * This function is slightly different from the one below in the case of:
+     * an image hosted on the same domain BUT on a different site than the
+     * Wordpress install will be reported as external content.
+     *
+     * @param string  $url a URL to evaluate against
+     * @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 );
 
-		return $is_external;
-	}
+        return $is_external;
+    }
 
-	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() );
+    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() );
 
-		// this case covers when the upload directory has been redefined
-		$upload_dir = wp_upload_dir();
-		$is_upload_url = strstr( $url, $upload_dir['baseurl'] );
+        // this case covers when the upload directory has been redefined
+        $upload_dir = wp_upload_dir();
+        $is_upload_url = strstr( $url, $upload_dir['baseurl'] );
 
-		return $is_content_url || $is_upload_url;
-	}
+        return $is_content_url || $is_upload_url;
+    }
     
-	/**
-	 *
-	 *
-	 * @param string  $url
-	 * @return bool     true if $path is an external url, false if relative or local.
-	 *                  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() );
-		if ( $has_http && !$on_domain ) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     *
+     *
+     * @param string  $url
+     * @return bool     true if $path is an external url, false if relative or local.
+     *                  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() );
+        if ( $has_http && !$on_domain ) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Pass links through untrailingslashit unless they are a single /
-	 *
-	 * @param string  $link
-	 * @return string
-	 */
-	public static function remove_trailing_slash( $link ) {
-		if ( $link != "/" )
-			$link = untrailingslashit( $link );
-		return $link;
-	}
+    /**
+     * Pass links through untrailingslashit unless they are a single /
+     *
+     * @param string  $link
+     * @return string
+     */
+    public static function remove_trailing_slash( $link ) {
+        if ( $link != "/" )
+            $link = untrailingslashit( $link );
+        return $link;
+    }
 
-	/**
-	 * Download an external file via a URL
-	 *
-	 * @param string  $url
-	 * @param int     $timeout
-	 * @return string|WP_Error the location of the temporay file name or an error
-	 * @deprecated since 0.20.0
-	 */
-	static function download_url( $url, $timeout = 300 ) {
-		if ( !$url ) {
-			return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
-		}
+    /**
+     * Download an external file via a URL
+     *
+     * @param string  $url
+     * @param int     $timeout
+     * @return string|WP_Error the location of the temporay file name or an error
+     * @deprecated since 0.20.0
+     */
+    static function download_url( $url, $timeout = 300 ) {
+        if ( !$url ) {
+            return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
+        }
 
-		$tmpfname = wp_tempnam( $url );
-		if ( !$tmpfname ) {
-			return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
-		}
+        $tmpfname = wp_tempnam( $url );
+        if ( !$tmpfname ) {
+            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 );
-			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 ) ) );
-		}
-		return $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 ) ) );
+        }
+        return $tmpfname;
+    }
 
-	/**
-	 * Returns the url parameters, for example for url http://example.org/blog/post/news/2014/whatever
-	 * this will return array('blog', 'post', 'news', '2014', 'whatever');
-	 * OR if sent an integer like: TimberUrlHelper::get_params(2); this will return 'news';
-	 *
-	 * @param int $i the position of the parameter to grab.
-	 * @return array|string
-	 */
-	public static function get_params( $i = false ) {
-		$args = explode( '/', trim( strtolower( $_SERVER['REQUEST_URI'] ) ) );
-		$newargs = array();
-		foreach ( $args as $arg ) {
-			if ( strlen( $arg ) ) {
-				$newargs[] = $arg;
-			}
-		}
-		if ( $i === false ) {
-			return $newargs;
-		}
-		if ( $i < 0 ) {
-			//count from end
-			$i = count( $newargs ) + $i;
-		}
-		if ( isset( $newargs[$i] ) ) {
-			return $newargs[$i];
-		}
-	}
+    /**
+     * Returns the url parameters, for example for url http://example.org/blog/post/news/2014/whatever
+     * this will return array('blog', 'post', 'news', '2014', 'whatever');
+     * OR if sent an integer like: TimberUrlHelper::get_params(2); this will return 'news';
+     *
+     * @param int $i the position of the parameter to grab.
+     * @return array|string
+     */
+    public static function get_params( $i = false ) {
+        $args = explode( '/', trim( strtolower( $_SERVER['REQUEST_URI'] ) ) );
+        $newargs = array();
+        foreach ( $args as $arg ) {
+            if ( strlen( $arg ) ) {
+                $newargs[] = $arg;
+            }
+        }
+        if ( $i === false ) {
+            return $newargs;
+        }
+        if ( $i < 0 ) {
+            //count from end
+            $i = count( $newargs ) + $i;
+        }
+        if ( isset( $newargs[$i] ) ) {
+            return $newargs[$i];
+        }
+    }
 
 }

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 +7 added lines, -7 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
@@ -56,11 +56,11 @@ 
             $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
+                // @codeCoverageIgnoreStart
+                TimberHelper::error_log( 'Error resizing image' );
+                TimberHelper::error_log( $result );
+                return false;
+                // @codeCoverageIgnoreEnd
             } else {
                 return true;
             }

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