jarednova / timber

lib/timber-twig.php

Spacing +130 added lines, -130 removed lines

@@ -15,8 +15,8 @@ 
 	 * @codeCoverageIgnore
 	 */
 	function __construct() {
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters_deprecated' ) );
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters' ) );
+		add_action('timber/twig/filters', array($this, 'add_timber_filters_deprecated'));
+		add_action('timber/twig/filters', array($this, 'add_timber_filters'));
 	}
 
 	/**
@@ -27,13 +27,13 @@ 
 	 * @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 = ' '){
+		$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;
 	}
 
@@ -45,149 +45,149 @@ 
 	 */
 	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' ) ) );
+		$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>';
-				} ) );
+		$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 );
-				} ) );
+		$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 ) {
+		$twig->addFunction(new Twig_SimpleFunction('action', function( $context ) {
 					$args = func_get_args();
-					array_shift( $args );
+					array_shift($args);
 					$args[] = $context;
-					call_user_func_array( 'do_action', $args );
-				}, array( 'needs_context' => true ) ) );
+					call_user_func_array('do_action', $args);
+				}, array('needs_context' => true)));
 
-		$twig->addFilter( new Twig_SimpleFilter( 'apply_filters', function () {
+		$twig->addFilter(new Twig_SimpleFilter('apply_filters', function() {
 					$args = func_get_args();
-					$tag = current( array_splice( $args, 1, 1 ) );
+					$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' ) ) );
+					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' ) );
+		$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 ) ) {
+		$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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+					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 );
+							$p = new $UserClass($p);
 						}
 						return $pid;
 					}
-					return new $UserClass( $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 ) ) {
+		$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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+					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 );
+							$p = new $UserClass($p);
 						}
 						return $pid;
 					}
-					return new $UserClass( $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 );
-				} ) );
+		$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 );
+		$twig = apply_filters('get_twig', $twig);
+		$twig = apply_filters('timber/twig', $twig);
 		return $twig;
 	}
 
@@ -198,10 +198,10 @@ 
 	 * @return array
 	 */
 	function to_array( $arr ) {
-		if ( is_array( $arr ) ) {
+		if ( is_array($arr) ) {
 			return $arr;
 		}
-		$arr = array( $arr );
+		$arr = array($arr);
 		return $arr;
 	}
 
@@ -213,11 +213,11 @@ 
 	 */
 	function exec_function( $function_name ) {
 		$args = func_get_args();
-		array_shift( $args );
+		array_shift($args);
 		if ( is_string($function_name) ) {
-			$function_name = trim( $function_name );
+			$function_name = trim($function_name);
 		}
-		return call_user_func_array( $function_name, ( $args ) );
+		return call_user_func_array($function_name, ($args));
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 * @return string
 	 */
 	function twig_pretags( $content ) {
-		return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
+		return preg_replace_callback('|<pre.*>(.*)</pre|isU', array(&$this, 'convert_pre_entities'), $content);
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 * @return string
 	 */
 	function convert_pre_entities( $matches ) {
-		return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
+		return str_replace($matches[1], htmlentities($matches[1]), $matches[0]);
 	}
 
 	/**
@@ -247,10 +247,10 @@ 
 	 */
 	function body_class( $body_classes ) {
 		ob_start();
-		if ( is_array( $body_classes ) ) {
-			$body_classes = explode( ' ', $body_classes );
+		if ( is_array($body_classes) ) {
+			$body_classes = explode(' ', $body_classes);
 		}
-		body_class( $body_classes );
+		body_class($body_classes);
 		$return = ob_get_contents();
 		ob_end_clean();
 		return $return;
@@ -265,18 +265,18 @@ 
 	 */
 	function intl_date( $date, $format = null ) {
 		if ( $format === null ) {
-			$format = get_option( 'date_format' );
+			$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 if ( is_numeric($date) && strtotime($date) === false ) {
+			$timestamp = intval($date);
 		} else {
-			$timestamp = strtotime( $date );
+			$timestamp = strtotime($date);
 		}
 
-		return date_i18n( $format, $timestamp );
+		return date_i18n($format, $timestamp);
 	}
 
 	//debug
@@ -290,16 +290,16 @@ 
 	 * @return string
 	 */
 	function object_docs( $obj, $methods = true ) {
-		$class = get_class( $obj );
-		$properties = (array)$obj;
+		$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 );
+		$rets = array_merge($properties, $methods);
+		ksort($rets);
+		$str = print_r($rets, true);
+		$str = str_replace('Array', $class . ' Object', $str);
 		return $str;
 	}
 
@@ -312,13 +312,13 @@ 
 	 */
 	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 );
+		$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 ) );
+			return sprintf($format_past, human_time_diff($from, $to));
 		} else {
-			return sprintf( $format_future, human_time_diff( $to, $from ) );
+			return sprintf($format_future, human_time_diff($to, $from));
 		}
 	}
 
@@ -329,17 +329,17 @@ 
 	 * @return string
 	 */
 	function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
-		$length = count( $arr );
+		$length = count($arr);
 		$list = '';
-		foreach( $arr as $index => $item ) {
+		foreach ( $arr as $index => $item ) {
 			if ( $index < $length - 2 ) {
-				$delimiter = $first_delimiter.' ';
+				$delimiter = $first_delimiter . ' ';
 			} elseif ( $index == $length - 2 ) {
-				$delimiter = ' '.$second_delimiter.' ';
+				$delimiter = ' ' . $second_delimiter . ' ';
 			} else {
 				$delimiter = '';
 			}
-			$list = $list.$item.$delimiter;
+			$list = $list . $item . $delimiter;
 		}
 		return $list;
 	}

lib/timber-comment.php

Spacing +37 added lines, -37 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * @param int $cid
 	 */
-	function __construct($cid) {
+	function __construct( $cid ) {
 		$this->init($cid);
 	}
 
@@ -52,9 +52,9 @@ 
 	 * @internal
 	 * @param integer $cid
 	 */
-	function init($cid) {
+	function init( $cid ) {
 		$comment_data = $cid;
-		if (is_integer($cid)) {
+		if ( is_integer($cid) ) {
 			$comment_data = get_comment($cid);
 		}
 		$this->import($comment_data);
@@ -86,11 +86,11 @@ 
 	 * @return TimberUser
 	 */
 	public function author() {
-		if ($this->user_id) {
+		if ( $this->user_id ) {
 			return new TimberUser($this->user_id);
 		} else {
 			$author = new TimberUser(0);
-			if (isset($this->comment_author) && $this->comment_author) {
+			if ( isset($this->comment_author) && $this->comment_author ) {
 				$author->name = $this->comment_author;
 			} else {
 				$author->name = 'Anonymous';
@@ -113,22 +113,22 @@ 
 	 * @param string $default
 	 * @return bool|mixed|string
 	 */
-	public function avatar($size = 92, $default = '') {
-		if (!get_option('show_avatars')) {
+	public function avatar( $size = 92, $default = '' ) {
+		if ( !get_option('show_avatars') ) {
 			return false;
 		}
-		if (!is_numeric($size)) {
+		if ( !is_numeric($size) ) {
 			$size = '92';
 		}
 
 		$email = $this->avatar_email();
 		$email_hash = '';
-		if (!empty($email)) {
+		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)) {
+		if ( !empty($email) ) {
 			$avatar = $this->avatar_out($default, $host, $email_hash, $size);
 		} else {
 			$avatar = $default;
@@ -181,7 +181,7 @@ 
 	 */
 	public function date( $date_format = '' ) {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->comment_date);
+		$the_date = (string) mysql2date($df, $this->comment_date);
 		return apply_filters('get_comment_date ', $the_date, $df);
 	}
 
@@ -206,7 +206,7 @@ 
 	 */
 	public function time( $time_format = '' ) {
 		$tf = $time_format ? $time_format : get_option('time_format');
-		$the_time = (string)mysql2date($tf, $this->comment_date);
+		$the_time = (string) mysql2date($tf, $this->comment_date);
 		return apply_filters('get_comment_time', $the_time, $tf);
 	}
 
@@ -214,7 +214,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function meta($field_name) {
+	public function meta( $field_name ) {
 		return $this->get_meta_field($field_name);
 	}
 
@@ -231,15 +231,15 @@ 
 	 * @param int $comment_id
 	 * @return mixed
 	 */
-	protected function get_meta_fields($comment_id = null) {
-		if ($comment_id === null) {
+	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) {
+		foreach ( $comment_metas as &$cm ) {
+			if ( is_array($cm) && count($cm) == 1 ) {
 				$cm = $cm[0];
 			}
 		}
@@ -252,9 +252,9 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	protected function get_meta_field($field_name) {
+	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) {
+		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);
@@ -269,7 +269,7 @@ 
 	 */
 	public function reply_link( $reply_text = 'Reply' ) {
 		if ( is_singular() && comments_open() && get_option('thread_comments') ) {
-			wp_enqueue_script( 'comment-reply' );
+			wp_enqueue_script('comment-reply');
 		}
 
 		// Get the comments depth option from the admin panel
@@ -284,7 +284,7 @@ 
 			'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
@@ -295,9 +295,9 @@ 
 	 * @return string
 	 */
 	protected function avatar_email() {
-		$id = (int)$this->user_id;
+		$id = (int) $this->user_id;
 		$user = get_userdata($id);
-		if ($user) {
+		if ( $user ) {
 			$email = $user->user_email;
 		} else {
 			$email = $this->comment_author_email;
@@ -310,11 +310,11 @@ 
 	 * @param string $email_hash
 	 * @return string
 	 */
-	protected function avatar_host($email_hash) {
-		if (is_ssl()) {
+	protected function avatar_host( $email_hash ) {
+		if ( is_ssl() ) {
 			$host = 'https://secure.gravatar.com';
 		} else {
-			if (!empty($email_hash)) {
+			if ( !empty($email_hash) ) {
 				$host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
 			} else {
 				$host = 'http://0.gravatar.com';
@@ -332,29 +332,29 @@ 
 	 * @param string $host
 	 * @return string
 	 */
-	protected function avatar_default($default, $email, $size, $host) {
-		if (substr($default, 0, 1) == '/') {
+	protected function avatar_default( $default, $email, $size, $host ) {
+		if ( substr($default, 0, 1) == '/' ) {
 			$default = home_url() . $default;
 		}
 
-		if (empty($default)) {
+		if ( empty($default) ) {
 			$avatar_default = get_option('avatar_default');
-			if (empty($avatar_default)) {
+			if ( empty($avatar_default) ) {
 				$default = 'mystery';
 			} else {
 				$default = $avatar_default;
 			}
 		}
-		if ('mystery' == $default) {
+		if ( 'mystery' == $default ) {
 			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
 			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ('blank' == $default) {
+		} else if ( 'blank' == $default ) {
 			$default = $email ? 'blank' : includes_url('images/blank.gif');
-		} else if (!empty($email) && 'gravatar_default' == $default) {
+		} else if ( !empty($email) && 'gravatar_default' == $default ) {
 			$default = '';
-		} else if ('gravatar_default' == $default) {
+		} else if ( 'gravatar_default' == $default ) {
 			$default = $host . '/avatar/?s=' . $size;
-		} else if (empty($email) && !strstr($default, 'http://')) {
+		} else if ( empty($email) && !strstr($default, 'http://') ) {
 			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
 		}
 		return $default;
@@ -368,10 +368,10 @@ 
 	 * @param string $size
 	 * @return mixed
 	 */
-	protected function avatar_out($default, $host, $email_hash, $size) {
+	protected function avatar_out( $default, $host, $email_hash, $size ) {
 		$out = $host . '/avatar/' . $email_hash . '?s=' . $size . '&d=' . urlencode($default);
 		$rating = get_option('avatar_rating');
-		if (!empty($rating)) {
+		if ( !empty($rating) ) {
 			$out .= '&r=' . $rating;
 		}
 		return str_replace('&', '&', esc_url($out));

lib/timber-term-getter.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+	public static function get_terms( $args = null, $maybe_args = array(), $TermClass = 'TimberTerm' ) {
 		if ( is_string($maybe_args) && !strstr($maybe_args, '=') ) {
 			//the user is sending the $TermClass in the second argument
 			$TermClass = $maybe_args;
@@ -53,7 +53,7 @@ 
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function handle_term_query($taxonomies, $args, $TermClass) {
+	public static function handle_term_query( $taxonomies, $args, $TermClass ) {
 		if ( !isset($args['hide_empty']) ) {
 			$args['hide_empty'] = false;
 		}
@@ -64,7 +64,7 @@ 
 			$args['include'] = $args['term_id'];
 		}
 		$terms = get_terms($taxonomies, $args);
-		foreach ($terms as &$term) {
+		foreach ( $terms as &$term ) {
 			$term = new $TermClass($term->term_id, $term->taxonomy);
 		}
 		return $terms;
@@ -74,7 +74,7 @@ 
 	 * @param string $query_string
 	 * @return stdClass
 	 */
-	protected static function get_term_query_from_query_string($query_string) {
+	protected static function get_term_query_from_query_string( $query_string ) {
 		$args = array();
 		parse_str($query_string, $args);
 		$ret = self::get_term_query_from_assoc_array($args);
@@ -85,7 +85,7 @@ 
 	 * @param string $taxs
 	 * @return stdClass
 	 */
-	protected static function get_term_query_from_string($taxs) {
+	protected static function get_term_query_from_string( $taxs ) {
 		$ret = new stdClass();
 		$ret->args = array();
 		if ( is_string($taxs) ) {
@@ -99,7 +99,7 @@ 
 	 * @param array $args
 	 * @return stdClass
 	 */
-	public static function get_term_query_from_assoc_array($args) {
+	public static function get_term_query_from_assoc_array( $args ) {
 		$ret = new stdClass();
 		$ret->args = $args;
 		if ( isset($ret->args['tax']) ) {
@@ -126,7 +126,7 @@ 
 	 * @param array $args
 	 * @return stdClass
 	 */
-	public static function get_term_query_from_array($args) {
+	public static function get_term_query_from_array( $args ) {
 		if ( is_array($args) && !empty($args) ) {
 			//okay its an array with content
 			if ( is_int($args[0]) ) {
@@ -142,7 +142,7 @@ 
 	 * @param integer[] $args
 	 * @return stdClass
 	 */
-	public static function get_term_query_from_array_of_ids($args) {
+	public static function get_term_query_from_array_of_ids( $args ) {
 		$ret = new stdClass();
 		$ret->taxonomies = get_taxonomies();
 		$ret->args['include'] = $args;
@@ -153,7 +153,7 @@ 
 	 * @param string[] $args
 	 * @return stdClass
 	 */
-	public static function get_term_query_from_array_of_strings($args) {
+	public static function get_term_query_from_array_of_strings( $args ) {
 		$ret = new stdClass();
 		$ret->taxonomies = self::correct_taxonomy_names($args);
 		$ret->args = array();
@@ -164,11 +164,11 @@ 
 	 * @param string|array $taxs
 	 * @return array
 	 */
-	private static function correct_taxonomy_names($taxs) {
+	private static function correct_taxonomy_names( $taxs ) {
 		if ( is_string($taxs) ) {
 			$taxs = array($taxs);
 		}
-		foreach ($taxs as &$tax) {
+		foreach ( $taxs as &$tax ) {
 			if ( $tax == 'tags' || $tax == 'tag' ) {
 				$tax = 'post_tag';
 			} else if ( $tax == 'categories' ) {

lib/timber-user.php

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
 	/**
 	 * @param int|bool $uid
 	 */
-	function __construct($uid = false) {
+	function __construct( $uid = false ) {
 		$this->init($uid);
 	}
 
@@ -84,7 +84,7 @@ 
 	 * @param string $field_name
 	 * @return null
 	 */
-	function get_meta($field_name) {
+	function get_meta( $field_name ) {
 		return $this->get_meta_field($field_name);
 	}
 
@@ -93,7 +93,7 @@ 
 	 * @param string 	$field
 	 * @param mixed 	$value
 	 */
-	function __set($field, $value) {
+	function __set( $field, $value ) {
 		if ( $field == 'name' ) {
 			$this->display_name = $value;
 		}
@@ -104,7 +104,7 @@ 
 	 * @internal
 	 * @param int|bool $uid The user ID to use
 	 */
-	protected function init($uid = false) {
+	protected function init( $uid = false ) {
 		if ( $uid === false ) {
 			$uid = get_current_user_id();
 		}
@@ -137,7 +137,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	function get_meta_field($field_name) {
+	function get_meta_field( $field_name ) {
 		$value = null;
 		$value = apply_filters('timber_user_get_meta_field_pre', $value, $this->ID, $field_name, $this);
 		if ( $value === null ) {
@@ -158,7 +158,7 @@ 
 				$um = get_user_meta($this->ID);
 			}
 			$custom = array();
-			foreach ($um as $key => $value) {
+			foreach ( $um as $key => $value ) {
 				if ( is_array($value) && count($value) == 1 ) {
 					$value = $value[0];
 				}
@@ -193,7 +193,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	function meta($field_name) {
+	function meta( $field_name ) {
 		return $this->get_meta_field($field_name);
 	}
 

lib/cache/WPObjectCacheAdapter.php

Spacing +3 added lines, -3 removed lines

@@ -12,16 +12,16 @@
 	 */
 	private $timberloader;
 
-	public function __construct(TimberLoader $timberloader, $cache_group = 'timber') {
+	public function __construct( TimberLoader $timberloader, $cache_group = 'timber' ) {
 		$this->cache_group = $cache_group;
 		$this->timberloader = $timberloader;
 	}
 
-	public function fetch($key) {
+	public function fetch( $key ) {
 		return $this->timberloader->get_cache($key, $this->cache_group, TimberLoader::CACHE_USE_DEFAULT);
 	}
 
-	public function save($key, $value, $expire = 0) {
+	public function save( $key, $value, $expire = 0 ) {
 		return $this->timberloader->set_cache($key, $value, $this->cache_group, $expire, TimberLoader::CACHE_USE_DEFAULT);
 	}
 

lib/cache/KeyGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -10,17 +10,17 @@
 	 * @param mixed $value
 	 * @return string
 	 */
-	public function generateKey($value) {
-		if (is_a($value, 'TimberKeyGeneratorInterface')) {
+	public function generateKey( $value ) {
+		if ( is_a($value, 'TimberKeyGeneratorInterface') ) {
 			return $value->_get_cache_key();
 		}
 
-		if (is_array($value) && isset($value['_cache_key'])) {
+		if ( is_array($value) && isset($value['_cache_key']) ) {
 			return $value['_cache_key'];
 		}
 
 		$key = md5(json_encode($value));
-		if (is_object($value)) {
+		if ( is_object($value) ) {
 			$key = get_class($value) . '|' . $key;
 		}
 

lib/timber-theme.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
 	 * We are currently using the My Theme theme.
 	 * ```
 	 */
-	function __construct($slug = null) {
+	function __construct( $slug = null ) {
 		$this->init($slug);
 	}
 
@@ -70,13 +70,13 @@ 
 	 * @internal
 	 * @param string $slug
 	 */
-	protected function init($slug = null) {
+	protected function init( $slug = null ) {
 		$data = wp_get_theme($slug);
 		$this->name = $data->get('Name');
 		$ss = $data->get_stylesheet();
 		$this->slug = $ss;
 
-		if ( ! function_exists( 'get_home_path' ) ) {
+		if ( !function_exists('get_home_path') ) {
 			require_once(ABSPATH . 'wp-admin/includes/file.php');
 		}
 
@@ -103,7 +103,7 @@ 
 	 * @return  string the relative path to the theme (ex: `/wp-content/themes/my-timber-theme`)
 	 */
 	public function path() {
-		return TimberURLHelper::get_rel_url( $this->link() );
+		return TimberURLHelper::get_rel_url($this->link());
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @param bool $default
 	 * @return string
 	 */
-	public function theme_mod($name, $default = false) {
+	public function theme_mod( $name, $default = false ) {
 		return get_theme_mod($name, $default);
 	}