jarednova / timber

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

lib/timber-comment.php

Spacing +31 added lines, -31 removed lines

@@ -44,7 +44,7 @@ 
 		$this->init($cid);
 	}
 
-	function __toString(){
+	function __toString() {
 		return $this->content();
 	}
 
@@ -54,7 +54,7 @@ 
 	 */
 	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';
@@ -114,21 +114,21 @@ 
 	 * @return bool|mixed|string
 	 */
 	public function avatar($size = 92, $default = '') {
-		if (!get_option('show_avatars')) {
+		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;
@@ -179,9 +179,9 @@ 
 	 * ```
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	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);
 	}
 
@@ -204,9 +204,9 @@ 
 	 * ```
 	 * @return string
 	 */
-	public function time( $time_format = '' ) {
+	public function time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
-		$the_time = (string)mysql2date($tf, $this->comment_date);
+		$the_time = (string) mysql2date($tf, $this->comment_date);
 		return apply_filters('get_comment_time', $the_time, $tf);
 	}
 
@@ -232,14 +232,14 @@ 
 	 * @return mixed
 	 */
 	protected function get_meta_fields($comment_id = null) {
-		if ($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) {
+			if ( is_array($cm) && count($cm) == 1 ) {
 				$cm = $cm[0];
 			}
 		}
@@ -254,7 +254,7 @@ 
 	 */
 	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,9 +269,9 @@ 
 	 * @param int $post_id
 	 * @return string
 	 */
-	public function reply_link( $reply_text = 'Reply' ) {
+	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
@@ -286,7 +286,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
@@ -297,9 +297,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;
@@ -313,10 +313,10 @@ 
 	 * @return string
 	 */
 	protected function avatar_host($email_hash) {
-		if (is_ssl()) {
+		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';
@@ -335,28 +335,28 @@ 
 	 * @return string
 	 */
 	protected function avatar_default($default, $email, $size, $host) {
-		if (substr($default, 0, 1) == '/') {
+		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;
@@ -373,7 +373,7 @@ 
 	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-post.php

Spacing +54 added lines, -54 removed lines

@@ -168,7 +168,7 @@ 
 	 * @param mixed $pid
 	 */
 	public function __construct($pid = null) {
-		$pid = $this->determine_id( $pid );
+		$pid = $this->determine_id($pid);
 		$this->init($pid);
 	}
 
@@ -188,13 +188,13 @@ 
 			&& get_class($wp_query->queried_object) == 'WP_Post'
 			) {
 			$pid = $wp_query->queried_object_id;
-		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id )  {
+		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id ) {
 			//hack for static page as home page
 			$pid = $wp_query->queried_object_id;
 		} else if ( $pid === null ) {
 			$gtid = false;
 			$maybe_post = get_post();
-			if ( isset($maybe_post->ID) ){
+			if ( isset($maybe_post->ID) ) {
 				$gtid = true;
 			}
 			if ( $gtid ) {
@@ -260,7 +260,7 @@ 
 	 * @param string $field
 	 * @param mixed $value
 	 */
-	public function update( $field, $value ) {
+	public function update($field, $value) {
 		if ( isset($this->ID) ) {
 			update_post_meta($this->ID, $field, $value);
 			$this->$field = $value;
@@ -275,7 +275,7 @@ 
 	 * @param mixed $pid
 	 * @return WP_Post on success
 	 */
-	protected function prepare_post_info( $pid = 0 ) {
+	protected function prepare_post_info($pid = 0) {
 		if ( is_string($pid) || is_numeric($pid) || (is_object($pid) && !isset($pid->post_title)) || $pid === 0 ) {
 			$pid = self::check_post_id($pid);
 			$post = get_post($pid);
@@ -297,7 +297,7 @@ 
 	 * @internal
 	 * @return integer ID number of a post
 	 */
-	protected function check_post_id( $pid ) {
+	protected function check_post_id($pid) {
 		if ( is_numeric($pid) && $pid === 0 ) {
 			$pid = get_the_ID();
 			return $pid;
@@ -323,7 +323,7 @@ 
 		global $wpdb;
 		$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $post_name);
 		$result = $wpdb->get_row($query);
-		if (!$result) {
+		if ( !$result ) {
 			return null;
 		}
 		return $result->ID;
@@ -362,7 +362,7 @@ 
 				$text = TimberHelper::trim_words($text, $len, false);
 				$trimmed = true;
 			}
-			$text = do_shortcode( $text );
+			$text = do_shortcode($text);
 		}
 		if ( !strlen($text) ) {
 			$text = TimberHelper::trim_words($this->get_content(), $len, false);
@@ -391,11 +391,11 @@ 
 			}
 			$read_more_class = apply_filters('timber/post/get_preview/read_more_class', "read-more");
 			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore_matches[1]) . '</a>';
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore_matches[1]) . '</a>';
 			} elseif ( $readmore ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore) . '</a>';
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore) . '</a>';
 			}
-			if ( !$strip && $last_p_tag && ( strpos($text, '<p>') || strpos($text, '<p ') ) ) {
+			if ( !$strip && $last_p_tag && (strpos($text, '<p>') || strpos($text, '<p ')) ) {
 				$text .= '</p>';
 			}
 		}
@@ -407,7 +407,7 @@ 
 	 * @internal
 	 * @param bool|int $pid a post ID number
 	 */
-	function import_custom( $pid = false ) {
+	function import_custom($pid = false) {
 		if ( !$pid ) {
 			$pid = $this->ID;
 		}
@@ -422,13 +422,13 @@ 
 	 * @param int $pid
 	 * @return array
 	 */
-	protected function get_post_custom( $pid ) {
+	protected function get_post_custom($pid) {
 		apply_filters('timber_post_get_meta_pre', array(), $pid, $this);
 		$customs = get_post_custom($pid);
 		if ( !is_array($customs) || empty($customs) ) {
 			return array();
 		}
-		foreach ( $customs as $key => $value ) {
+		foreach ($customs as $key => $value) {
 			if ( is_array($value) && count($value) == 1 && isset($value[0]) ) {
 				$value = $value[0];
 			}
@@ -482,7 +482,7 @@ 
 	 * @param bool $taxonomy
 	 * @return TimberPost|boolean
 	 */
-	function get_next( $taxonomy = false ) {
+	function get_next($taxonomy = false) {
 		if ( !isset($this->_next) || !isset($this->_next[$taxonomy]) ) {
 			global $post;
 			$this->_next = array();
@@ -513,7 +513,7 @@ 
 		$post = $this;
 		$ret = array();
 		if ( $multipage ) {
-			for ( $i = 1; $i <= $numpages; $i++ ) {
+			for ($i = 1; $i <= $numpages; $i++) {
 				$link = self::get_wp_link_page($i);
 				$data = array('name' => $i, 'title' => $i, 'text' => $i, 'link' => $link);
 				if ( $i == $page ) {
@@ -565,7 +565,7 @@ 
 	 * @param bool $taxonomy
 	 * @return TimberPost|boolean
 	 */
-	function get_prev( $taxonomy = false ) {
+	function get_prev($taxonomy = false) {
 		if ( isset($this->_prev) && isset($this->_prev[$taxonomy]) ) {
 			return $this->_prev[$taxonomy];
 		}
@@ -632,7 +632,7 @@ 
 		$post->slug = $post->post_name;
 		$customs = $this->get_post_custom($post->ID);
 		$post->custom = $customs;
-		$post = (object) array_merge((array)$customs, (array)$post);
+		$post = (object) array_merge((array) $customs, (array) $post);
 		return $post;
 	}
 
@@ -643,7 +643,7 @@ 
 	 * @param string $use
 	 * @return string
 	 */
-	function get_display_date( $use = 'post_date' ) {
+	function get_display_date($use = 'post_date') {
 		return date(get_option('date_format'), strtotime($this->$use));
 	}
 
@@ -653,9 +653,9 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	function get_date( $date_format = '' ) {
+	function get_date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->post_date);
+		$the_date = (string) mysql2date($df, $this->post_date);
 		return apply_filters('get_the_date', $the_date, $df);
 	}
 
@@ -664,7 +664,7 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	function get_modified_date( $date_format = '' ) {
+	function get_modified_date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
 		$the_time = $this->get_modified_time($df);
 		return apply_filters('get_the_modified_date', $the_time, $date_format);
@@ -675,7 +675,7 @@ 
 	 * @param  string $time_format
 	 * @return string
 	 */
-	function get_modified_time( $time_format = '' ) {
+	function get_modified_time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
 		$the_time = get_post_modified_time($tf, false, $this->ID, true);
 		return apply_filters('get_the_modified_time', $the_time, $time_format);
@@ -688,7 +688,7 @@ 
 	 * @param bool|string 	$childPostClass
 	 * @return array
 	 */
-	function get_children( $post_type = 'any', $childPostClass = false ) {
+	function get_children($post_type = 'any', $childPostClass = false) {
 		if ( $childPostClass === false ) {
 			$childPostClass = $this->PostClass;
 		}
@@ -696,7 +696,7 @@ 
 			$post_type = $this->post_type;
 		}
 		$children = get_children('post_parent=' . $this->ID . '&post_type=' . $post_type . '&numberposts=-1&orderby=menu_order title&order=ASC');
-		foreach ( $children as &$child ) {
+		foreach ($children as &$child) {
 			$child = new $childPostClass($child->ID);
 		}
 		$children = array_values($children);
@@ -732,16 +732,16 @@ 
 		$timber_comments = array();
 
 		if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
-			set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+			set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 			$overridden_cpage = true;
 		}
 
-        foreach( $comments as $key => &$comment ) {
+        foreach ($comments as $key => &$comment) {
             $timber_comment = new $CommentClass($comment);
             $timber_comments[$timber_comment->id] = $timber_comment;
         }
 
-		foreach( $timber_comments as $key => $comment ) {
+		foreach ($timber_comments as $key => $comment) {
 			if ( $comment->is_child() ) {
 				unset($timber_comments[$comment->id]);
 
@@ -785,7 +785,7 @@ 
 	 * @param string $TermClass
 	 * @return array
 	 */
-	function get_terms( $tax = '', $merge = true, $TermClass = '' ) {
+	function get_terms($tax = '', $merge = true, $TermClass = '') {
 
 		$TermClass = $TermClass ?: $this->TermClass;
 
@@ -796,7 +796,7 @@ 
 			$taxonomies = $tax;
 		}
 		if ( is_string($tax) ) {
-			if ( in_array($tax, array('all','any','')) ) {
+			if ( in_array($tax, array('all', 'any', '')) ) {
 				$taxonomies = get_object_taxonomies($this->post_type);
 			} else {
 				$taxonomies = array($tax);
@@ -805,8 +805,8 @@ 
 
 		$term_class_objects = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( in_array($taxonomy, array('tag','tags')) ) {
+		foreach ($taxonomies as $taxonomy) {
+			if ( in_array($taxonomy, array('tag', 'tags')) ) {
 				$taxonomy = 'post_tag';
 			}
 			if ( $taxonomy == 'categories' ) {
@@ -844,11 +844,11 @@ 
 	 * @param string $taxonomy
 	 * @return bool
 	 */
-	function has_term( $term_name_or_id, $taxonomy = 'all' ) {
+	function has_term($term_name_or_id, $taxonomy = 'all') {
 		if ( $taxonomy == 'all' || $taxonomy == 'any' ) {
 			$taxes = get_object_taxonomies($this->post_type, 'names');
 			$ret = false;
-			foreach ( $taxes as $tax ) {
+			foreach ($taxes as $tax) {
 				if ( has_term($term_name_or_id, $tax, $this->ID) ) {
 					$ret = true;
 					break;
@@ -863,7 +863,7 @@ 
 	 * @param string $field
 	 * @return TimberImage
 	 */
-	function get_image( $field ) {
+	function get_image($field) {
 		return new $this->ImageClass($this->$field);
 	}
 
@@ -913,7 +913,7 @@ 
 	 * @param int $page
 	 * @return string
 	 */
-	function get_content( $len = 0, $page = 0 ) {
+	function get_content($len = 0, $page = 0) {
 		if ( $len == 0 && $page == 0 && $this->_content ) {
 			return $this->_content;
 		}
@@ -974,7 +974,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function get_field( $field_name ) {
+	public function get_field($field_name) {
 		$value = apply_filters('timber_post_get_meta_field_pre', null, $this->ID, $field_name, $this);
 		if ( $value === null ) {
 			$value = get_post_meta($this->ID, $field_name);
@@ -992,7 +992,7 @@ 
 	/**
 	 * @param string $field_name
 	 */
-	function import_field( $field_name ) {
+	function import_field($field_name) {
 		$this->$field_name = $this->get_field($field_name);
 	}
 
@@ -1023,13 +1023,13 @@ 
 	 * ```
 	 * @return string a space-seperated list of classes
 	 */
-	public function post_class( $class='' ) {
+	public function post_class($class = '') {
 		global $post;
 		$old_global_post = $post;
 		$post = $this;
 		$class_array = get_post_class($class, $this->ID);
 		$post = $old_global_post;
-		if ( is_array($class_array) ){
+		if ( is_array($class_array) ) {
 			return implode(' ', $class_array);
 		}
 		return $class_array;
@@ -1131,8 +1131,8 @@ 
 	 * @param string|bool $childPostClass _optional_ a custom post class (ex: 'MyTimberPost') to return the objects as. By default (false) it will use TimberPost::$post_class value.
 	 * @return array
 	 */
-	public function children( $post_type = 'any', $childPostClass = false ) {
-		return $this->get_children( $post_type, $childPostClass );
+	public function children($post_type = 'any', $childPostClass = false) {
+		return $this->get_children($post_type, $childPostClass);
 	}
 
 	/**
@@ -1156,7 +1156,7 @@ 
 	 * ```
 	 * @return bool|array
 	 */
-	public function comments( $count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment' ) {
+	public function comments($count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment') {
 		return $this->get_comments($count, $order, $type, $status, $CommentClass);
 	}
 
@@ -1173,7 +1173,7 @@ 
 	 * @param int $page
 	 * @return string
 	 */
-	public function content( $page = 0 ) {
+	public function content($page = 0) {
 		return $this->get_content(0, $page);
 	}
 
@@ -1202,7 +1202,7 @@ 
 	 * @param string $date_format
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	public function date($date_format = '') {
 		return $this->get_date($date_format);
 	}
 
@@ -1224,9 +1224,9 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function time( $time_format = '' ) {
+	public function time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
-	 	$the_time = (string)mysql2date($tf, $this->post_date);
+	 	$the_time = (string) mysql2date($tf, $this->post_date);
 	 	return apply_filters('get_the_time', $the_time, $tf);
 	}
 
@@ -1262,7 +1262,7 @@ 
 	 * @param string $field_name
 	 * @return mixed
 	 */
-	public function meta( $field_name = null ) {
+	public function meta($field_name = null) {
 		if ( $field_name === null ) {
 			//on the off-chance the field is actually named meta
 			$field_name = 'meta';
@@ -1273,7 +1273,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function name(){
+	public function name() {
 		return $this->title();
 	}
 
@@ -1281,7 +1281,7 @@ 
 	 * @param string $date_format
 	 * @return string
 	 */
-	public function modified_date( $date_format = '' ) {
+	public function modified_date($date_format = '') {
 		return $this->get_modified_date($date_format);
 	}
 
@@ -1289,7 +1289,7 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function modified_time( $time_format = '' ) {
+	public function modified_time($time_format = '') {
 		return $this->get_modified_time($time_format);
 	}
 
@@ -1298,7 +1298,7 @@ 
 	 * @param bool $in_same_cat
 	 * @return mixed
 	 */
-	public function next( $in_same_cat = false ) {
+	public function next($in_same_cat = false) {
 		return $this->get_next($in_same_cat);
 	}
 
@@ -1356,7 +1356,7 @@ 
 	 * @param bool $in_same_cat
 	 * @return mixed
 	 */
-	public function prev( $in_same_cat = false ) {
+	public function prev($in_same_cat = false) {
 		return $this->get_prev($in_same_cat);
 	}
 
@@ -1368,7 +1368,7 @@ 
 	 * @param bool $merge Should the resulting array be one big one (true)? Or should it be an array of sub-arrays for each taxonomy (false)?
 	 * @return array
 	 */
-	public function terms( $tax = '', $merge = true ) {
+	public function terms($tax = '', $merge = true) {
 		return $this->get_terms($tax, $merge);
 	}
 

lib/timber-twig.php

Spacing +149 added lines, -149 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,151 +40,151 @@ 
 	 * @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( '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 ) ) {
-						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;
 	}
 
@@ -194,11 +194,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;
 	}
 
@@ -208,13 +208,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));
 	}
 
 	/**
@@ -223,8 +223,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);
 	}
 
 	/**
@@ -233,8 +233,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]);
 	}
 
 	/**
@@ -242,12 +242,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;
@@ -260,20 +260,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
@@ -285,17 +285,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;
 	}
 
@@ -306,15 +306,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));
 		}
 	}
 
@@ -324,18 +324,18 @@ 
 	 * @param string $second_delimiter
 	 * @return string
 	 */
-	function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
-		$length = count( $arr );
+	function add_list_separators($arr, $first_delimiter = ',', $second_delimiter = 'and') {
+		$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;
 	}