jarednova / timber

lib/timber-theme.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 		$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());
 	}
 
 	/**

lib/timber-twig.php

Spacing +139 added lines, -139 removed lines

@@ -12,8 +12,8 @@ 
 	}
 
 	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'));
 	}
 
 	/**
@@ -23,14 +23,14 @@ 
 	 * @deprecated since 0.20.7
 	 * @return Twig_Environment
 	 */
-	function add_timber_filters_deprecated( $twig ) {
-		$twig->addFilter( new Twig_SimpleFilter( 'get_src_from_attachment_id', 'twig_get_src_from_attachment_id' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'wp_body_class', array( $this, 'body_class' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterify', array( 'TimberHelper', 'twitterify' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterfy', array( 'TimberHelper', 'twitterify' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'string', function($arr, $glue = ' '){
+	function add_timber_filters_deprecated($twig) {
+		$twig->addFilter(new Twig_SimpleFilter('get_src_from_attachment_id', 'twig_get_src_from_attachment_id'));
+		$twig->addFilter(new Twig_SimpleFilter('wp_body_class', array($this, 'body_class')));
+		$twig->addFilter(new Twig_SimpleFilter('twitterify', array('TimberHelper', 'twitterify')));
+		$twig->addFilter(new Twig_SimpleFilter('twitterfy', array('TimberHelper', 'twitterify')));
+		$twig->addFilter(new Twig_SimpleFilter('string', function($arr, $glue = ' ') {
 			return twig_join_filter($arr, $glue);
-		} ) );
+		} ));
 		return $twig;
 	}
 
@@ -40,150 +40,150 @@ 
 	 * @param Twig_Environment $twig
 	 * @return Twig_Environment
 	 */
-	function add_timber_filters( $twig ) {
+	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('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( 'relative', function ( $link ) {
-					return TimberURLHelper::get_rel_url( $link, true );
-				} ) );
+		$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('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('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 ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $PostClass( $p );
+		$twig->addFunction(new Twig_SimpleFunction('TimberPost', function($pid, $PostClass = 'TimberPost') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $PostClass($p);
 						}
 						return $pid;
 					}
-					return new $PostClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberImage', function ( $pid, $ImageClass = 'TimberImage' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $ImageClass( $p );
+					return new $PostClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberImage', function($pid, $ImageClass = 'TimberImage') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $ImageClass($p);
 						}
 						return $pid;
 					}
-					return new $ImageClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberTerm', function ( $pid, $TermClass = 'TimberTerm' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $TermClass( $p );
+					return new $ImageClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberTerm', function($pid, $TermClass = 'TimberTerm') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $TermClass($p);
 						}
 						return $pid;
 					}
-					return new $TermClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberUser', function ( $pid, $UserClass = 'TimberUser' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $UserClass( $p );
+					return new $TermClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberUser', function($pid, $UserClass = 'TimberUser') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $UserClass($p);
 						}
 						return $pid;
 					}
-					return new $UserClass( $pid );
-				} ) );
+					return new $UserClass($pid);
+				} ));
 
 		/* TimberObjects Alias */
-		$twig->addFunction( new Twig_SimpleFunction( 'Post', function ( $pid, $PostClass = 'TimberPost' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $PostClass( $p );
+		$twig->addFunction(new Twig_SimpleFunction('Post', function($pid, $PostClass = 'TimberPost') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $PostClass($p);
 						}
 						return $pid;
 					}
-					return new $PostClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'Image', function ( $pid, $ImageClass = 'TimberImage' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $ImageClass( $p );
+					return new $PostClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('Image', function($pid, $ImageClass = 'TimberImage') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $ImageClass($p);
 						}
 						return $pid;
 					}
-					return new $ImageClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'Term', function ( $pid, $TermClass = 'TimberTerm' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $TermClass( $p );
+					return new $ImageClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('Term', function($pid, $TermClass = 'TimberTerm') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $TermClass($p);
 						}
 						return $pid;
 					}
-					return new $TermClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'User', function ( $pid, $UserClass = 'TimberUser' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $UserClass( $p );
+					return new $TermClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('User', function($pid, $UserClass = 'TimberUser') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $UserClass($p);
 						}
 						return $pid;
 					}
-					return new $UserClass( $pid );
-				} ) );
+					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;
 	}
 
@@ -193,11 +193,11 @@ 
 	 * @param mixed   $arr
 	 * @return array
 	 */
-	function to_array( $arr ) {
-		if ( is_array( $arr ) ) {
+	function to_array($arr) {
+		if ( is_array($arr) ) {
 			return $arr;
 		}
-		$arr = array( $arr );
+		$arr = array($arr);
 		return $arr;
 	}
 
@@ -207,13 +207,13 @@ 
 	 * @param string  $function_name
 	 * @return mixed
 	 */
-	function exec_function( $function_name ) {
+	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));
 	}
 
 	/**
@@ -222,8 +222,8 @@ 
 	 * @param string  $content
 	 * @return string
 	 */
-	function twig_pretags( $content ) {
-		return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
+	function twig_pretags($content) {
+		return preg_replace_callback('|<pre.*>(.*)</pre|isU', array(&$this, 'convert_pre_entities'), $content);
 	}
 
 	/**
@@ -232,8 +232,8 @@ 
 	 * @param array   $matches
 	 * @return string
 	 */
-	function convert_pre_entities( $matches ) {
-		return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
+	function convert_pre_entities($matches) {
+		return str_replace($matches[1], htmlentities($matches[1]), $matches[0]);
 	}
 
 	/**
@@ -241,12 +241,12 @@ 
 	 * @deprecated 0.20.7
 	 * @return string
 	 */
-	function body_class( $body_classes ) {
+	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;
@@ -259,20 +259,20 @@ 
 	 * @param string  $format (optional)
 	 * @return string
 	 */
-	function intl_date( $date, $format = null ) {
+	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();
-		} 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
@@ -284,17 +284,17 @@ 
 	 * @param bool    $methods
 	 * @return string
 	 */
-	function object_docs( $obj, $methods = true ) {
-		$class = get_class( $obj );
-		$properties = (array)$obj;
+	function object_docs($obj, $methods = true) {
+		$class = get_class($obj);
+		$properties = (array) $obj;
 		if ( $methods ) {
 			/** @var array $methods */
 			$methods = $obj->get_method_values();
 		}
-		$rets = array_merge( $properties, $methods );
-		ksort( $rets );
-		$str = print_r( $rets, true );
-		$str = str_replace( 'Array', $class . ' Object', $str );
+		$rets = array_merge($properties, $methods);
+		ksort($rets);
+		$str = print_r($rets, true);
+		$str = str_replace('Array', $class . ' Object', $str);
 		return $str;
 	}
 
@@ -305,15 +305,15 @@ 
 	 * @param string $format_future
 	 * @return string
 	 */
-	function time_ago( $from, $to = null, $format_past = '%s ago', $format_future = '%s from now' ) {
+	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));
 		}
 	}
 

lib/timber-url-helper.php

Spacing +72 added lines, -72 removed lines

@@ -9,8 +9,8 @@ 
 	 */
 	public static function get_current_url() {
 		$pageURL = "http://";
-		if ( isset( $_SERVER['HTTPS'] ) && $_SERVER["HTTPS"] == "on" ) {
-			$pageURL = "https://";;
+		if ( isset($_SERVER['HTTPS']) && $_SERVER["HTTPS"] == "on" ) {
+			$pageURL = "https://"; ;
 		}
 		if ( isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] && $_SERVER["SERVER_PORT"] != "80" ) {
 			$pageURL .= self::get_host() . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
@@ -26,12 +26,12 @@ 
 	 * @param string  $url
 	 * @return bool
 	 */
-	public static function is_url( $url ) {
-		if ( !is_string( $url ) ) {
+	public static function is_url($url) {
+		if ( !is_string($url) ) {
 			return false;
 		}
-		$url = strtolower( $url );
-		if ( strstr( $url, '://' ) ) {
+		$url = strtolower($url);
+		if ( strstr($url, '://') ) {
 			return true;
 		}
 		return false;
@@ -43,11 +43,11 @@ 
 	 * @return string
 	 */
 	public static function get_path_base() {
-		$struc = get_option( 'permalink_structure' );
-		$struc = explode( '/', $struc );
+		$struc = get_option('permalink_structure');
+		$struc = explode('/', $struc);
 		$p = '/';
-		foreach ( $struc as $s ) {
-			if ( !strstr( $s, '%' ) && strlen( $s ) ) {
+		foreach ($struc as $s) {
+			if ( !strstr($s, '%') && strlen($s) ) {
 				$p .= $s . '/';
 			}
 		}
@@ -61,22 +61,22 @@ 
 	 * @param bool    $force
 	 * @return string
 	 */
-	public static function get_rel_url( $url, $force = false ) {
-		$url_info = parse_url( $url );
-		if ( isset( $url_info['host'] ) && $url_info['host'] != self::get_host() && !$force ) {
+	public static function get_rel_url($url, $force = false) {
+		$url_info = parse_url($url);
+		if ( isset($url_info['host']) && $url_info['host'] != self::get_host() && !$force ) {
 			return $url;
 		}
 		$link = '';
-		if ( isset( $url_info['path'] ) ) {
+		if ( isset($url_info['path']) ) {
 			$link = $url_info['path'];
 		}
-		if ( isset( $url_info['query'] ) && strlen( $url_info['query'] ) ) {
+		if ( isset($url_info['query']) && strlen($url_info['query']) ) {
 			$link .= '?' . $url_info['query'];
 		}
-		if ( isset( $url_info['fragment'] ) && strlen( $url_info['fragment'] ) ) {
+		if ( isset($url_info['fragment']) && strlen($url_info['fragment']) ) {
 			$link .= '#' . $url_info['fragment'];
 		}
-		$link = TimberURLHelper::remove_double_slashes( $link );
+		$link = TimberURLHelper::remove_double_slashes($link);
 		return $link;
 	}
 
@@ -86,10 +86,10 @@ 
 	 * @return string the HTTP_HOST or SERVER_NAME
 	 */
 	public static function get_host() {
-		if (isset($_SERVER['HTTP_HOST'])) {
+		if ( isset($_SERVER['HTTP_HOST']) ) {
 			return $_SERVER['HTTP_HOST'];
 		}
-		if (isset($_SERVER['SERVER_NAME'])) {
+		if ( isset($_SERVER['SERVER_NAME']) ) {
 			return $_SERVER['SERVER_NAME'];
 		}
 		return '';
@@ -101,8 +101,8 @@ 
 	 * @param string  $url
 	 * @return bool
 	 */
-	public static function is_local( $url ) {
-		if ( strstr( $url, self::get_host() ) ) {
+	public static function is_local($url) {
+		if ( strstr($url, self::get_host()) ) {
 			return true;
 		}
 		return false;
@@ -114,10 +114,10 @@ 
 	 * @param string  $src
 	 * @return string
 	 */
-	public static function get_full_path( $src ) {
+	public static function get_full_path($src) {
 		$root = ABSPATH;
 		$old_root_path = $root . $src;
-		$old_root_path = str_replace( '//', '/', $old_root_path );
+		$old_root_path = str_replace('//', '/', $old_root_path);
 		return $old_root_path;
 	}
 
@@ -129,16 +129,16 @@ 
 	 * @param string  $url
 	 * @return string
 	 */
-	public static function url_to_file_system( $url ) {
-		$url_parts = parse_url( $url );
+	public static function url_to_file_system($url) {
+		$url_parts = parse_url($url);
 		$path = ABSPATH . $url_parts['path'];
-		$path = str_replace( '//', '/', $path );
+		$path = str_replace('//', '/', $path);
 		return $path;
 	}
 
-	public static function file_system_to_url( $fs ) {
-		$relative_path = self::get_rel_path( $fs );
-		$home = home_url( '/'.$relative_path );
+	public static function file_system_to_url($fs) {
+		$relative_path = self::get_rel_path($fs);
+		$home = home_url('/' . $relative_path);
 		return $home;
 	}
 
@@ -148,12 +148,12 @@ 
 	 * @param string  $src
 	 * @return string
 	 */
-	public static function get_rel_path( $src ) {
-		if ( strstr( $src, ABSPATH ) ) {
-			return str_replace( ABSPATH, '', $src );
+	public static function get_rel_path($src) {
+		if ( strstr($src, ABSPATH) ) {
+			return str_replace(ABSPATH, '', $src);
 		}
 		//its outside the wordpress directory, alternate setups:
-		$src = str_replace( WP_CONTENT_DIR, '', $src );
+		$src = str_replace(WP_CONTENT_DIR, '', $src);
 		return WP_CONTENT_SUBDIR . $src;
 	}
 
@@ -163,10 +163,10 @@ 
 	 * @param string  $url
 	 * @return string
 	 */
-	public static function remove_double_slashes( $url ) {
-		$url = str_replace( '//', '/', $url );
-		if ( strstr( $url, 'http:' ) && !strstr( $url, 'http://' ) ) {
-			$url = str_replace( 'http:/', 'http://', $url );
+	public static function remove_double_slashes($url) {
+		$url = str_replace('//', '/', $url);
+		if ( strstr($url, 'http:') && !strstr($url, 'http://') ) {
+			$url = str_replace('http:/', 'http://', $url);
 		}
 		return $url;
 	}
@@ -178,20 +178,20 @@ 
 	 * @param string  $path
 	 * @return string
 	 */
-	public static function prepend_to_url( $url, $path ) {
-		if ( strstr( strtolower( $url ), 'http' ) ) {
-			$url_parts = parse_url( $url );
+	public static function prepend_to_url($url, $path) {
+		if ( strstr(strtolower($url), 'http') ) {
+			$url_parts = parse_url($url);
 			$url = $url_parts['scheme'] . '://' . $url_parts['host'] . $path . $url_parts['path'];
-			if ( isset( $url_parts['query'] ) ) {
+			if ( isset($url_parts['query']) ) {
 				$url .= $url_parts['query'];
 			}
-			if ( isset( $url_parts['fragment'] ) ) {
+			if ( isset($url_parts['fragment']) ) {
 				$url .= $url_parts['fragment'];
 			}
 		} else {
 			$url = $url . $path;
 		}
-		return self::remove_double_slashes( $url );
+		return self::remove_double_slashes($url);
 	}
 
 	/**
@@ -200,8 +200,8 @@ 
 	 * @param string  $path
 	 * @return string
 	 */
-	public static function preslashit( $path ) {
-		if ( strpos( $path, '/' ) != 0 ) {
+	public static function preslashit($path) {
+		if ( strpos($path, '/') != 0 ) {
 			$path = '/' . $path;
 		}
 		return $path;
@@ -212,8 +212,8 @@ 
 	 *
 	 * @return boolean true if $path is an absolute url, false if relative.
 	 */
-	public static function is_absolute( $path ) {
-		return (boolean) ( strstr( $path, 'http' ) );
+	public static function is_absolute($path) {
+		return (boolean) (strstr($path, 'http'));
 	}
 
 	/**
@@ -224,8 +224,8 @@ 
 	 * @param string  $url a URL to evaluate against
 	 * @return boolean if $url points to an external location returns true
 	 */
-	public static function is_external_content( $url ) {
-		$is_external = TimberURLHelper::is_absolute( $url ) && ! TimberURLHelper::is_internal_content( $url );
+	public static function is_external_content($url) {
+		$is_external = TimberURLHelper::is_absolute($url) && !TimberURLHelper::is_internal_content($url);
 
 		return $is_external;
 	}
@@ -235,11 +235,11 @@ 
 		// otherwise you run into errors with sites that:
 		// 1. use WPML plugin
 		// 2. or redefine content directory
-		$is_content_url = strstr( $url, content_url() );
+		$is_content_url = strstr($url, content_url());
 
 		// this case covers when the upload directory has been redefined
 		$upload_dir = wp_upload_dir();
-		$is_upload_url = strstr( $url, $upload_dir['baseurl'] );
+		$is_upload_url = strstr($url, $upload_dir['baseurl']);
 
 		return $is_content_url || $is_upload_url;
 	}
@@ -251,9 +251,9 @@ 
 	 * @return bool     true if $path is an external url, false if relative or local.
 	 *                  true if it's a subdomain (http://cdn.example.org = true)
 	 */
-	public static function is_external( $url ) {
-		$has_http = strstr( strtolower( $url ), 'http' );
-		$on_domain = strstr( $url, self::get_host() );
+	public static function is_external($url) {
+		$has_http = strstr(strtolower($url), 'http');
+		$on_domain = strstr($url, self::get_host());
 		if ( $has_http && !$on_domain ) {
 			return true;
 		}
@@ -266,9 +266,9 @@ 
 	 * @param string  $link
 	 * @return string
 	 */
-	public static function remove_trailing_slash( $link ) {
+	public static function remove_trailing_slash($link) {
 		if ( $link != "/" )
-			$link = untrailingslashit( $link );
+			$link = untrailingslashit($link);
 		return $link;
 	}
 
@@ -280,25 +280,25 @@ 
 	 * @return string|WP_Error the location of the temporay file name or an error
 	 * @deprecated since 0.20.0
 	 */
-	static function download_url( $url, $timeout = 300 ) {
+	static function download_url($url, $timeout = 300) {
 		if ( !$url ) {
-			return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
+			return new WP_Error('http_no_url', __('Invalid URL Provided.'));
 		}
 
-		$tmpfname = wp_tempnam( $url );
+		$tmpfname = wp_tempnam($url);
 		if ( !$tmpfname ) {
-			return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
+			return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 		}
 
-		$response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+		$response = wp_remote_get($url, array('timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname));
 
-		if ( is_wp_error( $response ) ) {
-			unlink( $tmpfname );
+		if ( is_wp_error($response) ) {
+			unlink($tmpfname);
 			return $response;
 		}
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $tmpfname );
-			return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+		if ( 200 != wp_remote_retrieve_response_code($response) ) {
+			unlink($tmpfname);
+			return new WP_Error('http_404', trim(wp_remote_retrieve_response_message($response)));
 		}
 		return $tmpfname;
 	}
@@ -311,11 +311,11 @@ 
 	 * @param int $i the position of the parameter to grab.
 	 * @return array|string
 	 */
-	public static function get_params( $i = false ) {
-		$args = explode( '/', trim( strtolower( $_SERVER['REQUEST_URI'] ) ) );
+	public static function get_params($i = false) {
+		$args = explode('/', trim(strtolower($_SERVER['REQUEST_URI'])));
 		$newargs = array();
-		foreach ( $args as $arg ) {
-			if ( strlen( $arg ) ) {
+		foreach ($args as $arg) {
+			if ( strlen($arg) ) {
 				$newargs[] = $arg;
 			}
 		}
@@ -324,9 +324,9 @@ 
 		}
 		if ( $i < 0 ) {
 			//count from end
-			$i = count( $newargs ) + $i;
+			$i = count($newargs) + $i;
 		}
-		if ( isset( $newargs[$i] ) ) {
+		if ( isset($newargs[$i]) ) {
 			return $newargs[$i];
 		}
 	}

timber.php

Spacing +119 added lines, -119 removed lines

@@ -14,11 +14,11 @@ 
 // we look for Composer files first in the plugins dir.
 // then in the wp-content dir (site install).
 // and finally in the current themes directories.
-if (   file_exists( $composer_autoload = __DIR__ . '/vendor/autoload.php' ) /* check in self */
-	|| file_exists( $composer_autoload = WP_CONTENT_DIR.'/vendor/autoload.php') /* check in wp-content */
-	|| file_exists( $composer_autoload = plugin_dir_path( __FILE__ ).'vendor/autoload.php') /* check in plugin directory */
-	|| file_exists( $composer_autoload = get_stylesheet_directory().'/vendor/autoload.php') /* check in child theme */
-	|| file_exists( $composer_autoload = get_template_directory().'/vendor/autoload.php') /* check in parent theme */
+if ( file_exists($composer_autoload = __DIR__ . '/vendor/autoload.php') /* check in self */
+	|| file_exists($composer_autoload = WP_CONTENT_DIR . '/vendor/autoload.php') /* check in wp-content */
+	|| file_exists($composer_autoload = plugin_dir_path(__FILE__) . 'vendor/autoload.php') /* check in plugin directory */
+	|| file_exists($composer_autoload = get_stylesheet_directory() . '/vendor/autoload.php') /* check in child theme */
+	|| file_exists($composer_autoload = get_template_directory() . '/vendor/autoload.php') /* check in parent theme */
 	) {
 	require_once $composer_autoload;
 }
@@ -63,21 +63,21 @@ 
 		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( __DIR__ ) );
+		defined("TIMBER_LOC") or define("TIMBER_LOC", realpath(__DIR__));
 	}
 
 	protected function init() {
 		TimberTwig::init();
-		TimberRoutes::init( $this );
+		TimberRoutes::init($this);
 		TimberImageHelper::init();
 		TimberAdmin::init();
 		TimberIntegrations::init();
@@ -93,8 +93,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);
 	}
 
 	/**
@@ -104,8 +104,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);
 	}
 
 	/**
@@ -115,8 +115,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);
 	}
 
 	/**
@@ -126,8 +126,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);
 	}
 
 	/**
@@ -137,8 +137,8 @@ 
 	 * @return array
 	 * @deprecated since 0.20.0
 	 */
-	static function get_pids( $query = null ) {
-		return TimberPostGetter::get_pids( $query );
+	static function get_pids($query = null) {
+		return TimberPostGetter::get_pids($query);
 	}
 
 	/**
@@ -148,8 +148,8 @@ 
 	 * @return array
 	 * @deprecated since 0.20.0
 	 */
-	static function get_posts_from_loop( $PostClass ) {
-		return TimberPostGetter::get_posts( $PostClass );
+	static function get_posts_from_loop($PostClass) {
+		return TimberPostGetter::get_posts($PostClass);
 	}
 
 	/**
@@ -160,8 +160,8 @@ 
 	 * @return array
 	 * @deprecated since 0.20.0
 	 */
-	static function get_posts_from_slug( $slug, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_posts( $slug, $PostClass );
+	static function get_posts_from_slug($slug, $PostClass = 'TimberPost') {
+		return TimberPostGetter::get_posts($slug, $PostClass);
 	}
 
 	/**
@@ -172,8 +172,8 @@ 
 	 * @return array
 	 * @deprecated since 0.20.0
 	 */
-	static function get_posts_from_wp_query( $query = array(), $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_posts( $query, $PostClass );
+	static function get_posts_from_wp_query($query = array(), $PostClass = 'TimberPost') {
+		return TimberPostGetter::query_posts($query, $PostClass);
 	}
 
 	/**
@@ -184,8 +184,8 @@ 
 	 * @return array|null
 	 * @deprecated since 0.20.0
 	 */
-	static function get_posts_from_array_of_ids( $query = array(), $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_posts( $query, $PostClass );
+	static function get_posts_from_array_of_ids($query = array(), $PostClass = 'TimberPost') {
+		return TimberPostGetter::get_posts($query, $PostClass);
 	}
 
 	/**
@@ -195,9 +195,9 @@ 
 	 * @return int
 	 * @deprecated since 0.20.0
 	 */
-	static function get_pid( $query ) {
-		$pids = TimberPostGetter::get_pids( $query );
-		if ( is_array( $pids ) && count( $pids ) ) {
+	static function get_pid($query) {
+		$pids = TimberPostGetter::get_pids($query);
+		if ( is_array($pids) && count($pids) ) {
 			return $pids[0];
 		}
 	}
@@ -223,8 +223,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
@@ -236,14 +236,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;
 	}
@@ -261,29 +261,29 @@ 
 		$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['theme'] = $data['site']->theme;
 		//deprecated, these should be fetched via TimberSite or TimberTheme
-		$data['theme_dir'] = WP_CONTENT_SUBDIR.str_replace( WP_CONTENT_DIR, '', get_stylesheet_directory() );
-		$data['language_attributes'] = TimberHelper::function_wrapper( 'language_attributes' );
+		$data['theme_dir'] = WP_CONTENT_SUBDIR . str_replace(WP_CONTENT_DIR, '', get_stylesheet_directory());
+		$data['language_attributes'] = TimberHelper::function_wrapper('language_attributes');
 		$data['stylesheet_uri'] = get_stylesheet_uri();
 		$data['template_uri'] = get_template_directory_uri();
 
 		$data['posts'] = Timber::query_posts();
 
 		//deprecated, this should be fetched via TimberMenu
-		if ( function_exists( 'wp_nav_menu' ) ) {
+		if ( function_exists('wp_nav_menu') ) {
 			$locations = get_nav_menu_locations();
-			if ( count( $locations ) ) {
-				$data['wp_nav_menu'] = wp_nav_menu( array( 'container_class' => 'menu-header', 'echo' => false, 'menu_class' => 'nav-menu' ) );
+			if ( count($locations) ) {
+				$data['wp_nav_menu'] = wp_nav_menu(array('container_class' => 'menu-header', 'echo' => false, 'menu_class' => 'nav-menu'));
 			}
 		}
-		$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;
 	}
 
@@ -297,27 +297,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;
 	}
 
@@ -328,14 +328,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);
 	}
 
 	/**
@@ -347,15 +347,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;
 	}
 
@@ -368,8 +368,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;
 	}
@@ -381,8 +381,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;
 	}
@@ -398,14 +398,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);
 	}
 
 	/**
@@ -415,21 +415,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();
@@ -445,8 +445,8 @@ 
 	 * @param int     $widget_id
 	 * @return TimberFunctionWrapper
 	 */
-	public static function get_widgets( $widget_id ) {
-		return TimberHelper::function_wrapper( 'dynamic_sidebar', array( $widget_id ), true );
+	public static function get_widgets($widget_id) {
+		return TimberHelper::function_wrapper('dynamic_sidebar', array($widget_id), true);
 	}
 
 
@@ -461,12 +461,12 @@ 
 	 * @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);
 	}
 
 	public function cancel_query() {
-		add_action( 'posts_request', array( $this, 'cancel_query_posts_request' ) );
+		add_action('posts_request', array($this, 'cancel_query_posts_request'));
 	}
 
 	function cancel_query_posts_request() {
@@ -480,8 +480,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);
 	}
 
 	/**
@@ -489,8 +489,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);
 	}
 
 
@@ -503,44 +503,44 @@ 
 	 * @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 );
+		$args['current'] = max(1, get_query_var('paged'));
+		$args['mid_size'] = max(9 - $args['current'], 3);
 		$args['prev_next'] = false;
-		if ( is_int( $prefs ) ) {
+		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'] = '';
@@ -558,9 +558,9 @@ 
 	 * @return string
 	 * @deprecated since 0.20.0
 	 */
-	public static function get_calling_script_path( $offset = 0 ) {
-		$dir = self::get_calling_script_dir( $offset );
-		return str_replace( ABSPATH, '', realpath( $dir ) );
+	public static function get_calling_script_path($offset = 0) {
+		$dir = self::get_calling_script_dir($offset);
+		return str_replace(ABSPATH, '', realpath($dir));
 	}
 
 	/**
@@ -568,10 +568,10 @@ 
 	 *
 	 * @return boolean|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;
 		}
@@ -585,11 +585,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 ( $trace['file'] != __FILE__ ) {
 				$caller = $trace['file'];
 				break;
@@ -609,8 +609,8 @@ 
 	 * @return bool
 	 * @deprecated since 0.20.0
 	 */
-	public static function is_post_class_or_class_map( $args ) {
-		return TimberPostGetter::is_post_class_or_class_map( $args );
+	public static function is_post_class_or_class_map($args) {
+		return TimberPostGetter::is_post_class_or_class_map($args);
 	}
 
 }