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-admin.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 class TimberAdmin {
 
     public static function init() {
-        return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
+        return add_filter('plugin_row_meta', array(__CLASS__, 'meta_links'), 10, 2);
     }
 
 	/**
@@ -12,7 +12,7 @@ 
 	 * @return array
 	 */
 	public static function meta_links( $links, $file ) {
-		if ( strstr( $file, '/timber.php' ) ) {
+		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>';

lib/timber-image.php

Spacing +22 added lines, -22 removed lines

@@ -88,7 +88,7 @@ 
 	 * ```
 	 * @param int|string $iid
 	 */
-	public function __construct($iid) {
+	public function __construct( $iid ) {
 		$this->init($iid);
 	}
 
@@ -115,7 +115,7 @@ 
 	 * @param string $dim
 	 * @return array|int
 	 */
-	protected function get_dimensions($dim = null) {
+	protected function get_dimensions( $dim = null ) {
 		if ( isset($this->_dimensions) ) {
 			return $this->get_dimensions_loaded($dim);
 		}
@@ -133,7 +133,7 @@ 
 	 * @param string|null $dim
 	 * @return array|int
 	 */
-	protected function get_dimensions_loaded($dim) {
+	protected function get_dimensions_loaded( $dim ) {
 		if ( $dim === null ) {
 			return $this->_dimensions;
 		}
@@ -152,25 +152,25 @@ 
 	 */
 	protected function get_image_info( $iid ) {
 		$image_info = $iid;
-		if (is_numeric($iid)) {
+		if ( is_numeric($iid) ) {
 			$image_info = wp_get_attachment_metadata($iid);
-			if (!is_array($image_info)) {
+			if ( !is_array($image_info) ) {
 				$image_info = array();
 			}
 			$image_custom = get_post_custom($iid);
 			$basic = get_post($iid);
-			if ($basic) {
-				if (isset($basic->post_excerpt)) {
+			if ( $basic ) {
+				if ( isset($basic->post_excerpt) ) {
 					$this->caption = $basic->post_excerpt;
 				}
 				$image_custom = array_merge($image_custom, get_object_vars($basic));
 			}
 			return array_merge($image_info, $image_custom);
 		}
-		if (is_array($image_info) && isset($image_info['image'])) {
+		if ( is_array($image_info) && isset($image_info['image']) ) {
 			return $image_info['image'];
 		}
-		if (is_object($image_info)) {
+		if ( is_object($image_info) ) {
 		   return get_object_vars($image_info);
 		}
 		return $iid;
@@ -181,7 +181,7 @@ 
 	 * @param  string $url for evaluation
 	 * @return string with http/https corrected depending on what's appropriate for server
 	 */
-	protected static function _maybe_secure_url($url) {
+	protected static function _maybe_secure_url( $url ) {
 		if ( is_ssl() && strpos($url, 'https') !== 0 && strpos($url, 'http') === 0 ) {
 			$url = 'https' . substr($url, strlen('http'));
 		}
@@ -203,8 +203,8 @@ 
 	 * @param int $iid
 	 */
 	function init( $iid = false ) {
-		if ( !is_numeric( $iid ) && is_string( $iid ) ) {
-			if (strstr($iid, '://')) {
+		if ( !is_numeric($iid) && is_string($iid) ) {
+			if ( strstr($iid, '://') ) {
 				$this->init_with_url($iid);
 				return;
 			}
@@ -215,15 +215,15 @@ 
 
 			$relative = false;
 			$iid_lower = strtolower($iid);
-			foreach( $this->file_types as $type ) { if( strstr( $iid_lower, $type ) ) { $relative = true; break; } };
+			foreach ( $this->file_types as $type ) { if ( strstr($iid_lower, $type) ) { $relative = true; break; } };
 			if ( $relative ) {
-				$this->init_with_relative_path( $iid );
+				$this->init_with_relative_path($iid);
 				return;
 			}
 		} else if ( $iid instanceof WP_Post ) {
 			$ref = new ReflectionClass($this);
 			$post = $ref->getParentClass()->newInstance($iid->ID);
-			if (isset($post->_thumbnail_id) && $post->_thumbnail_id) {
+			if ( isset($post->_thumbnail_id) && $post->_thumbnail_id ) {
 				return $this->init((int) $post->_thumbnail_id);
 			}
 			return $this->init($iid->ID);
@@ -254,7 +254,7 @@ 
 		}
 		if ( isset($this->ID) ) {
 			$custom = get_post_custom($this->ID);
-			foreach ($custom as $key => $value) {
+			foreach ( $custom as $key => $value ) {
 				$this->$key = $value[0];
 			}
 			$this->id = $this->ID;
@@ -273,8 +273,8 @@ 
 	 * @param string $relative_path
 	 */
 	protected function init_with_relative_path( $relative_path ) {
-		$this->abs_url = home_url( $relative_path );
-		$file_path = TimberURLHelper::get_full_path( $relative_path );
+		$this->abs_url = home_url($relative_path);
+		$file_path = TimberURLHelper::get_full_path($relative_path);
 		$this->file_loc = $file_path;
 		$this->file = $file_path;
 	}
@@ -284,7 +284,7 @@ 
 	 * @param string $file_path
 	 */
 	protected function init_with_file_path( $file_path ) {
-		$url = TimberURLHelper::file_system_to_url( $file_path );
+		$url = TimberURLHelper::file_system_to_url($file_path);
 		$this->abs_url = $url;
 		$this->file_loc = $file_path;
 		$this->file = $file_path;
@@ -294,7 +294,7 @@ 
 	 * @internal
 	 * @param string $url
 	 */
-	protected function init_with_url($url) {
+	protected function init_with_url( $url ) {
 		$this->abs_url = $url;
 		if ( TimberURLHelper::is_local($url) ) {
 			$this->file = ABSPATH . TimberURLHelper::get_rel_url($url);
@@ -409,7 +409,7 @@ 
 	 * ```
 	 * @return bool|string
 	 */
-	public function src($size = '') {
+	public function src( $size = '' ) {
 		if ( isset($this->abs_url) ) {
 			return $this->_maybe_secure_url($this->abs_url);
 		}
@@ -484,7 +484,7 @@ 
 	 * @return bool|string
 	 */
 	function get_src( $size = '' ) {
-		return $this->src( $size );
+		return $this->src($size);
 	}
 
 	/**

lib/timber-archives.php

Spacing +20 added lines, -20 removed lines

@@ -97,13 +97,13 @@ 
 		$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')) {
+		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 );
+		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);
 			}
@@ -137,28 +137,28 @@ 
 			. "ORDER BY post_date $order $limit";
 		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if (!$results = wp_cache_get($key, 'posts')) {
+		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 ( $results ) {
+			foreach ( (array) $results as $result ) {
 				$url = get_month_link($result->year, $result->month);
-				if ($show_year && !$nested) {
+				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) {
+				if ( $nested ) {
 					$output[$result->year][] = $this->get_archives_link($url, $text);
 				} else {
 					$output[] = $this->get_archives_link($url, $text);
 				}
 			}
 		}
-		if ($nested) {
+		if ( $nested ) {
 			$out2 = array();
-			foreach ($output as $year => $months) {
+			foreach ( $output as $year => $months ) {
 				$out2[] = array('name' => $year, 'children' => $months);
 			}
 			return $out2;
@@ -220,7 +220,7 @@ 
 		$archive_week_start_date_format = 'Y/m/d';
 		$archive_week_end_date_format = 'Y/m/d';
 
-		if (!$archive_date_format_over_ride) {
+		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');
@@ -232,7 +232,7 @@ 
 
 		$output = array();
 		$last_changed = wp_cache_get('last_changed', 'posts');
-		if (!$last_changed) {
+		if ( !$last_changed ) {
 			$last_changed = microtime();
 			wp_cache_set('last_changed', $last_changed, 'posts');
 		}
@@ -246,14 +246,14 @@ 
 			$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')) {
+			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 ) {
+				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);
@@ -266,13 +266,13 @@ 
 				. "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')) {
+			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 ) {
+				foreach ( (array) $results as $result ) {
 					if ( $result->week != $arc_w_last ) {
 						$arc_year = $result->yr;
 						$arc_w_last = $result->week;
@@ -295,10 +295,10 @@ 
 				wp_cache_set($key, $results, 'posts');
 			}
 			if ( $results ) {
-				foreach ( (array)$results as $result ) {
-					if ($result->post_date != '0000-00-00 00:00:00') {
+				foreach ( (array) $results as $result ) {
+					if ( $result->post_date != '0000-00-00 00:00:00' ) {
 						$url = get_permalink($result);
-						if ($result->post_title) {
+						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 {

lib/integrations/acf-timber.php

Spacing +17 added lines, -17 removed lines

@@ -3,12 +3,12 @@ 
 class ACFTimber {
 
     function __construct() {
-        add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 );
-        add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 );
-        add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 );
-        add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 );
+        add_filter('timber_post_get_meta', array($this, 'post_get_meta'), 10, 2);
+        add_filter('timber_post_get_meta_field', array($this, 'post_get_meta_field'), 10, 3);
+        add_filter('timber_term_get_meta', array($this, 'term_get_meta'), 10, 3);
+        add_filter('timber_term_get_meta_field', array($this, 'term_get_meta_field'), 10, 4);
+        add_filter('timber_user_get_meta_field_pre', array($this, 'user_get_meta_field'), 10, 3);
+        add_filter('timber_term_set_meta', array($this, 'term_set_meta'), 10, 4);
     }
 
     function post_get_meta( $customs, $post_id ) {
@@ -16,32 +16,32 @@ 
     }
 
     function post_get_meta_field( $value, $post_id, $field_name ) {
-        return get_field( $field_name, $post_id );
+        return get_field($field_name, $post_id);
     }
 
     function term_get_meta_field( $value, $term_id, $field_name, $term ) {
         $searcher = $term->taxonomy . "_" . $term->ID;
-        return get_field( $field_name, $searcher );
+        return get_field($field_name, $searcher);
     }
 
     function term_set_meta( $value, $field, $term_id, $term ) {
         $searcher = $term->taxonomy . "_" . $term->ID;
-        update_field( $field, $value, $searcher );
+        update_field($field, $value, $searcher);
         return $value;
     }
 
     function term_get_meta( $fields, $term_id, $term ) {
         $searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category
-        $fds = get_fields( $searcher );
-        if ( is_array( $fds ) ) {
+        $fds = get_fields($searcher);
+        if ( is_array($fds) ) {
             foreach ( $fds as $key => $value ) {
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $key = str_replace( $searcher, '', $key );
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $field = get_field( $key, $searcher );
+                $key = preg_replace('/_/', '', $key, 1);
+                $key = str_replace($searcher, '', $key);
+                $key = preg_replace('/_/', '', $key, 1);
+                $field = get_field($key, $searcher);
                 $fields[$key] = $field;
             }
-            $fields = array_merge( $fields, $fds );
+            $fields = array_merge($fields, $fds);
         }
         return $fields;
     }
@@ -51,7 +51,7 @@ 
     }
 
     function user_get_meta_field( $value, $uid, $field ) {
-        return get_field( $field, 'user_' . $uid );
+        return get_field($field, 'user_' . $uid);
     }
 }
 

lib/integrations/wpcli-timber.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!class_exists('WP_CLI_Command')) {
+if ( !class_exists('WP_CLI_Command') ) {
 	return;
 }
 
@@ -13,7 +13,7 @@ 
      *    wp timber clear_cache
      *
      */
-    public function clear_cache($mode = 'all') {
+    public function clear_cache( $mode = 'all' ) {
         TimberCommand::clear_cache($mode);
     }
 
@@ -25,9 +25,9 @@ 
      *    wp timber clear_cache_twig
      *
      */
-    function clear_cache_twig(){
+    function clear_cache_twig() {
         $clear = TimberCommand::clear_cache_twig();
-        if ($clear){
+        if ( $clear ) {
             WP_CLI::success('Cleared contents of twig cache');
         } else {
             WP_CLI::warning('Failed to clear twig cache');
@@ -45,7 +45,7 @@ 
     function clear_cache_timber() {
         $clear = TimberCommand::clear_cache_timber();
         $message = 'Failed to clear timber cache';
-        if ($clear){
+        if ( $clear ) {
             $message = "Cleared contents of Timber's Cache";
             WP_CLI::success($message);
         } else {

lib/integrations/timber-command.php

Spacing +8 added lines, -8 removed lines

@@ -6,29 +6,29 @@
  */
 class TimberCommand {
 
-    public static function clear_cache($mode = 'all'){
-        if (is_array($mode)){
+    public static function clear_cache( $mode = 'all' ) {
+        if ( is_array($mode) ) {
             $mode = reset($mode);
         }
-        if ($mode == 'all') {
+        if ( $mode == 'all' ) {
             $twig_cache = self::clear_cache_twig();
             $timber_cache = self::clear_cache_timber();
-            if ($twig_cache && $timber_cache){
+            if ( $twig_cache && $timber_cache ) {
                 return true;
             }
-        } else if ($mode == 'twig') {
+        } else if ( $mode == 'twig' ) {
             return self::clear_cache_twig();
-        } else if ($mode == 'timber') {
+        } else if ( $mode == 'timber' ) {
             return self::clear_cache_timber();
         }
     }
 
-    static function clear_cache_timber(){
+    static function clear_cache_timber() {
         $loader = new TimberLoader();
         return $loader->clear_cache_timber();
     }
 
-    static function clear_cache_twig(){
+    static function clear_cache_twig() {
         $loader = new TimberLoader();
         return $loader->clear_cache_twig();
     }

lib/timber-routes.php

Spacing +2 added lines, -2 removed lines

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

lib/timber-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));