jarednova / timber

lib/timber.php

Spacing +90 added lines, -90 removed lines

@@ -45,16 +45,16 @@ 
 		if ( is_admin() || $_SERVER['PHP_SELF'] == '/wp-login.php' ) {
 			return;
 		}
-		if ( version_compare( phpversion(), '5.3.0', '<' ) && !is_admin() ) {
-			trigger_error( 'Timber requires PHP 5.3.0 or greater. You have '.phpversion(), E_USER_ERROR );
+		if ( version_compare(phpversion(), '5.3.0', '<') && !is_admin() ) {
+			trigger_error('Timber requires PHP 5.3.0 or greater. You have ' . phpversion(), E_USER_ERROR);
 		}
-		if ( !class_exists( 'Twig_Autoloader' ) ) {
-			trigger_error( 'You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR );
+		if ( !class_exists('Twig_Autoloader') ) {
+			trigger_error('You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR);
 		}
 	}
 
 	function init_constants() {
-		defined( "TIMBER_LOC" ) or define( "TIMBER_LOC", realpath( dirname(__DIR__) ) );
+		defined("TIMBER_LOC") or define("TIMBER_LOC", realpath(dirname(__DIR__)));
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	 */
 	protected function init() {
 		TimberTwig::init();
-		TimberRoutes::init( $this );
+		TimberRoutes::init($this);
 		TimberImageHelper::init();
 		TimberAdmin::init();
 		TimberIntegrations::init();
@@ -78,8 +78,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function get_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_post( $query, $PostClass );
+	public static function get_post($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::get_post($query, $PostClass);
 	}
 
 	/**
@@ -89,8 +89,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
-		return TimberPostGetter::get_posts( $query, $PostClass, $return_collection );
+	public static function get_posts($query = false, $PostClass = 'TimberPost', $return_collection = false) {
+		return TimberPostGetter::get_posts($query, $PostClass, $return_collection);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function query_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_post( $query, $PostClass );
+	public static function query_post($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::query_post($query, $PostClass);
 	}
 
 	/**
@@ -111,8 +111,8 @@ 
 	 * @param string  $PostClass
 	 * @return array|bool|null
 	 */
-	public static function query_posts( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_posts( $query, $PostClass );
+	public static function query_posts($query = false, $PostClass = 'TimberPost') {
+		return TimberPostGetter::query_posts($query, $PostClass);
 	}
 
 	/**
@@ -136,8 +136,8 @@ 
 	 * @param string  $TermClass
 	 * @return mixed
 	 */
-	public static function get_terms( $args = null, $maybe_args = array(), $TermClass = 'TimberTerm' ) {
-		return TimberTermGetter::get_terms( $args, $maybe_args, $TermClass );
+	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+		return TimberTermGetter::get_terms($args, $maybe_args, $TermClass);
 	}
 
 	/* Site Retrieval
@@ -149,14 +149,14 @@ 
 	 * @param array|bool $blog_ids
 	 * @return array
 	 */
-	public static function get_sites( $blog_ids = false ) {
-		if ( !is_array( $blog_ids ) ) {
+	public static function get_sites($blog_ids = false) {
+		if ( !is_array($blog_ids) ) {
 			global $wpdb;
-			$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC" );
+			$blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC");
 		}
 		$return = array();
-		foreach ( $blog_ids as $blog_id ) {
-			$return[] = new TimberSite( $blog_id );
+		foreach ($blog_ids as $blog_id) {
+			$return[] = new TimberSite($blog_id);
 		}
 		return $return;
 	}
@@ -174,17 +174,17 @@ 
 		$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;
 
 		$data['posts'] = Timber::query_posts();
 
-		$data = apply_filters( 'timber_context', $data );
-		$data = apply_filters( 'timber/context', $data );
+		$data = apply_filters('timber_context', $data);
+		$data = apply_filters('timber/context', $data);
 		return $data;
 	}
 
@@ -198,27 +198,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;
 	}
 
@@ -229,14 +229,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);
 	}
 
 	/**
@@ -248,15 +248,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;
 	}
 
@@ -269,8 +269,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;
 	}
@@ -282,8 +282,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;
 	}
@@ -299,14 +299,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);
 	}
 
 	/**
@@ -316,21 +316,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();
@@ -346,8 +346,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);
 	}
 
 
@@ -362,8 +362,8 @@ 
 	 * @param array   $args
 	 * @deprecated since 0.20.0
 	 */
-	public static function add_route( $route, $callback, $args = array() ) {
-		Routes::map( $route, $callback, $args );
+	public static function add_route($route, $callback, $args = array()) {
+		Routes::map($route, $callback, $args);
 	}
 
 	/**
@@ -371,8 +371,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);
 	}
 
 	/**
@@ -380,8 +380,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);
 	}
 
 
@@ -394,43 +394,43 @@ 
 	 * @param array   $prefs
 	 * @return array mixed
 	 */
-	public static function get_pagination( $prefs = array() ) {
+	public static function get_pagination($prefs = array()) {
 		global $wp_query;
 		global $paged;
 		global $wp_rewrite;
 		$args = array();
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
 		if ( $wp_rewrite->using_permalinks() ) {
-			$url = explode( '?', get_pagenum_link( 0 ) );
-			if ( isset( $url[1] ) ) {
-				parse_str( $url[1], $query );
+			$url = explode('?', get_pagenum_link(0));
+			if ( isset($url[1]) ) {
+				parse_str($url[1], $query);
 				$args['add_args'] = $query;
 			}
 			$args['format'] = 'page/%#%';
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
+			$args['base'] = trailingslashit($url[0]) . '%_%';
 		} else {
 			$big = 999999999;
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
 		}
 		$args['type'] = 'array';
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
-		if ( is_int( $prefs ) ) {
+		$args['current'] = max(1, get_query_var('paged'));
+		$args['mid_size'] = max(9 - $args['current'], 3);
+		if ( is_int($prefs) ) {
 			$args['mid_size'] = $prefs - 2;
 		} else {
-			$args = array_merge( $args, $prefs );
+			$args = array_merge($args, $prefs);
 		}
 		$data = array();
 		$data['current'] = $args['current'];
 		$data['total'] = $args['total'];
-		$data['pages'] = TimberHelper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
+		$data['pages'] = TimberHelper::paginate_links($args);
+		$next = get_next_posts_page_link($args['total']);
 		if ( $next ) {
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
 		}
-		$prev = previous_posts( false );
+		$prev = previous_posts(false);
 		if ( $prev ) {
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
 		}
 		if ( $paged < 2 ) {
 			$data['prev'] = '';
@@ -446,10 +446,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_calling_script_dir( $offset = 0 ) {
-		$caller = self::get_calling_script_file( $offset );
-		if ( !is_null( $caller ) ) {
-			$pathinfo = pathinfo( $caller );
+	public static function get_calling_script_dir($offset = 0) {
+		$caller = self::get_calling_script_file($offset);
+		if ( !is_null($caller) ) {
+			$pathinfo = pathinfo($caller);
 			$dir = $pathinfo['dirname'];
 			return $dir;
 		}
@@ -462,11 +462,11 @@ 
 	 * @return string|null
 	 * @deprecated since 0.20.0
 	 */
-	public static function get_calling_script_file( $offset = 0 ) {
+	public static function get_calling_script_file($offset = 0) {
 		$caller = null;
 		$backtrace = debug_backtrace();
 		$i = 0;
-		foreach ( $backtrace as $trace ) {
+		foreach ($backtrace as $trace) {
 			if ( array_key_exists('file', $trace) && $trace['file'] != __FILE__ ) {
 				$caller = $trace['file'];
 				break;

lib/timber-helper.php

Spacing +143 added lines, -143 removed lines

@@ -25,18 +25,18 @@ 
 	 * @param bool    $force          (optional) Force callback to be executed when transient is locked
 	 * @return mixed
 	 */
-	public static function transient( $slug, $callback, $transient_time = 0, $lock_timeout = 5, $force = false ) {
-		$slug = apply_filters( 'timber/transient/slug', $slug );
+	public static function transient($slug, $callback, $transient_time = 0, $lock_timeout = 5, $force = false) {
+		$slug = apply_filters('timber/transient/slug', $slug);
 
-		$enable_transients = ( $transient_time === false || ( defined( 'WP_DISABLE_TRANSIENTS' ) && WP_DISABLE_TRANSIENTS ) ) ? false : true;
-		$data = $enable_transients ? get_transient( $slug ) : false;
+		$enable_transients = ($transient_time === false || (defined('WP_DISABLE_TRANSIENTS') && WP_DISABLE_TRANSIENTS)) ? false : true;
+		$data = $enable_transients ? get_transient($slug) : false;
 
 		if ( false === $data ) {
 
-			if ( $enable_transients && self::_is_transient_locked( $slug ) ) {
+			if ( $enable_transients && self::_is_transient_locked($slug) ) {
 
-				$force = apply_filters( 'timber_force_transients', $force );
-				$force = apply_filters( 'timber_force_transient_' . $slug, $force );
+				$force = apply_filters('timber_force_transients', $force);
+				$force = apply_filters('timber_force_transient_' . $slug, $force);
 
 				if ( !$force ) {
 					//the server is currently executing the process.
@@ -50,13 +50,13 @@ 
 			// lock timeout shouldn't be higher than 5 seconds, unless
 			// remote calls with high timeouts are made here
 			if ( $enable_transients )
-				self::_lock_transient( $slug, $lock_timeout );
+				self::_lock_transient($slug, $lock_timeout);
 
 			$data = $callback();
 
 			if ( $enable_transients ) {
-				set_transient( $slug, $data, $transient_time );
-				self::_unlock_transient( $slug );
+				set_transient($slug, $data, $transient_time);
+				self::_unlock_transient($slug);
 			}
 
 		}
@@ -70,24 +70,24 @@ 
 	 * @param string $slug
 	 * @param integer $lock_timeout
 	 */
-	static function _lock_transient( $slug, $lock_timeout ) {
-		set_transient( $slug . '_lock', true, $lock_timeout );
+	static function _lock_transient($slug, $lock_timeout) {
+		set_transient($slug . '_lock', true, $lock_timeout);
 	}
 
 	/**
 	 * @internal
 	 * @param string $slug
 	 */
-	static function _unlock_transient( $slug ) {
-		delete_transient( $slug . '_lock', true );
+	static function _unlock_transient($slug) {
+		delete_transient($slug . '_lock', true);
 	}
 
 	/**
 	 * @internal
 	 * @param string $slug
 	 */
-	static function _is_transient_locked( $slug ) {
-		return (bool)get_transient( $slug . '_lock' );
+	static function _is_transient_locked($slug) {
+		return (bool) get_transient($slug . '_lock');
 	}
 
 	/* These are for measuring page render time */
@@ -99,7 +99,7 @@ 
 	 */
 	public static function start_timer() {
 		$time = microtime();
-		$time = explode( ' ', $time );
+		$time = explode(' ', $time);
 		$time = $time[1] + $time[0];
 		return $time;
 	}
@@ -115,12 +115,12 @@ 
 	 * @param int     $start
 	 * @return string
 	 */
-	public static function stop_timer( $start ) {
+	public static function stop_timer($start) {
 		$time = microtime();
-		$time = explode( ' ', $time );
+		$time = explode(' ', $time);
 		$time = $time[1] + $time[0];
 		$finish = $time;
-		$total_time = round( ( $finish - $start ), 4 );
+		$total_time = round(($finish - $start), 4);
 		return $total_time . ' seconds.';
 	}
 
@@ -153,9 +153,9 @@ 
 	 * @param array   $args
 	 * @return string
 	 */
-	public static function ob_function( $function, $args = array( null ) ) {
+	public static function ob_function($function, $args = array(null)) {
 		ob_start();
-		call_user_func_array( $function, $args );
+		call_user_func_array($function, $args);
 		$data = ob_get_contents();
 		ob_end_clean();
 		return $data;
@@ -169,8 +169,8 @@ 
 	 * @param bool    $return_output_buffer
 	 * @return TimberFunctionWrapper
 	 */
-	public static function function_wrapper( $function_name, $defaults = array(), $return_output_buffer = false ) {
-		return new TimberFunctionWrapper( $function_name, $defaults, $return_output_buffer );
+	public static function function_wrapper($function_name, $defaults = array(), $return_output_buffer = false) {
+		return new TimberFunctionWrapper($function_name, $defaults, $return_output_buffer);
 	}
 
 	/**
@@ -179,14 +179,14 @@ 
 	 * @param mixed $arg that you want to error_log
 	 * @return void
 	 */
-	public static function error_log( $arg ) {
+	public static function error_log($arg) {
 		if ( !WP_DEBUG ) {
 			return;
 		}
-		if ( is_object( $arg ) || is_array( $arg ) ) {
-			$arg = print_r( $arg, true );
+		if ( is_object($arg) || is_array($arg) ) {
+			$arg = print_r($arg, true);
 		}
-		return error_log( $arg );
+		return error_log($arg);
 	}
 
 	/**
@@ -196,9 +196,9 @@ 
 	 * @param string  $seplocation
 	 * @return string
 	 */
-	public static function get_wp_title( $separator = ' ', $seplocation = 'left' ) {
-		$separator = apply_filters( 'timber_wp_title_seperator', $separator );
-		return trim( wp_title( $separator, false, $seplocation ) );
+	public static function get_wp_title($separator = ' ', $seplocation = 'left') {
+		$separator = apply_filters('timber_wp_title_seperator', $separator);
+		return trim(wp_title($separator, false, $seplocation));
 	}
 
 	/* Text Utilities
@@ -213,35 +213,35 @@ 
 	 * @param string  $allowed_tags
 	 * @return string
 	 */
-	public static function trim_words( $text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote' ) {
+	public static function trim_words($text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote') {
 		if ( null === $more ) {
-			$more = __( '…' );
+			$more = __('…');
 		}
 		$original_text = $text;
 		$allowed_tag_string = '';
-		foreach ( explode( ' ', apply_filters( 'timber/trim_words/allowed_tags', $allowed_tags ) ) as $tag ) {
+		foreach (explode(' ', apply_filters('timber/trim_words/allowed_tags', $allowed_tags)) as $tag) {
 			$allowed_tag_string .= '<' . $tag . '>';
 		}
-		$text = strip_tags( $text, $allowed_tag_string );
+		$text = strip_tags($text, $allowed_tag_string);
 		/* translators: If your word count is based on single characters (East Asian characters), enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
-		if ( 'characters' == _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-			$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-			preg_match_all( '/./u', $text, $words_array );
-			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+		if ( 'characters' == _x('words', 'word count: words or characters?') && preg_match('/^utf\-?8$/i', get_option('blog_charset')) ) {
+			$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+			preg_match_all('/./u', $text, $words_array);
+			$words_array = array_slice($words_array[0], 0, $num_words + 1);
 			$sep = '';
 		} else {
-			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+			$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 			$sep = ' ';
 		}
-		if ( count( $words_array ) > $num_words ) {
-			array_pop( $words_array );
-			$text = implode( $sep, $words_array );
+		if ( count($words_array) > $num_words ) {
+			array_pop($words_array);
+			$text = implode($sep, $words_array);
 			$text = $text . $more;
 		} else {
-			$text = implode( $sep, $words_array );
+			$text = implode($sep, $words_array);
 		}
-		$text = self::close_tags( $text );
-		return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+		$text = self::close_tags($text);
+		return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 	}
 
 	/**
@@ -250,29 +250,29 @@ 
 	 * @param string  $html
 	 * @return string
 	 */
-	public static function close_tags( $html ) {
+	public static function close_tags($html) {
 		//put all opened tags into an array
-		preg_match_all( '#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result );
+		preg_match_all('#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
 		$openedtags = $result[1];
 		//put all closed tags into an array
-		preg_match_all( '#</([a-z]+)>#iU', $html, $result );
+		preg_match_all('#</([a-z]+)>#iU', $html, $result);
 		$closedtags = $result[1];
-		$len_opened = count( $openedtags );
+		$len_opened = count($openedtags);
 		// all tags are closed
-		if ( count( $closedtags ) == $len_opened ) {
+		if ( count($closedtags) == $len_opened ) {
 			return $html;
 		}
-		$openedtags = array_reverse( $openedtags );
+		$openedtags = array_reverse($openedtags);
 		// close tags
-		for ( $i = 0; $i < $len_opened; $i++ ) {
-			if ( !in_array( $openedtags[$i], $closedtags ) ) {
+		for ($i = 0; $i < $len_opened; $i++) {
+			if ( !in_array($openedtags[$i], $closedtags) ) {
 				$html .= '</' . $openedtags[$i] . '>';
 			} else {
-				unset( $closedtags[array_search( $openedtags[$i], $closedtags )] );
+				unset($closedtags[array_search($openedtags[$i], $closedtags)]);
 			}
 		}
-		$html = str_replace(array('</br>','</hr>','</wbr>'), '', $html);
-		$html = str_replace(array('<br>','<hr>','<wbr>'), array('<br />','<hr />','<wbr />'), $html);
+		$html = str_replace(array('</br>', '</hr>', '</wbr>'), '', $html);
+		$html = str_replace(array('<br>', '<hr>', '<wbr>'), array('<br />', '<hr />', '<wbr />'), $html);
 		return $html;
 	}
 
@@ -285,17 +285,17 @@ 
 	 * @return array|int
 	 * @deprecated 0.20.0
 	 */
-	public static function get_posts_by_meta( $key, $value ) {
+	public static function get_posts_by_meta($key, $value) {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s", $key, $value );
-		$results = $wpdb->get_col( $query );
+		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s", $key, $value);
+		$results = $wpdb->get_col($query);
 		$pids = array();
-		foreach ( $results as $result ) {
-			if ( get_post( $result ) ) {
+		foreach ($results as $result) {
+			if ( get_post($result) ) {
 				$pids[] = $result;
 			}
 		}
-		if ( count( $pids ) ) {
+		if ( count($pids) ) {
 			return $pids;
 		}
 		return 0;
@@ -309,12 +309,12 @@ 
 	 * @return int
 	 * @deprecated 0.20.0
 	 */
-	public static function get_post_by_meta( $key, $value ) {
+	public static function get_post_by_meta($key, $value) {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s ORDER BY post_id", $key, $value );
-		$results = $wpdb->get_col( $query );
-		foreach ( $results as $result ) {
-			if ( $result && get_post( $result ) ) {
+		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s ORDER BY post_id", $key, $value);
+		$results = $wpdb->get_col($query);
+		foreach ($results as $result) {
+			if ( $result && get_post($result) ) {
 				return $result;
 			}
 		}
@@ -327,10 +327,10 @@ 
 	 * @param int     $ttid
 	 * @return mixed
 	 */
-	public static function get_term_id_by_term_taxonomy_id( $ttid ) {
+	public static function get_term_id_by_term_taxonomy_id($ttid) {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %s", $ttid );
-		return $wpdb->get_var( $query );
+		$query = $wpdb->prepare("SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %s", $ttid);
+		return $wpdb->get_var($query);
 	}
 
 	/* Object Utilities
@@ -343,8 +343,8 @@ 
 	 * @param string  $prop
 	 * @return void
 	 */
-	public static function osort( &$array, $prop ) {
-		usort( $array, function ( $a, $b ) use ( $prop ) {
+	public static function osort(&$array, $prop) {
+		usort($array, function($a, $b) use ($prop) {
 				return $a->$prop > $b->$prop ? 1 : -1;
 			} );
 	}
@@ -355,11 +355,11 @@ 
 	 * @param array   $arr
 	 * @return bool
 	 */
-	public static function is_array_assoc( $arr ) {
-		if ( !is_array( $arr ) ) {
+	public static function is_array_assoc($arr) {
+		if ( !is_array($arr) ) {
 			return false;
 		}
-		return (bool)count( array_filter( array_keys( $arr ), 'is_string' ) );
+		return (bool) count(array_filter(array_keys($arr), 'is_string'));
 	}
 
 	/**
@@ -368,11 +368,11 @@ 
 	 * @param array   $array
 	 * @return stdClass
 	 */
-	public static function array_to_object( $array ) {
+	public static function array_to_object($array) {
 		$obj = new stdClass;
-		foreach ( $array as $k => $v ) {
-			if ( is_array( $v ) ) {
-				$obj->{$k} = self::array_to_object( $v ); //RECURSION
+		foreach ($array as $k => $v) {
+			if ( is_array($v) ) {
+				$obj->{$k} = self::array_to_object($v); //RECURSION
 			} else {
 				$obj->{$k} = $v;
 			}
@@ -388,11 +388,11 @@ 
 	 * @param mixed   $value
 	 * @return bool|int
 	 */
-	public static function get_object_index_by_property( $array, $key, $value ) {
-		if ( is_array( $array ) ) {
+	public static function get_object_index_by_property($array, $key, $value) {
+		if ( is_array($array) ) {
 			$i = 0;
-			foreach ( $array as $arr ) {
-				if ( is_array( $arr ) ) {
+			foreach ($array as $arr) {
+				if ( is_array($arr) ) {
 					if ( $arr[$key] == $value ) {
 						return $i;
 					}
@@ -416,16 +416,16 @@ 
 	 * @return array|null
 	 * @throws Exception
 	 */
-	public static function get_object_by_property( $array, $key, $value ) {
-		if ( is_array( $array ) ) {
-			foreach ( $array as $arr ) {
+	public static function get_object_by_property($array, $key, $value) {
+		if ( is_array($array) ) {
+			foreach ($array as $arr) {
 				if ( $arr->$key == $value ) {
 					return $arr;
 				}
 			}
 		} else {
-			throw new InvalidArgumentException( '$array is not an array, got:' );
-			TimberHelper::error_log( $array );
+			throw new InvalidArgumentException('$array is not an array, got:');
+			TimberHelper::error_log($array);
 		}
 	}
 
@@ -436,9 +436,9 @@ 
 	 * @param int     $len
 	 * @return array
 	 */
-	public static function array_truncate( $array, $len ) {
-		if ( sizeof( $array ) > $len ) {
-			$array = array_splice( $array, 0, $len );
+	public static function array_truncate($array, $len) {
+		if ( sizeof($array) > $len ) {
+			$array = array_splice($array, 0, $len);
 		}
 		return $array;
 	}
@@ -452,12 +452,12 @@ 
 	 * @param mixed   $value
 	 * @return bool
 	 */
-	public static function is_true( $value ) {
-		if ( isset( $value ) ) {
-			if (is_string($value)) {
+	public static function is_true($value) {
+		if ( isset($value) ) {
+			if ( is_string($value) ) {
 				$value = strtolower($value);
 			}
-			if ( ($value == 'true' || $value === 1 || $value === '1' || $value == true) && $value !== false && $value !== 'false') {
+			if ( ($value == 'true' || $value === 1 || $value === '1' || $value == true) && $value !== false && $value !== 'false' ) {
 				return true;
 			}
 		}
@@ -470,8 +470,8 @@ 
 	 * @param int     $i
 	 * @return bool
 	 */
-	public static function iseven( $i ) {
-		return ( $i % 2 ) == 0;
+	public static function iseven($i) {
+		return ($i % 2) == 0;
 	}
 
 	/**
@@ -480,8 +480,8 @@ 
 	 * @param int     $i
 	 * @return bool
 	 */
-	public static function isodd( $i ) {
-		return ( $i % 2 ) != 0;
+	public static function isodd($i) {
+		return ($i % 2) != 0;
 	}
 
 	/* Links, Forms, Etc. Utilities
@@ -495,8 +495,8 @@ 
 	 * @param array   $args this $args thing is a fucking mess, [fix at some point](http://codex.wordpress.org/Function_Reference/comment_form)
 	 * @return string
 	 */
-	public static function get_comment_form( $post_id = null, $args = array() ) {
-		return self::ob_function( 'comment_form', array( $args, $post_id ) );
+	public static function get_comment_form($post_id = null, $args = array()) {
+		return self::ob_function('comment_form', array($args, $post_id));
 	}
 
 	/**
@@ -505,7 +505,7 @@ 
 	 * @param string  $args
 	 * @return array
 	 */
-	public static function paginate_links( $args = '' ) {
+	public static function paginate_links($args = '') {
 		$defaults = array(
 			'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
 			'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
@@ -513,28 +513,28 @@ 
 			'current' => 0,
 			'show_all' => false,
 			'prev_next' => false,
-			'prev_text' => __( '&laquo; Previous' ),
-			'next_text' => __( 'Next &raquo;' ),
+			'prev_text' => __('&laquo; Previous'),
+			'next_text' => __('Next &raquo;'),
 			'end_size' => 1,
 			'mid_size' => 2,
 			'type' => 'array',
 			'add_args' => false, // array of query args to add
 			'add_fragment' => ''
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 		// Who knows what else people pass in $args
-		$args['total'] = intval( (int)$args['total'] );
+		$args['total'] = intval((int) $args['total']);
 		if ( $args['total'] < 2 ) {
 			return array();
 		}
-		$args['current'] = (int)$args['current'];
-		$args['end_size'] = 0 < (int)$args['end_size'] ? (int)$args['end_size'] : 1; // Out of bounds?  Make it the default.
-		$args['mid_size'] = 0 <= (int)$args['mid_size'] ? (int)$args['mid_size'] : 2;
-		$args['add_args'] = is_array( $args['add_args'] ) ? $args['add_args'] : false;
+		$args['current'] = (int) $args['current'];
+		$args['end_size'] = 0 < (int) $args['end_size'] ? (int) $args['end_size'] : 1; // Out of bounds?  Make it the default.
+		$args['mid_size'] = 0 <= (int) $args['mid_size'] ? (int) $args['mid_size'] : 2;
+		$args['add_args'] = is_array($args['add_args']) ? $args['add_args'] : false;
 		$page_links = array();
 		$dots = false;
-		for ( $n = 1; $n <= $args['total']; $n++ ) {
-			$n_display = number_format_i18n( $n );
+		for ($n = 1; $n <= $args['total']; $n++) {
+			$n_display = number_format_i18n($n);
 			if ( $n == $args['current'] ) {
 				$page_links[] = array(
 					'class' => 'page-number page-numbers current',
@@ -545,18 +545,18 @@ 
 				);
 				$dots = true;
 			} else {
-				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
-					$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
-					$link = str_replace( '%#%', $n, $link );
-					$link = trailingslashit( $link ) . ltrim( $args['add_fragment'], '/' );
+				if ( $args['show_all'] || ($n <= $args['end_size'] || ($args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size']) || $n > $args['total'] - $args['end_size']) ) {
+					$link = str_replace('%_%', 1 == $n ? '' : $args['format'], $args['base']);
+					$link = str_replace('%#%', $n, $link);
+					$link = trailingslashit($link) . ltrim($args['add_fragment'], '/');
 					if ( $args['add_args'] ) {
-						$link = rtrim( add_query_arg( $args['add_args'], $link ), '/' );
+						$link = rtrim(add_query_arg($args['add_args'], $link), '/');
 					}
 					$link = str_replace(' ', '+', $link);
-					$link = untrailingslashit( $link );
+					$link = untrailingslashit($link);
 					$page_links[] = array(
 						'class' => 'page-number page-numbers',
-						'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+						'link' => esc_url(apply_filters('paginate_links', $link)),
 						'title' => $n_display,
 						'name' => $n_display,
 						'current' => $args['current'] == $n
@@ -565,7 +565,7 @@ 
 				} elseif ( $dots && !$args['show_all'] ) {
 					$page_links[] = array(
 						'class' => 'dots',
-						'title' => __( '&hellip;' )
+						'title' => __('&hellip;')
 					);
 					$dots = false;
 				}
@@ -584,8 +584,8 @@ 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function is_url( $url ) {
-		return TimberURLHelper::is_url( $url );
+	static function is_url($url) {
+		return TimberURLHelper::is_url($url);
 	}
 
 	/**
@@ -598,71 +598,71 @@ 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function get_rel_url( $url, $force = false ) {
-		return TimberURLHelper::get_rel_url( $url, $force );
+	static function get_rel_url($url, $force = false) {
+		return TimberURLHelper::get_rel_url($url, $force);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function is_local( $url ) {
-		return TimberURLHelper::is_local( $url );
+	static function is_local($url) {
+		return TimberURLHelper::is_local($url);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function get_full_path( $src ) {
-		return TimberURLHelper::get_full_path( $src );
+	static function get_full_path($src) {
+		return TimberURLHelper::get_full_path($src);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function get_rel_path( $src ) {
-		return TimberURLHelper::get_rel_path( $src );
+	static function get_rel_path($src) {
+		return TimberURLHelper::get_rel_path($src);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function remove_double_slashes( $url ) {
-		return TimberURLHelper::remove_double_slashes( $url );
+	static function remove_double_slashes($url) {
+		return TimberURLHelper::remove_double_slashes($url);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function prepend_to_url( $url, $path ) {
-		return TimberURLHelper::prepend_to_url( $url, $path );
+	static function prepend_to_url($url, $path) {
+		return TimberURLHelper::prepend_to_url($url, $path);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function preslashit( $path ) {
-		return TimberURLHelper::preslashit( $path );
+	static function preslashit($path) {
+		return TimberURLHelper::preslashit($path);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function is_external( $url ) {
-		return TimberURLHelper::is_external( $url );
+	static function is_external($url) {
+		return TimberURLHelper::is_external($url);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function download_url( $url, $timeout = 300 ) {
-		return TimberURLHelper::download_url( $url, $timeout );
+	static function download_url($url, $timeout = 300) {
+		return TimberURLHelper::download_url($url, $timeout);
 	}
 
 	/**
 	 * @deprecated 0.18.0
 	 */
-	static function get_params( $i = -1 ) {
-		return TimberURLHelper::get_params( $i );
+	static function get_params($i = -1) {
+		return TimberURLHelper::get_params($i);
 	}
 
 }

lib/timber-image.php

Spacing +20 added lines, -20 removed lines

@@ -150,27 +150,27 @@ 
 	 * @internal
 	 * @param  int $iid the id number of the image in the WP database
 	 */
-	protected function get_image_info( $iid ) {
+	protected function get_image_info($iid) {
 		$image_info = $iid;
-		if (is_numeric($iid)) {
+		if ( is_numeric($iid) ) {
 			$image_info = wp_get_attachment_metadata($iid);
-			if (!is_array($image_info)) {
+			if ( !is_array($image_info) ) {
 				$image_info = array();
 			}
 			$image_custom = get_post_custom($iid);
 			$basic = get_post($iid);
-			if ($basic) {
-				if (isset($basic->post_excerpt)) {
+			if ( $basic ) {
+				if ( isset($basic->post_excerpt) ) {
 					$this->caption = $basic->post_excerpt;
 				}
 				$image_custom = array_merge($image_custom, get_object_vars($basic));
 			}
 			return array_merge($image_info, $image_custom);
 		}
-		if (is_array($image_info) && isset($image_info['image'])) {
+		if ( is_array($image_info) && isset($image_info['image']) ) {
 			return $image_info['image'];
 		}
-		if (is_object($image_info)) {
+		if ( is_object($image_info) ) {
 		   return get_object_vars($image_info);
 		}
 		return $iid;
@@ -202,9 +202,9 @@ 
 	 * @internal
 	 * @param int $iid
 	 */
-	function init( $iid = false ) {
-		if ( !is_numeric( $iid ) && is_string( $iid ) ) {
-			if (strstr($iid, '://')) {
+	function init($iid = false) {
+		if ( !is_numeric($iid) && is_string($iid) ) {
+			if ( strstr($iid, '://') ) {
 				$this->init_with_url($iid);
 				return;
 			}
@@ -215,15 +215,15 @@ 
 			
 			$relative = false;
 			$iid_lower = strtolower($iid);
-			foreach( $this->file_types as $type ) { if( strstr( $iid_lower, $type ) ) { $relative = true; break; } };
+			foreach ($this->file_types as $type) { if ( strstr($iid_lower, $type) ) { $relative = true; break; } };
 			if ( $relative ) {
-				$this->init_with_relative_path( $iid );
+				$this->init_with_relative_path($iid);
 				return;
 			}
 		} else if ( $iid instanceof WP_Post ) {
 			$ref = new ReflectionClass($this);
 			$post = $ref->getParentClass()->newInstance($iid->ID);
-			if (isset($post->_thumbnail_id) && $post->_thumbnail_id) {
+			if ( isset($post->_thumbnail_id) && $post->_thumbnail_id ) {
 				return $this->init((int) $post->_thumbnail_id);
 			}
 			return $this->init($post->ID);
@@ -265,9 +265,9 @@ 
 	 * @internal
 	 * @param string $relative_path
 	 */
-	protected function init_with_relative_path( $relative_path ) {
-		$this->abs_url = home_url( $relative_path );
-		$file_path = TimberURLHelper::get_full_path( $relative_path );
+	protected function init_with_relative_path($relative_path) {
+		$this->abs_url = home_url($relative_path);
+		$file_path = TimberURLHelper::get_full_path($relative_path);
 		$this->file_loc = $file_path;
 		$this->file = $file_path;
 	}
@@ -276,8 +276,8 @@ 
 	 * @internal
 	 * @param string $file_path
 	 */
-	protected function init_with_file_path( $file_path ) {
-		$url = TimberURLHelper::file_system_to_url( $file_path );
+	protected function init_with_file_path($file_path) {
+		$url = TimberURLHelper::file_system_to_url($file_path);
 		$this->abs_url = $url;
 		$this->file_loc = $file_path;
 		$this->file = $file_path;
@@ -476,8 +476,8 @@ 
 	 * @param string $size
 	 * @return bool|string
 	 */
-	function get_src( $size = '' ) {
-		return $this->src( $size );
+	function get_src($size = '') {
+		return $this->src($size);
 	}
 
 	/**

lib/timber-request.php

Spacing +4 added lines, -4 removed lines

@@ -21,14 +21,14 @@
 		$this->get = $_GET;
 	}
 
-	public function __call( $field, $args ) {}
+	public function __call($field, $args) {}
 
-	public function __get( $field ) {}
+	public function __get($field) {}
 
 	/**
 	 * @return boolean
 	 */
-	public function __isset( $field ) {}
+	public function __isset($field) {}
 
-	public function meta( $key ) {}
+	public function meta($key) {}
 }

lib/timber-function-wrapper.php

Spacing +19 added lines, -19 removed lines

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