jarednova / timber

lib/timber-core.php

Indentation +3 added lines, -3 removed lines

@@ -32,9 +32,9 @@
      * @return mixed
      */
     function __get( $field ) {
-    	if ( property_exists($this, $field) ) {
-    		return $this->$field;
-    	}
+        if ( property_exists($this, $field) ) {
+            return $this->$field;
+        }
         if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
             return $this->$field = $meta_value;
         }

lib/timber-image-helper.php

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

lib/timber-twig.php

Indentation +341 added lines, -341 removed lines

@@ -2,346 +2,346 @@
 
 class TimberTwig {
 
-	public static $dir_name;
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public static function init() {
-		new TimberTwig();
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	function __construct() {
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters_deprecated' ) );
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters' ) );
-	}
-
-	/**
-	 * These are all deprecated and will be removed in 0.21.0
-	 *
-	 * @param Twig_Environment $twig
-	 * @deprecated since 0.20.7
-	 * @return Twig_Environment
-	 */
-	function add_timber_filters_deprecated( $twig ) {
-		$twig->addFilter( new Twig_SimpleFilter( 'get_src_from_attachment_id', 'twig_get_src_from_attachment_id' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'wp_body_class', array( $this, 'body_class' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterify', array( 'TimberHelper', 'twitterify' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterfy', array( 'TimberHelper', 'twitterify' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'string', function($arr, $glue = ' '){
-			return twig_join_filter($arr, $glue);
-		} ) );
-		return $twig;
-	}
-
-	/**
-	 *
-	 *
-	 * @param Twig_Environment $twig
-	 * @return Twig_Environment
-	 */
-	function add_timber_filters( $twig ) {
-		/* image filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'resize', array( 'TimberImageHelper', 'resize' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'retina', array( 'TimberImageHelper', 'retina_resize' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'letterbox', array( 'TimberImageHelper', 'letterbox' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'tojpg', array( 'TimberImageHelper', 'img_to_jpg' ) ) );
-
-		/* debugging filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'docs', 'twig_object_docs' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'get_class',  'get_class' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'get_type', 'get_type' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'print_r', function( $arr ) {
-					return print_r( $arr, true );
-				} ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'print_a', function( $arr ) {
-					return '<pre>' . self::object_docs( $arr, true ) . '</pre>';
-				} ) );
-
-		/* other filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'stripshortcodes', 'strip_shortcodes' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'array', array( $this, 'to_array' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'excerpt', 'wp_trim_words' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'function', array( $this, 'exec_function' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'pretags', array( $this, 'twig_pretags' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'sanitize', 'sanitize_title' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'shortcodes', 'do_shortcode' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'time_ago', array( $this, 'time_ago' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'wpautop', 'wpautop' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'list', array( $this, 'add_list_separators' ) ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'relative', function ( $link ) {
-					return TimberURLHelper::get_rel_url( $link, true );
-				} ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'date', array( $this, 'intl_date' ) ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'truncate', function ( $text, $len ) {
-					return TimberHelper::trim_words( $text, $len );
-				} ) );
-
-		/* actions and filters */
-		$twig->addFunction( new Twig_SimpleFunction( 'action', function ( $context ) {
-					$args = func_get_args();
-					array_shift( $args );
-					$args[] = $context;
-					call_user_func_array( 'do_action', $args );
-				}, array( 'needs_context' => true ) ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'apply_filters', function () {
-					$args = func_get_args();
-					$tag = current( array_splice( $args, 1, 1 ) );
-
-					return apply_filters_ref_array( $tag, $args );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'function', array( &$this, 'exec_function' ) ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'fn', array( &$this, 'exec_function' ) ) );
-
-		$twig->addFunction( new Twig_SimpleFunction( 'shortcode', 'do_shortcode' ) );
-
-		/* TimberObjects */
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberPost', function ( $pid, $PostClass = 'TimberPost' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $PostClass( $p );
-						}
-						return $pid;
-					}
-					return new $PostClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberImage', function ( $pid, $ImageClass = 'TimberImage' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $ImageClass( $p );
-						}
-						return $pid;
-					}
-					return new $ImageClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberTerm', function ( $pid, $TermClass = 'TimberTerm' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $TermClass( $p );
-						}
-						return $pid;
-					}
-					return new $TermClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberUser', function ( $pid, $UserClass = 'TimberUser' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $UserClass( $p );
-						}
-						return $pid;
-					}
-					return new $UserClass( $pid );
-				} ) );
-
-		/* TimberObjects Alias */
-		$twig->addFunction( new Twig_SimpleFunction( 'Post', function ( $pid, $PostClass = 'TimberPost' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $PostClass( $p );
-						}
-						return $pid;
-					}
-					return new $PostClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'Image', function ( $pid, $ImageClass = 'TimberImage' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $ImageClass( $p );
-						}
-						return $pid;
-					}
-					return new $ImageClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'Term', function ( $pid, $TermClass = 'TimberTerm' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $TermClass( $p );
-						}
-						return $pid;
-					}
-					return new $TermClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'User', function ( $pid, $UserClass = 'TimberUser' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $UserClass( $p );
-						}
-						return $pid;
-					}
-					return new $UserClass( $pid );
-				} ) );
-
-		/* bloginfo and translate */
-		$twig->addFunction( 'bloginfo', new Twig_SimpleFunction( 'bloginfo', function ( $show = '', $filter = 'raw' ) {
-					return get_bloginfo( $show, $filter );
-				} ) );
-		$twig->addFunction( '__', new Twig_SimpleFunction( '__', function ( $text, $domain = 'default' ) {
-					return __( $text, $domain );
-				} ) );
-		/* get_twig is deprecated, use timber/twig */
-		$twig = apply_filters( 'get_twig', $twig );
-		$twig = apply_filters( 'timber/twig', $twig );
-		return $twig;
-	}
-
-	/**
-	 *
-	 *
-	 * @param mixed   $arr
-	 * @return array
-	 */
-	function to_array( $arr ) {
-		if ( is_array( $arr ) ) {
-			return $arr;
-		}
-		$arr = array( $arr );
-		return $arr;
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $function_name
-	 * @return mixed
-	 */
-	function exec_function( $function_name ) {
-		$args = func_get_args();
-		array_shift( $args );
-		if ( is_string($function_name) ) {
-			$function_name = trim( $function_name );
-		}
-		return call_user_func_array( $function_name, ( $args ) );
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $content
-	 * @return string
-	 */
-	function twig_pretags( $content ) {
-		return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
-	}
-
-	/**
-	 *
-	 *
-	 * @param array   $matches
-	 * @return string
-	 */
-	function convert_pre_entities( $matches ) {
-		return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
-	}
-
-	/**
-	 * @param mixed   $body_classes
-	 * @deprecated 0.20.7
-	 * @return string
-	 */
-	function body_class( $body_classes ) {
-		ob_start();
-		if ( is_array( $body_classes ) ) {
-			$body_classes = explode( ' ', $body_classes );
-		}
-		body_class( $body_classes );
-		$return = ob_get_contents();
-		ob_end_clean();
-		return $return;
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $date
-	 * @param string  $format (optional)
-	 * @return string
-	 */
-	function intl_date( $date, $format = null ) {
-		if ( $format === null ) {
-			$format = get_option( 'date_format' );
-		}
-
-		if ( $date instanceof DateTime ) {
-			$timestamp = $date->getTimestamp() + $date->getOffset();
-		} else if (is_numeric( $date ) && strtotime( $date ) === false ) {
-			$timestamp = intval( $date );
-		} else {
-			$timestamp = strtotime( $date );
-		}
-
-		return date_i18n( $format, $timestamp );
-	}
-
-	//debug
-
-	/**
-	 *
-	 *
-	 * @param mixed   $obj
-	 * @param bool    $methods
-	 * @deprecated since 0.20.7
-	 * @return string
-	 */
-	function object_docs( $obj, $methods = true ) {
-		$class = get_class( $obj );
-		$properties = (array)$obj;
-		if ( $methods ) {
-			/** @var array $methods */
-			$methods = $obj->get_method_values();
-		}
-		$rets = array_merge( $properties, $methods );
-		ksort( $rets );
-		$str = print_r( $rets, true );
-		$str = str_replace( 'Array', $class . ' Object', $str );
-		return $str;
-	}
-
-	/**
-	 * @param int|string $from
-	 * @param int|string $to
-	 * @param string $format_past
-	 * @param string $format_future
-	 * @return string
-	 */
-	function time_ago( $from, $to = null, $format_past = '%s ago', $format_future = '%s from now' ) {
-		$to = $to === null ? time() : $to;
-		$to = is_int( $to ) ? $to : strtotime( $to );
-		$from = is_int( $from ) ? $from : strtotime( $from );
-
-		if ( $from < $to ) {
-			return sprintf( $format_past, human_time_diff( $from, $to ) );
-		} else {
-			return sprintf( $format_future, human_time_diff( $to, $from ) );
-		}
-	}
-
-	/**
-	 * @param array $arr
-	 * @param string $first_delimiter
-	 * @param string $second_delimiter
-	 * @return string
-	 */
-	function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
-		$length = count( $arr );
-		$list = '';
-		foreach( $arr as $index => $item ) {
-			if ( $index < $length - 2 ) {
-				$delimiter = $first_delimiter.' ';
-			} elseif ( $index == $length - 2 ) {
-				$delimiter = ' '.$second_delimiter.' ';
-			} else {
-				$delimiter = '';
-			}
-			$list = $list.$item.$delimiter;
-		}
-		return $list;
-	}
+    public static $dir_name;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public static function init() {
+        new TimberTwig();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    function __construct() {
+        add_action( 'timber/twig/filters', array( $this, 'add_timber_filters_deprecated' ) );
+        add_action( 'timber/twig/filters', array( $this, 'add_timber_filters' ) );
+    }
+
+    /**
+     * These are all deprecated and will be removed in 0.21.0
+     *
+     * @param Twig_Environment $twig
+     * @deprecated since 0.20.7
+     * @return Twig_Environment
+     */
+    function add_timber_filters_deprecated( $twig ) {
+        $twig->addFilter( new Twig_SimpleFilter( 'get_src_from_attachment_id', 'twig_get_src_from_attachment_id' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'wp_body_class', array( $this, 'body_class' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'twitterify', array( 'TimberHelper', 'twitterify' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'twitterfy', array( 'TimberHelper', 'twitterify' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'string', function($arr, $glue = ' '){
+            return twig_join_filter($arr, $glue);
+        } ) );
+        return $twig;
+    }
+
+    /**
+     *
+     *
+     * @param Twig_Environment $twig
+     * @return Twig_Environment
+     */
+    function add_timber_filters( $twig ) {
+        /* image filters */
+        $twig->addFilter( new Twig_SimpleFilter( 'resize', array( 'TimberImageHelper', 'resize' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'retina', array( 'TimberImageHelper', 'retina_resize' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'letterbox', array( 'TimberImageHelper', 'letterbox' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'tojpg', array( 'TimberImageHelper', 'img_to_jpg' ) ) );
+
+        /* debugging filters */
+        $twig->addFilter( new Twig_SimpleFilter( 'docs', 'twig_object_docs' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'get_class',  'get_class' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'get_type', 'get_type' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'print_r', function( $arr ) {
+                    return print_r( $arr, true );
+                } ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'print_a', function( $arr ) {
+                    return '<pre>' . self::object_docs( $arr, true ) . '</pre>';
+                } ) );
+
+        /* other filters */
+        $twig->addFilter( new Twig_SimpleFilter( 'stripshortcodes', 'strip_shortcodes' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'array', array( $this, 'to_array' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'excerpt', 'wp_trim_words' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'function', array( $this, 'exec_function' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'pretags', array( $this, 'twig_pretags' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'sanitize', 'sanitize_title' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'shortcodes', 'do_shortcode' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'time_ago', array( $this, 'time_ago' ) ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'wpautop', 'wpautop' ) );
+        $twig->addFilter( new Twig_SimpleFilter( 'list', array( $this, 'add_list_separators' ) ) );
+
+        $twig->addFilter( new Twig_SimpleFilter( 'relative', function ( $link ) {
+                    return TimberURLHelper::get_rel_url( $link, true );
+                } ) );
+
+        $twig->addFilter( new Twig_SimpleFilter( 'date', array( $this, 'intl_date' ) ) );
+
+        $twig->addFilter( new Twig_SimpleFilter( 'truncate', function ( $text, $len ) {
+                    return TimberHelper::trim_words( $text, $len );
+                } ) );
+
+        /* actions and filters */
+        $twig->addFunction( new Twig_SimpleFunction( 'action', function ( $context ) {
+                    $args = func_get_args();
+                    array_shift( $args );
+                    $args[] = $context;
+                    call_user_func_array( 'do_action', $args );
+                }, array( 'needs_context' => true ) ) );
+
+        $twig->addFilter( new Twig_SimpleFilter( 'apply_filters', function () {
+                    $args = func_get_args();
+                    $tag = current( array_splice( $args, 1, 1 ) );
+
+                    return apply_filters_ref_array( $tag, $args );
+                } ) );
+        $twig->addFunction( new Twig_SimpleFunction( 'function', array( &$this, 'exec_function' ) ) );
+        $twig->addFunction( new Twig_SimpleFunction( 'fn', array( &$this, 'exec_function' ) ) );
+
+        $twig->addFunction( new Twig_SimpleFunction( 'shortcode', 'do_shortcode' ) );
+
+        /* TimberObjects */
+        $twig->addFunction( new Twig_SimpleFunction( 'TimberPost', function ( $pid, $PostClass = 'TimberPost' ) {
+                    if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
+                        foreach ( $pid as &$p ) {
+                            $p = new $PostClass( $p );
+                        }
+                        return $pid;
+                    }
+                    return new $PostClass( $pid );
+                } ) );
+        $twig->addFunction( new Twig_SimpleFunction( 'TimberImage', function ( $pid, $ImageClass = 'TimberImage' ) {
+                    if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
+                        foreach ( $pid as &$p ) {
+                            $p = new $ImageClass( $p );
+                        }
+                        return $pid;
+                    }
+                    return new $ImageClass( $pid );
+                } ) );
+        $twig->addFunction( new Twig_SimpleFunction( 'TimberTerm', function ( $pid, $TermClass = 'TimberTerm' ) {
+                    if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
+                        foreach ( $pid as &$p ) {
+                            $p = new $TermClass( $p );
+                        }
+                        return $pid;
+                    }
+                    return new $TermClass( $pid );
+                } ) );
+        $twig->addFunction( new Twig_SimpleFunction( 'TimberUser', function ( $pid, $UserClass = 'TimberUser' ) {
+                    if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
+                        foreach ( $pid as &$p ) {
+                            $p = new $UserClass( $p );
+                        }
+                        return $pid;
+                    }
+                    return new $UserClass( $pid );
+                } ) );
+
+        /* TimberObjects Alias */
+        $twig->addFunction( new Twig_SimpleFunction( 'Post', function ( $pid, $PostClass = 'TimberPost' ) {
+                    if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
+                        foreach ( $pid as &$p ) {
+                            $p = new $PostClass( $p );
+                        }
+                        return $pid;
+                    }
+                    return new $PostClass( $pid );
+                } ) );
+        $twig->addFunction( new Twig_SimpleFunction( 'Image', function ( $pid, $ImageClass = 'TimberImage' ) {
+                    if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
+                        foreach ( $pid as &$p ) {
+                            $p = new $ImageClass( $p );
+                        }
+                        return $pid;
+                    }
+                    return new $ImageClass( $pid );
+                } ) );
+        $twig->addFunction( new Twig_SimpleFunction( 'Term', function ( $pid, $TermClass = 'TimberTerm' ) {
+                    if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
+                        foreach ( $pid as &$p ) {
+                            $p = new $TermClass( $p );
+                        }
+                        return $pid;
+                    }
+                    return new $TermClass( $pid );
+                } ) );
+        $twig->addFunction( new Twig_SimpleFunction( 'User', function ( $pid, $UserClass = 'TimberUser' ) {
+                    if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
+                        foreach ( $pid as &$p ) {
+                            $p = new $UserClass( $p );
+                        }
+                        return $pid;
+                    }
+                    return new $UserClass( $pid );
+                } ) );
+
+        /* bloginfo and translate */
+        $twig->addFunction( 'bloginfo', new Twig_SimpleFunction( 'bloginfo', function ( $show = '', $filter = 'raw' ) {
+                    return get_bloginfo( $show, $filter );
+                } ) );
+        $twig->addFunction( '__', new Twig_SimpleFunction( '__', function ( $text, $domain = 'default' ) {
+                    return __( $text, $domain );
+                } ) );
+        /* get_twig is deprecated, use timber/twig */
+        $twig = apply_filters( 'get_twig', $twig );
+        $twig = apply_filters( 'timber/twig', $twig );
+        return $twig;
+    }
+
+    /**
+     *
+     *
+     * @param mixed   $arr
+     * @return array
+     */
+    function to_array( $arr ) {
+        if ( is_array( $arr ) ) {
+            return $arr;
+        }
+        $arr = array( $arr );
+        return $arr;
+    }
+
+    /**
+     *
+     *
+     * @param string  $function_name
+     * @return mixed
+     */
+    function exec_function( $function_name ) {
+        $args = func_get_args();
+        array_shift( $args );
+        if ( is_string($function_name) ) {
+            $function_name = trim( $function_name );
+        }
+        return call_user_func_array( $function_name, ( $args ) );
+    }
+
+    /**
+     *
+     *
+     * @param string  $content
+     * @return string
+     */
+    function twig_pretags( $content ) {
+        return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
+    }
+
+    /**
+     *
+     *
+     * @param array   $matches
+     * @return string
+     */
+    function convert_pre_entities( $matches ) {
+        return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
+    }
+
+    /**
+     * @param mixed   $body_classes
+     * @deprecated 0.20.7
+     * @return string
+     */
+    function body_class( $body_classes ) {
+        ob_start();
+        if ( is_array( $body_classes ) ) {
+            $body_classes = explode( ' ', $body_classes );
+        }
+        body_class( $body_classes );
+        $return = ob_get_contents();
+        ob_end_clean();
+        return $return;
+    }
+
+    /**
+     *
+     *
+     * @param string  $date
+     * @param string  $format (optional)
+     * @return string
+     */
+    function intl_date( $date, $format = null ) {
+        if ( $format === null ) {
+            $format = get_option( 'date_format' );
+        }
+
+        if ( $date instanceof DateTime ) {
+            $timestamp = $date->getTimestamp() + $date->getOffset();
+        } else if (is_numeric( $date ) && strtotime( $date ) === false ) {
+            $timestamp = intval( $date );
+        } else {
+            $timestamp = strtotime( $date );
+        }
+
+        return date_i18n( $format, $timestamp );
+    }
+
+    //debug
+
+    /**
+     *
+     *
+     * @param mixed   $obj
+     * @param bool    $methods
+     * @deprecated since 0.20.7
+     * @return string
+     */
+    function object_docs( $obj, $methods = true ) {
+        $class = get_class( $obj );
+        $properties = (array)$obj;
+        if ( $methods ) {
+            /** @var array $methods */
+            $methods = $obj->get_method_values();
+        }
+        $rets = array_merge( $properties, $methods );
+        ksort( $rets );
+        $str = print_r( $rets, true );
+        $str = str_replace( 'Array', $class . ' Object', $str );
+        return $str;
+    }
+
+    /**
+     * @param int|string $from
+     * @param int|string $to
+     * @param string $format_past
+     * @param string $format_future
+     * @return string
+     */
+    function time_ago( $from, $to = null, $format_past = '%s ago', $format_future = '%s from now' ) {
+        $to = $to === null ? time() : $to;
+        $to = is_int( $to ) ? $to : strtotime( $to );
+        $from = is_int( $from ) ? $from : strtotime( $from );
+
+        if ( $from < $to ) {
+            return sprintf( $format_past, human_time_diff( $from, $to ) );
+        } else {
+            return sprintf( $format_future, human_time_diff( $to, $from ) );
+        }
+    }
+
+    /**
+     * @param array $arr
+     * @param string $first_delimiter
+     * @param string $second_delimiter
+     * @return string
+     */
+    function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
+        $length = count( $arr );
+        $list = '';
+        foreach( $arr as $index => $item ) {
+            if ( $index < $length - 2 ) {
+                $delimiter = $first_delimiter.' ';
+            } elseif ( $index == $length - 2 ) {
+                $delimiter = ' '.$second_delimiter.' ';
+            } else {
+                $delimiter = '';
+            }
+            $list = $list.$item.$delimiter;
+        }
+        return $list;
+    }
 
 }

lib/timber-admin.php

Indentation +16 added lines, -16 removed lines

@@ -6,21 +6,21 @@
         return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
     }
 
-	/**
-	 * @param array   $links
-	 * @param string  $file
-	 * @return array
-	 */
-	public static function meta_links( $links, $file ) {
-		if ( strstr( $file, '/timber.php' ) ) {
-			unset($links[2]);
-			$links[] = '<a href="/wp-admin/plugin-install.php?tab=plugin-information&amp;plugin=timber-library&amp;TB_iframe=true&amp;width=600&amp;height=550" class="thickbox" aria-label="More information about Timber" data-title="Timber">View details</a>';
-			$links[] = '<a href="http://upstatement.com/timber" target="_blank">Homepage</a>';
-			$links[] = '<a href="https://github.com/jarednova/timber/wiki" target="_blank">Documentation</a>';
-			$links[] = '<a href="https://github.com/jarednova/timber/wiki/getting-started" target="_blank">Starter Guide</a>';
-			return $links;
-		}
-		return $links;
-	}
+    /**
+     * @param array   $links
+     * @param string  $file
+     * @return array
+     */
+    public static function meta_links( $links, $file ) {
+        if ( strstr( $file, '/timber.php' ) ) {
+            unset($links[2]);
+            $links[] = '<a href="/wp-admin/plugin-install.php?tab=plugin-information&amp;plugin=timber-library&amp;TB_iframe=true&amp;width=600&amp;height=550" class="thickbox" aria-label="More information about Timber" data-title="Timber">View details</a>';
+            $links[] = '<a href="http://upstatement.com/timber" target="_blank">Homepage</a>';
+            $links[] = '<a href="https://github.com/jarednova/timber/wiki" target="_blank">Documentation</a>';
+            $links[] = '<a href="https://github.com/jarednova/timber/wiki/getting-started" target="_blank">Starter Guide</a>';
+            return $links;
+        }
+        return $links;
+    }
 
 }

lib/timber-image.php

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

lib/timber-archives.php

Indentation +261 added lines, -261 removed lines

@@ -32,284 +32,284 @@
  */
 class TimberArchives extends TimberCore {
 
-	public $base = '';
-	/**
-	 * @api
-	 * @var array the items of the archives to iterate through and markup for your page
-	 */
-	public $items;
+    public $base = '';
+    /**
+     * @api
+     * @var array the items of the archives to iterate through and markup for your page
+     */
+    public $items;
 
-	/**
-	 * @api
-	 * @param $args array of arguments {
-	 *     @type bool show_year => false
-	 *     @type string
-	 *     @type string type => 'monthly-nested'
-	 *     @type int limit => -1
-	 *     @type bool show_post_count => false
-	 *     @type string order => 'DESC'
-	 *     @type string post_type => 'post'
-	 *     @type bool show_year => false
-	 *     @type bool nested => false
-	 * }
-	 * @param string $base any additional paths that need to be prepended to the URLs that are generated, for example: "tags"
-	 */
-	function __construct( $args = null, $base = '' ) {
-		$this->init($args, $base);
-	}
+    /**
+     * @api
+     * @param $args array of arguments {
+     *     @type bool show_year => false
+     *     @type string
+     *     @type string type => 'monthly-nested'
+     *     @type int limit => -1
+     *     @type bool show_post_count => false
+     *     @type string order => 'DESC'
+     *     @type string post_type => 'post'
+     *     @type bool show_year => false
+     *     @type bool nested => false
+     * }
+     * @param string $base any additional paths that need to be prepended to the URLs that are generated, for example: "tags"
+     */
+    function __construct( $args = null, $base = '' ) {
+        $this->init($args, $base);
+    }
 
-	/**
-	 * @internal
-	 * @param array|string $args
-	 * @param string $base
-	 */
-	function init( $args = null, $base = '' ) {
-		$this->base = $base;
-		$this->items = $this->get_items($args);
-	}
+    /**
+     * @internal
+     * @param array|string $args
+     * @param string $base
+     */
+    function init( $args = null, $base = '' ) {
+        $this->base = $base;
+        $this->items = $this->get_items($args);
+    }
 
-	/**
-	 * @internal
-	 * @param string $url
-	 * @param string $text
-	 * @return mixed
-	 */
-	protected function get_archives_link( $url, $text ) {
-		$ret = array();
-		$ret['text'] = $ret['title'] = $ret['name'] = wptexturize($text);
-		$ret['url'] = $ret['link'] = esc_url(TimberURLHelper::prepend_to_url($url, $this->base));
-		return $ret;
-	}
+    /**
+     * @internal
+     * @param string $url
+     * @param string $text
+     * @return mixed
+     */
+    protected function get_archives_link( $url, $text ) {
+        $ret = array();
+        $ret['text'] = $ret['title'] = $ret['name'] = wptexturize($text);
+        $ret['url'] = $ret['link'] = esc_url(TimberURLHelper::prepend_to_url($url, $this->base));
+        return $ret;
+    }
 
-	/**
-	 * @internal
-	 * @param array $args
-	 * @param string $last_changed
-	 * @param string $join
-	 * @param string $where
-	 * @param string $order
-	 * @param string $limit
-	 * @return array
-	 */
-	protected function get_items_yearly( $args, $last_changed, $join, $where, $order, $limit ) {
-		global $wpdb;
-		$output = array();
-		$query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM {$wpdb->posts} $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
-		$key = md5($query);
-		$key = "wp_get_archives:$key:$last_changed";
-		if (!$results = wp_cache_get($key, 'posts')) {
-			$results = $wpdb->get_results($query);
-			wp_cache_set($key, $results, 'posts');
-		}
-		if ($results) {
-			foreach ( (array)$results as $result ) {
-				$url = get_year_link( $result->year );
-				$text = sprintf('%d', $result->year);
-				$output[] = $this->get_archives_link($url, $text);
-			}
-		}
-		return $output;
-	}
+    /**
+     * @internal
+     * @param array $args
+     * @param string $last_changed
+     * @param string $join
+     * @param string $where
+     * @param string $order
+     * @param string $limit
+     * @return array
+     */
+    protected function get_items_yearly( $args, $last_changed, $join, $where, $order, $limit ) {
+        global $wpdb;
+        $output = array();
+        $query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM {$wpdb->posts} $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
+        $key = md5($query);
+        $key = "wp_get_archives:$key:$last_changed";
+        if (!$results = wp_cache_get($key, 'posts')) {
+            $results = $wpdb->get_results($query);
+            wp_cache_set($key, $results, 'posts');
+        }
+        if ($results) {
+            foreach ( (array)$results as $result ) {
+                $url = get_year_link( $result->year );
+                $text = sprintf('%d', $result->year);
+                $output[] = $this->get_archives_link($url, $text);
+            }
+        }
+        return $output;
+    }
 
-	/**
-	 * @internal
-	 * @param array|string $args
-	 * @param string $last_changed
-	 * @param string $join
-	 * @param string $where
-	 * @param string $order
-	 * @param int $limit
-	 * @param bool $nested
-	 * @return array
-	 */
-	protected function get_items_monthly( $args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true ) {
-		global $wpdb, $wp_locale;
-		$output = array();
-		$defaults = array(
-			'show_year' => false,
-		);
-		$r = wp_parse_args($args, $defaults);
+    /**
+     * @internal
+     * @param array|string $args
+     * @param string $last_changed
+     * @param string $join
+     * @param string $where
+     * @param string $order
+     * @param int $limit
+     * @param bool $nested
+     * @return array
+     */
+    protected function get_items_monthly( $args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true ) {
+        global $wpdb, $wp_locale;
+        $output = array();
+        $defaults = array(
+            'show_year' => false,
+        );
+        $r = wp_parse_args($args, $defaults);
 
-		$show_year = $r['show_year'];
-		//will need to specify which year we're looking for
-		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts "
-			. "FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) "
-			. "ORDER BY post_date $order $limit";
-		$key = md5($query);
-		$key = "wp_get_archives:$key:$last_changed";
-		if (!$results = wp_cache_get($key, 'posts')) {
-			$results = $wpdb->get_results($query);
-			wp_cache_set($key, $results, 'posts');
-		}
-		if ($results) {
-			foreach ((array)$results as $result) {
-				$url = get_month_link($result->year, $result->month);
-				if ($show_year && !$nested) {
-					$text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year);
-				} else {
-					$text = sprintf(__('%1$s'), $wp_locale->get_month($result->month));
-				}
-				if ($nested) {
-					$output[$result->year][] = $this->get_archives_link($url, $text);
-				} else {
-					$output[] = $this->get_archives_link($url, $text);
-				}
-			}
-		}
-		if ($nested) {
-			$out2 = array();
-			foreach ($output as $year => $months) {
-				$out2[] = array('name' => $year, 'children' => $months);
-			}
-			return $out2;
-		}
-		return $output;
-	}
+        $show_year = $r['show_year'];
+        //will need to specify which year we're looking for
+        $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts "
+            . "FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) "
+            . "ORDER BY post_date $order $limit";
+        $key = md5($query);
+        $key = "wp_get_archives:$key:$last_changed";
+        if (!$results = wp_cache_get($key, 'posts')) {
+            $results = $wpdb->get_results($query);
+            wp_cache_set($key, $results, 'posts');
+        }
+        if ($results) {
+            foreach ((array)$results as $result) {
+                $url = get_month_link($result->year, $result->month);
+                if ($show_year && !$nested) {
+                    $text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year);
+                } else {
+                    $text = sprintf(__('%1$s'), $wp_locale->get_month($result->month));
+                }
+                if ($nested) {
+                    $output[$result->year][] = $this->get_archives_link($url, $text);
+                } else {
+                    $output[] = $this->get_archives_link($url, $text);
+                }
+            }
+        }
+        if ($nested) {
+            $out2 = array();
+            foreach ($output as $year => $months) {
+                $out2[] = array('name' => $year, 'children' => $months);
+            }
+            return $out2;
+        }
+        return $output;
+    }
 
-	/**
-	 * @api
-	 * @param array|string $args
-	 * @return array|string
-	 */
-	function get_items( $args = null ) {
-		global $wpdb;
+    /**
+     * @api
+     * @param array|string $args
+     * @return array|string
+     */
+    function get_items( $args = null ) {
+        global $wpdb;
 
-		$defaults = array(
-			'type' => 'monthly-nested',
-			'limit' => '',
-			'show_post_count' => false,
-			'order' => 'DESC',
-			'post_type' => 'post',
-			'show_year' => false,
-			'nested' => false
-		);
+        $defaults = array(
+            'type' => 'monthly-nested',
+            'limit' => '',
+            'show_post_count' => false,
+            'order' => 'DESC',
+            'post_type' => 'post',
+            'show_year' => false,
+            'nested' => false
+        );
 
-		$args = wp_parse_args($args, $defaults);
-		$post_type = $args['post_type'];
-		$order = $args['order'];
-		$nested = $args['nested'];
-		$type = $args['type'];
-		$limit = '';
-		if ( $type == 'yearlymonthly' || $type == 'yearmonth' ) {
-			$type = 'monthly-nested';
-		}
-		if ( $type == 'monthly-nested' ) {
-			$nested = true;
-		}
+        $args = wp_parse_args($args, $defaults);
+        $post_type = $args['post_type'];
+        $order = $args['order'];
+        $nested = $args['nested'];
+        $type = $args['type'];
+        $limit = '';
+        if ( $type == 'yearlymonthly' || $type == 'yearmonth' ) {
+            $type = 'monthly-nested';
+        }
+        if ( $type == 'monthly-nested' ) {
+            $nested = true;
+        }
 
-		if ( !empty($args['limit']) ) {
-			$limit = absint($limit);
-			$limit = ' LIMIT ' . $limit;
-		}
+        if ( !empty($args['limit']) ) {
+            $limit = absint($limit);
+            $limit = ' LIMIT ' . $limit;
+        }
 
-		$order = strtoupper($order);
-		if ( $order !== 'ASC' ) {
-			$order = 'DESC';
-		}
+        $order = strtoupper($order);
+        if ( $order !== 'ASC' ) {
+            $order = 'DESC';
+        }
 
-		// this is what will separate dates on weekly archive links
-		$archive_week_separator = '–';
+        // this is what will separate dates on weekly archive links
+        $archive_week_separator = '–';
 
-		// over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
-		$archive_date_format_over_ride = 0;
+        // over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
+        $archive_date_format_over_ride = 0;
 
-		// options for daily archive (only if you over-ride the general date format)
-		$archive_day_date_format = 'Y/m/d';
+        // options for daily archive (only if you over-ride the general date format)
+        $archive_day_date_format = 'Y/m/d';
 
-		// options for weekly archive (only if you over-ride the general date format)
-		$archive_week_start_date_format = 'Y/m/d';
-		$archive_week_end_date_format = 'Y/m/d';
+        // options for weekly archive (only if you over-ride the general date format)
+        $archive_week_start_date_format = 'Y/m/d';
+        $archive_week_end_date_format = 'Y/m/d';
 
-		if (!$archive_date_format_over_ride) {
-			$archive_day_date_format = get_option('date_format');
-			$archive_week_start_date_format = get_option('date_format');
-			$archive_week_end_date_format = get_option('date_format');
-		}
+        if (!$archive_date_format_over_ride) {
+            $archive_day_date_format = get_option('date_format');
+            $archive_week_start_date_format = get_option('date_format');
+            $archive_week_end_date_format = get_option('date_format');
+        }
 
-		$where = $wpdb->prepare('WHERE post_type = "%s" AND post_status = "publish"', $post_type);
-		$where = apply_filters('getarchives_where', $where, $args);
-		$join = apply_filters('getarchives_join', '', $args);
+        $where = $wpdb->prepare('WHERE post_type = "%s" AND post_status = "publish"', $post_type);
+        $where = apply_filters('getarchives_where', $where, $args);
+        $join = apply_filters('getarchives_join', '', $args);
 
-		$output = array();
-		$last_changed = wp_cache_get('last_changed', 'posts');
-		if (!$last_changed) {
-			$last_changed = microtime();
-			wp_cache_set('last_changed', $last_changed, 'posts');
-		}
-		if ( 'monthly' == $type ) {
-			$output = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit, $nested);
-		} elseif ( 'yearly' == $type ) {
-			$output = $this->get_items_yearly($args, $last_changed, $join, $where, $order, $limit);
-		} elseif ( 'monthly-nested' == $type ) {
-			$output = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit);
-		} elseif ( 'daily' == $type ) {
-			$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
-			$key = md5($query);
-			$key = "wp_get_archives:$key:$last_changed";
-			if (!$results = wp_cache_get($key, 'posts')) {
-				$results = $wpdb->get_results($query);
-				$cache = array();
-				$cache[$key] = $results;
-				wp_cache_set($key, $results, 'posts');
-			}
-			if ( $results ) {
-				foreach ( (array)$results as $result ) {
-					$url = get_day_link($result->year, $result->month, $result->dayofmonth);
-					$date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth);
-					$text = mysql2date($archive_day_date_format, $date);
-					$output[] = $this->get_archives_link($url, $text);
-				}
-			}
-		} elseif ( 'weekly' == $type ) {
-			$week = _wp_mysql_week('`post_date`');
-			$query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, "
-				. "count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
-			$key = md5($query);
-			$key = "wp_get_archives:$key:$last_changed";
-			if (!$results = wp_cache_get($key, 'posts')) {
-				$results = $wpdb->get_results($query);
-				wp_cache_set($key, $results, 'posts');
-			}
-			$arc_w_last = '';
-			if ( $results ) {
-				foreach ( (array)$results as $result ) {
-					if ( $result->week != $arc_w_last ) {
-						$arc_year = $result->yr;
-						$arc_w_last = $result->week;
-						$arc_week = get_weekstartend($result->yyyymmdd, get_option('start_of_week'));
-						$arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
-						$arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
-						$url = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&', '=', $result->week);
-						$text = $arc_week_start . $archive_week_separator . $arc_week_end;
-						$output[] = $this->get_archives_link($url, $text);
-					}
-				}
-			}
-		} elseif ( 'postbypost' == $type || 'alpha' == $type ) {
-			$orderby = 'alpha' == $type ? 'post_title ASC ' : 'post_date DESC ';
-			$query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
-			$key = md5($query);
-			$key = "wp_get_archives:$key:$last_changed";
-			if ( !$results = wp_cache_get($key, 'posts') ) {
-				$results = $wpdb->get_results($query);
-				wp_cache_set($key, $results, 'posts');
-			}
-			if ( $results ) {
-				foreach ( (array)$results as $result ) {
-					if ($result->post_date != '0000-00-00 00:00:00') {
-						$url = get_permalink($result);
-						if ($result->post_title) {
-							/** This filter is documented in wp-includes/post-template.php */
-							$text = strip_tags(apply_filters('the_title', $result->post_title, $result->ID));
-						} else {
-							$text = $result->ID;
-						}
-						$output[] = $this->get_archives_link($url, $text);
-					}
-				}
-			}
-		}
-		return $output;
-	}
+        $output = array();
+        $last_changed = wp_cache_get('last_changed', 'posts');
+        if (!$last_changed) {
+            $last_changed = microtime();
+            wp_cache_set('last_changed', $last_changed, 'posts');
+        }
+        if ( 'monthly' == $type ) {
+            $output = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit, $nested);
+        } elseif ( 'yearly' == $type ) {
+            $output = $this->get_items_yearly($args, $last_changed, $join, $where, $order, $limit);
+        } elseif ( 'monthly-nested' == $type ) {
+            $output = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit);
+        } elseif ( 'daily' == $type ) {
+            $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
+            $key = md5($query);
+            $key = "wp_get_archives:$key:$last_changed";
+            if (!$results = wp_cache_get($key, 'posts')) {
+                $results = $wpdb->get_results($query);
+                $cache = array();
+                $cache[$key] = $results;
+                wp_cache_set($key, $results, 'posts');
+            }
+            if ( $results ) {
+                foreach ( (array)$results as $result ) {
+                    $url = get_day_link($result->year, $result->month, $result->dayofmonth);
+                    $date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth);
+                    $text = mysql2date($archive_day_date_format, $date);
+                    $output[] = $this->get_archives_link($url, $text);
+                }
+            }
+        } elseif ( 'weekly' == $type ) {
+            $week = _wp_mysql_week('`post_date`');
+            $query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, "
+                . "count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
+            $key = md5($query);
+            $key = "wp_get_archives:$key:$last_changed";
+            if (!$results = wp_cache_get($key, 'posts')) {
+                $results = $wpdb->get_results($query);
+                wp_cache_set($key, $results, 'posts');
+            }
+            $arc_w_last = '';
+            if ( $results ) {
+                foreach ( (array)$results as $result ) {
+                    if ( $result->week != $arc_w_last ) {
+                        $arc_year = $result->yr;
+                        $arc_w_last = $result->week;
+                        $arc_week = get_weekstartend($result->yyyymmdd, get_option('start_of_week'));
+                        $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
+                        $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
+                        $url = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&', '=', $result->week);
+                        $text = $arc_week_start . $archive_week_separator . $arc_week_end;
+                        $output[] = $this->get_archives_link($url, $text);
+                    }
+                }
+            }
+        } elseif ( 'postbypost' == $type || 'alpha' == $type ) {
+            $orderby = 'alpha' == $type ? 'post_title ASC ' : 'post_date DESC ';
+            $query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
+            $key = md5($query);
+            $key = "wp_get_archives:$key:$last_changed";
+            if ( !$results = wp_cache_get($key, 'posts') ) {
+                $results = $wpdb->get_results($query);
+                wp_cache_set($key, $results, 'posts');
+            }
+            if ( $results ) {
+                foreach ( (array)$results as $result ) {
+                    if ($result->post_date != '0000-00-00 00:00:00') {
+                        $url = get_permalink($result);
+                        if ($result->post_title) {
+                            /** This filter is documented in wp-includes/post-template.php */
+                            $text = strip_tags(apply_filters('the_title', $result->post_title, $result->ID));
+                        } else {
+                            $text = $result->ID;
+                        }
+                        $output[] = $this->get_archives_link($url, $text);
+                    }
+                }
+            }
+        }
+        return $output;
+    }
 
 }

lib/integrations/wpcli-timber.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 if (!class_exists('WP_CLI_Command')) {
-	return;
+    return;
 }
 
 class Timber_WP_CLI_Command extends WP_CLI_Command {

lib/timber-routes.php

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

lib/timber-comment.php

Indentation +327 added lines, -327 removed lines

@@ -21,360 +21,360 @@
  */
 class TimberComment extends TimberCore implements TimberCoreInterface {
 
-	public $PostClass = 'TimberPost';
-	public $object_type = 'comment';
+    public $PostClass = 'TimberPost';
+    public $object_type = 'comment';
 
-	public static $representation = 'comment';
+    public static $representation = 'comment';
 
-	public $ID;
-	public $id;
-	public $comment_author_email;
-	public $comment_content;
-	public $comment_date;
-	public $comment_ID;
-	public $user_id;
-	public $comment_author;
+    public $ID;
+    public $id;
+    public $comment_author_email;
+    public $comment_content;
+    public $comment_date;
+    public $comment_ID;
+    public $user_id;
+    public $comment_author;
 
-	public $children = array();
+    public $children = array();
 
-	/**
-	 * @param int $cid
-	 */
-	function __construct($cid) {
-		$this->init($cid);
-	}
+    /**
+     * @param int $cid
+     */
+    function __construct($cid) {
+        $this->init($cid);
+    }
 
-	function __toString() {
-		return $this->content();
-	}
+    function __toString() {
+        return $this->content();
+    }
 
-	/**
-	 * @internal
-	 * @param integer $cid
-	 */
-	function init($cid) {
-		$comment_data = $cid;
-		if (is_integer($cid)) {
-			$comment_data = get_comment($cid);
-		}
-		$this->import($comment_data);
-		$this->ID = $this->comment_ID;
-		$this->id = $this->comment_ID;
-		$comment_meta_data = $this->get_meta_fields($this->ID);
-		$this->import($comment_meta_data);
-	}
+    /**
+     * @internal
+     * @param integer $cid
+     */
+    function init($cid) {
+        $comment_data = $cid;
+        if (is_integer($cid)) {
+            $comment_data = get_comment($cid);
+        }
+        $this->import($comment_data);
+        $this->ID = $this->comment_ID;
+        $this->id = $this->comment_ID;
+        $comment_meta_data = $this->get_meta_fields($this->ID);
+        $this->import($comment_meta_data);
+    }
 
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * <h3>Comments by...</h3>
-	 * <ol>
-	 * {% for comment in post.comments %}
-	 * 	<li>{{comment.author.name}}, who is a {{comment.author.role}}</li>
-	 * {% endfor %}
-	 * </ol>
-	 * ```
-	 * ```html
-	 * <h3>Comments by...</h3>
-	 * <ol>
-	 * 	<li>Jared Novack, who is a contributor</li>
-	 * 	<li>Katie Ricci, who is a subscriber</li>
-	 * 	<li>Rebecca Pearl, who is a author</li>
-	 * </ol>
-	 * ```
-	 * @return TimberUser
-	 */
-	public function author() {
-		if ($this->user_id) {
-			return new TimberUser($this->user_id);
-		} else {
-			$author = new TimberUser(0);
-			if (isset($this->comment_author) && $this->comment_author) {
-				$author->name = $this->comment_author;
-			} else {
-				$author->name = 'Anonymous';
-			}
-		}
-		return $author;
-	}
+    /**
+     * @api
+     * @example
+     * ```twig
+     * <h3>Comments by...</h3>
+     * <ol>
+     * {% for comment in post.comments %}
+     * 	<li>{{comment.author.name}}, who is a {{comment.author.role}}</li>
+     * {% endfor %}
+     * </ol>
+     * ```
+     * ```html
+     * <h3>Comments by...</h3>
+     * <ol>
+     * 	<li>Jared Novack, who is a contributor</li>
+     * 	<li>Katie Ricci, who is a subscriber</li>
+     * 	<li>Rebecca Pearl, who is a author</li>
+     * </ol>
+     * ```
+     * @return TimberUser
+     */
+    public function author() {
+        if ($this->user_id) {
+            return new TimberUser($this->user_id);
+        } else {
+            $author = new TimberUser(0);
+            if (isset($this->comment_author) && $this->comment_author) {
+                $author->name = $this->comment_author;
+            } else {
+                $author->name = 'Anonymous';
+            }
+        }
+        return $author;
+    }
 
-	/**
-	 * Fetches the Gravatar
-	 * @api
-	 * @example
-	 * ```twig
-	 * <img src="{{comment.avatar(36,template_uri~"/img/dude.jpg")}}" alt="Image of {{comment.author.name}}" />
-	 * ```
-	 * ```html
-	 * <img src="http://gravatar.com/i/sfsfsdfasdfsfa.jpg" alt="Image of Katherine Rich" />
-	 * ```
-	 * @param int $size
-	 * @param string $default
-	 * @return bool|mixed|string
-	 */
-	public function avatar($size = 92, $default = '') {
-		if (!get_option('show_avatars')) {
-			return false;
-		}
-		if (!is_numeric($size)) {
-			$size = '92';
-		}
+    /**
+     * Fetches the Gravatar
+     * @api
+     * @example
+     * ```twig
+     * <img src="{{comment.avatar(36,template_uri~"/img/dude.jpg")}}" alt="Image of {{comment.author.name}}" />
+     * ```
+     * ```html
+     * <img src="http://gravatar.com/i/sfsfsdfasdfsfa.jpg" alt="Image of Katherine Rich" />
+     * ```
+     * @param int $size
+     * @param string $default
+     * @return bool|mixed|string
+     */
+    public function avatar($size = 92, $default = '') {
+        if (!get_option('show_avatars')) {
+            return false;
+        }
+        if (!is_numeric($size)) {
+            $size = '92';
+        }
 
-		$email = $this->avatar_email();
-		$email_hash = '';
-		if (!empty($email)) {
-			$email_hash = md5(strtolower(trim($email)));
-		}
-		$host = $this->avatar_host($email_hash);
-		$default = $this->avatar_default($default, $email, $size, $host);
-		if (!empty($email)) {
-			$avatar = $this->avatar_out($default, $host, $email_hash, $size);
-		} else {
-			$avatar = $default;
-		}
-		return $avatar;
-	}
+        $email = $this->avatar_email();
+        $email_hash = '';
+        if (!empty($email)) {
+            $email_hash = md5(strtolower(trim($email)));
+        }
+        $host = $this->avatar_host($email_hash);
+        $default = $this->avatar_default($default, $email, $size, $host);
+        if (!empty($email)) {
+            $avatar = $this->avatar_out($default, $host, $email_hash, $size);
+        } else {
+            $avatar = $default;
+        }
+        return $avatar;
+    }
 
-	/**
-	 * @api
-	 * @return string
-	 */
-	public function content() {
-		return apply_filters('get_comment_text ', $this->comment_content);
-	}
+    /**
+     * @api
+     * @return string
+     */
+    public function content() {
+        return apply_filters('get_comment_text ', $this->comment_content);
+    }
 
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% if comment.approved %}
-	 * 	Your comment is good
-	 * {% else %}
-	 * 	Do you kiss your mother with that mouth?
-	 * {% endif %}
-	 * ```
-	 * @return boolean
-	 */
-	public function approved() {
-		return $this->comment_approved;
-	}
+    /**
+     * @api
+     * @example
+     * ```twig
+     * {% if comment.approved %}
+     * 	Your comment is good
+     * {% else %}
+     * 	Do you kiss your mother with that mouth?
+     * {% endif %}
+     * ```
+     * @return boolean
+     */
+    public function approved() {
+        return $this->comment_approved;
+    }
 
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% for comment in post.comments %}
-	 * <article class="comment">
-	 *   <p class="date">Posted on {{ comment.date }}:</p>
-	 *   <p class="comment">{{ comment.content }}</p>
-	 * </article>
-	 * {% endfor %}
-	 * ```
-	 * ```html
-	 * <article class="comment">
-	 *   <p class="date">Posted on September 28, 2015:</p>
-	 *   <p class="comment">Happy Birthday!</p>
-	 * </article>
-	 * ```
-	 * @return string
-	 */
-	public function date( $date_format = '' ) {
-		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->comment_date);
-		return apply_filters('get_comment_date ', $the_date, $df);
-	}
+    /**
+     * @api
+     * @example
+     * ```twig
+     * {% for comment in post.comments %}
+     * <article class="comment">
+     *   <p class="date">Posted on {{ comment.date }}:</p>
+     *   <p class="comment">{{ comment.content }}</p>
+     * </article>
+     * {% endfor %}
+     * ```
+     * ```html
+     * <article class="comment">
+     *   <p class="date">Posted on September 28, 2015:</p>
+     *   <p class="comment">Happy Birthday!</p>
+     * </article>
+     * ```
+     * @return string
+     */
+    public function date( $date_format = '' ) {
+        $df = $date_format ? $date_format : get_option('date_format');
+        $the_date = (string)mysql2date($df, $this->comment_date);
+        return apply_filters('get_comment_date ', $the_date, $df);
+    }
 
-	/**
-	 * @api
-	 * @example
-	 * ```twig
-	 * {% for comment in post.comments %}
-	 * <article class="comment">
-	 *   <p class="date">Posted on {{ comment.date }} at {{comment.time}}:</p>
-	 *   <p class="comment">{{ comment.content }}</p>
-	 * </article>
-	 * {% endfor %}
-	 * ```
-	 * ```html
-	 * <article class="comment">
-	 *   <p class="date">Posted on September 28, 2015 at 12:45 am:</p>
-	 *   <p class="comment">Happy Birthday!</p>
-	 * </article>
-	 * ```
-	 * @return string
-	 */
-	public function time( $time_format = '' ) {
-		$tf = $time_format ? $time_format : get_option('time_format');
-		$the_time = (string)mysql2date($tf, $this->comment_date);
-		return apply_filters('get_comment_time', $the_time, $tf);
-	}
+    /**
+     * @api
+     * @example
+     * ```twig
+     * {% for comment in post.comments %}
+     * <article class="comment">
+     *   <p class="date">Posted on {{ comment.date }} at {{comment.time}}:</p>
+     *   <p class="comment">{{ comment.content }}</p>
+     * </article>
+     * {% endfor %}
+     * ```
+     * ```html
+     * <article class="comment">
+     *   <p class="date">Posted on September 28, 2015 at 12:45 am:</p>
+     *   <p class="comment">Happy Birthday!</p>
+     * </article>
+     * ```
+     * @return string
+     */
+    public function time( $time_format = '' ) {
+        $tf = $time_format ? $time_format : get_option('time_format');
+        $the_time = (string)mysql2date($tf, $this->comment_date);
+        return apply_filters('get_comment_time', $the_time, $tf);
+    }
 
-	/**
-	 * @param string $field_name
-	 * @return mixed
-	 */
-	public function meta($field_name) {
-		return $this->get_meta_field($field_name);
-	}
+    /**
+     * @param string $field_name
+     * @return mixed
+     */
+    public function meta($field_name) {
+        return $this->get_meta_field($field_name);
+    }
 
-	/**
-	 * @api
-	 * @return bool
-	 */
-	public function is_child() {
-		return $this->comment_parent > 0;
-	}
+    /**
+     * @api
+     * @return bool
+     */
+    public function is_child() {
+        return $this->comment_parent > 0;
+    }
 
-	/**
-	 * @internal
-	 * @param int $comment_id
-	 * @return mixed
-	 */
-	protected function get_meta_fields($comment_id = null) {
-		if ($comment_id === null) {
-			$comment_id = $this->ID;
-		}
-		//Could not find a WP function to fetch all comment meta data, so I made one.
-		apply_filters('timber_comment_get_meta_pre', array(), $comment_id);
-		$comment_metas = get_comment_meta($comment_id);
-		foreach ($comment_metas as &$cm) {
-			if (is_array($cm) && count($cm) == 1) {
-				$cm = $cm[0];
-			}
-		}
-		$comment_metas = apply_filters('timber_comment_get_meta', $comment_metas, $comment_id);
-		return $comment_metas;
-	}
+    /**
+     * @internal
+     * @param int $comment_id
+     * @return mixed
+     */
+    protected function get_meta_fields($comment_id = null) {
+        if ($comment_id === null) {
+            $comment_id = $this->ID;
+        }
+        //Could not find a WP function to fetch all comment meta data, so I made one.
+        apply_filters('timber_comment_get_meta_pre', array(), $comment_id);
+        $comment_metas = get_comment_meta($comment_id);
+        foreach ($comment_metas as &$cm) {
+            if (is_array($cm) && count($cm) == 1) {
+                $cm = $cm[0];
+            }
+        }
+        $comment_metas = apply_filters('timber_comment_get_meta', $comment_metas, $comment_id);
+        return $comment_metas;
+    }
 
-	/**
-	 * @internal
-	 * @param string $field_name
-	 * @return mixed
-	 */
-	protected function get_meta_field($field_name) {
-		$value = apply_filters('timber_comment_get_meta_field_pre', null, $this->ID, $field_name, $this);
-		if ($value === null) {
-			$value = get_comment_meta($this->ID, $field_name, true);
-		}
-		$value = apply_filters('timber_comment_get_meta_field', $value, $this->ID, $field_name, $this);
-		return $value;
-	}
+    /**
+     * @internal
+     * @param string $field_name
+     * @return mixed
+     */
+    protected function get_meta_field($field_name) {
+        $value = apply_filters('timber_comment_get_meta_field_pre', null, $this->ID, $field_name, $this);
+        if ($value === null) {
+            $value = get_comment_meta($this->ID, $field_name, true);
+        }
+        $value = apply_filters('timber_comment_get_meta_field', $value, $this->ID, $field_name, $this);
+        return $value;
+    }
 
-	/**
-	 * Enqueue the WP threaded comments javascript,
-	 * and fetch the reply link for various comments.
-	 * @api
-	 * @return string
-	 */
-	public function reply_link( $reply_text = 'Reply' ) {
-		if ( is_singular() && comments_open() && get_option('thread_comments') ) {
-			wp_enqueue_script( 'comment-reply' );
-		}
+    /**
+     * Enqueue the WP threaded comments javascript,
+     * and fetch the reply link for various comments.
+     * @api
+     * @return string
+     */
+    public function reply_link( $reply_text = 'Reply' ) {
+        if ( is_singular() && comments_open() && get_option('thread_comments') ) {
+            wp_enqueue_script( 'comment-reply' );
+        }
 
-		// Get the comments depth option from the admin panel
-		$max_depth = get_option('thread_comments_depth');
+        // Get the comments depth option from the admin panel
+        $max_depth = get_option('thread_comments_depth');
 
-		// Default args
-		$args = array(
-			'add_below' => 'comment',
-			'respond_id' => 'respond',
-			'reply_text' => $reply_text,
-			'depth' => 1,
-			'max_depth' => $max_depth,
-		);
+        // Default args
+        $args = array(
+            'add_below' => 'comment',
+            'respond_id' => 'respond',
+            'reply_text' => $reply_text,
+            'depth' => 1,
+            'max_depth' => $max_depth,
+        );
 
-		return get_comment_reply_link( $args, $this->ID, $this->post_id );
-	}
+        return get_comment_reply_link( $args, $this->ID, $this->post_id );
+    }
 
-	/* AVATAR Stuff
+    /* AVATAR Stuff
 	======================= */
 
-	/**
-	 * @internal
-	 * @return string
-	 */
-	protected function avatar_email() {
-		$id = (int)$this->user_id;
-		$user = get_userdata($id);
-		if ($user) {
-			$email = $user->user_email;
-		} else {
-			$email = $this->comment_author_email;
-		}
-		return $email;
-	}
+    /**
+     * @internal
+     * @return string
+     */
+    protected function avatar_email() {
+        $id = (int)$this->user_id;
+        $user = get_userdata($id);
+        if ($user) {
+            $email = $user->user_email;
+        } else {
+            $email = $this->comment_author_email;
+        }
+        return $email;
+    }
 
-	/**
-	 * @internal
-	 * @param string $email_hash
-	 * @return string
-	 */
-	protected function avatar_host($email_hash) {
-		if (is_ssl()) {
-			$host = 'https://secure.gravatar.com';
-		} else {
-			if (!empty($email_hash)) {
-				$host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
-			} else {
-				$host = 'http://0.gravatar.com';
-			}
-		}
-		return $host;
-	}
+    /**
+     * @internal
+     * @param string $email_hash
+     * @return string
+     */
+    protected function avatar_host($email_hash) {
+        if (is_ssl()) {
+            $host = 'https://secure.gravatar.com';
+        } else {
+            if (!empty($email_hash)) {
+                $host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
+            } else {
+                $host = 'http://0.gravatar.com';
+            }
+        }
+        return $host;
+    }
 
-	/**
-	 * @internal
-	 * @todo  what if it's relative?
-	 * @param string $default
-	 * @param string $email
-	 * @param string $size
-	 * @param string $host
-	 * @return string
-	 */
-	protected function avatar_default($default, $email, $size, $host) {
-		if (substr($default, 0, 1) == '/') {
-			$default = home_url() . $default;
-		}
+    /**
+     * @internal
+     * @todo  what if it's relative?
+     * @param string $default
+     * @param string $email
+     * @param string $size
+     * @param string $host
+     * @return string
+     */
+    protected function avatar_default($default, $email, $size, $host) {
+        if (substr($default, 0, 1) == '/') {
+            $default = home_url() . $default;
+        }
 
-		if (empty($default)) {
-			$avatar_default = get_option('avatar_default');
-			if (empty($avatar_default)) {
-				$default = 'mystery';
-			} else {
-				$default = $avatar_default;
-			}
-		}
-		if ('mystery' == $default) {
-			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
-			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ('blank' == $default) {
-			$default = $email ? 'blank' : includes_url('images/blank.gif');
-		} else if (!empty($email) && 'gravatar_default' == $default) {
-			$default = '';
-		} else if ('gravatar_default' == $default) {
-			$default = $host . '/avatar/?s=' . $size;
-		} else if (empty($email) && !strstr($default, 'http://')) {
-			$default = $host . '/avatar/?d=' . $default . '&amp;s=' . $size;
-		}
-		return $default;
-	}
+        if (empty($default)) {
+            $avatar_default = get_option('avatar_default');
+            if (empty($avatar_default)) {
+                $default = 'mystery';
+            } else {
+                $default = $avatar_default;
+            }
+        }
+        if ('mystery' == $default) {
+            $default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
+            // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
+        } else if ('blank' == $default) {
+            $default = $email ? 'blank' : includes_url('images/blank.gif');
+        } else if (!empty($email) && 'gravatar_default' == $default) {
+            $default = '';
+        } else if ('gravatar_default' == $default) {
+            $default = $host . '/avatar/?s=' . $size;
+        } else if (empty($email) && !strstr($default, 'http://')) {
+            $default = $host . '/avatar/?d=' . $default . '&amp;s=' . $size;
+        }
+        return $default;
+    }
 
-	/**
-	 * @internal
-	 * @param string $default
-	 * @param string $host
-	 * @param string $email_hash
-	 * @param string $size
-	 * @return mixed
-	 */
-	protected function avatar_out($default, $host, $email_hash, $size) {
-		$out = $host . '/avatar/' . $email_hash . '?s=' . $size . '&amp;d=' . urlencode($default);
-		$rating = get_option('avatar_rating');
-		if (!empty($rating)) {
-			$out .= '&amp;r=' . $rating;
-		}
-		return str_replace('&#038;', '&amp;', esc_url($out));
-	}
+    /**
+     * @internal
+     * @param string $default
+     * @param string $host
+     * @param string $email_hash
+     * @param string $size
+     * @return mixed
+     */
+    protected function avatar_out($default, $host, $email_hash, $size) {
+        $out = $host . '/avatar/' . $email_hash . '?s=' . $size . '&amp;d=' . urlencode($default);
+        $rating = get_option('avatar_rating');
+        if (!empty($rating)) {
+            $out .= '&amp;r=' . $rating;
+        }
+        return str_replace('&#038;', '&amp;', esc_url($out));
+    }
 
 }