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 {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 		$show_year = $r['show_year'];
 		//will need to specify which year we're looking for
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts "
-			. "FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) "
+			. "from $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) "
 			. "ORDER BY post_date $order $limit";
 		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";

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

Indentation +103 added lines, -103 removed lines

@@ -2,116 +2,116 @@
 
 abstract class TimberCore {
 
-    public $id;
-    public $ID;
-    public $object_type;
+	public $id;
+	public $ID;
+	public $object_type;
 
-    /**
-     *
-     *
-     * @return boolean
-     */
-    function __isset( $field ) {
-        if ( isset( $this->$field ) ) {
-            return $this->$field;
-        }
-        return false;
-    }
+	/**
+	 *
+	 *
+	 * @return boolean
+	 */
+	function __isset( $field ) {
+		if ( isset( $this->$field ) ) {
+			return $this->$field;
+		}
+		return false;
+	}
 
-    /**
-     * 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 );
-    }
+	/**
+	 * 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 );
+	}
 
-    /**
-     * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
-     *
-     * @return mixed
-     */
-    function __get( $field ) {
-    	if ( property_exists($this, $field) ) {
-    		return $this->$field;
-    	}
-        if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
-            return $this->$field = $meta_value;
-        }
-        if ( method_exists($this, $field) ) {
-            return $this->$field = $this->$field();
-        }
-        return $this->$field = false;
-    }
+	/**
+	 * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
+	 *
+	 * @return mixed
+	 */
+	function __get( $field ) {
+		if ( property_exists($this, $field) ) {
+			return $this->$field;
+		}
+		if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
+			return $this->$field = $meta_value;
+		}
+		if ( method_exists($this, $field) ) {
+			return $this->$field = $this->$field();
+		}
+		return $this->$field = false;
+	}
 
-    /**
-     * Takes an array or object and adds the properties to the parent object
-     * @example
-     * ```php
-     * $data = array('airplane' => '757-200', 'flight' => '5316');
-     * $post = new TimberPost()
-     * $post->import(data);
-     * echo $post->airplane; //757-200
-     * ```
-     * @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 );
-        }
-        if ( is_array( $info ) ) {
-            foreach ( $info as $key => $value ) {
-                if ( !empty( $key ) && $force ) {
-                    $this->$key = $value;
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
-                    $this->$key = $value;
-                }
-            }
-        }
-    }
+	/**
+	 * Takes an array or object and adds the properties to the parent object
+	 * @example
+	 * ```php
+	 * $data = array('airplane' => '757-200', 'flight' => '5316');
+	 * $post = new TimberPost()
+	 * $post->import(data);
+	 * echo $post->airplane; //757-200
+	 * ```
+	 * @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 );
+		}
+		if ( is_array( $info ) ) {
+			foreach ( $info as $key => $value ) {
+				if ( !empty( $key ) && $force ) {
+					$this->$key = $value;
+				} else if ( !empty( $key ) && !method_exists($this, $key) ){
+					$this->$key = $value;
+				}
+			}
+		}
+	}
 
 
-    /**
-     * @ignore
-     * @param string  $key
-     * @param mixed   $value
-     */
-    function update( $key, $value ) {
-        update_metadata( $this->object_type, $this->ID, $key, $value );
-    }
+	/**
+	 * @ignore
+	 * @param string  $key
+	 * @param mixed   $value
+	 */
+	function update( $key, $value ) {
+		update_metadata( $this->object_type, $this->ID, $key, $value );
+	}
 
-    /**
-     * Can you edit this post/term/user? Well good for you. You're no better than me.
-     * @example
-     * ```twig
-     * {% if post.can_edit %}
-     * <a href="{{ post.edit_link }}">Edit</a>
-     * {% endif %}
-     * ```
-     * ```html
-     * <a href="http://example.org/wp-admin/edit.php?p=242">Edit</a>
-     * ```
-     * @return bool
-     */
-    function can_edit() {
-        if ( !function_exists( 'current_user_can' ) ) {
-            return false;
-        }
-        if ( current_user_can( 'edit_post', $this->ID ) ) {
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * Can you edit this post/term/user? Well good for you. You're no better than me.
+	 * @example
+	 * ```twig
+	 * {% if post.can_edit %}
+	 * <a href="{{ post.edit_link }}">Edit</a>
+	 * {% endif %}
+	 * ```
+	 * ```html
+	 * <a href="http://example.org/wp-admin/edit.php?p=242">Edit</a>
+	 * ```
+	 * @return bool
+	 */
+	function can_edit() {
+		if ( !function_exists( 'current_user_can' ) ) {
+			return false;
+		}
+		if ( current_user_can( 'edit_post', $this->ID ) ) {
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     *
-     *
-     * @return array
-     */
-    function get_method_values() {
-        $ret = array();
-        $ret['can_edit'] = $this->can_edit();
-        return $ret;
-    }
+	/**
+	 *
+	 *
+	 * @return array
+	 */
+	function get_method_values() {
+		$ret = array();
+		$ret['can_edit'] = $this->can_edit();
+		return $ret;
+	}
 
 }

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;

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             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;
                 }
             }

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

Indentation +11 added lines, -11 removed lines

@@ -5,20 +5,20 @@
  * @package  timber
  */
 class TimberIntegrations {
-    public static function init() {
+	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() {
+	public static function maybe_init_acftimber() {
 
-        if ( class_exists( 'ACF' ) ) {
-            new ACFTimber();
-        }
+		if ( class_exists( 'ACF' ) ) {
+			new ACFTimber();
+		}
 
-    }
+	}
 }

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

Braces +20 added lines, -21 removed lines

@@ -258,7 +258,7 @@ 
 		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'])) {
@@ -277,7 +277,7 @@ 
 			return true;
 		} 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;
 		}
@@ -348,14 +348,13 @@ 
 		$value = false;
 
 		$trans_key = substr($group . '_' . $key, 0, self::TRANS_KEY_LEN);
-		if (self::CACHE_TRANSIENT === $cache_mode)
-			$value = get_transient($trans_key);
-
-		elseif (self::CACHE_SITE_TRANSIENT === $cache_mode)
-			$value = get_site_transient($trans_key);
-
-		elseif (self::CACHE_OBJECT === $cache_mode && $object_cache)
-			$value = wp_cache_get($key, $group);
+		if (self::CACHE_TRANSIENT === $cache_mode) {
+					$value = get_transient($trans_key);
+		} elseif (self::CACHE_SITE_TRANSIENT === $cache_mode) {
+					$value = get_site_transient($trans_key);
+		} elseif (self::CACHE_OBJECT === $cache_mode && $object_cache) {
+					$value = wp_cache_get($key, $group);
+		}
 
 		return $value;
 	}
@@ -375,20 +374,20 @@ 
 			$object_cache = true;
 		}
 
-		if ((int)$expires < 1)
-			$expires = 0;
+		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)
-			set_transient($trans_key, $value, $expires);
-
-		elseif (self::CACHE_SITE_TRANSIENT === $cache_mode)
-			set_site_transient($trans_key, $value, $expires);
-
-		elseif (self::CACHE_OBJECT === $cache_mode && $object_cache)
-			wp_cache_set($key, $value, $group, $expires);
+		if (self::CACHE_TRANSIENT === $cache_mode) {
+					set_transient($trans_key, $value, $expires);
+		} elseif (self::CACHE_SITE_TRANSIENT === $cache_mode) {
+					set_site_transient($trans_key, $value, $expires);
+		} elseif (self::CACHE_OBJECT === $cache_mode && $object_cache) {
+					wp_cache_set($key, $value, $group, $expires);
+		}
 
 		return $value;
 	}

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
 	 */
 	public 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 (self::template_exists($filename)) {
+				if ( self::template_exists($filename) ) {
 					return $filename;
 				}
 			}
@@ -100,7 +100,7 @@ 
 	protected 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;
 		}
 

lib/timber-post-getter.php

Spacing +23 added lines, -23 removed lines

@@ -8,19 +8,19 @@ 
 	 * @return array|bool|null
 	 */
 	static function get_post($query = false, $PostClass = 'TimberPost') {
-		$posts = self::get_posts( $query, $PostClass );
-		if ( $post = reset($posts ) ) {
+		$posts = self::get_posts($query, $PostClass);
+		if ( $post = reset($posts) ) {
 			return $post;
 		}
 	}
 
-	static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
-		$posts = self::query_posts( $query, $PostClass );
-		return apply_filters('timber_post_getter_get_posts', $posts->get_posts( $return_collection ));
+	static function get_posts($query = false, $PostClass = 'TimberPost', $return_collection = false) {
+		$posts = self::query_posts($query, $PostClass);
+		return apply_filters('timber_post_getter_get_posts', $posts->get_posts($return_collection));
 	}
 
-	static function query_post( $query = false, $PostClass = 'TimberPost' ) {
-		$posts = self::query_posts( $query, $PostClass );
+	static function query_post($query = false, $PostClass = 'TimberPost') {
+		$posts = self::query_posts($query, $PostClass);
 		if ( method_exists($posts, 'current') && $post = $posts->current() ) {
 			return $post;
 		}
@@ -31,32 +31,32 @@ 
 	 * @param string $PostClass
 	 * @return array|bool|null
 	 */
-	static function query_posts($query = false, $PostClass = 'TimberPost' ) {
-		if (self::is_post_class_or_class_map($query)) {
+	static function query_posts($query = false, $PostClass = 'TimberPost') {
+		if ( self::is_post_class_or_class_map($query) ) {
 			$PostClass = $query;
 			$query = false;
 		}
 
-		if (is_object($query) && !is_a($query, 'WP_Query') ){
+		if ( is_object($query) && !is_a($query, 'WP_Query') ) {
 			// The only object other than a query is a type of post object
-			$query = array( $query );
+			$query = array($query);
 		}
 
-		if ( is_array( $query ) && count( $query ) && isset( $query[0] ) && is_object( $query[0] ) ) {
+		if ( is_array($query) && count($query) && isset($query[0]) && is_object($query[0]) ) {
 			// We have an array of post objects that already have data
-			return new TimberPostsCollection( $query, $PostClass );
+			return new TimberPostsCollection($query, $PostClass);
 		} else {
 			// We have a query (of sorts) to work with
-			$tqi = new TimberQueryIterator( $query, $PostClass );
+			$tqi = new TimberQueryIterator($query, $PostClass);
 			return $tqi;
 		}
 	}
 
-	static function get_pids($query){
+	static function get_pids($query) {
 		$posts = self::get_posts($query);
 		$pids = array();
-		foreach($posts as $post){
-			if (isset($post->ID)){
+		foreach ($posts as $post) {
+			if ( isset($post->ID) ) {
 				$pids[] = $post->ID;
 			}
 		}
@@ -64,7 +64,7 @@ 
 	}
 
 	static function loop_to_id() {
-		if (!self::wp_query_has_posts()) { return false; }
+		if ( !self::wp_query_has_posts() ) { return false; }
 
 		global $wp_query;
 		$post_num = property_exists($wp_query, 'current_post')
@@ -72,7 +72,7 @@ 
 				  : 0
 				  ;
 
-		if (!isset($wp_query->posts[$post_num])) { return false; }
+		if ( !isset($wp_query->posts[$post_num]) ) { return false; }
 
 		return $wp_query->posts[$post_num]->ID;
 	}
@@ -89,13 +89,13 @@ 
 	 * @param string|array $arg
 	 * @return bool
 	 */
-	static function is_post_class_or_class_map($arg){
-		if (is_string($arg) && class_exists($arg)) {
+	static function is_post_class_or_class_map($arg) {
+		if ( is_string($arg) && class_exists($arg) ) {
 			return true;
 		}
-		if (is_array($arg)) {
+		if ( is_array($arg) ) {
 			foreach ($arg as $item) {
-				if (is_string($item) && class_exists($item)) {
+				if ( is_string($item) && class_exists($item) ) {
 					return true;
 				}
 			}

Braces +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
 			$query = false;
 		}
 
-		if (is_object($query) && !is_a($query, 'WP_Query') ){
+		if (is_object($query) && !is_a($query, 'WP_Query') ) {
 			// The only object other than a query is a type of post object
 			$query = array( $query );
 		}
@@ -52,11 +52,11 @@ 
 		}
 	}
 
-	static function get_pids($query){
+	static function get_pids($query) {
 		$posts = self::get_posts($query);
 		$pids = array();
-		foreach($posts as $post){
-			if (isset($post->ID)){
+		foreach($posts as $post) {
+			if (isset($post->ID)) {
 				$pids[] = $post->ID;
 			}
 		}
@@ -89,7 +89,7 @@ 
 	 * @param string|array $arg
 	 * @return bool
 	 */
-	static function is_post_class_or_class_map($arg){
+	static function is_post_class_or_class_map($arg) {
 		if (is_string($arg) && class_exists($arg)) {
 			return true;
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -606,7 +606,7 @@
 	 * Is post class or class map.
 	 *
 	 * @param string|array $args
-	 * @return bool
+	 * @return boolean|null
 	 * @deprecated since 0.20.0
 	 */
 	public static function is_post_class_or_class_map( $args ) {

lib/timber-posts-collection.php

Indentation +84 added lines, -84 removed lines

@@ -2,96 +2,96 @@
 
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) )
-    exit;
+	exit;
 
 class TimberPostsCollection extends ArrayObject {
 
-    public function __construct( $posts = array(), $post_class = 'TimberPost' ) {
-        $returned_posts = array();
-        if ( is_null( $posts ) ){
-            $posts = array();
-        }
-        foreach ( $posts as $post_object ) {
-            $post_class_use = $post_class;
-
-            if ( is_array( $post_class ) ) {
-                $post_type      = get_post_type( $post_object );
-                $post_class_use = 'TimberPost';
-
-                if ( isset( $post_class[$post_type] ) ) {
-                    $post_class_use = $post_class[$post_type];
-
-                } else {
-                    if ( is_array( $post_class ) ) {
-                        TimberHelper::error_log( $post_type . ' of ' . $post_object->ID . ' not found in ' . print_r( $post_class, true ) );
-                    } else {
-                        TimberHelper::error_log( $post_type . ' not found in ' . $post_class );
-                    }
-                }
-            }
-
-            // Don't create yet another object if $post_object is already of the right type
-            if ( is_a( $post_object, $post_class_use ) ) {
-                $post = $post_object;
-            } else {
-                $post = new $post_class_use( $post_object );
-            }
-
-            if ( isset( $post->ID ) ) {
-                $returned_posts[] = $post;
-            }
-        }
-
-        $returned_posts = self::maybe_set_preview($returned_posts);
-
-        parent::__construct( $returned_posts, $flags = 0, 'TimberPostsIterator' );
-    }
-
-    public function get_posts() {
-        return $this->getArrayCopy();
-    }
-
-     /**
-     * @param array $posts
-     * @return array
-     */
-    static function maybe_set_preview( $posts ) {
-        if ( is_array( $posts ) && isset( $_GET['preview'] ) && $_GET['preview']
-               && isset( $_GET['preview_id'] ) && $_GET['preview_id']
-               && current_user_can( 'edit_post', $_GET['preview_id'] ) ) {
-            // No need to check the nonce, that already happened in _show_post_preview on init
-
-            $preview_id = $_GET['preview_id'];
-            foreach( $posts as &$post ) {
-                if ( is_object( $post ) && $post->ID == $preview_id ) {
-                    // Based on _set_preview( $post ), but adds import_custom
-                    $preview = wp_get_post_autosave( $preview_id );
-                    if ( is_object($preview) ) {
-
-                        $preview = sanitize_post($preview);
-
-                        $post->post_content = $preview->post_content;
-                        $post->post_title = $preview->post_title;
-                        $post->post_excerpt = $preview->post_excerpt;
-                        $post->import_custom( $preview_id );
-
-                        add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
-                    }
-                }
-            }
-
-        }
-
-        return $posts;
-    }
+	public function __construct( $posts = array(), $post_class = 'TimberPost' ) {
+		$returned_posts = array();
+		if ( is_null( $posts ) ){
+			$posts = array();
+		}
+		foreach ( $posts as $post_object ) {
+			$post_class_use = $post_class;
+
+			if ( is_array( $post_class ) ) {
+				$post_type      = get_post_type( $post_object );
+				$post_class_use = 'TimberPost';
+
+				if ( isset( $post_class[$post_type] ) ) {
+					$post_class_use = $post_class[$post_type];
+
+				} else {
+					if ( is_array( $post_class ) ) {
+						TimberHelper::error_log( $post_type . ' of ' . $post_object->ID . ' not found in ' . print_r( $post_class, true ) );
+					} else {
+						TimberHelper::error_log( $post_type . ' not found in ' . $post_class );
+					}
+				}
+			}
+
+			// Don't create yet another object if $post_object is already of the right type
+			if ( is_a( $post_object, $post_class_use ) ) {
+				$post = $post_object;
+			} else {
+				$post = new $post_class_use( $post_object );
+			}
+
+			if ( isset( $post->ID ) ) {
+				$returned_posts[] = $post;
+			}
+		}
+
+		$returned_posts = self::maybe_set_preview($returned_posts);
+
+		parent::__construct( $returned_posts, $flags = 0, 'TimberPostsIterator' );
+	}
+
+	public function get_posts() {
+		return $this->getArrayCopy();
+	}
+
+	 /**
+	  * @param array $posts
+	  * @return array
+	  */
+	static function maybe_set_preview( $posts ) {
+		if ( is_array( $posts ) && isset( $_GET['preview'] ) && $_GET['preview']
+			   && isset( $_GET['preview_id'] ) && $_GET['preview_id']
+			   && current_user_can( 'edit_post', $_GET['preview_id'] ) ) {
+			// No need to check the nonce, that already happened in _show_post_preview on init
+
+			$preview_id = $_GET['preview_id'];
+			foreach( $posts as &$post ) {
+				if ( is_object( $post ) && $post->ID == $preview_id ) {
+					// Based on _set_preview( $post ), but adds import_custom
+					$preview = wp_get_post_autosave( $preview_id );
+					if ( is_object($preview) ) {
+
+						$preview = sanitize_post($preview);
+
+						$post->post_content = $preview->post_content;
+						$post->post_title = $preview->post_title;
+						$post->post_excerpt = $preview->post_excerpt;
+						$post->import_custom( $preview_id );
+
+						add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
+					}
+				}
+			}
+
+		}
+
+		return $posts;
+	}
 
 }
 
 class TimberPostsIterator extends ArrayIterator {
 
-    public function current() {
-        global $post;
-        $post = parent::current();
-        return $post;
-    }
+	public function current() {
+		global $post;
+		$post = parent::current();
+		return $post;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -1,50 +1,50 @@ 
 <?php
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) )
+if ( !defined('ABSPATH') )
     exit;
 
 class TimberPostsCollection extends ArrayObject {
 
-    public function __construct( $posts = array(), $post_class = 'TimberPost' ) {
+    public function __construct($posts = array(), $post_class = 'TimberPost') {
         $returned_posts = array();
-        if ( is_null( $posts ) ){
+        if ( is_null($posts) ) {
             $posts = array();
         }
-        foreach ( $posts as $post_object ) {
+        foreach ($posts as $post_object) {
             $post_class_use = $post_class;
 
-            if ( is_array( $post_class ) ) {
-                $post_type      = get_post_type( $post_object );
+            if ( is_array($post_class) ) {
+                $post_type      = get_post_type($post_object);
                 $post_class_use = 'TimberPost';
 
-                if ( isset( $post_class[$post_type] ) ) {
+                if ( isset($post_class[$post_type]) ) {
                     $post_class_use = $post_class[$post_type];
 
                 } else {
-                    if ( is_array( $post_class ) ) {
-                        TimberHelper::error_log( $post_type . ' of ' . $post_object->ID . ' not found in ' . print_r( $post_class, true ) );
+                    if ( is_array($post_class) ) {
+                        TimberHelper::error_log($post_type . ' of ' . $post_object->ID . ' not found in ' . print_r($post_class, true));
                     } else {
-                        TimberHelper::error_log( $post_type . ' not found in ' . $post_class );
+                        TimberHelper::error_log($post_type . ' not found in ' . $post_class);
                     }
                 }
             }
 
             // Don't create yet another object if $post_object is already of the right type
-            if ( is_a( $post_object, $post_class_use ) ) {
+            if ( is_a($post_object, $post_class_use) ) {
                 $post = $post_object;
             } else {
-                $post = new $post_class_use( $post_object );
+                $post = new $post_class_use($post_object);
             }
 
-            if ( isset( $post->ID ) ) {
+            if ( isset($post->ID) ) {
                 $returned_posts[] = $post;
             }
         }
 
         $returned_posts = self::maybe_set_preview($returned_posts);
 
-        parent::__construct( $returned_posts, $flags = 0, 'TimberPostsIterator' );
+        parent::__construct($returned_posts, $flags = 0, 'TimberPostsIterator');
     }
 
     public function get_posts() {
@@ -55,17 +55,17 @@ 
      * @param array $posts
      * @return array
      */
-    static function maybe_set_preview( $posts ) {
-        if ( is_array( $posts ) && isset( $_GET['preview'] ) && $_GET['preview']
-               && isset( $_GET['preview_id'] ) && $_GET['preview_id']
-               && current_user_can( 'edit_post', $_GET['preview_id'] ) ) {
+    static function maybe_set_preview($posts) {
+        if ( is_array($posts) && isset($_GET['preview']) && $_GET['preview']
+               && isset($_GET['preview_id']) && $_GET['preview_id']
+               && current_user_can('edit_post', $_GET['preview_id']) ) {
             // No need to check the nonce, that already happened in _show_post_preview on init
 
             $preview_id = $_GET['preview_id'];
-            foreach( $posts as &$post ) {
-                if ( is_object( $post ) && $post->ID == $preview_id ) {
+            foreach ($posts as &$post) {
+                if ( is_object($post) && $post->ID == $preview_id ) {
                     // Based on _set_preview( $post ), but adds import_custom
-                    $preview = wp_get_post_autosave( $preview_id );
+                    $preview = wp_get_post_autosave($preview_id);
                     if ( is_object($preview) ) {
 
                         $preview = sanitize_post($preview);
@@ -73,9 +73,9 @@ 
                         $post->post_content = $preview->post_content;
                         $post->post_title = $preview->post_title;
                         $post->post_excerpt = $preview->post_excerpt;
-                        $post->import_custom( $preview_id );
+                        $post->import_custom($preview_id);
 
-                        add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
+                        add_filter('get_the_terms', '_wp_preview_terms_filter', 10, 3);
                     }
                 }
             }

Braces +3 added lines, -2 removed lines

@@ -1,14 +1,15 @@
 <?php
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) )
+if ( !defined( 'ABSPATH' ) ) {
     exit;
+}
 
 class TimberPostsCollection extends ArrayObject {
 
     public function __construct( $posts = array(), $post_class = 'TimberPost' ) {
         $returned_posts = array();
-        if ( is_null( $posts ) ){
+        if ( is_null( $posts ) ) {
             $posts = array();
         }
         foreach ( $posts as $post_object ) {

lib/timber-query-iterator.php

Indentation +148 added lines, -148 removed lines

@@ -1,156 +1,156 @@
 <?php
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) )
-    exit;
+	exit;
 
 class TimberQueryIterator implements Iterator {
 
-    /**
-     *
-     *
-     * @var WP_Query
-     */
-    private $_query = null;
-    private $_posts_class = 'TimberPost';
-
-    public function __construct( $query = false, $posts_class = 'TimberPost' ) {
-        add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
-        if ( $posts_class )
-            $this->_posts_class = $posts_class;
-
-        if ( is_a( $query, 'WP_Query' ) ) {
-            // We got a full-fledged WP Query, look no further!
-            $the_query = $query;
-
-        } elseif ( false === $query ) {
-            // If query is explicitly set to false, use the main loop
-            global $wp_query;
-            $the_query =& $wp_query;
-            //if we're on a custom posts page?
-            $the_query = self::handle_maybe_custom_posts_page($the_query);
-        } elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
-            // We have a regularly formed WP query string or array to use
-            $the_query = new WP_Query( $query );
-
-        } elseif ( is_numeric( $query ) || is_string( $query ) ) {
-            // We have what could be a post name or post ID to pull out
-            $the_query = self::get_query_from_string( $query );
-
-        } elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
-            // We have a list of pids (post IDs) to extract from
-            $the_query = self::get_query_from_array_of_ids( $query );
-        } elseif ( is_array($query) && empty($query)) {
-            // it's an empty array
-            $the_query = array();
-        } else {
-            TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
-            TimberHelper::error_log( $query );
-
-            // We have failed hard, at least let get something.
-            $the_query = new WP_Query();
-        }
-
-        $this->_query = $the_query;
-
-    }
-
-    public function get_posts( $return_collection = false ) {
-        if (isset($this->_query->posts)){
-            $posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
-            return ( $return_collection ) ? $posts : $posts->get_posts();
-        }
-    }
-
-    //
-    // GET POSTS
-    //
-    public static function get_query_from_array_of_ids( $query = array() ) {
-        if ( !is_array( $query ) || !count( $query ) )
-            return null;
-
-        return new WP_Query( array(
-                'post_type'=> 'any',
-                'ignore_sticky_posts' => true,
-                'post__in' => $query,
-                'orderby'  => 'post__in',
-                'nopaging' => true
-            ) );
-    }
-
-    public static function get_query_from_string( $string = '' ) {
-        $post_type = false;
-
-        if ( is_string( $string ) && strstr( $string, '#' ) ) {
-            //we have a post_type directive here
-            list( $post_type, $string ) = explode( '#', $string );
-        }
-
-        $query = array(
-            'post_type' => ( $post_type ) ? $post_type : 'any'
-        );
-
-        if ( is_numeric( $string ) ) {
-            $query['p'] = $string;
-
-        } else {
-            $query['name'] = $string;
-        }
-
-        return new WP_Query( $query );
-    }
-
-    //
-    // Iterator Interface
-    //
-
-    public function valid() {
-        return $this->_query->have_posts();
-    }
-
-    public function current() {
-        global $post;
-
-        $this->_query->the_post();
-
-        // Sets up the global post, but also return the post, for use in Twig template
-        $posts_class = $this->_posts_class;
-        return new $posts_class( $post );
-    }
-
-    /**
-     * Don't implement next, because current already advances the loop
-     */
-    final public function next() {}
-
-    public function rewind() {
-        $this->_query->rewind_posts();
-    }
-
-    public function key() {
-        $this->_query->current_post;
-    }
-
-    //get_posts users numberposts
-    static function fix_number_posts_wp_quirk( $query ) {
-        if (isset($query->query) && isset($query->query['numberposts'])
-                && !isset($query->query['posts_per_page'])) {
-            $query->set( 'posts_per_page', $query->query['numberposts'] );
-        }
-        return $query;
-    }
-
-    /**
-     * this will test for whether a custom page to display posts is active, and if so, set the query to the default
-     * @param  WP_Query $query the original query recived from WordPress
-     * @return WP_Query
-     */
-    static function handle_maybe_custom_posts_page( $query ) {
-    	if ($custom_posts_page = get_option('page_for_posts')) {
-        	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
-        		return new WP_Query(array('post_type' => 'post'));
-        	}
-        }
-        return $query;
-    }
+	/**
+	 *
+	 *
+	 * @var WP_Query
+	 */
+	private $_query = null;
+	private $_posts_class = 'TimberPost';
+
+	public function __construct( $query = false, $posts_class = 'TimberPost' ) {
+		add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
+		if ( $posts_class )
+			$this->_posts_class = $posts_class;
+
+		if ( is_a( $query, 'WP_Query' ) ) {
+			// We got a full-fledged WP Query, look no further!
+			$the_query = $query;
+
+		} elseif ( false === $query ) {
+			// If query is explicitly set to false, use the main loop
+			global $wp_query;
+			$the_query =& $wp_query;
+			//if we're on a custom posts page?
+			$the_query = self::handle_maybe_custom_posts_page($the_query);
+		} elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
+			// We have a regularly formed WP query string or array to use
+			$the_query = new WP_Query( $query );
+
+		} elseif ( is_numeric( $query ) || is_string( $query ) ) {
+			// We have what could be a post name or post ID to pull out
+			$the_query = self::get_query_from_string( $query );
+
+		} elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
+			// We have a list of pids (post IDs) to extract from
+			$the_query = self::get_query_from_array_of_ids( $query );
+		} elseif ( is_array($query) && empty($query)) {
+			// it's an empty array
+			$the_query = array();
+		} else {
+			TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
+			TimberHelper::error_log( $query );
+
+			// We have failed hard, at least let get something.
+			$the_query = new WP_Query();
+		}
+
+		$this->_query = $the_query;
+
+	}
+
+	public function get_posts( $return_collection = false ) {
+		if (isset($this->_query->posts)){
+			$posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
+			return ( $return_collection ) ? $posts : $posts->get_posts();
+		}
+	}
+
+	//
+	// GET POSTS
+	//
+	public static function get_query_from_array_of_ids( $query = array() ) {
+		if ( !is_array( $query ) || !count( $query ) )
+			return null;
+
+		return new WP_Query( array(
+				'post_type'=> 'any',
+				'ignore_sticky_posts' => true,
+				'post__in' => $query,
+				'orderby'  => 'post__in',
+				'nopaging' => true
+			) );
+	}
+
+	public static function get_query_from_string( $string = '' ) {
+		$post_type = false;
+
+		if ( is_string( $string ) && strstr( $string, '#' ) ) {
+			//we have a post_type directive here
+			list( $post_type, $string ) = explode( '#', $string );
+		}
+
+		$query = array(
+			'post_type' => ( $post_type ) ? $post_type : 'any'
+		);
+
+		if ( is_numeric( $string ) ) {
+			$query['p'] = $string;
+
+		} else {
+			$query['name'] = $string;
+		}
+
+		return new WP_Query( $query );
+	}
+
+	//
+	// Iterator Interface
+	//
+
+	public function valid() {
+		return $this->_query->have_posts();
+	}
+
+	public function current() {
+		global $post;
+
+		$this->_query->the_post();
+
+		// Sets up the global post, but also return the post, for use in Twig template
+		$posts_class = $this->_posts_class;
+		return new $posts_class( $post );
+	}
+
+	/**
+	 * Don't implement next, because current already advances the loop
+	 */
+	final public function next() {}
+
+	public function rewind() {
+		$this->_query->rewind_posts();
+	}
+
+	public function key() {
+		$this->_query->current_post;
+	}
+
+	//get_posts users numberposts
+	static function fix_number_posts_wp_quirk( $query ) {
+		if (isset($query->query) && isset($query->query['numberposts'])
+				&& !isset($query->query['posts_per_page'])) {
+			$query->set( 'posts_per_page', $query->query['numberposts'] );
+		}
+		return $query;
+	}
+
+	/**
+	 * this will test for whether a custom page to display posts is active, and if so, set the query to the default
+	 * @param  WP_Query $query the original query recived from WordPress
+	 * @return WP_Query
+	 */
+	static function handle_maybe_custom_posts_page( $query ) {
+		if ($custom_posts_page = get_option('page_for_posts')) {
+			if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
+				return new WP_Query(array('post_type' => 'post'));
+			}
+		}
+		return $query;
+	}
 
 }

Spacing +35 added lines, -35 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) )
+if ( !defined('ABSPATH') )
     exit;
 
 class TimberQueryIterator implements Iterator {
@@ -13,38 +13,38 @@ 
     private $_query = null;
     private $_posts_class = 'TimberPost';
 
-    public function __construct( $query = false, $posts_class = 'TimberPost' ) {
-        add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
+    public function __construct($query = false, $posts_class = 'TimberPost') {
+        add_action('pre_get_posts', array($this, 'fix_number_posts_wp_quirk'));
         if ( $posts_class )
             $this->_posts_class = $posts_class;
 
-        if ( is_a( $query, 'WP_Query' ) ) {
+        if ( is_a($query, 'WP_Query') ) {
             // We got a full-fledged WP Query, look no further!
             $the_query = $query;
 
         } elseif ( false === $query ) {
             // If query is explicitly set to false, use the main loop
             global $wp_query;
-            $the_query =& $wp_query;
+            $the_query = & $wp_query;
             //if we're on a custom posts page?
             $the_query = self::handle_maybe_custom_posts_page($the_query);
-        } elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
+        } elseif ( TimberHelper::is_array_assoc($query) || (is_string($query) && strstr($query, '=')) ) {
             // We have a regularly formed WP query string or array to use
-            $the_query = new WP_Query( $query );
+            $the_query = new WP_Query($query);
 
-        } elseif ( is_numeric( $query ) || is_string( $query ) ) {
+        } elseif ( is_numeric($query) || is_string($query) ) {
             // We have what could be a post name or post ID to pull out
-            $the_query = self::get_query_from_string( $query );
+            $the_query = self::get_query_from_string($query);
 
-        } elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
+        } elseif ( is_array($query) && count($query) && (is_integer($query[0]) || is_string($query[0])) ) {
             // We have a list of pids (post IDs) to extract from
-            $the_query = self::get_query_from_array_of_ids( $query );
-        } elseif ( is_array($query) && empty($query)) {
+            $the_query = self::get_query_from_array_of_ids($query);
+        } elseif ( is_array($query) && empty($query) ) {
             // it's an empty array
             $the_query = array();
         } else {
-            TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
-            TimberHelper::error_log( $query );
+            TimberHelper::error_log('I have failed you! in ' . basename(__FILE__) . '::' . __LINE__);
+            TimberHelper::error_log($query);
 
             // We have failed hard, at least let get something.
             $the_query = new WP_Query();
@@ -54,49 +54,49 @@ 
 
     }
 
-    public function get_posts( $return_collection = false ) {
-        if (isset($this->_query->posts)){
-            $posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
-            return ( $return_collection ) ? $posts : $posts->get_posts();
+    public function get_posts($return_collection = false) {
+        if ( isset($this->_query->posts) ) {
+            $posts = new TimberPostsCollection($this->_query->posts, $this->_posts_class);
+            return ($return_collection) ? $posts : $posts->get_posts();
         }
     }
 
     //
     // GET POSTS
     //
-    public static function get_query_from_array_of_ids( $query = array() ) {
-        if ( !is_array( $query ) || !count( $query ) )
+    public static function get_query_from_array_of_ids($query = array()) {
+        if ( !is_array($query) || !count($query) )
             return null;
 
-        return new WP_Query( array(
+        return new WP_Query(array(
                 'post_type'=> 'any',
                 'ignore_sticky_posts' => true,
                 'post__in' => $query,
                 'orderby'  => 'post__in',
                 'nopaging' => true
-            ) );
+            ));
     }
 
-    public static function get_query_from_string( $string = '' ) {
+    public static function get_query_from_string($string = '') {
         $post_type = false;
 
-        if ( is_string( $string ) && strstr( $string, '#' ) ) {
+        if ( is_string($string) && strstr($string, '#') ) {
             //we have a post_type directive here
-            list( $post_type, $string ) = explode( '#', $string );
+            list($post_type, $string) = explode('#', $string);
         }
 
         $query = array(
-            'post_type' => ( $post_type ) ? $post_type : 'any'
+            'post_type' => ($post_type) ? $post_type : 'any'
         );
 
-        if ( is_numeric( $string ) ) {
+        if ( is_numeric($string) ) {
             $query['p'] = $string;
 
         } else {
             $query['name'] = $string;
         }
 
-        return new WP_Query( $query );
+        return new WP_Query($query);
     }
 
     //
@@ -114,7 +114,7 @@ 
 
         // Sets up the global post, but also return the post, for use in Twig template
         $posts_class = $this->_posts_class;
-        return new $posts_class( $post );
+        return new $posts_class($post);
     }
 
     /**
@@ -131,10 +131,10 @@ 
     }
 
     //get_posts users numberposts
-    static function fix_number_posts_wp_quirk( $query ) {
-        if (isset($query->query) && isset($query->query['numberposts'])
-                && !isset($query->query['posts_per_page'])) {
-            $query->set( 'posts_per_page', $query->query['numberposts'] );
+    static function fix_number_posts_wp_quirk($query) {
+        if ( isset($query->query) && isset($query->query['numberposts'])
+                && !isset($query->query['posts_per_page']) ) {
+            $query->set('posts_per_page', $query->query['numberposts']);
         }
         return $query;
     }
@@ -144,8 +144,8 @@ 
      * @param  WP_Query $query the original query recived from WordPress
      * @return WP_Query
      */
-    static function handle_maybe_custom_posts_page( $query ) {
-    	if ($custom_posts_page = get_option('page_for_posts')) {
+    static function handle_maybe_custom_posts_page($query) {
+    	if ( $custom_posts_page = get_option('page_for_posts') ) {
         	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
         		return new WP_Query(array('post_type' => 'post'));
         	}

Braces +9 added lines, -6 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) )
+if ( !defined( 'ABSPATH' ) ) {
     exit;
+}
 
 class TimberQueryIterator implements Iterator {
 
@@ -15,8 +16,9 @@ 
 
     public function __construct( $query = false, $posts_class = 'TimberPost' ) {
         add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
-        if ( $posts_class )
-            $this->_posts_class = $posts_class;
+        if ( $posts_class ) {
+                    $this->_posts_class = $posts_class;
+        }
 
         if ( is_a( $query, 'WP_Query' ) ) {
             // We got a full-fledged WP Query, look no further!
@@ -55,7 +57,7 @@ 
     }
 
     public function get_posts( $return_collection = false ) {
-        if (isset($this->_query->posts)){
+        if (isset($this->_query->posts)) {
             $posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
             return ( $return_collection ) ? $posts : $posts->get_posts();
         }
@@ -65,8 +67,9 @@ 
     // GET POSTS
     //
     public static function get_query_from_array_of_ids( $query = array() ) {
-        if ( !is_array( $query ) || !count( $query ) )
-            return null;
+        if ( !is_array( $query ) || !count( $query ) ) {
+                    return null;
+        }
 
         return new WP_Query( array(
                 'post_type'=> 'any',