jarednova / timber

lib/timber-archives.php

Spacing +25 added lines, -25 removed lines

@@ -54,7 +54,7 @@ 
 	 * }
 	 * @param string $base any additional paths that need to be prepended to the URLs that are generated, for example: "tags"
 	 */
-	function __construct( $args = null, $base = '' ) {
+	function __construct($args = null, $base = '') {
 		$this->init($args, $base);
 	}
 
@@ -63,7 +63,7 @@ 
 	 * @param array|string $args
 	 * @param string $base
 	 */
-	function init( $args = null, $base = '' ) {
+	function init($args = null, $base = '') {
 		$this->base = $base;
 		$this->items = $this->get_items($args);
 	}
@@ -74,7 +74,7 @@ 
 	 * @param string $text
 	 * @return mixed
 	 */
-	protected function get_archives_link( $url, $text ) {
+	protected function get_archives_link($url, $text) {
 		$ret = array();
 		$ret['text'] = $ret['title'] = $ret['name'] = wptexturize($text);
 		$ret['url'] = $ret['link'] = esc_url(TimberURLHelper::prepend_to_url($url, $this->base));
@@ -91,18 +91,18 @@ 
 	 * @param string $limit
 	 * @return array
 	 */
-	protected function get_items_yearly( $args, $last_changed, $join, $where, $order, $limit ) {
+	protected function get_items_yearly($args, $last_changed, $join, $where, $order, $limit) {
 		global $wpdb;
 		$output = array();
 		$query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM {$wpdb->posts} $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
 		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if (!$results = wp_cache_get($key, 'posts')) {
+		if ( !$results = wp_cache_get($key, 'posts') ) {
 			$results = $wpdb->get_results($query);
 			wp_cache_set($key, $results, 'posts');
 		}
-		if ($results) {
-			foreach ((array)$results as $result) {
+		if ( $results ) {
+			foreach ((array) $results as $result) {
 				$url = get_year_link($result->year);
 				$text = sprintf('%d', $result->year);
 				$output[] = $this->get_archives_link($url, $text);
@@ -122,7 +122,7 @@ 
 	 * @param bool $nested
 	 * @return array
 	 */
-	protected function get_items_monthly( $args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true ) {
+	protected function get_items_monthly($args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true) {
 		global $wpdb, $wp_locale;
 		$output = array();
 		$defaults = array(
@@ -137,26 +137,26 @@ 
 			. "ORDER BY post_date $order $limit";
 		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if (!$results = wp_cache_get($key, 'posts')) {
+		if ( !$results = wp_cache_get($key, 'posts') ) {
 			$results = $wpdb->get_results($query);
 			wp_cache_set($key, $results, 'posts');
 		}
-		if ($results) {
-			foreach ((array)$results as $result) {
+		if ( $results ) {
+			foreach ((array) $results as $result) {
 				$url = get_month_link($result->year, $result->month);
-				if ($show_year && !$nested) {
+				if ( $show_year && !$nested ) {
 					$text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year);
 				} else {
 					$text = sprintf(__('%1$s'), $wp_locale->get_month($result->month));
 				}
-				if ($nested) {
+				if ( $nested ) {
 					$output[$result->year][] = $this->get_archives_link($url, $text);
 				} else {
 					$output[] = $this->get_archives_link($url, $text);
 				}
 			}
 		}
-		if ($nested) {
+		if ( $nested ) {
 			$out2 = array();
 			foreach ($output as $year => $months) {
 				$out2[] = array('name' => $year, 'children' => $months);
@@ -171,7 +171,7 @@ 
 	 * @param array|string $args
 	 * @return array|string
 	 */
-	function get_items( $args = null ) {
+	function get_items($args = null) {
 		global $wpdb;
 
 		$defaults = array(
@@ -220,7 +220,7 @@ 
 		$archive_week_start_date_format = 'Y/m/d';
 		$archive_week_end_date_format = 'Y/m/d';
 
-		if (!$archive_date_format_over_ride) {
+		if ( !$archive_date_format_over_ride ) {
 			$archive_day_date_format = get_option('date_format');
 			$archive_week_start_date_format = get_option('date_format');
 			$archive_week_end_date_format = get_option('date_format');
@@ -232,7 +232,7 @@ 
 
 		$output = array();
 		$last_changed = wp_cache_get('last_changed', 'posts');
-		if (!$last_changed) {
+		if ( !$last_changed ) {
 			$last_changed = microtime();
 			wp_cache_set('last_changed', $last_changed, 'posts');
 		}
@@ -242,7 +242,7 @@ 
 			$output = $this->get_items_yearly($args, $last_changed, $join, $where, $order, $limit);
 		} elseif ( 'monthly-nested' == $type ) {
 			$years = $this->get_items_yearly($args, $last_changed, $join, $where, $order, $limit);
-			foreach ( $years as &$year ) {
+			foreach ($years as &$year) {
 				$args = array('show_year' => false);
 				$year['children'] = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit);
 			}
@@ -251,14 +251,14 @@ 
 			$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
 			$key = md5($query);
 			$key = "wp_get_archives:$key:$last_changed";
-			if (!$results = wp_cache_get($key, 'posts')) {
+			if ( !$results = wp_cache_get($key, 'posts') ) {
 				$results = $wpdb->get_results($query);
 				$cache = array();
 				$cache[$key] = $results;
 				wp_cache_set($key, $results, 'posts');
 			}
 			if ( $results ) {
-				foreach ( (array)$results as $result ) {
+				foreach ((array) $results as $result) {
 					$url = get_day_link($result->year, $result->month, $result->dayofmonth);
 					$date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth);
 					$text = mysql2date($archive_day_date_format, $date);
@@ -271,13 +271,13 @@ 
 				. "count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
 			$key = md5($query);
 			$key = "wp_get_archives:$key:$last_changed";
-			if (!$results = wp_cache_get($key, 'posts')) {
+			if ( !$results = wp_cache_get($key, 'posts') ) {
 				$results = $wpdb->get_results($query);
 				wp_cache_set($key, $results, 'posts');
 			}
 			$arc_w_last = '';
 			if ( $results ) {
-				foreach ( (array)$results as $result ) {
+				foreach ((array) $results as $result) {
 					if ( $result->week != $arc_w_last ) {
 						$arc_year = $result->yr;
 						$arc_w_last = $result->week;
@@ -300,10 +300,10 @@ 
 				wp_cache_set($key, $results, 'posts');
 			}
 			if ( $results ) {
-				foreach ( (array)$results as $result ) {
-					if ($result->post_date != '0000-00-00 00:00:00') {
+				foreach ((array) $results as $result) {
+					if ( $result->post_date != '0000-00-00 00:00:00' ) {
 						$url = get_permalink($result);
-						if ($result->post_title) {
+						if ( $result->post_title ) {
 							/** This filter is documented in wp-includes/post-template.php */
 							$text = strip_tags(apply_filters('the_title', $result->post_title, $result->ID));
 						} else {

lib/timber-core-interface.php

Spacing +4 added lines, -4 removed lines

@@ -2,15 +2,15 @@
 
 interface TimberCoreInterface {
 
-	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-core.php

Spacing +17 added lines, -17 removed lines

@@ -11,8 +11,8 @@ 
      *
      * @return boolean
      */
-    function __isset( $field ) {
-        if ( isset( $this->$field ) ) {
+    function __isset($field) {
+        if ( isset($this->$field) ) {
             return $this->$field;
         }
         return false;
@@ -22,8 +22,8 @@ 
      * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
      * @return mixed
      */
-    function __call( $field, $args ) {
-        return $this->__get( $field );
+    function __call($field, $args) {
+        return $this->__get($field);
     }
 
     /**
@@ -31,11 +31,11 @@ 
      *
      * @return mixed
      */
-    function __get( $field ) {
+    function __get($field) {
     	if ( property_exists($this, $field) ) {
     		return $this->$field;
     	}
-        if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
+        if ( method_exists($this, 'meta') && $meta_value = $this->meta($field) ) {
             return $this->$field = $meta_value;
         }
         if ( method_exists($this, $field) ) {
@@ -55,15 +55,15 @@ 
      * ```
      * @param array|object $info an object or array you want to grab data from to attach to the Timber object
      */
-    function import( $info, $force = false ) {
-        if ( is_object( $info ) ) {
-            $info = get_object_vars( $info );
+    function import($info, $force = false) {
+        if ( is_object($info) ) {
+            $info = get_object_vars($info);
         }
-        if ( is_array( $info ) ) {
-            foreach ( $info as $key => $value ) {
-                if ( !empty( $key ) && $force ) {
+        if ( is_array($info) ) {
+            foreach ($info as $key => $value) {
+                if ( !empty($key) && $force ) {
                     $this->$key = $value;
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
+                } else if ( !empty($key) && !method_exists($this, $key) ) {
                     $this->$key = $value;
                 }
             }
@@ -76,8 +76,8 @@ 
      * @param string  $key
      * @param mixed   $value
      */
-    function update( $key, $value ) {
-        update_metadata( $this->object_type, $this->ID, $key, $value );
+    function update($key, $value) {
+        update_metadata($this->object_type, $this->ID, $key, $value);
     }
 
     /**
@@ -94,10 +94,10 @@ 
      * @return bool
      */
     function can_edit() {
-        if ( !function_exists( 'current_user_can' ) ) {
+        if ( !function_exists('current_user_can') ) {
             return false;
         }
-        if ( current_user_can( 'edit_post', $this->ID ) ) {
+        if ( current_user_can('edit_post', $this->ID) ) {
             return true;
         }
         return false;

lib/timber-function-wrapper.php

Spacing +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
 	private $_use_ob;
 
 	public function __toString() {
-		return (string)$this->call();
+		return (string) $this->call();
 	}
 
 	/**
@@ -17,12 +17,12 @@ 
 	 * @param array   $args
 	 * @param bool    $return_output_buffer
 	 */
-	public function __construct( $function, $args = array(), $return_output_buffer = false ) {
+	public function __construct($function, $args = array(), $return_output_buffer = false) {
 		$this->_function = $function;
 		$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'));
 	}
 
 	/**
@@ -31,12 +31,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;
 	}
@@ -47,12 +47,12 @@ 
 	 * @return string
 	 */
 	public function call() {
-		$args = $this->_parse_args( func_get_args(), $this->_args );
+		$args = $this->_parse_args(func_get_args(), $this->_args);
 
 		if ( $this->_use_ob ) {
-			return TimberHelper::ob_function( $this->_function, $args );
+			return TimberHelper::ob_function($this->_function, $args);
 		} else {
-			return call_user_func_array( $this->_function, $args );
+			return call_user_func_array($this->_function, $args);
 		}
 	}
 
@@ -63,12 +63,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;

lib/timber-helper.php

Spacing +152 added lines, -152 removed lines

@@ -25,17 +25,17 @@ 
 	 * @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 ) {
+	public static function transient($slug, $callback, $transient_time = 0, $lock_timeout = 5, $force = false) {
 
-		$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.
@@ -49,13 +49,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);
 			}
 
 		}
@@ -69,24 +69,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 */
@@ -98,7 +98,7 @@ 
 	 */
 	public static function start_timer() {
 		$time = microtime();
-		$time = explode( ' ', $time );
+		$time = explode(' ', $time);
 		$time = $time[1] + $time[0];
 		return $time;
 	}
@@ -114,12 +114,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.';
 	}
 
@@ -152,9 +152,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;
@@ -168,8 +168,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);
 	}
 
 	/**
@@ -178,14 +178,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);
 	}
 
 	/**
@@ -195,9 +195,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
@@ -212,36 +212,36 @@ 
 	 * @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,15 +416,15 @@ 
 	 * @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 Exception( '$array is not an array, given value: ' . $array );
+			throw new Exception('$array is not an array, given value: ' . $array);
 		}
 	}
 
@@ -435,9 +435,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;
 	}
@@ -451,12 +451,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;
 			}
 		}
@@ -469,8 +469,8 @@ 
 	 * @param int     $i
 	 * @return bool
 	 */
-	public static function iseven( $i ) {
-		return ( $i % 2 ) == 0;
+	public static function iseven($i) {
+		return ($i % 2) == 0;
 	}
 
 	/**
@@ -479,8 +479,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
@@ -494,8 +494,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));
 	}
 
 	/**
@@ -504,7 +504,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
@@ -512,42 +512,42 @@ 
 			'current' => 0,
 			'show_all' => false,
 			'prev_next' => true,
-			'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;
 		if ( $args['prev_next'] && $args['current'] && 1 < $args['current'] ) {
-			$link = str_replace( '%_%', 2 == $args['current'] ? '' : $args['format'], $args['base'] );
-			$link = str_replace( '%#%', $args['current'] - 1, $link );
+			$link = str_replace('%_%', 2 == $args['current'] ? '' : $args['format'], $args['base']);
+			$link = str_replace('%#%', $args['current'] - 1, $link);
 			if ( $args['add_args'] ) {
-				$link = add_query_arg( $args['add_args'], $link );
+				$link = add_query_arg($args['add_args'], $link);
 			}
 			$link .= $args['add_fragment'];
-			$link = untrailingslashit( $link );
+			$link = untrailingslashit($link);
 			$page_links[] = array(
 				'class' => 'prev page-numbers',
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+				'link' => esc_url(apply_filters('paginate_links', $link)),
 				'title' => $args['prev_text']
 			);
 		}
-		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',
@@ -558,18 +558,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
@@ -578,22 +578,22 @@ 
 				} elseif ( $dots && !$args['show_all'] ) {
 					$page_links[] = array(
 						'class' => 'dots',
-						'title' => __( '&hellip;' )
+						'title' => __('&hellip;')
 					);
 					$dots = false;
 				}
 			}
 		}
-		if ( $args['prev_next'] && $args['current'] && ( $args['current'] < $args['total'] || -1 == $args['total'] ) ) {
-			$link = str_replace( '%_%', $args['format'], $args['base'] );
-			$link = str_replace( '%#%', $args['current'] + 1, $link );
+		if ( $args['prev_next'] && $args['current'] && ($args['current'] < $args['total'] || -1 == $args['total']) ) {
+			$link = str_replace('%_%', $args['format'], $args['base']);
+			$link = str_replace('%#%', $args['current'] + 1, $link);
 			if ( $args['add_args'] ) {
-				$link = add_query_arg( $args['add_args'], $link );
+				$link = add_query_arg($args['add_args'], $link);
 			}
-			$link = untrailingslashit( trailingslashit( $link ) . $args['add_fragment'] );
+			$link = untrailingslashit(trailingslashit($link) . $args['add_fragment']);
 			$page_links[] = array(
 				'class' => 'next page-numbers',
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+				'link' => esc_url(apply_filters('paginate_links', $link)),
 				'title' => $args['next_text']
 			);
 		}
@@ -610,8 +610,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);
 	}
 
 	/**
@@ -624,71 +624,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-helper.php

Spacing +82 added lines, -82 removed lines

@@ -43,9 +43,9 @@ 
 	 * ```
 	 * @return string (ex: )
 	 */
-	public static function resize( $src, $w, $h = 0, $crop = 'default', $force = false ) {
-		if (!is_numeric($w) && is_string($w)) {
-			if ($sizes = self::find_wp_dimensions($w)) {
+	public static function resize($src, $w, $h = 0, $crop = 'default', $force = false) {
+		if ( !is_numeric($w) && is_string($w) ) {
+			if ( $sizes = self::find_wp_dimensions($w) ) {
 				$w = $sizes['w'];
 				$h = $sizes['h'];
 			} else {
@@ -66,16 +66,16 @@ 
 	 *     @type int h
 	 * }
 	 */
-	private static function find_wp_dimensions( $size ) {
+	private static function find_wp_dimensions($size) {
 		global $_wp_additional_image_sizes;
-		if (isset($_wp_additional_image_sizes[$size])) {
+		if ( isset($_wp_additional_image_sizes[$size]) ) {
 			$w = $_wp_additional_image_sizes[$size]['width'];
 			$h = $_wp_additional_image_sizes[$size]['height'];
-		} else if (in_array($size, array('thumbnail', 'medium', 'large'))) {
-			$w = get_option($size.'_size_w');
-			$h = get_option($size.'_size_h');
+		} else if ( in_array($size, array('thumbnail', 'medium', 'large')) ) {
+			$w = get_option($size . '_size_w');
+			$h = get_option($size . '_size_h');
 		}
-		if (isset($w) && isset($h) && ($w || $h)) {
+		if ( isset($w) && isset($h) && ($w || $h) ) {
 			return array('w' => $w, 'h' => $h);
 		}
 		return false;
@@ -90,7 +90,7 @@ 
 	 *
 	 * @return string url to the new image
 	 */
-	public static function retina_resize( $src, $multiplier = 2, $force = false ) {
+	public static function retina_resize($src, $multiplier = 2, $force = false) {
 		$op = new TimberImageOperationRetina($multiplier);
 		return self::_operate($src, $op, $force);
 	}
@@ -100,13 +100,13 @@ 
 	 * @param  string  $file local filepath to a file, not a URL
 	 * @return boolean true if it's an animated gif, false if not
 	 */
-	public static function is_animated_gif( $file ) {
+	public static function is_animated_gif($file) {
 		if ( strpos(strtolower($file), '.gif') == -1 ) {
 			//doesn't have .gif, bail
 			return false;
 		}
 		//its a gif so test
-		if(!($fh = @fopen($file, 'rb'))) {
+		if ( !($fh = @fopen($file, 'rb')) ) {
 		  	return false;
 	    }
 	    $count = 0;
@@ -118,7 +118,7 @@ 
 
 	    // We read through the file til we reach the end of the file, or we've found
 	    // at least 2 frame headers
-	    while(!feof($fh) && $count < 2) {
+	    while (!feof($fh) && $count < 2) {
 	        $chunk = fread($fh, 1024 * 100); //read 100kb at a time
 	        $count += preg_match_all('#\x00\x21\xF9\x04.{4}\x00[\x2C\x21]#s', $chunk, $matches);
 	    }
@@ -138,7 +138,7 @@ 
 	 * @param bool    $force
 	 * @return mixed|null|string
 	 */
-	public static function letterbox( $src, $w, $h, $color = '#000000', $force = false ) {
+	public static function letterbox($src, $w, $h, $color = '#000000', $force = false) {
 		$op = new TimberImageOperationLetterbox($w, $h, $color);
 		return self::_operate($src, $op, $force);
 	}
@@ -150,7 +150,7 @@ 
 	 * @param string  $bghex
 	 * @return string
 	 */
-	public static function img_to_jpg( $src, $bghex = '#FFFFFF', $force = false ) {
+	public static function img_to_jpg($src, $bghex = '#FFFFFF', $force = false) {
 		$op = new TimberImageOperationToJpg($bghex);
 		return self::_operate($src, $op, $force);
 	}
@@ -159,12 +159,12 @@ 
 	 * Deletes all resized versions of an image when the source is deleted
 	 */
 	protected static function add_actions() {
-		add_action( 'delete_post', function ( $post_id ) {
-				$post = get_post( $post_id );
-				$image_types = array( 'image/jpeg', 'image/png', 'image/gif', 'image/jpg' );
-				if ( $post->post_type == 'attachment' && in_array( $post->post_mime_type, $image_types ) ) {
-					$attachment = new TimberImage( $post_id );
-					TimberImageHelper::delete_generated_files( $attachment->file_loc );
+		add_action('delete_post', function($post_id) {
+				$post = get_post($post_id);
+				$image_types = array('image/jpeg', 'image/png', 'image/gif', 'image/jpg');
+				if ( $post->post_type == 'attachment' && in_array($post->post_mime_type, $image_types) ) {
+					$attachment = new TimberImage($post_id);
+					TimberImageHelper::delete_generated_files($attachment->file_loc);
 				}
 			} );
 	}
@@ -174,9 +174,9 @@ 
 	 * for example /wp-content or /content
 	 */
 	protected static function add_constants() {
-		if ( !defined( 'WP_CONTENT_SUBDIR' ) ) {
-			$wp_content_path = str_replace( home_url(), '', WP_CONTENT_URL );
-			define( 'WP_CONTENT_SUBDIR', $wp_content_path );
+		if ( !defined('WP_CONTENT_SUBDIR') ) {
+			$wp_content_path = str_replace(home_url(), '', WP_CONTENT_URL);
+			define('WP_CONTENT_SUBDIR', $wp_content_path);
 		}
 	}
 
@@ -186,8 +186,8 @@ 
 	 * @return void
 	 */
 	static function add_filters() {
-		add_filter( 'upload_dir', function ( $arr ) {
-			$arr['relative'] = str_replace( home_url(), '', $arr['baseurl'] );
+		add_filter('upload_dir', function($arr) {
+			$arr['relative'] = str_replace(home_url(), '', $arr['baseurl']);
 			return $arr;
 		} );
 	}
@@ -198,16 +198,16 @@ 
 	 * @param string  $local_file   ex: /var/www/wp-content/uploads/2015/my-pic.jpg
 	 *                              or: http://example.org/wp-content/uploads/2015/my-pic.jpg
 	 */
-	static function delete_generated_files( $local_file ) {
-		if (TimberURLHelper::is_absolute( $local_file ) ) {
-			$local_file = TimberURLHelper::url_to_file_system( $local_file );
+	static function delete_generated_files($local_file) {
+		if ( TimberURLHelper::is_absolute($local_file) ) {
+			$local_file = TimberURLHelper::url_to_file_system($local_file);
 		}
-		$info = pathinfo( $local_file );
+		$info = pathinfo($local_file);
 		$dir = $info['dirname'];
 		$ext = $info['extension'];
 		$filename = $info['filename'];
-		self::process_delete_generated_files( $filename, $ext, $dir, '-[0-9999999]*', '-[0-9]*x[0-9]*-c-[a-z]*.' );
-		self::process_delete_generated_files( $filename, $ext, $dir, '-lbox-[0-9999999]*', '-lbox-[0-9]*x[0-9]*-[a-zA-Z0-9]*.' );
+		self::process_delete_generated_files($filename, $ext, $dir, '-[0-9999999]*', '-[0-9]*x[0-9]*-c-[a-z]*.');
+		self::process_delete_generated_files($filename, $ext, $dir, '-lbox-[0-9999999]*', '-lbox-[0-9]*x[0-9]*-[a-zA-Z0-9]*.');
 	}
 
 	/**
@@ -224,14 +224,14 @@ 
 	 * @param string 	$search_pattern pattern of files to pluck from
 	 * @param string 	$match_pattern pattern of files to go forth and delete
 	 */
-	protected static function process_delete_generated_files( $filename, $ext, $dir, $search_pattern, $match_pattern ) {
+	protected static function process_delete_generated_files($filename, $ext, $dir, $search_pattern, $match_pattern) {
 		$searcher = '/' . $filename . $search_pattern;
-		foreach ( glob( $dir . $searcher ) as $found_file ) {
-			$regexdir = str_replace( '/', '\/', $dir );
-			$pattern = '/' . ( $regexdir ) . '\/' . $filename . $match_pattern . $ext . '/';
-			$match = preg_match( $pattern, $found_file );
+		foreach (glob($dir . $searcher) as $found_file) {
+			$regexdir = str_replace('/', '\/', $dir);
+			$pattern = '/' . ($regexdir) . '\/' . $filename . $match_pattern . $ext . '/';
+			$match = preg_match($pattern, $found_file);
 			if ( $match ) {
-				unlink( $found_file );
+				unlink($found_file);
 			}
 		}
 	}
@@ -243,9 +243,9 @@ 
 	 * @param string  $url
 	 * @return string
 	 */
-	public static function get_server_location( $url ) {
+	public static function get_server_location($url) {
 		// if we're already an absolute dir, just return
-		if ( 0 === strpos( $url, ABSPATH ) ) {
+		if ( 0 === strpos($url, ABSPATH) ) {
 			return $url;
 		}
 		// otherwise, analyze URL then build mapping path
@@ -260,15 +260,15 @@ 
 	 * @param string  $file
 	 * @return string
 	 */
-	public static function get_sideloaded_file_loc( $file ) {
+	public static function get_sideloaded_file_loc($file) {
 		$upload = wp_upload_dir();
 		$dir = $upload['path'];
 		$filename = $file;
-		$file = parse_url( $file );
-		$path_parts = pathinfo( $file['path'] );
-		$basename = md5( $filename );
+		$file = parse_url($file);
+		$path_parts = pathinfo($file['path']);
+		$basename = md5($filename);
 		$ext = 'jpg';
-		if ( isset( $path_parts['extension'] ) ) {
+		if ( isset($path_parts['extension']) ) {
 			$ext = $path_parts['extension'];
 		}
 		return $dir . '/' . $basename . '.' . $ext;
@@ -280,28 +280,28 @@ 
 	 * @param string  $file the URL to the original file
 	 * @return string the URL to the downloaded file
 	 */
-	public static function sideload_image( $file ) {
-		$loc = self::get_sideloaded_file_loc( $file );
-		if ( file_exists( $loc ) ) {
-			return TimberURLHelper::preslashit( TimberURLHelper::get_rel_path( $loc ) );
+	public static function sideload_image($file) {
+		$loc = self::get_sideloaded_file_loc($file);
+		if ( file_exists($loc) ) {
+			return TimberURLHelper::preslashit(TimberURLHelper::get_rel_path($loc));
 		}
 		// Download file to temp location
-		if ( !function_exists( 'download_url' ) ) {
+		if ( !function_exists('download_url') ) {
 			require_once ABSPATH . '/wp-admin/includes/file.php';
 		}
-		$tmp = download_url( $file );
-		preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+		$tmp = download_url($file);
+		preg_match('/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches);
 		$file_array = array();
-		$file_array['name'] = basename( $matches[0] );
+		$file_array['name'] = basename($matches[0]);
 		$file_array['tmp_name'] = $tmp;
 		// If error storing temporarily, unlink
-		if ( is_wp_error( $tmp ) ) {
-			@unlink( $file_array['tmp_name'] );
+		if ( is_wp_error($tmp) ) {
+			@unlink($file_array['tmp_name']);
 			$file_array['tmp_name'] = '';
 		}
 		// do the validation and storage stuff
-		$locinfo = pathinfo( $loc );
-		$file = wp_upload_bits( $locinfo['basename'], null, file_get_contents( $file_array['tmp_name'] ) );
+		$locinfo = pathinfo($loc);
+		$file = wp_upload_bits($locinfo['basename'], null, file_get_contents($file_array['tmp_name']));
 		return $file['url'];
 	}
 
@@ -328,23 +328,23 @@ 
 		if ( 0 === strpos($tmp, ABSPATH) ) { // we've been given a dir, not an url
 			$result['absolute'] = true;
 			if ( 0 === strpos($tmp, $upload_dir['basedir']) ) {
-				$result['base']= self::BASE_UPLOADS; // upload based
+				$result['base'] = self::BASE_UPLOADS; // upload based
 				$tmp = str_replace($upload_dir['basedir'], '', $tmp);
 			}
 			if ( 0 === strpos($tmp, WP_CONTENT_DIR) ) {
-				$result['base']= self::BASE_CONTENT; // content based
+				$result['base'] = self::BASE_CONTENT; // content based
 				$tmp = str_replace(WP_CONTENT_DIR, '', $tmp);
 			}
 		} else {
-			if (!$result['absolute']) {
-				$tmp = home_url().$tmp;
+			if ( !$result['absolute'] ) {
+				$tmp = home_url() . $tmp;
 			}
-			if (0 === strpos($tmp, $upload_dir['baseurl'])) {
-				$result['base']= self::BASE_UPLOADS; // upload based
+			if ( 0 === strpos($tmp, $upload_dir['baseurl']) ) {
+				$result['base'] = self::BASE_UPLOADS; // upload based
 				$tmp = str_replace($upload_dir['baseurl'], '', $tmp);
 			}
-			if (0 === strpos($tmp, content_url())) {
-				$result['base']= self::BASE_CONTENT; // content-based
+			if ( 0 === strpos($tmp, content_url()) ) {
+				$result['base'] = self::BASE_CONTENT; // content-based
 				$tmp = str_replace(content_url(), '', $tmp);
 			}
 		}
@@ -368,18 +368,18 @@ 
 	 */
 	private static function _get_file_url($base, $subdir, $filename, $absolute) {
 		$url = '';
-		if( self::BASE_UPLOADS == $base ) {
+		if ( self::BASE_UPLOADS == $base ) {
 			$upload_dir = wp_upload_dir();
 			$url = $upload_dir['baseurl'];
 		}
-		if( self::BASE_CONTENT == $base ) {
+		if ( self::BASE_CONTENT == $base ) {
 			$url = content_url();
 		}
-		if(!empty($subdir)) {
+		if ( !empty($subdir) ) {
 			$url .= $subdir;
 		}
-		$url .= '/'.$filename;
-		if(!$absolute) {
+		$url .= '/' . $filename;
+		if ( !$absolute ) {
 			$url = str_replace(home_url(), '', $url);
 		}
 		// $url = TimberURLHelper::remove_double_slashes( $url);
@@ -396,17 +396,17 @@ 
 	 */
 	private static function _get_file_path($base, $subdir, $filename) {
 		$path = '';
-		if(self::BASE_UPLOADS == $base) {
+		if ( self::BASE_UPLOADS == $base ) {
 			$upload_dir = wp_upload_dir();
 			$path = $upload_dir['basedir'];
 		}
-		if(self::BASE_CONTENT == $base) {
+		if ( self::BASE_CONTENT == $base ) {
 			$path = WP_CONTENT_DIR;
 		}
-		if(!empty($subdir)) {
+		if ( !empty($subdir) ) {
 			$path .= $subdir;
 		}
-		$path .= '/'.$filename;
+		$path .= '/' . $filename;
 		return $path;
 	}
 
@@ -424,13 +424,13 @@ 
 	 * @return string         URL to the new image - or the source one if error
 	 *
 	 */
-	private static function _operate( $src, $op, $force = false ) {
-		if ( empty( $src ) ) {
+	private static function _operate($src, $op, $force = false) {
+		if ( empty($src) ) {
 			return '';
 		}
 		// if external image, load it first
-		if ( TimberURLHelper::is_external_content( $src ) ) {
-			$src = self::sideload_image( $src );
+		if ( TimberURLHelper::is_external_content($src) ) {
+			$src = self::sideload_image($src);
 		}
 		// break down URL into components
 		$au = self::analyze_url($src);
@@ -452,17 +452,17 @@ 
 			$au['basename']
 		);
 		// if already exists...
-		if ( file_exists( $new_server_path ) ) {
+		if ( file_exists($new_server_path) ) {
 			if ( $force ) {
 				// Force operation - warning: will regenerate the image on every pageload, use for testing purposes only!
-				unlink( $new_server_path );
+				unlink($new_server_path);
 			} else {
 				// return existing file (caching)
 				return $new_url;
 			}
 		}
 		// otherwise generate result file
-		if($op->run($old_server_path, $new_server_path)) {
+		if ( $op->run($old_server_path, $new_server_path) ) {
 			return $new_url;
 		} else {
 			// in case of error, we return source file itself
@@ -484,7 +484,7 @@ 
 		);
 		return $new_url;
 	}
-	public static function get_letterbox_file_path($url, $w, $h, $color ) {
+	public static function get_letterbox_file_path($url, $w, $h, $color) {
 		$au = self::analyze_url($url);
 		$op = new TimberImageOperationLetterbox($w, $h, $color);
 		$new_path = self::_get_file_path(

lib/timber-image.php

Spacing +34 added lines, -34 removed lines

@@ -87,7 +87,7 @@ 
 	 * @return string the src of the file
 	 */
 	public function __toString() {
-		if ($this->get_src()) {
+		if ( $this->get_src() ) {
 			return $this->get_src();
 		}
 		return '';
@@ -107,7 +107,7 @@ 
 	 * @return array|int
 	 */
 	protected function get_dimensions($dim = null) {
-		if (isset($this->_dimensions)) {
+		if ( isset($this->_dimensions) ) {
 			return $this->get_dimensions_loaded($dim);
 		}
 		if ( file_exists($this->file_loc) && filesize($this->file_loc) ) {
@@ -125,13 +125,13 @@ 
 	 * @return array|int
 	 */
 	protected function get_dimensions_loaded($dim) {
-		if ($dim === null) {
+		if ( $dim === null ) {
 			return $this->_dimensions;
 		}
-		if ($dim == 'w' || $dim == 'width') {
+		if ( $dim == 'w' || $dim == 'width' ) {
 			return $this->_dimensions[0];
 		}
-		if ($dim == 'h' || $dim == 'height') {
+		if ( $dim == 'h' || $dim == 'height' ) {
 			return $this->_dimensions[1];
 		}
 		return null;
@@ -141,27 +141,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;
@@ -173,7 +173,7 @@ 
 	 * @return string with http/https corrected depending on what's appropriate for server
 	 */
 	protected static function _maybe_secure_url($url) {
-		if (is_ssl() && strpos($url, 'https') !== 0 && strpos($url, 'http') === 0) {
+		if ( is_ssl() && strpos($url, 'https') !== 0 && strpos($url, 'http') === 0 ) {
 			$url = 'https' . substr($url, strlen('http'));
 		}
 		return $url;
@@ -182,7 +182,7 @@ 
 	public static function wp_upload_dir() {
 		static $wp_upload_dir = false;
 
-		if (!$wp_upload_dir) {
+		if ( !$wp_upload_dir ) {
 			$wp_upload_dir = wp_upload_dir();
 		}
 
@@ -193,9 +193,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;
 			}
@@ -203,7 +203,7 @@ 
 				$this->init_with_file_path($iid);
 				return;
 			}
-			if (strstr(strtolower($iid), '.jpg')) {
+			if ( strstr(strtolower($iid), '.jpg') ) {
 				$this->init_with_relative_path($iid);
 				return;
 			}
@@ -214,24 +214,24 @@ 
 		$this->import($image_info);
 		$basedir = self::wp_upload_dir();
 		$basedir = $basedir['basedir'];
-		if (isset($this->file)) {
+		if ( isset($this->file) ) {
 			$this->file_loc = $basedir . DIRECTORY_SEPARATOR . $this->file;
-		} else if (isset($this->_wp_attached_file)) {
+		} else if ( isset($this->_wp_attached_file) ) {
 			$this->file = reset($this->_wp_attached_file);
 			$this->file_loc = $basedir . DIRECTORY_SEPARATOR . $this->file;
 		}
-		if (isset($image_info['id'])) {
+		if ( isset($image_info['id']) ) {
 			$this->ID = $image_info['id'];
-		} else if (is_numeric($iid)) {
+		} else if ( is_numeric($iid) ) {
 			$this->ID = $iid;
 		}
-		if (isset($this->ID)) {
+		if ( isset($this->ID) ) {
 			$custom = get_post_custom($this->ID);
 			foreach ($custom as $key => $value) {
 				$this->$key = $value[0];
 			}
 		} else {
-			if (is_array($iid) || is_object($iid)) {
+			if ( is_array($iid) || is_object($iid) ) {
 				TimberHelper::error_log('Not able to init in TimberImage with iid=');
 				TimberHelper::error_log($iid);
 			} else {
@@ -244,9 +244,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;
 	}
@@ -255,8 +255,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;
@@ -268,7 +268,7 @@ 
 	 */
 	protected function init_with_url($url) {
 		$this->abs_url = $url;
-		if (TimberURLHelper::is_local($url)) {
+		if ( TimberURLHelper::is_local($url) ) {
 			$this->file = ABSPATH . TimberURLHelper::get_rel_url($url);
 			$this->file_loc = ABSPATH . TimberURLHelper::get_rel_url($url);
 		}
@@ -336,7 +336,7 @@ 
 	 * ```
 	 */
 	public function link() {
-		if (strlen($this->abs_url)) {
+		if ( strlen($this->abs_url) ) {
 			return $this->abs_url;
 		}
 		return get_permalink($this->ID);
@@ -347,7 +347,7 @@ 
 	 * @return bool|TimberPost
 	 */
 	public function parent() {
-		if (!$this->post_parent) {
+		if ( !$this->post_parent ) {
 			return false;
 		}
 		return new $this->PostClass($this->post_parent);
@@ -455,8 +455,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-integrations.php

Spacing +4 added lines, -4 removed lines

@@ -7,16 +7,16 @@
 class TimberIntegrations {
     public static function init() {
 
-        add_action( 'init', array( __CLASS__, 'maybe_init_acftimber' ) );
+        add_action('init', array(__CLASS__, 'maybe_init_acftimber'));
 
-        if ( class_exists( 'WP_CLI_Command' ) ) {
-            WP_CLI::add_command( 'timber', 'Timber_WP_CLI_Command' );
+        if ( class_exists('WP_CLI_Command') ) {
+            WP_CLI::add_command('timber', 'Timber_WP_CLI_Command');
         }
     }
 
     public static function maybe_init_acftimber() {
 
-        if ( class_exists( 'ACF' ) ) {
+        if ( class_exists('ACF') ) {
             new ACFTimber();
         }
 

lib/timber-loader.php

Spacing +51 added lines, -51 removed lines

@@ -41,8 +41,8 @@ 
 	 */
 	function render($file, $data = null, $expires = false, $cache_mode = self::CACHE_USE_DEFAULT) {
 		// Different $expires if user is anonymous or logged in
-		if (is_array($expires)) {
-			if (is_user_logged_in() && isset($expires[1])) {
+		if ( is_array($expires) ) {
+			if ( is_user_logged_in() && isset($expires[1]) ) {
 				$expires = $expires[1];
 			} else {
 				$expires = $expires[0];
@@ -51,15 +51,15 @@ 
 
 		$key = null;
 		$output = false;
-		if (false !== $expires) {
+		if ( false !== $expires ) {
 			ksort($data);
 			$key = md5($file . json_encode($data));
 			$output = $this->get_cache($key, self::CACHEGROUP, $cache_mode);
 		}
 
-		if (false === $output || null === $output) {
+		if ( false === $output || null === $output ) {
 			$twig = $this->get_twig();
-			if (strlen($file)) {
+			if ( strlen($file) ) {
 				$loader = $this->get_loader();
 				$result = $loader->getCacheKey($file);
 				do_action('timber_loader_render_file', $result);
@@ -69,7 +69,7 @@ 
 			$output = $twig->render($file, $data);
 		}
 
-		if (false !== $output && false !== $expires && null !== $key) {
+		if ( false !== $output && false !== $expires && null !== $key ) {
 			$this->set_cache($key, $output, self::CACHEGROUP, $expires, $cache_mode);
 		}
 		$output = apply_filters('timber_output', $output);
@@ -81,10 +81,10 @@ 
 	 * @return bool
 	 */
 	function choose_template($filenames) {
-		if (is_array($filenames)) {
+		if ( is_array($filenames) ) {
 			/* its an array so we have to figure out which one the dev wants */
 			foreach ($filenames as $filename) {
-				if ($this->template_exists($filename)) {
+				if ( $this->template_exists($filename) ) {
 					return $filename;
 				}
 			}
@@ -100,7 +100,7 @@ 
 	function template_exists($file) {
 		foreach ($this->locations as $dir) {
 			$look_for = trailingslashit($dir) . $file;
-			if (file_exists($look_for)) {
+			if ( file_exists($look_for) ) {
 				return true;
 			}
 		}
@@ -114,7 +114,7 @@ 
 		$theme_locs = array();
 		$child_loc = get_stylesheet_directory();
 		$parent_loc = get_template_directory();
-		if (DIRECTORY_SEPARATOR == '\\') {
+		if ( DIRECTORY_SEPARATOR == '\\' ) {
 			$child_loc = str_replace('/', '\\', $child_loc);
 			$parent_loc = str_replace('/', '\\', $parent_loc);
 		}
@@ -122,7 +122,7 @@ 
 		foreach ($this->get_locations_theme_dir() as $dirname) {
 			$theme_locs[] = trailingslashit($child_loc) . trailingslashit($dirname);
 		}
-		if ($child_loc != $parent_loc) {
+		if ( $child_loc != $parent_loc ) {
 			$theme_locs[] = $parent_loc;
 			foreach ($this->get_locations_theme_dir() as $dirname) {
 				$theme_locs[] = trailingslashit($parent_loc) . trailingslashit($dirname);
@@ -138,7 +138,7 @@ 
 	 * @return string[] the names of directores, ie: array('templats', 'views');
 	 */
 	private function get_locations_theme_dir() {
-		if (is_string(Timber::$dirname)) {
+		if ( is_string(Timber::$dirname) ) {
 			return array(Timber::$dirname);
 		}
 		return Timber::$dirname;
@@ -149,13 +149,13 @@ 
 	 */
 	function get_locations_user() {
 		$locs = array();
-		if (isset(Timber::$locations)) {
-			if (is_string(Timber::$locations)) {
+		if ( isset(Timber::$locations) ) {
+			if ( is_string(Timber::$locations) ) {
 				Timber::$locations = array(Timber::$locations);
 			}
 			foreach (Timber::$locations as $tloc) {
 				$tloc = realpath($tloc);
-				if (is_dir($tloc)) {
+				if ( is_dir($tloc) ) {
 					$locs[] = $tloc;
 				}
 			}
@@ -169,14 +169,14 @@ 
 	 */
 	function get_locations_caller($caller = false) {
 		$locs = array();
-		if ($caller && is_string($caller)) {
+		if ( $caller && is_string($caller) ) {
 			$caller = trailingslashit($caller);
-			if (is_dir($caller)) {
+			if ( is_dir($caller) ) {
 				$locs[] = $caller;
 			}
 			foreach ($this->get_locations_theme_dir() as $dirname) {
 				$caller_sub = $caller . trailingslashit($dirname);
-				if (is_dir($caller_sub)) {
+				if ( is_dir($caller_sub) ) {
 					$locs[] = $caller_sub;
 				}
 			}
@@ -210,14 +210,14 @@ 
 		$paths = array();
 		foreach ($this->locations as $loc) {
 			$loc = realpath($loc);
-			if (is_dir($loc)) {
+			if ( is_dir($loc) ) {
 				$loc = realpath($loc);
 				$paths[] = $loc;
 			} else {
 				//error_log($loc.' is not a directory');
 			}
 		}
-		if (!ini_get('open_basedir')) {
+		if ( !ini_get('open_basedir') ) {
 			$paths[] = '/';
 		} else {
 			$paths[] = ABSPATH;
@@ -233,15 +233,15 @@ 
 	function get_twig() {
 		$loader = $this->get_loader();
 		$params = array('debug' => WP_DEBUG, 'autoescape' => false);
-		if (isset(Timber::$autoescape)) {
+		if ( isset(Timber::$autoescape) ) {
 			$params['autoescape'] = Timber::$autoescape;
 		}
-		if (Timber::$cache === true) {
+		if ( Timber::$cache === true ) {
 			Timber::$twig_cache = true;
 		}
-		if (Timber::$twig_cache) {
-			$twig_cache_loc = apply_filters( 'timber/cache/location', TIMBER_LOC . '/cache/twig' );
-			if (!file_exists($twig_cache_loc)) {
+		if ( Timber::$twig_cache ) {
+			$twig_cache_loc = apply_filters('timber/cache/location', TIMBER_LOC . '/cache/twig');
+			if ( !file_exists($twig_cache_loc) ) {
 				mkdir($twig_cache_loc, 0777, true);
 			}
 			$params['cache'] = $twig_cache_loc;
@@ -258,26 +258,26 @@ 
 		return $twig;
 	}
 
-	public function clear_cache_timber($cache_mode = self::CACHE_USE_DEFAULT){
+	public function clear_cache_timber($cache_mode = self::CACHE_USE_DEFAULT) {
 		//_transient_timberloader
 		$object_cache = false;
-		if (isset($GLOBALS['wp_object_cache']) && is_object($GLOBALS['wp_object_cache'])) {
+		if ( isset($GLOBALS['wp_object_cache']) && is_object($GLOBALS['wp_object_cache']) ) {
 			$object_cache = true;
 		}
 		$cache_mode = $this->_get_cache_mode($cache_mode);
-		if (self::CACHE_TRANSIENT === $cache_mode) {
+		if ( self::CACHE_TRANSIENT === $cache_mode ) {
 			global $wpdb;
 			$query = $wpdb->prepare("DELETE FROM $wpdb->options WHERE option_name LIKE '%s'", '_transient_timberloader_%');
-			$wpdb->query( $query );
+			$wpdb->query($query);
 			return true;
-		} else if (self::CACHE_SITE_TRANSIENT === $cache_mode) {
+		} else if ( self::CACHE_SITE_TRANSIENT === $cache_mode ) {
 			global $wpdb;
 			$query = $wpdb->prepare("DELETE FROM $wpdb->options WHERE option_name LIKE '%s'", '_transient_timberloader_%');
-			$wpdb->query( $query );
+			$wpdb->query($query);
 			return true;
-		} else if (self::CACHE_OBJECT === $cache_mode && $object_cache) {
+		} else if ( self::CACHE_OBJECT === $cache_mode && $object_cache ) {
 			global $wp_object_cache;
-			if (isset($wp_object_cache->cache[self::CACHEGROUP])){
+			if ( isset($wp_object_cache->cache[self::CACHEGROUP]) ) {
 				unset($wp_object_cache->cache[self::CACHEGROUP]);
 				return true;
 			}
@@ -289,7 +289,7 @@ 
 		$twig = $this->get_twig();
 		$twig->clearCacheFiles();
 		$cache = $twig->getCache();
-		if ($cache){
+		if ( $cache ) {
 			self::rrmdir($twig->getCache());
 			return true;
 		}
@@ -300,15 +300,15 @@ 
 	 * @param string|false $dirPath
 	 */
 	public static function rrmdir($dirPath) {
-		if (! is_dir($dirPath)) {
+		if ( !is_dir($dirPath) ) {
 			throw new InvalidArgumentException("$dirPath must be a directory");
 		}
-		if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {
+		if ( substr($dirPath, strlen($dirPath) - 1, 1) != '/' ) {
 			$dirPath .= '/';
 		}
 		$files = glob($dirPath . '*', GLOB_MARK);
 		foreach ($files as $file) {
-			if (is_dir($file)) {
+			if ( is_dir($file) ) {
 				self::rrmdir($file);
 			} else {
 				unlink($file);
@@ -323,9 +323,9 @@ 
 	private function _get_cache_extension() {
 
 		$key_generator   = new \Timber\Cache\KeyGenerator();
-		$cache_provider  = new \Timber\Cache\WPObjectCacheAdapter( $this );
-		$cache_strategy  = new \Asm89\Twig\CacheExtension\CacheStrategy\GenerationalCacheStrategy( $cache_provider, $key_generator );
-		$cache_extension = new \Asm89\Twig\CacheExtension\Extension( $cache_strategy );
+		$cache_provider  = new \Timber\Cache\WPObjectCacheAdapter($this);
+		$cache_strategy  = new \Asm89\Twig\CacheExtension\CacheStrategy\GenerationalCacheStrategy($cache_provider, $key_generator);
+		$cache_extension = new \Asm89\Twig\CacheExtension\Extension($cache_strategy);
 
 		return $cache_extension;
 	}
@@ -339,7 +339,7 @@ 
 	public function get_cache($key, $group = self::CACHEGROUP, $cache_mode = self::CACHE_USE_DEFAULT) {
 		$object_cache = false;
 
-		if (isset($GLOBALS['wp_object_cache']) && is_object($GLOBALS['wp_object_cache'])) {
+		if ( isset($GLOBALS['wp_object_cache']) && is_object($GLOBALS['wp_object_cache']) ) {
 			$object_cache = true;
 		}
 
@@ -348,13 +348,13 @@ 
 		$value = false;
 
 		$trans_key = substr($group . '_' . $key, 0, self::TRANS_KEY_LEN);
-		if (self::CACHE_TRANSIENT === $cache_mode)
+		if ( self::CACHE_TRANSIENT === $cache_mode )
 			$value = get_transient($trans_key);
 
-		elseif (self::CACHE_SITE_TRANSIENT === $cache_mode)
+		elseif ( self::CACHE_SITE_TRANSIENT === $cache_mode )
 			$value = get_site_transient($trans_key);
 
-		elseif (self::CACHE_OBJECT === $cache_mode && $object_cache)
+		elseif ( self::CACHE_OBJECT === $cache_mode && $object_cache )
 			$value = wp_cache_get($key, $group);
 
 		return $value;
@@ -371,23 +371,23 @@ 
 	public function set_cache($key, $value, $group = self::CACHEGROUP, $expires = 0, $cache_mode = self::CACHE_USE_DEFAULT) {
 		$object_cache = false;
 
-		if (isset($GLOBALS['wp_object_cache']) && is_object($GLOBALS['wp_object_cache'])) {
+		if ( isset($GLOBALS['wp_object_cache']) && is_object($GLOBALS['wp_object_cache']) ) {
 			$object_cache = true;
 		}
 
-		if ((int)$expires < 1)
+		if ( (int) $expires < 1 )
 			$expires = 0;
 
 		$cache_mode = self::_get_cache_mode($cache_mode);
 		$trans_key = substr($group . '_' . $key, 0, self::TRANS_KEY_LEN);
 
-		if (self::CACHE_TRANSIENT === $cache_mode)
+		if ( self::CACHE_TRANSIENT === $cache_mode )
 			set_transient($trans_key, $value, $expires);
 
-		elseif (self::CACHE_SITE_TRANSIENT === $cache_mode)
+		elseif ( self::CACHE_SITE_TRANSIENT === $cache_mode )
 			set_site_transient($trans_key, $value, $expires);
 
-		elseif (self::CACHE_OBJECT === $cache_mode && $object_cache)
+		elseif ( self::CACHE_OBJECT === $cache_mode && $object_cache )
 			wp_cache_set($key, $value, $group, $expires);
 
 		return $value;
@@ -398,12 +398,12 @@ 
 	 * @return string
 	 */
 	private function _get_cache_mode($cache_mode) {
-		if (empty($cache_mode) || self::CACHE_USE_DEFAULT === $cache_mode) {
+		if ( empty($cache_mode) || self::CACHE_USE_DEFAULT === $cache_mode ) {
 			$cache_mode = $this->cache_mode;
 		}
 
 		// Fallback if self::$cache_mode did not get a valid value
-		if (!in_array($cache_mode, self::$cache_modes)) {
+		if ( !in_array($cache_mode, self::$cache_modes) ) {
 			$cache_mode = self::CACHE_OBJECT;
 		}