jarednova / timber

lib/timber-function-wrapper.php

Spacing +19 added lines, -19 removed lines

@@ -9,7 +9,7 @@ 
 
 	public function __toString() {
 		 try {
-			return (string)$this->call();
+			return (string) $this->call();
 		 } catch (Exception $e) {
 		 	return 'Caught exception: ' . $e->getMessage() . "\n";
 		 }
@@ -22,13 +22,13 @@ 
 	 * @param array   $args
 	 * @param bool    $return_output_buffer
 	 */
-	public function __construct( $function, $args = array(), $return_output_buffer = false ) {
-		if( is_array( $function ) ) {
-			if( (is_string( $function[0] ) && class_exists( $function[0] ) ) || gettype( $function[0] ) === 'object' ) {
+	public function __construct($function, $args = array(), $return_output_buffer = false) {
+		if ( is_array($function) ) {
+			if ( (is_string($function[0]) && class_exists($function[0])) || gettype($function[0]) === 'object' ) {
 				$this->_class = $function[0];
 			}
 			
-			if( is_string( $function[1] ) ) $this->_function = $function[1];
+			if ( is_string($function[1]) ) $this->_function = $function[1];
 		} else {
 			$this->_function = $function;
 		}
@@ -36,7 +36,7 @@ 
 		$this->_args = $args;
 		$this->_use_ob = $return_output_buffer;
 
-		add_filter( 'get_twig', array( &$this, 'add_to_twig' ) );
+		add_filter('get_twig', array(&$this, 'add_to_twig'));
 	}
 
 	/**
@@ -45,12 +45,12 @@ 
 	 * @param Twig_Environment $twig
 	 * @return Twig_Environment
 	 */
-	public function add_to_twig( $twig ) {
+	public function add_to_twig($twig) {
 		$wrapper = $this;
 
-		$twig->addFunction( new Twig_SimpleFunction( $this->_function, function () use ( $wrapper ) {
-					return call_user_func_array( array( $wrapper, 'call' ), func_get_args() );
-				} ) );
+		$twig->addFunction(new Twig_SimpleFunction($this->_function, function() use ($wrapper) {
+					return call_user_func_array(array($wrapper, 'call'), func_get_args());
+				} ));
 
 		return $twig;
 	}
@@ -61,13 +61,13 @@ 
 	 * @return string
 	 */
 	public function call() {
-		$args = $this->_parse_args( func_get_args(), $this->_args );
-		$callable = ( isset( $this->_class ) ) ? array( $this->_class, $this->_function ) : $this->_function;
+		$args = $this->_parse_args(func_get_args(), $this->_args);
+		$callable = (isset($this->_class)) ? array($this->_class, $this->_function) : $this->_function;
 
 		if ( $this->_use_ob ) {
-			return TimberHelper::ob_function( $callable, $args );
+			return TimberHelper::ob_function($callable, $args);
 		} else {
-			return call_user_func_array( $callable, $args );
+			return call_user_func_array($callable, $args);
 		}
 	}
 
@@ -78,12 +78,12 @@ 
 	 * @param array   $defaults
 	 * @return array
 	 */
-	private function _parse_args( $args, $defaults ) {
-		$_arg = reset( $defaults );
+	private function _parse_args($args, $defaults) {
+		$_arg = reset($defaults);
 
-		foreach ( $args as $index => $arg ) {
-			$defaults[$index] = is_null( $arg ) ? $_arg : $arg;
-			$_arg = next( $defaults );
+		foreach ($args as $index => $arg) {
+			$defaults[$index] = is_null($arg) ? $_arg : $arg;
+			$_arg = next($defaults);
 		}
 
 		return $defaults;

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

Spacing +31 added lines, -31 removed lines

@@ -21,8 +21,8 @@ 
 		$this->w = $w;
 		$this->h = $h;
 		// Sanitize crop position
-		$allowed_crop_positions = array( 'default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center' );
-		if ( $crop !== false && !in_array( $crop, $allowed_crop_positions ) ) {
+		$allowed_crop_positions = array('default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center');
+		if ( $crop !== false && !in_array($crop, $allowed_crop_positions) ) {
 			$crop = $allowed_crop_positions[0];
 		}
 		$this->crop = $crop;
@@ -42,9 +42,9 @@ 
 		if ( $this->h ) {
 			$h = $this->h;
 		}
-		$result = $src_filename . '-' . $w . 'x' . $h . '-c-' . ( $this->crop ? $this->crop : 'f' ); // Crop will be either user named or f (false)
-		if($src_extension) {
-			$result .= '.'.$src_extension;
+		$result = $src_filename . '-' . $w . 'x' . $h . '-c-' . ($this->crop ? $this->crop : 'f'); // Crop will be either user named or f (false)
+		if ( $src_extension ) {
+			$result .= '.' . $src_extension;
 		}
 		return $result;
 	}
@@ -53,8 +53,8 @@ 
 	 * @param string $load_filename
 	 * @param string $save_filename
 	 */
-	protected function run_animated_gif( $load_filename, $save_filename ) {
-		$image = wp_get_image_editor( $load_filename );
+	protected function run_animated_gif($load_filename, $save_filename) {
+		$image = wp_get_image_editor($load_filename);
 		$current_size = $image->get_size();
 		$src_w = $current_size['width'];
 		$src_h = $current_size['height'];
@@ -65,7 +65,7 @@ 
 		}
 		$image = new Imagick($load_filename);
 		$image = $image->coalesceImages();
-		$crop = self::get_target_sizes( $load_filename );
+		$crop = self::get_target_sizes($load_filename);
 		foreach ($image as $frame) {
 			$frame->cropImage($crop['src_w'], $crop['src_h'], $crop['x'], $crop['y']);
 			$frame->thumbnailImage($w, $h);
@@ -75,8 +75,8 @@ 
 		return $image->writeImages($save_filename, true);
 	}
 
-	protected function get_target_sizes( $load_filename ) {
-		$image = wp_get_image_editor( $load_filename );
+	protected function get_target_sizes($load_filename) {
+		$image = wp_get_image_editor($load_filename);
 		$w = $this->w;
 		$h = $this->h;
 		$crop = $this->crop;
@@ -86,11 +86,11 @@ 
 		$src_h = $current_size['height'];
 		$src_ratio = $src_w / $src_h;
 		if ( !$h ) {
-			$h = round( $w / $src_ratio );
+			$h = round($w / $src_ratio);
 		}
 		if ( !$w ) {
 			//the user wants to resize based on constant height
-			$w = round( $h * $src_ratio );
+			$w = round($h * $src_ratio);
 		}
 		if ( !$crop ) {
 			return array(
@@ -104,13 +104,13 @@ 
 		$src_wt = $src_h * $dest_ratio;
 		$src_ht = $src_w / $dest_ratio;
 		$src_x = $src_w / 2 - $src_wt / 2;
-		$src_y = ( $src_h - $src_ht ) / 6;
+		$src_y = ($src_h - $src_ht) / 6;
 		//now specific overrides based on options:
-		switch ( $crop ) {
+		switch ($crop) {
 			case 'center':
 				// Get source x and y
-				$src_x = round( ( $src_w - $src_wt ) / 2 );
-				$src_y = round( ( $src_h - $src_ht ) / 2 );
+				$src_x = round(($src_w - $src_wt) / 2);
+				$src_y = round(($src_h - $src_ht) / 2);
 				break;
 
 			case 'top':
@@ -122,11 +122,11 @@ 
 				break;
 
 			case 'top-center':
-				$src_y = round( ( $src_h - $src_ht ) / 4 );
+				$src_y = round(($src_h - $src_ht) / 4);
 				break;
 
 			case 'bottom-center':
-				$src_y = $src_h - $src_ht - round( ( $src_h - $src_ht ) / 4 );
+				$src_y = $src_h - $src_ht - round(($src_h - $src_ht) / 4);
 				break;
 
 			case 'left':
@@ -138,7 +138,7 @@ 
 				break;
 		}
 		// Crop the image
-		return ( $dest_ratio > $src_ratio )
+		return ($dest_ratio > $src_ratio)
 			? array(
 				'x' => 0, 'y' => $src_y,
 				'src_w' => $src_w, 'src_h' => $src_ht,
@@ -168,35 +168,35 @@ 
 			//return if successful
 			//proceed if not
 			$gif = self::run_animated_gif($load_filename, $save_filename);
-			if ($gif) {
+			if ( $gif ) {
 				return true;
 			}
 		}
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
-			$crop = self::get_target_sizes( $load_filename );
-			$image->crop( 	$crop['x'],
+		$image = wp_get_image_editor($load_filename);
+		if ( !is_wp_error($image) ) {
+			$crop = self::get_target_sizes($load_filename);
+			$image->crop($crop['x'],
 							$crop['y'],
 							$crop['src_w'],
 							$crop['src_h'],
 							$crop['target_w'],
 							$crop['target_h']
 			);
-			$result = $image->save( $save_filename );
-			if ( is_wp_error( $result ) ) {
+			$result = $image->save($save_filename);
+			if ( is_wp_error($result) ) {
 				// @codeCoverageIgnoreStart
-				TimberHelper::error_log( 'Error resizing image' );
-				TimberHelper::error_log( $result );
+				TimberHelper::error_log('Error resizing image');
+				TimberHelper::error_log($result);
 				return false;
 				// @codeCoverageIgnoreEnd
 			} else {
 				return true;
 			}
-		} else if ( isset( $image->error_data['error_loading_image'] ) ) {
+		} else if ( isset($image->error_data['error_loading_image']) ) {
 			// @codeCoverageIgnoreStart
-			TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
+			TimberHelper::error_log('Error loading ' . $image->error_data['error_loading_image']);
 		} else {
-			TimberHelper::error_log( $image );
+			TimberHelper::error_log($image);
 			// @codeCoverageIgnoreEnd
 		}
 	}

lib/timber-image-helper.php

Spacing +84 added lines, -84 removed lines

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

lib/timber.php

Spacing +90 added lines, -90 removed lines

@@ -45,16 +45,16 @@ 
 		if ( is_admin() || $_SERVER['PHP_SELF'] == '/wp-login.php' ) {
 			return;
 		}
-		if ( version_compare( phpversion(), '5.3.0', '<' ) && !is_admin() ) {
-			trigger_error( 'Timber requires PHP 5.3.0 or greater. You have '.phpversion(), E_USER_ERROR );
+		if ( version_compare(phpversion(), '5.3.0', '<') && !is_admin() ) {
+			trigger_error('Timber requires PHP 5.3.0 or greater. You have ' . phpversion(), E_USER_ERROR);
 		}
-		if ( !class_exists( 'Twig_Autoloader' ) ) {
-			trigger_error( 'You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR );
+		if ( !class_exists('Twig_Autoloader') ) {
+			trigger_error('You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR);
 		}
 	}
 
 	function init_constants() {
-		defined( "TIMBER_LOC" ) or define( "TIMBER_LOC", realpath( dirname(__DIR__) ) );
+		defined("TIMBER_LOC") or define("TIMBER_LOC", realpath(dirname(__DIR__)));
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	 */
 	protected function init() {
 		TimberTwig::init();
-		TimberRoutes::init( $this );
+		TimberRoutes::init($this);
 		TimberImageHelper::init();
 		TimberAdmin::init();
 		TimberIntegrations::init();
@@ -78,8 +78,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function get_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_post( $query, $PostClass );
+	public static function get_post($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::get_post($query, $PostClass);
 	}
 
 	/**
@@ -89,8 +89,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
-		return TimberPostGetter::get_posts( $query, $PostClass, $return_collection );
+	public static function get_posts($query = false, $PostClass = 'TimberPost', $return_collection = false) {
+		return TimberPostGetter::get_posts($query, $PostClass, $return_collection);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function query_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_post( $query, $PostClass );
+	public static function query_post($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::query_post($query, $PostClass);
 	}
 
 	/**
@@ -111,8 +111,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function query_posts( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_posts( $query, $PostClass );
+	public static function query_posts($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::query_posts($query, $PostClass);
 	}
 
 	/**
@@ -136,8 +136,8 @@ 
 	 * @param string  $TermClass
 	 * @return mixed
 	 */
-	public static function get_terms( $args = null, $maybe_args = array(), $TermClass = 'TimberTerm' ) {
-		return TimberTermGetter::get_terms( $args, $maybe_args, $TermClass );
+	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+		return TimberTermGetter::get_terms($args, $maybe_args, $TermClass);
 	}
 
 	/* Site Retrieval
@@ -149,14 +149,14 @@ 
 	 * @param array|bool $blog_ids
 	 * @return array
 	 */
-	public static function get_sites( $blog_ids = false ) {
-		if ( !is_array( $blog_ids ) ) {
+	public static function get_sites($blog_ids = false) {
+		if ( !is_array($blog_ids) ) {
 			global $wpdb;
-			$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC" );
+			$blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC");
 		}
 		$return = array();
-		foreach ( $blog_ids as $blog_id ) {
-			$return[] = new TimberSite( $blog_id );
+		foreach ($blog_ids as $blog_id) {
+			$return[] = new TimberSite($blog_id);
 		}
 		return $return;
 	}
@@ -174,9 +174,9 @@ 
 		$data = array();
 		$data['http_host'] = 'http://' . TimberURLHelper::get_host();
 		$data['wp_title'] = TimberHelper::get_wp_title();
-		$data['wp_head'] = TimberHelper::function_wrapper( 'wp_head' );
-		$data['wp_footer'] = TimberHelper::function_wrapper( 'wp_footer' );
-		$data['body_class'] = implode( ' ', get_body_class() );
+		$data['wp_head'] = TimberHelper::function_wrapper('wp_head');
+		$data['wp_footer'] = TimberHelper::function_wrapper('wp_footer');
+		$data['body_class'] = implode(' ', get_body_class());
 
 		$data['site'] = new TimberSite();
 		$data['request'] = new TimberRequest();
@@ -184,8 +184,8 @@ 
 
 		$data['posts'] = Timber::query_posts();
 
-		$data = apply_filters( 'timber_context', $data );
-		$data = apply_filters( 'timber/context', $data );
+		$data = apply_filters('timber_context', $data);
+		$data = apply_filters('timber/context', $data);
 		return $data;
 	}
 
@@ -199,27 +199,27 @@ 
 	 * @param bool    $via_render
 	 * @return bool|string
 	 */
-	public static function compile( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT, $via_render = false ) {
+	public static function compile($filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT, $via_render = false) {
 		$caller = self::get_calling_script_dir();
 		$caller_file = self::get_calling_script_file();
-		$caller_file = apply_filters( 'timber_calling_php_file', $caller_file );
-		$loader = new TimberLoader( $caller );
-		$file = $loader->choose_template( $filenames );
+		$caller_file = apply_filters('timber_calling_php_file', $caller_file);
+		$loader = new TimberLoader($caller);
+		$file = $loader->choose_template($filenames);
 		$output = '';
-		if ( is_null( $data ) ) {
+		if ( is_null($data) ) {
 			$data = array();
 		}
-		if ( strlen( $file ) ) {
+		if ( strlen($file) ) {
 			if ( $via_render ) {
-				$file = apply_filters( 'timber_render_file', $file );
-				$data = apply_filters( 'timber_render_data', $data );
+				$file = apply_filters('timber_render_file', $file);
+				$data = apply_filters('timber_render_data', $data);
 			} else {
-				$file = apply_filters( 'timber_compile_file', $file );
-				$data = apply_filters( 'timber_compile_data', $data );
+				$file = apply_filters('timber_compile_file', $file);
+				$data = apply_filters('timber_compile_data', $data);
 			}
-			$output = $loader->render( $file, $data, $expires, $cache_mode );
+			$output = $loader->render($file, $data, $expires, $cache_mode);
 		}
-		do_action( 'timber_compile_done' );
+		do_action('timber_compile_done');
 		return $output;
 	}
 
@@ -230,14 +230,14 @@ 
 	 * @param array   $data   an array with data in it.
 	 * @return  bool|string
 	 */
-	public static function compile_string( $string, $data = array() ) {
+	public static function compile_string($string, $data = array()) {
 		$dummy_loader = new TimberLoader();
 		$dummy_loader->get_twig();
 		$loader = new Twig_Loader_String();
-		$twig = new Twig_Environment( $loader );
-		$twig = apply_filters( 'timber/twig/filters', $twig );
-		$twig = apply_filters( 'twig_apply_filters', $twig );
-		return $twig->render( $string, $data );
+		$twig = new Twig_Environment($loader);
+		$twig = apply_filters('timber/twig/filters', $twig);
+		$twig = apply_filters('twig_apply_filters', $twig);
+		return $twig->render($string, $data);
 	}
 
 	/**
@@ -249,15 +249,15 @@ 
 	 * @param string  $cache_mode
 	 * @return bool|string
 	 */
-	public static function fetch( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
+	public static function fetch($filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT) {
 		if ( $expires === true ) {
 			//if this is reading as true; the user probably is using the old $echo param
 			//so we should move all vars up by a spot
 			$expires = $cache_mode;
 			$cache_mode = TimberLoader::CACHE_USE_DEFAULT;
 		}
-		$output = self::compile( $filenames, $data, $expires, $cache_mode, true );
-		$output = apply_filters( 'timber_compile_result', $output );
+		$output = self::compile($filenames, $data, $expires, $cache_mode, true);
+		$output = apply_filters('timber_compile_result', $output);
 		return $output;
 	}
 
@@ -270,8 +270,8 @@ 
 	 * @param string  $cache_mode
 	 * @return bool|string
 	 */
-	public static function render( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
-		$output = static::fetch( $filenames, $data, $expires, $cache_mode );
+	public static function render($filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT) {
+		$output = static::fetch($filenames, $data, $expires, $cache_mode);
 		echo $output;
 		return $output;
 	}
@@ -283,8 +283,8 @@ 
 	 * @param array   $data   an array with data in it.
 	 * @return  bool|string
 	 */
-	public static function render_string( $string, $data = array() ) {
-		$compiled = self::compile_string( $string, $data );
+	public static function render_string($string, $data = array()) {
+		$compiled = self::compile_string($string, $data);
 		echo $compiled;
 		return $compiled;
 	}
@@ -300,14 +300,14 @@ 
 	 * @param array   $data
 	 * @return bool|string
 	 */
-	public static function get_sidebar( $sidebar = '', $data = array() ) {
+	public static function get_sidebar($sidebar = '', $data = array()) {
 		if ( $sidebar == '' ) {
 			$sidebar = 'sidebar.php';
 		}
-		if ( strstr( strtolower( $sidebar ), '.php' ) ) {
-			return self::get_sidebar_from_php( $sidebar, $data );
+		if ( strstr(strtolower($sidebar), '.php') ) {
+			return self::get_sidebar_from_php($sidebar, $data);
 		}
-		return self::compile( $sidebar, $data );
+		return self::compile($sidebar, $data);
 	}
 
 	/**
@@ -317,21 +317,21 @@ 
 	 * @param array   $data
 	 * @return string
 	 */
-	public static function get_sidebar_from_php( $sidebar = '', $data ) {
+	public static function get_sidebar_from_php($sidebar = '', $data) {
 		$caller = self::get_calling_script_dir();
 		$loader = new TimberLoader();
-		$uris = $loader->get_locations( $caller );
+		$uris = $loader->get_locations($caller);
 		ob_start();
 		$found = false;
-		foreach ( $uris as $uri ) {
-			if ( file_exists( trailingslashit( $uri ) . $sidebar ) ) {
-				include trailingslashit( $uri ) . $sidebar;
+		foreach ($uris as $uri) {
+			if ( file_exists(trailingslashit($uri) . $sidebar) ) {
+				include trailingslashit($uri) . $sidebar;
 				$found = true;
 				break;
 			}
 		}
 		if ( !$found ) {
-			TimberHelper::error_log( 'error loading your sidebar, check to make sure the file exists' );
+			TimberHelper::error_log('error loading your sidebar, check to make sure the file exists');
 		}
 		$ret = ob_get_contents();
 		ob_end_clean();
@@ -347,8 +347,8 @@ 
 	 * @param int     $widget_id
 	 * @return TimberFunctionWrapper
 	 */
-	public static function get_widgets( $widget_id ) {
-		return trim( TimberHelper::function_wrapper( 'dynamic_sidebar', array( $widget_id ), true ) );
+	public static function get_widgets($widget_id) {
+		return trim(TimberHelper::function_wrapper('dynamic_sidebar', array($widget_id), true));
 	}
 
 
@@ -363,8 +363,8 @@ 
 	 * @param array   $args
 	 * @deprecated since 0.20.0
 	 */
-	public static function add_route( $route, $callback, $args = array() ) {
-		Routes::map( $route, $callback, $args );
+	public static function add_route($route, $callback, $args = array()) {
+		Routes::map($route, $callback, $args);
 	}
 
 	/**
@@ -372,8 +372,8 @@ 
 	 *
 	 * @deprecated since 0.20.0
 	 */
-	public static function load_template( $template, $query = false, $status_code = 200, $tparams = false ) {
-		return Routes::load( $template, $tparams, $query, $status_code );
+	public static function load_template($template, $query = false, $status_code = 200, $tparams = false) {
+		return Routes::load($template, $tparams, $query, $status_code);
 	}
 
 	/**
@@ -381,8 +381,8 @@ 
 	 *
 	 * @deprecated since 0.20.2
 	 */
-	public static function load_view( $template, $query = false, $status_code = 200, $tparams = false ) {
-		return Routes::load( $template, $tparams, $query, $status_code );
+	public static function load_view($template, $query = false, $status_code = 200, $tparams = false) {
+		return Routes::load($template, $tparams, $query, $status_code);
 	}
 
 
@@ -395,43 +395,43 @@ 
 	 * @param array   $prefs
 	 * @return array mixed
 	 */
-	public static function get_pagination( $prefs = array() ) {
+	public static function get_pagination($prefs = array()) {
 		global $wp_query;
 		global $paged;
 		global $wp_rewrite;
 		$args = array();
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
 		if ( $wp_rewrite->using_permalinks() ) {
-			$url = explode( '?', get_pagenum_link( 0 ) );
-			if ( isset( $url[1] ) ) {
-				parse_str( $url[1], $query );
+			$url = explode('?', get_pagenum_link(0));
+			if ( isset($url[1]) ) {
+				parse_str($url[1], $query);
 				$args['add_args'] = $query;
 			}
 			$args['format'] = 'page/%#%';
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
+			$args['base'] = trailingslashit($url[0]) . '%_%';
 		} else {
 			$big = 999999999;
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
 		}
 		$args['type'] = 'array';
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
-		if ( is_int( $prefs ) ) {
+		$args['current'] = max(1, get_query_var('paged'));
+		$args['mid_size'] = max(9 - $args['current'], 3);
+		if ( is_int($prefs) ) {
 			$args['mid_size'] = $prefs - 2;
 		} else {
-			$args = array_merge( $args, $prefs );
+			$args = array_merge($args, $prefs);
 		}
 		$data = array();
 		$data['current'] = $args['current'];
 		$data['total'] = $args['total'];
-		$data['pages'] = TimberHelper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
+		$data['pages'] = TimberHelper::paginate_links($args);
+		$next = get_next_posts_page_link($args['total']);
 		if ( $next ) {
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
 		}
-		$prev = previous_posts( false );
+		$prev = previous_posts(false);
 		if ( $prev ) {
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
 		}
 		if ( $paged < 2 ) {
 			$data['prev'] = '';
@@ -447,10 +447,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_calling_script_dir( $offset = 0 ) {
-		$caller = self::get_calling_script_file( $offset );
-		if ( !is_null( $caller ) ) {
-			$pathinfo = pathinfo( $caller );
+	public static function get_calling_script_dir($offset = 0) {
+		$caller = self::get_calling_script_file($offset);
+		if ( !is_null($caller) ) {
+			$pathinfo = pathinfo($caller);
 			$dir = $pathinfo['dirname'];
 			return $dir;
 		}
@@ -463,11 +463,11 @@ 
 	 * @return string|null
 	 * @deprecated since 0.20.0
 	 */
-	public static function get_calling_script_file( $offset = 0 ) {
+	public static function get_calling_script_file($offset = 0) {
 		$caller = null;
 		$backtrace = debug_backtrace();
 		$i = 0;
-		foreach ( $backtrace as $trace ) {
+		foreach ($backtrace as $trace) {
 			if ( array_key_exists('file', $trace) && $trace['file'] != __FILE__ ) {
 				$caller = $trace['file'];
 				break;

lib/timber-post.php

Spacing +68 added lines, -68 removed lines

@@ -162,7 +162,7 @@ 
 	 * @param mixed $pid
 	 */
 	public function __construct($pid = null) {
-		$pid = $this->determine_id( $pid );
+		$pid = $this->determine_id($pid);
 		$this->init($pid);
 	}
 
@@ -181,18 +181,18 @@ 
 			&& is_object($wp_query->queried_object)
 			&& get_class($wp_query->queried_object) == 'WP_Post'
 			) {
-				if( isset( $_GET['preview'] ) && isset( $_GET['preview_nonce'] ) && wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $wp_query->queried_object_id ) ) {
-					$pid = $this->get_post_preview_id( $wp_query );
+				if ( isset($_GET['preview']) && isset($_GET['preview_nonce']) && wp_verify_nonce($_GET['preview_nonce'], 'post_preview_' . $wp_query->queried_object_id) ) {
+					$pid = $this->get_post_preview_id($wp_query);
 				} else if ( !$pid ) {
 					$pid = $wp_query->queried_object_id;
 				}
-		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id )  {
+		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id ) {
 			//hack for static page as home page
 			$pid = $wp_query->queried_object_id;
 		} else if ( $pid === null ) {
 			$gtid = false;
 			$maybe_post = get_post();
-			if ( isset($maybe_post->ID) ){
+			if ( isset($maybe_post->ID) ) {
 				$gtid = true;
 			}
 			if ( $gtid ) {
@@ -219,7 +219,7 @@ 
 		return $this->title();
 	}
 
-	protected function get_post_preview_id( $query ) {
+	protected function get_post_preview_id($query) {
 		$can = array(
 	 		'edit_' . $query->queried_object->post_type . 's',
 	 	);
@@ -230,19 +230,19 @@ 
 
 	 	$can_preview = array();
 
-		foreach( $can as $type ) {
-		     if( current_user_can( $type ) ) {
+		foreach ($can as $type) {
+		     if ( current_user_can($type) ) {
 		        $can_preview[] = true;
 		     }
 		}
 
-		if ( count( $can_preview ) !== count( $can ) ) {
+		if ( count($can_preview) !== count($can) ) {
 		     return;
 		}
 
-		$revisions = wp_get_post_revisions( $query->queried_object_id );
+		$revisions = wp_get_post_revisions($query->queried_object_id);
 
-		if( !empty( $revisions ) ) {
+		if ( !empty($revisions) ) {
 			$last = end($revisions);
 			return $last->ID;
 		}
@@ -286,7 +286,7 @@ 
 	 * @param string $field
 	 * @param mixed $value
 	 */
-	public function update( $field, $value ) {
+	public function update($field, $value) {
 		if ( isset($this->ID) ) {
 			update_post_meta($this->ID, $field, $value);
 			$this->$field = $value;
@@ -301,7 +301,7 @@ 
 	 * @param mixed $pid
 	 * @return WP_Post on success
 	 */
-	protected function prepare_post_info( $pid = 0 ) {
+	protected function prepare_post_info($pid = 0) {
 		if ( is_string($pid) || is_numeric($pid) || (is_object($pid) && !isset($pid->post_title)) || $pid === 0 ) {
 			$pid = self::check_post_id($pid);
 			$post = get_post($pid);
@@ -320,7 +320,7 @@ 
 	 * @internal
 	 * @return integer ID number of a post
 	 */
-	protected function check_post_id( $pid ) {
+	protected function check_post_id($pid) {
 		if ( is_numeric($pid) && $pid === 0 ) {
 			$pid = get_the_ID();
 			return $pid;
@@ -346,7 +346,7 @@ 
 		global $wpdb;
 		$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $post_name);
 		$result = $wpdb->get_row($query);
-		if (!$result) {
+		if ( !$result ) {
 			return null;
 		}
 		return $result->ID;
@@ -386,7 +386,7 @@ 
 				$text = TimberHelper::trim_words($text, $len, false);
 				$trimmed = true;
 			}
-			$text = do_shortcode( $text );
+			$text = do_shortcode($text);
 		}
 		if ( !strlen($text) ) {
 			$text = TimberHelper::trim_words($this->get_content(), $len, false);
@@ -416,11 +416,11 @@ 
 			}
 			$read_more_class = apply_filters('timber/post/get_preview/read_more_class', "read-more");
 			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore_matches[1]) . '</a>';
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore_matches[1]) . '</a>';
 			} elseif ( $readmore ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore) . '</a>';
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore) . '</a>';
 			}
-			if ( !$strip && $last_p_tag && ( strpos($text, '<p>') || strpos($text, '<p ') ) ) {
+			if ( !$strip && $last_p_tag && (strpos($text, '<p>') || strpos($text, '<p ')) ) {
 				$text .= '</p>';
 			}
 		}
@@ -432,7 +432,7 @@ 
 	 * @internal
 	 * @param bool|int $pid a post ID number
 	 */
-	function import_custom( $pid = false ) {
+	function import_custom($pid = false) {
 		if ( !$pid ) {
 			$pid = $this->ID;
 		}
@@ -447,13 +447,13 @@ 
 	 * @param int $pid
 	 * @return array
 	 */
-	protected function get_post_custom( $pid ) {
+	protected function get_post_custom($pid) {
 		apply_filters('timber_post_get_meta_pre', array(), $pid, $this);
 		$customs = get_post_custom($pid);
 		if ( !is_array($customs) || empty($customs) ) {
 			return array();
 		}
-		foreach ( $customs as $key => $value ) {
+		foreach ($customs as $key => $value) {
 			if ( is_array($value) && count($value) == 1 && isset($value[0]) ) {
 				$value = $value[0];
 			}
@@ -507,7 +507,7 @@ 
 	 * @param bool $taxonomy
 	 * @return TimberPost|boolean
 	 */
-	function get_next( $taxonomy = false ) {
+	function get_next($taxonomy = false) {
 		if ( !isset($this->_next) || !isset($this->_next[$taxonomy]) ) {
 			global $post;
 			$this->_next = array();
@@ -538,7 +538,7 @@ 
 		$post = $this;
 		$ret = array();
 		if ( $multipage ) {
-			for ( $i = 1; $i <= $numpages; $i++ ) {
+			for ($i = 1; $i <= $numpages; $i++) {
 				$link = self::get_wp_link_page($i);
 				$data = array('name' => $i, 'title' => $i, 'text' => $i, 'link' => $link);
 				if ( $i == $page ) {
@@ -590,7 +590,7 @@ 
 	 * @param bool $taxonomy
 	 * @return TimberPost|boolean
 	 */
-	function get_prev( $taxonomy = false ) {
+	function get_prev($taxonomy = false) {
 		if ( isset($this->_prev) && isset($this->_prev[$taxonomy]) ) {
 			return $this->_prev[$taxonomy];
 		}
@@ -657,7 +657,7 @@ 
 		$post->slug = $post->post_name;
 		$customs = $this->get_post_custom($post->ID);
 		$post->custom = $customs;
-		$post = (object) array_merge((array)$customs, (array)$post);
+		$post = (object) array_merge((array) $customs, (array) $post);
 		return $post;
 	}
 
@@ -667,9 +667,9 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	function get_date( $date_format = '' ) {
+	function get_date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->post_date);
+		$the_date = (string) mysql2date($df, $this->post_date);
 		return apply_filters('get_the_date', $the_date, $df);
 	}
 
@@ -678,7 +678,7 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	function get_modified_date( $date_format = '' ) {
+	function get_modified_date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
 		$the_time = $this->get_modified_time($df);
 		return apply_filters('get_the_modified_date', $the_time, $date_format);
@@ -689,7 +689,7 @@ 
 	 * @param  string $time_format
 	 * @return string
 	 */
-	function get_modified_time( $time_format = '' ) {
+	function get_modified_time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
 		$the_time = get_post_modified_time($tf, false, $this->ID, true);
 		return apply_filters('get_the_modified_time', $the_time, $time_format);
@@ -702,7 +702,7 @@ 
 	 * @param bool|string 	$childPostClass
 	 * @return array
 	 */
-	function get_children( $post_type = 'any', $childPostClass = false ) {
+	function get_children($post_type = 'any', $childPostClass = false) {
 		if ( $childPostClass === false ) {
 			$childPostClass = $this->PostClass;
 		}
@@ -710,7 +710,7 @@ 
 			$post_type = $this->post_type;
 		}
 		$children = get_children('post_parent=' . $this->ID . '&post_type=' . $post_type . '&numberposts=-1&orderby=menu_order title&order=ASC&post_status=publish');
-		foreach ( $children as &$child ) {
+		foreach ($children as &$child) {
 			$child = new $childPostClass($child->ID);
 		}
 		$children = array_values($children);
@@ -747,42 +747,42 @@ 
 		}
 
 		if ( $user_ID ) {
-			$args['include_unapproved'] = array( $user_ID );
-		} elseif ( ! empty( $comment_author_email ) ) {
-			$args['include_unapproved'] = array( $comment_author_email );
+			$args['include_unapproved'] = array($user_ID);
+		} elseif ( !empty($comment_author_email) ) {
+			$args['include_unapproved'] = array($comment_author_email);
 		}
 
 		$comments = get_comments($args);
 		$timber_comments = array();
 
 		if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
-			set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+			set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 			$overridden_cpage = true;
 		}
 
-		foreach($comments as $key => &$comment) {
+		foreach ($comments as $key => &$comment) {
 			$timber_comment = new $CommentClass($comment);
 			$timber_comments[$timber_comment->id] = $timber_comment;
 		}
 
 		// Build a flattened (depth=1) comment tree
 		$comments_tree = array();
-		foreach( $timber_comments as $key => $comment ) {
-			if ( ! $comment->is_child() ) {
+		foreach ($timber_comments as $key => $comment) {
+			if ( !$comment->is_child() ) {
 				continue;
 			}
 
 			$tree_element = $comment;
 			do {
 				$tree_element = $timber_comments[$tree_element->comment_parent];
-			} while( $tree_element->is_child() );
+			} while ($tree_element->is_child());
 
 			$comments_tree[$tree_element->id][] = $comment->id;
 		}
 
 		// Add child comments to the relative "super parents"
-		foreach($comments_tree as $comment_parent => $comment_children) {
-			foreach($comment_children as $comment_child) {
+		foreach ($comments_tree as $comment_parent => $comment_children) {
+			foreach ($comment_children as $comment_child) {
 				$timber_comments[$comment_parent]->children[] = $timber_comments[$comment_child];
 				unset($timber_comments[$comment_child]);
 			}
@@ -822,7 +822,7 @@ 
 	 * @param string $TermClass
 	 * @return array
 	 */
-	function get_terms( $tax = '', $merge = true, $TermClass = '' ) {
+	function get_terms($tax = '', $merge = true, $TermClass = '') {
 
 		$TermClass = $TermClass ?: $this->TermClass;
 
@@ -833,7 +833,7 @@ 
 			$taxonomies = $tax;
 		}
 		if ( is_string($tax) ) {
-			if ( in_array($tax, array('all','any','')) ) {
+			if ( in_array($tax, array('all', 'any', '')) ) {
 				$taxonomies = get_object_taxonomies($this->post_type);
 			} else {
 				$taxonomies = array($tax);
@@ -842,8 +842,8 @@ 
 
 		$term_class_objects = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( in_array($taxonomy, array('tag','tags')) ) {
+		foreach ($taxonomies as $taxonomy) {
+			if ( in_array($taxonomy, array('tag', 'tags')) ) {
 				$taxonomy = 'post_tag';
 			}
 			if ( $taxonomy == 'categories' ) {
@@ -880,11 +880,11 @@ 
 	 * @param string $taxonomy
 	 * @return bool
 	 */
-	function has_term( $term_name_or_id, $taxonomy = 'all' ) {
+	function has_term($term_name_or_id, $taxonomy = 'all') {
 		if ( $taxonomy == 'all' || $taxonomy == 'any' ) {
 			$taxes = get_object_taxonomies($this->post_type, 'names');
 			$ret = false;
-			foreach ( $taxes as $tax ) {
+			foreach ($taxes as $tax) {
 				if ( has_term($term_name_or_id, $tax, $this->ID) ) {
 					$ret = true;
 					break;
@@ -899,7 +899,7 @@ 
 	 * @param string $field
 	 * @return TimberImage
 	 */
-	function get_image( $field ) {
+	function get_image($field) {
 		return new $this->ImageClass($this->$field);
 	}
 
@@ -949,7 +949,7 @@ 
 	 * @param int $page
 	 * @return string
 	 */
-	function get_content( $len = 0, $page = 0 ) {
+	function get_content($len = 0, $page = 0) {
 		if ( $len == 0 && $page == 0 && $this->_content ) {
 			return $this->_content;
 		}
@@ -1006,7 +1006,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function get_field( $field_name ) {
+	public function get_field($field_name) {
 		$value = apply_filters('timber_post_get_meta_field_pre', null, $this->ID, $field_name, $this);
 		if ( $value === null ) {
 			$value = get_post_meta($this->ID, $field_name);
@@ -1024,7 +1024,7 @@ 
 	/**
 	 * @param string $field_name
 	 */
-	function import_field( $field_name ) {
+	function import_field($field_name) {
 		$this->$field_name = $this->get_field($field_name);
 	}
 
@@ -1055,13 +1055,13 @@ 
 	 * ```
 	 * @return string a space-seperated list of classes
 	 */
-	public function post_class( $class='' ) {
+	public function post_class($class = '') {
 		global $post;
 		$old_global_post = $post;
 		$post = $this;
 		$class_array = get_post_class($class, $this->ID);
 		$post = $old_global_post;
-		if ( is_array($class_array) ){
+		if ( is_array($class_array) ) {
 			return implode(' ', $class_array);
 		}
 		return $class_array;
@@ -1163,8 +1163,8 @@ 
 	 * @param string|bool $childPostClass _optional_ a custom post class (ex: 'MyTimberPost') to return the objects as. By default (false) it will use TimberPost::$post_class value.
 	 * @return array
 	 */
-	public function children( $post_type = 'any', $childPostClass = false ) {
-		return $this->get_children( $post_type, $childPostClass );
+	public function children($post_type = 'any', $childPostClass = false) {
+		return $this->get_children($post_type, $childPostClass);
 	}
 
 	/**
@@ -1188,7 +1188,7 @@ 
 	 * ```
 	 * @return bool|array
 	 */
-	public function comments( $count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment' ) {
+	public function comments($count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment') {
 		return $this->get_comments($count, $order, $type, $status, $CommentClass);
 	}
 
@@ -1205,7 +1205,7 @@ 
 	 * @param int $page
 	 * @return string
 	 */
-	public function content( $page = 0 ) {
+	public function content($page = 0) {
 		return $this->get_content(0, $page);
 	}
 
@@ -1234,7 +1234,7 @@ 
 	 * @param string $date_format
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	public function date($date_format = '') {
 		return $this->get_date($date_format);
 	}
 
@@ -1256,9 +1256,9 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function time( $time_format = '' ) {
+	public function time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
-	 	$the_time = (string)mysql2date($tf, $this->post_date);
+	 	$the_time = (string) mysql2date($tf, $this->post_date);
 	 	return apply_filters('get_the_time', $the_time, $tf);
 	}
 
@@ -1294,7 +1294,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function meta( $field_name = null ) {
+	public function meta($field_name = null) {
 		if ( $field_name === null ) {
 			//on the off-chance the field is actually named meta
 			$field_name = 'meta';
@@ -1305,7 +1305,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		return $this->title();
 	}
 
@@ -1313,7 +1313,7 @@ 
 	 * @param string $date_format
 	 * @return string
 	 */
-	public function modified_date( $date_format = '' ) {
+	public function modified_date($date_format = '') {
 		return $this->get_modified_date($date_format);
 	}
 
@@ -1321,7 +1321,7 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function modified_time( $time_format = '' ) {
+	public function modified_time($time_format = '') {
 		return $this->get_modified_time($time_format);
 	}
 
@@ -1330,7 +1330,7 @@ 
 	 * @param bool $in_same_cat
 	 * @return mixed
 	 */
-	public function next( $in_same_cat = false ) {
+	public function next($in_same_cat = false) {
 		return $this->get_next($in_same_cat);
 	}
 
@@ -1388,7 +1388,7 @@ 
 	 * @param bool $in_same_cat
 	 * @return mixed
 	 */
-	public function prev( $in_same_cat = false ) {
+	public function prev($in_same_cat = false) {
 		return $this->get_prev($in_same_cat);
 	}
 
@@ -1400,7 +1400,7 @@ 
 	 * @param bool $merge Should the resulting array be one big one (true)? Or should it be an array of sub-arrays for each taxonomy (false)?
 	 * @return array
 	 */
-	public function terms( $tax = '', $merge = true ) {
+	public function terms($tax = '', $merge = true) {
 		return $this->get_terms($tax, $merge);
 	}