jarednova / timber

lib/integrations/wpcli-timber.php

Braces +3 added lines, -3 removed lines

@@ -25,9 +25,9 @@ 
      *    wp timber clear_cache_twig
      *
      */
-    function clear_cache_twig(){
+    function clear_cache_twig() {
         $clear = TimberCommand::clear_cache_twig();
-        if ($clear){
+        if ($clear) {
             WP_CLI::success('Cleared contents of twig cache');
         } else {
             WP_CLI::warning('Failed to clear twig cache');
@@ -45,7 +45,7 @@ 
     function clear_cache_timber() {
         $clear = TimberCommand::clear_cache_timber();
         $message = 'Failed to clear timber cache';
-        if ($clear){
+        if ($clear) {
             $message = "Cleared contents of Timber's Cache";
             WP_CLI::success($message);
         } else {

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 if (!class_exists('WP_CLI_Command')) {
-	return;
+    return;
 }
 
 class Timber_WP_CLI_Command extends WP_CLI_Command {

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!class_exists('WP_CLI_Command')) {
+if ( !class_exists('WP_CLI_Command') ) {
 	return;
 }
 
@@ -13,7 +13,7 @@ 
      *    wp timber clear_cache
      *
      */
-    public function clear_cache($mode = 'all') {
+    public function clear_cache( $mode = 'all' ) {
         TimberCommand::clear_cache($mode);
     }
 
@@ -25,9 +25,9 @@ 
      *    wp timber clear_cache_twig
      *
      */
-    function clear_cache_twig(){
+    function clear_cache_twig() {
         $clear = TimberCommand::clear_cache_twig();
-        if ($clear){
+        if ( $clear ) {
             WP_CLI::success('Cleared contents of twig cache');
         } else {
             WP_CLI::warning('Failed to clear twig cache');
@@ -45,7 +45,7 @@ 
     function clear_cache_timber() {
         $clear = TimberCommand::clear_cache_timber();
         $message = 'Failed to clear timber cache';
-        if ($clear){
+        if ( $clear ) {
             $message = "Cleared contents of Timber's Cache";
             WP_CLI::success($message);
         } else {

lib/timber-archives.php

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";

Indentation +261 added lines, -261 removed lines

@@ -32,284 +32,284 @@
  */
 class TimberArchives extends TimberCore {
 
-	public $base = '';
-	/**
-	 * @api
-	 * @var array the items of the archives to iterate through and markup for your page
-	 */
-	public $items;
+    public $base = '';
+    /**
+     * @api
+     * @var array the items of the archives to iterate through and markup for your page
+     */
+    public $items;
 
-	/**
-	 * @api
-	 * @param $args array of arguments {
-	 *     @type bool show_year => false
-	 *     @type string
-	 *     @type string type => 'monthly-nested'
-	 *     @type int limit => -1
-	 *     @type bool show_post_count => false
-	 *     @type string order => 'DESC'
-	 *     @type string post_type => 'post'
-	 *     @type bool show_year => false
-	 *     @type bool nested => false
-	 * }
-	 * @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 = '' ) {
-		$this->init($args, $base);
-	}
+    /**
+     * @api
+     * @param $args array of arguments {
+     *     @type bool show_year => false
+     *     @type string
+     *     @type string type => 'monthly-nested'
+     *     @type int limit => -1
+     *     @type bool show_post_count => false
+     *     @type string order => 'DESC'
+     *     @type string post_type => 'post'
+     *     @type bool show_year => false
+     *     @type bool nested => false
+     * }
+     * @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 = '' ) {
+        $this->init($args, $base);
+    }
 
-	/**
-	 * @internal
-	 * @param array|string $args
-	 * @param string $base
-	 */
-	function init( $args = null, $base = '' ) {
-		$this->base = $base;
-		$this->items = $this->get_items($args);
-	}
+    /**
+     * @internal
+     * @param array|string $args
+     * @param string $base
+     */
+    function init( $args = null, $base = '' ) {
+        $this->base = $base;
+        $this->items = $this->get_items($args);
+    }
 
-	/**
-	 * @internal
-	 * @param string $url
-	 * @param string $text
-	 * @return mixed
-	 */
-	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));
-		return $ret;
-	}
+    /**
+     * @internal
+     * @param string $url
+     * @param string $text
+     * @return mixed
+     */
+    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));
+        return $ret;
+    }
 
-	/**
-	 * @internal
-	 * @param array $args
-	 * @param string $last_changed
-	 * @param string $join
-	 * @param string $where
-	 * @param string $order
-	 * @param string $limit
-	 * @return array
-	 */
-	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')) {
-			$results = $wpdb->get_results($query);
-			wp_cache_set($key, $results, 'posts');
-		}
-		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);
-			}
-		}
-		return $output;
-	}
+    /**
+     * @internal
+     * @param array $args
+     * @param string $last_changed
+     * @param string $join
+     * @param string $where
+     * @param string $order
+     * @param string $limit
+     * @return array
+     */
+    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')) {
+            $results = $wpdb->get_results($query);
+            wp_cache_set($key, $results, 'posts');
+        }
+        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);
+            }
+        }
+        return $output;
+    }
 
-	/**
-	 * @internal
-	 * @param array|string $args
-	 * @param string $last_changed
-	 * @param string $join
-	 * @param string $where
-	 * @param string $order
-	 * @param int $limit
-	 * @param bool $nested
-	 * @return array
-	 */
-	protected function get_items_monthly( $args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true ) {
-		global $wpdb, $wp_locale;
-		$output = array();
-		$defaults = array(
-			'show_year' => false,
-		);
-		$r = wp_parse_args($args, $defaults);
+    /**
+     * @internal
+     * @param array|string $args
+     * @param string $last_changed
+     * @param string $join
+     * @param string $where
+     * @param string $order
+     * @param int $limit
+     * @param bool $nested
+     * @return array
+     */
+    protected function get_items_monthly( $args, $last_changed, $join, $where, $order, $limit = 1000, $nested = true ) {
+        global $wpdb, $wp_locale;
+        $output = array();
+        $defaults = array(
+            'show_year' => false,
+        );
+        $r = wp_parse_args($args, $defaults);
 
-		$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) "
-			. "ORDER BY post_date $order $limit";
-		$key = md5($query);
-		$key = "wp_get_archives:$key:$last_changed";
-		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) {
-				$url = get_month_link($result->year, $result->month);
-				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) {
-					$output[$result->year][] = $this->get_archives_link($url, $text);
-				} else {
-					$output[] = $this->get_archives_link($url, $text);
-				}
-			}
-		}
-		if ($nested) {
-			$out2 = array();
-			foreach ($output as $year => $months) {
-				$out2[] = array('name' => $year, 'children' => $months);
-			}
-			return $out2;
-		}
-		return $output;
-	}
+        $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) "
+            . "ORDER BY post_date $order $limit";
+        $key = md5($query);
+        $key = "wp_get_archives:$key:$last_changed";
+        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) {
+                $url = get_month_link($result->year, $result->month);
+                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) {
+                    $output[$result->year][] = $this->get_archives_link($url, $text);
+                } else {
+                    $output[] = $this->get_archives_link($url, $text);
+                }
+            }
+        }
+        if ($nested) {
+            $out2 = array();
+            foreach ($output as $year => $months) {
+                $out2[] = array('name' => $year, 'children' => $months);
+            }
+            return $out2;
+        }
+        return $output;
+    }
 
-	/**
-	 * @api
-	 * @param array|string $args
-	 * @return array|string
-	 */
-	function get_items( $args = null ) {
-		global $wpdb;
+    /**
+     * @api
+     * @param array|string $args
+     * @return array|string
+     */
+    function get_items( $args = null ) {
+        global $wpdb;
 
-		$defaults = array(
-			'type' => 'monthly-nested',
-			'limit' => '',
-			'show_post_count' => false,
-			'order' => 'DESC',
-			'post_type' => 'post',
-			'show_year' => false,
-			'nested' => false
-		);
+        $defaults = array(
+            'type' => 'monthly-nested',
+            'limit' => '',
+            'show_post_count' => false,
+            'order' => 'DESC',
+            'post_type' => 'post',
+            'show_year' => false,
+            'nested' => false
+        );
 
-		$args = wp_parse_args($args, $defaults);
-		$post_type = $args['post_type'];
-		$order = $args['order'];
-		$nested = $args['nested'];
-		$type = $args['type'];
-		$limit = '';
-		if ( $type == 'yearlymonthly' || $type == 'yearmonth' ) {
-			$type = 'monthly-nested';
-		}
-		if ( $type == 'monthly-nested' ) {
-			$nested = true;
-		}
+        $args = wp_parse_args($args, $defaults);
+        $post_type = $args['post_type'];
+        $order = $args['order'];
+        $nested = $args['nested'];
+        $type = $args['type'];
+        $limit = '';
+        if ( $type == 'yearlymonthly' || $type == 'yearmonth' ) {
+            $type = 'monthly-nested';
+        }
+        if ( $type == 'monthly-nested' ) {
+            $nested = true;
+        }
 
-		if ( !empty($args['limit']) ) {
-			$limit = absint($limit);
-			$limit = ' LIMIT ' . $limit;
-		}
+        if ( !empty($args['limit']) ) {
+            $limit = absint($limit);
+            $limit = ' LIMIT ' . $limit;
+        }
 
-		$order = strtoupper($order);
-		if ( $order !== 'ASC' ) {
-			$order = 'DESC';
-		}
+        $order = strtoupper($order);
+        if ( $order !== 'ASC' ) {
+            $order = 'DESC';
+        }
 
-		// this is what will separate dates on weekly archive links
-		$archive_week_separator = '–';
+        // this is what will separate dates on weekly archive links
+        $archive_week_separator = '–';
 
-		// over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
-		$archive_date_format_over_ride = 0;
+        // over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
+        $archive_date_format_over_ride = 0;
 
-		// options for daily archive (only if you over-ride the general date format)
-		$archive_day_date_format = 'Y/m/d';
+        // options for daily archive (only if you over-ride the general date format)
+        $archive_day_date_format = 'Y/m/d';
 
-		// options for weekly archive (only if you over-ride the general date format)
-		$archive_week_start_date_format = 'Y/m/d';
-		$archive_week_end_date_format = 'Y/m/d';
+        // options for weekly archive (only if you over-ride the general date format)
+        $archive_week_start_date_format = 'Y/m/d';
+        $archive_week_end_date_format = 'Y/m/d';
 
-		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');
-		}
+        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');
+        }
 
-		$where = $wpdb->prepare('WHERE post_type = "%s" AND post_status = "publish"', $post_type);
-		$where = apply_filters('getarchives_where', $where, $args);
-		$join = apply_filters('getarchives_join', '', $args);
+        $where = $wpdb->prepare('WHERE post_type = "%s" AND post_status = "publish"', $post_type);
+        $where = apply_filters('getarchives_where', $where, $args);
+        $join = apply_filters('getarchives_join', '', $args);
 
-		$output = array();
-		$last_changed = wp_cache_get('last_changed', 'posts');
-		if (!$last_changed) {
-			$last_changed = microtime();
-			wp_cache_set('last_changed', $last_changed, 'posts');
-		}
-		if ( 'monthly' == $type ) {
-			$output = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit, $nested);
-		} elseif ( 'yearly' == $type ) {
-			$output = $this->get_items_yearly($args, $last_changed, $join, $where, $order, $limit);
-		} elseif ( 'monthly-nested' == $type ) {
-			$output = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit);
-		} elseif ( 'daily' == $type ) {
-			$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')) {
-				$results = $wpdb->get_results($query);
-				$cache = array();
-				$cache[$key] = $results;
-				wp_cache_set($key, $results, 'posts');
-			}
-			if ( $results ) {
-				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);
-					$output[] = $this->get_archives_link($url, $text);
-				}
-			}
-		} elseif ( 'weekly' == $type ) {
-			$week = _wp_mysql_week('`post_date`');
-			$query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, "
-				. "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')) {
-				$results = $wpdb->get_results($query);
-				wp_cache_set($key, $results, 'posts');
-			}
-			$arc_w_last = '';
-			if ( $results ) {
-				foreach ( (array)$results as $result ) {
-					if ( $result->week != $arc_w_last ) {
-						$arc_year = $result->yr;
-						$arc_w_last = $result->week;
-						$arc_week = get_weekstartend($result->yyyymmdd, get_option('start_of_week'));
-						$arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
-						$arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
-						$url = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&', '=', $result->week);
-						$text = $arc_week_start . $archive_week_separator . $arc_week_end;
-						$output[] = $this->get_archives_link($url, $text);
-					}
-				}
-			}
-		} elseif ( 'postbypost' == $type || 'alpha' == $type ) {
-			$orderby = 'alpha' == $type ? 'post_title ASC ' : 'post_date DESC ';
-			$query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
-			$key = md5($query);
-			$key = "wp_get_archives:$key:$last_changed";
-			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 ($result->post_date != '0000-00-00 00:00:00') {
-						$url = get_permalink($result);
-						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 {
-							$text = $result->ID;
-						}
-						$output[] = $this->get_archives_link($url, $text);
-					}
-				}
-			}
-		}
-		return $output;
-	}
+        $output = array();
+        $last_changed = wp_cache_get('last_changed', 'posts');
+        if (!$last_changed) {
+            $last_changed = microtime();
+            wp_cache_set('last_changed', $last_changed, 'posts');
+        }
+        if ( 'monthly' == $type ) {
+            $output = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit, $nested);
+        } elseif ( 'yearly' == $type ) {
+            $output = $this->get_items_yearly($args, $last_changed, $join, $where, $order, $limit);
+        } elseif ( 'monthly-nested' == $type ) {
+            $output = $this->get_items_monthly($args, $last_changed, $join, $where, $order, $limit);
+        } elseif ( 'daily' == $type ) {
+            $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')) {
+                $results = $wpdb->get_results($query);
+                $cache = array();
+                $cache[$key] = $results;
+                wp_cache_set($key, $results, 'posts');
+            }
+            if ( $results ) {
+                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);
+                    $output[] = $this->get_archives_link($url, $text);
+                }
+            }
+        } elseif ( 'weekly' == $type ) {
+            $week = _wp_mysql_week('`post_date`');
+            $query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, "
+                . "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')) {
+                $results = $wpdb->get_results($query);
+                wp_cache_set($key, $results, 'posts');
+            }
+            $arc_w_last = '';
+            if ( $results ) {
+                foreach ( (array)$results as $result ) {
+                    if ( $result->week != $arc_w_last ) {
+                        $arc_year = $result->yr;
+                        $arc_w_last = $result->week;
+                        $arc_week = get_weekstartend($result->yyyymmdd, get_option('start_of_week'));
+                        $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
+                        $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
+                        $url = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&', '=', $result->week);
+                        $text = $arc_week_start . $archive_week_separator . $arc_week_end;
+                        $output[] = $this->get_archives_link($url, $text);
+                    }
+                }
+            }
+        } elseif ( 'postbypost' == $type || 'alpha' == $type ) {
+            $orderby = 'alpha' == $type ? 'post_title ASC ' : 'post_date DESC ';
+            $query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
+            $key = md5($query);
+            $key = "wp_get_archives:$key:$last_changed";
+            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 ($result->post_date != '0000-00-00 00:00:00') {
+                        $url = get_permalink($result);
+                        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 {
+                            $text = $result->ID;
+                        }
+                        $output[] = $this->get_archives_link($url, $text);
+                    }
+                }
+            }
+        }
+        return $output;
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -97,13 +97,13 @@ 
 		$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 ) {
-				$url = get_year_link( $result->year );
+		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);
 			}
@@ -137,28 +137,28 @@ 
 			. "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) {
+			foreach ( $output as $year => $months ) {
 				$out2[] = array('name' => $year, 'children' => $months);
 			}
 			return $out2;
@@ -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');
 		}
@@ -246,14 +246,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);
@@ -266,13 +266,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;
@@ -295,10 +295,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.php

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

Indentation +3 added lines, -3 removed lines

@@ -32,9 +32,9 @@
      * @return mixed
      */
     function __get( $field ) {
-    	if ( property_exists($this, $field) ) {
-    		return $this->$field;
-    	}
+        if ( property_exists($this, $field) ) {
+            return $this->$field;
+        }
         if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
             return $this->$field = $meta_value;
         }

Spacing +11 added lines, -11 removed lines

@@ -12,7 +12,7 @@ 
      * @return boolean
      */
     function __isset( $field ) {
-        if ( isset( $this->$field ) ) {
+        if ( isset($this->$field) ) {
             return $this->$field;
         }
         return false;
@@ -23,7 +23,7 @@ 
      * @return mixed
      */
     function __call( $field, $args ) {
-        return $this->__get( $field );
+        return $this->__get($field);
     }
 
     /**
@@ -35,7 +35,7 @@ 
     	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) ) {
@@ -56,14 +56,14 @@ 
      * @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_object($info) ) {
+            $info = get_object_vars($info);
         }
-        if ( is_array( $info ) ) {
+        if ( is_array($info) ) {
             foreach ( $info as $key => $value ) {
-                if ( !empty( $key ) && $force ) {
+                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;
                 }
             }
@@ -77,7 +77,7 @@ 
      * @param mixed   $value
      */
     function update( $key, $value ) {
-        update_metadata( $this->object_type, $this->ID, $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-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

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

Indentation +407 added lines, -407 removed lines

@@ -2,412 +2,412 @@
 
 class TimberLoader {
 
-	const CACHEGROUP = 'timberloader';
-
-	const TRANS_KEY_LEN = 50;
-
-	const CACHE_NONE = 'none';
-	const CACHE_OBJECT = 'cache';
-	const CACHE_TRANSIENT = 'transient';
-	const CACHE_SITE_TRANSIENT = 'site-transient';
-	const CACHE_USE_DEFAULT = 'default';
-
-	public static $cache_modes = array(
-		self::CACHE_NONE,
-		self::CACHE_OBJECT,
-		self::CACHE_TRANSIENT,
-		self::CACHE_SITE_TRANSIENT
-	);
-
-	protected $cache_mode = self::CACHE_TRANSIENT;
-
-	public $locations;
-
-	/**
-	 * @param bool|string   $caller the calling directory or false
-	 */
-	function __construct($caller = false) {
-		$this->locations = $this->get_locations($caller);
-		$this->cache_mode = apply_filters('timber_cache_mode', $this->cache_mode);
-		$this->cache_mode = apply_filters('timber/cache/mode', $this->cache_mode);
-	}
-
-	/**
-	 * @param string        $file
-	 * @param array         $data
-	 * @param bool          $expires
-	 * @param string        $cache_mode
-	 * @return bool|string
-	 */
-	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])) {
-				$expires = $expires[1];
-			} else {
-				$expires = $expires[0];
-			}
-		}
-
-		$key = null;
-		$output = false;
-		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) {
-			$twig = $this->get_twig();
-			if (strlen($file)) {
-				$loader = $this->get_loader();
-				$result = $loader->getCacheKey($file);
-				do_action('timber_loader_render_file', $result);
-			}
-			$data = apply_filters('timber_loader_render_data', $data);
-			$data = apply_filters('timber/loader/render_data', $data);
-			$output = $twig->render($file, $data);
-		}
-
-		if (false !== $output && false !== $expires && null !== $key) {
-			$this->set_cache($key, $output, self::CACHEGROUP, $expires, $cache_mode);
-		}
-		$output = apply_filters('timber_output', $output);
-		return apply_filters('timber/output', $output);
-	}
-
-	/**
-	 * @param array $filenames
-	 * @return bool
-	 */
-	public function choose_template($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)) {
-					return $filename;
-				}
-			}
-			return $filenames[0];
-		}
-		return $filenames;
-	}
-
-	/**
-	 * @param string $file
-	 * @return bool
-	 */
-	protected function template_exists($file) {
-		foreach ($this->locations as $dir) {
-			$look_for = trailingslashit($dir) . $file;
-			if (file_exists($look_for)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	function get_locations_theme() {
-		$theme_locs = array();
-		$child_loc = get_stylesheet_directory();
-		$parent_loc = get_template_directory();
-		if (DIRECTORY_SEPARATOR == '\\') {
-			$child_loc = str_replace('/', '\\', $child_loc);
-			$parent_loc = str_replace('/', '\\', $parent_loc);
-		}
-		$theme_locs[] = $child_loc;
-		foreach ($this->get_locations_theme_dir() as $dirname) {
-			$theme_locs[] = trailingslashit($child_loc) . trailingslashit($dirname);
-		}
-		if ($child_loc != $parent_loc) {
-			$theme_locs[] = $parent_loc;
-			foreach ($this->get_locations_theme_dir() as $dirname) {
-				$theme_locs[] = trailingslashit($parent_loc) . trailingslashit($dirname);
-			}
-		}
-		//now make sure theres a trailing slash on everything
-		$theme_locs = array_map('trailingslashit', $theme_locs);
-		return $theme_locs;
-	}
-
-	/**
-	 * returns an array of the directory inside themes that holds twig files
-	 * @return string[] the names of directores, ie: array('templats', 'views');
-	 */
-	private function get_locations_theme_dir() {
-		if (is_string(Timber::$dirname)) {
-			return array(Timber::$dirname);
-		}
-		return Timber::$dirname;
-	}
-
-	/**
-	 * @return array
-	 */
-	function get_locations_user() {
-		$locs = array();
-		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)) {
-					$locs[] = $tloc;
-				}
-			}
-		}
-		return $locs;
-	}
-
-	/**
-	 * @param bool|string   $caller the calling directory
-	 * @return array
-	 */
-	function get_locations_caller($caller = false) {
-		$locs = array();
-		if ($caller && is_string($caller)) {
-			$caller = trailingslashit($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)) {
-					$locs[] = $caller_sub;
-				}
-			}
-		}
-		return $locs;
-	}
-
-	/**
-	 * @param bool|string   $caller the calling directory (or false)
-	 * @return array
-	 */
-	function get_locations($caller = false) {
-		//prioirty: user locations, caller (but not theme), child theme, parent theme, caller
-		$locs = array();
-		$locs = array_merge($locs, $this->get_locations_user());
-		$locs = array_merge($locs, $this->get_locations_caller($caller));
-		//remove themes from caller
-		$locs = array_diff($locs, $this->get_locations_theme());
-		$locs = array_merge($locs, $this->get_locations_theme());
-		$locs = array_merge($locs, $this->get_locations_caller($caller));
-		$locs = array_unique($locs);
-		$locs = apply_filters('timber_locations', $locs);
-		$locs = apply_filters('timber/locations', $locs);
-		return $locs;
-	}
-
-	/**
-	 * @return Twig_Loader_Filesystem
-	 */
-	function get_loader() {
-		$paths = array();
-		foreach ($this->locations as $loc) {
-			$loc = realpath($loc);
-			if (is_dir($loc)) {
-				$loc = realpath($loc);
-				$paths[] = $loc;
-			} else {
-				//error_log($loc.' is not a directory');
-			}
-		}
-		if (!ini_get('open_basedir')) {
-			$paths[] = '/';
-		} else {
-			$paths[] = ABSPATH;
-		}
-		$paths = apply_filters('timber/loader/paths', $paths);
-		$loader = new Twig_Loader_Filesystem($paths);
-		return $loader;
-	}
-
-	/**
-	 * @return Twig_Environment
-	 */
-	function get_twig() {
-		$loader = $this->get_loader();
-		$params = array('debug' => WP_DEBUG, 'autoescape' => false);
-		if (isset(Timber::$autoescape)) {
-			$params['autoescape'] = Timber::$autoescape;
-		}
-		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)) {
-				mkdir($twig_cache_loc, 0777, true);
-			}
-			$params['cache'] = $twig_cache_loc;
-		}
-		$twig = new Twig_Environment($loader, $params);
-		if ( WP_DEBUG ) {
-			$twig->addExtension(new Twig_Extension_Debug());
-		}
-		$twig->addExtension($this->_get_cache_extension());
-
-		$twig = apply_filters('twig_apply_filters', $twig);
-		$twig = apply_filters('timber/twig/filters', $twig);
-		$twig = apply_filters('timber/loader/twig', $twig);
-		return $twig;
-	}
-
-	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'])) {
-			$object_cache = true;
-		}
-		$cache_mode = $this->_get_cache_mode($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 );
-			return true;
-		} 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 );
-			return true;
-		} else if (self::CACHE_OBJECT === $cache_mode && $object_cache) {
-			global $wp_object_cache;
-			if (isset($wp_object_cache->cache[self::CACHEGROUP])){
-				unset($wp_object_cache->cache[self::CACHEGROUP]);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function clear_cache_twig() {
-		$twig = $this->get_twig();
-		$twig->clearCacheFiles();
-		$cache = $twig->getCache();
-		if ($cache){
-			self::rrmdir($twig->getCache());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param string|false $dirPath
-	 */
-	public static function rrmdir($dirPath) {
-		if (! is_dir($dirPath)) {
-			throw new InvalidArgumentException("$dirPath must be a directory");
-		}
-		if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {
-			$dirPath .= '/';
-		}
-		$files = glob($dirPath . '*', GLOB_MARK);
-		foreach ($files as $file) {
-			if (is_dir($file)) {
-				self::rrmdir($file);
-			} else {
-				unlink($file);
-			}
-		}
-		rmdir($dirPath);
-	}
-
-	/**
-	 * @return \Asm89\Twig\CacheExtension\Extension
-	 */
-	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 );
-
-		return $cache_extension;
-	}
-
-	/**
-	 * @param string $key
-	 * @param string $group
-	 * @param string $cache_mode
-	 * @return bool
-	 */
-	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'])) {
-			$object_cache = true;
-		}
-
-		$cache_mode = $this->_get_cache_mode($cache_mode);
-
-		$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);
-
-		return $value;
-	}
-
-	/**
-	 * @param string $key
-	 * @param string|boolean $value
-	 * @param string $group
-	 * @param int $expires
-	 * @param string $cache_mode
-	 * @return string|boolean
-	 */
-	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'])) {
-			$object_cache = true;
-		}
-
-		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);
-
-		return $value;
-	}
-
-	/**
-	 * @param string $cache_mode
-	 * @return string
-	 */
-	private function _get_cache_mode($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)) {
-			$cache_mode = self::CACHE_OBJECT;
-		}
-
-		return $cache_mode;
-	}
+    const CACHEGROUP = 'timberloader';
+
+    const TRANS_KEY_LEN = 50;
+
+    const CACHE_NONE = 'none';
+    const CACHE_OBJECT = 'cache';
+    const CACHE_TRANSIENT = 'transient';
+    const CACHE_SITE_TRANSIENT = 'site-transient';
+    const CACHE_USE_DEFAULT = 'default';
+
+    public static $cache_modes = array(
+        self::CACHE_NONE,
+        self::CACHE_OBJECT,
+        self::CACHE_TRANSIENT,
+        self::CACHE_SITE_TRANSIENT
+    );
+
+    protected $cache_mode = self::CACHE_TRANSIENT;
+
+    public $locations;
+
+    /**
+     * @param bool|string   $caller the calling directory or false
+     */
+    function __construct($caller = false) {
+        $this->locations = $this->get_locations($caller);
+        $this->cache_mode = apply_filters('timber_cache_mode', $this->cache_mode);
+        $this->cache_mode = apply_filters('timber/cache/mode', $this->cache_mode);
+    }
+
+    /**
+     * @param string        $file
+     * @param array         $data
+     * @param bool          $expires
+     * @param string        $cache_mode
+     * @return bool|string
+     */
+    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])) {
+                $expires = $expires[1];
+            } else {
+                $expires = $expires[0];
+            }
+        }
+
+        $key = null;
+        $output = false;
+        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) {
+            $twig = $this->get_twig();
+            if (strlen($file)) {
+                $loader = $this->get_loader();
+                $result = $loader->getCacheKey($file);
+                do_action('timber_loader_render_file', $result);
+            }
+            $data = apply_filters('timber_loader_render_data', $data);
+            $data = apply_filters('timber/loader/render_data', $data);
+            $output = $twig->render($file, $data);
+        }
+
+        if (false !== $output && false !== $expires && null !== $key) {
+            $this->set_cache($key, $output, self::CACHEGROUP, $expires, $cache_mode);
+        }
+        $output = apply_filters('timber_output', $output);
+        return apply_filters('timber/output', $output);
+    }
+
+    /**
+     * @param array $filenames
+     * @return bool
+     */
+    public function choose_template($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)) {
+                    return $filename;
+                }
+            }
+            return $filenames[0];
+        }
+        return $filenames;
+    }
+
+    /**
+     * @param string $file
+     * @return bool
+     */
+    protected function template_exists($file) {
+        foreach ($this->locations as $dir) {
+            $look_for = trailingslashit($dir) . $file;
+            if (file_exists($look_for)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    function get_locations_theme() {
+        $theme_locs = array();
+        $child_loc = get_stylesheet_directory();
+        $parent_loc = get_template_directory();
+        if (DIRECTORY_SEPARATOR == '\\') {
+            $child_loc = str_replace('/', '\\', $child_loc);
+            $parent_loc = str_replace('/', '\\', $parent_loc);
+        }
+        $theme_locs[] = $child_loc;
+        foreach ($this->get_locations_theme_dir() as $dirname) {
+            $theme_locs[] = trailingslashit($child_loc) . trailingslashit($dirname);
+        }
+        if ($child_loc != $parent_loc) {
+            $theme_locs[] = $parent_loc;
+            foreach ($this->get_locations_theme_dir() as $dirname) {
+                $theme_locs[] = trailingslashit($parent_loc) . trailingslashit($dirname);
+            }
+        }
+        //now make sure theres a trailing slash on everything
+        $theme_locs = array_map('trailingslashit', $theme_locs);
+        return $theme_locs;
+    }
+
+    /**
+     * returns an array of the directory inside themes that holds twig files
+     * @return string[] the names of directores, ie: array('templats', 'views');
+     */
+    private function get_locations_theme_dir() {
+        if (is_string(Timber::$dirname)) {
+            return array(Timber::$dirname);
+        }
+        return Timber::$dirname;
+    }
+
+    /**
+     * @return array
+     */
+    function get_locations_user() {
+        $locs = array();
+        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)) {
+                    $locs[] = $tloc;
+                }
+            }
+        }
+        return $locs;
+    }
+
+    /**
+     * @param bool|string   $caller the calling directory
+     * @return array
+     */
+    function get_locations_caller($caller = false) {
+        $locs = array();
+        if ($caller && is_string($caller)) {
+            $caller = trailingslashit($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)) {
+                    $locs[] = $caller_sub;
+                }
+            }
+        }
+        return $locs;
+    }
+
+    /**
+     * @param bool|string   $caller the calling directory (or false)
+     * @return array
+     */
+    function get_locations($caller = false) {
+        //prioirty: user locations, caller (but not theme), child theme, parent theme, caller
+        $locs = array();
+        $locs = array_merge($locs, $this->get_locations_user());
+        $locs = array_merge($locs, $this->get_locations_caller($caller));
+        //remove themes from caller
+        $locs = array_diff($locs, $this->get_locations_theme());
+        $locs = array_merge($locs, $this->get_locations_theme());
+        $locs = array_merge($locs, $this->get_locations_caller($caller));
+        $locs = array_unique($locs);
+        $locs = apply_filters('timber_locations', $locs);
+        $locs = apply_filters('timber/locations', $locs);
+        return $locs;
+    }
+
+    /**
+     * @return Twig_Loader_Filesystem
+     */
+    function get_loader() {
+        $paths = array();
+        foreach ($this->locations as $loc) {
+            $loc = realpath($loc);
+            if (is_dir($loc)) {
+                $loc = realpath($loc);
+                $paths[] = $loc;
+            } else {
+                //error_log($loc.' is not a directory');
+            }
+        }
+        if (!ini_get('open_basedir')) {
+            $paths[] = '/';
+        } else {
+            $paths[] = ABSPATH;
+        }
+        $paths = apply_filters('timber/loader/paths', $paths);
+        $loader = new Twig_Loader_Filesystem($paths);
+        return $loader;
+    }
+
+    /**
+     * @return Twig_Environment
+     */
+    function get_twig() {
+        $loader = $this->get_loader();
+        $params = array('debug' => WP_DEBUG, 'autoescape' => false);
+        if (isset(Timber::$autoescape)) {
+            $params['autoescape'] = Timber::$autoescape;
+        }
+        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)) {
+                mkdir($twig_cache_loc, 0777, true);
+            }
+            $params['cache'] = $twig_cache_loc;
+        }
+        $twig = new Twig_Environment($loader, $params);
+        if ( WP_DEBUG ) {
+            $twig->addExtension(new Twig_Extension_Debug());
+        }
+        $twig->addExtension($this->_get_cache_extension());
+
+        $twig = apply_filters('twig_apply_filters', $twig);
+        $twig = apply_filters('timber/twig/filters', $twig);
+        $twig = apply_filters('timber/loader/twig', $twig);
+        return $twig;
+    }
+
+    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'])) {
+            $object_cache = true;
+        }
+        $cache_mode = $this->_get_cache_mode($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 );
+            return true;
+        } 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 );
+            return true;
+        } else if (self::CACHE_OBJECT === $cache_mode && $object_cache) {
+            global $wp_object_cache;
+            if (isset($wp_object_cache->cache[self::CACHEGROUP])){
+                unset($wp_object_cache->cache[self::CACHEGROUP]);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function clear_cache_twig() {
+        $twig = $this->get_twig();
+        $twig->clearCacheFiles();
+        $cache = $twig->getCache();
+        if ($cache){
+            self::rrmdir($twig->getCache());
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param string|false $dirPath
+     */
+    public static function rrmdir($dirPath) {
+        if (! is_dir($dirPath)) {
+            throw new InvalidArgumentException("$dirPath must be a directory");
+        }
+        if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {
+            $dirPath .= '/';
+        }
+        $files = glob($dirPath . '*', GLOB_MARK);
+        foreach ($files as $file) {
+            if (is_dir($file)) {
+                self::rrmdir($file);
+            } else {
+                unlink($file);
+            }
+        }
+        rmdir($dirPath);
+    }
+
+    /**
+     * @return \Asm89\Twig\CacheExtension\Extension
+     */
+    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 );
+
+        return $cache_extension;
+    }
+
+    /**
+     * @param string $key
+     * @param string $group
+     * @param string $cache_mode
+     * @return bool
+     */
+    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'])) {
+            $object_cache = true;
+        }
+
+        $cache_mode = $this->_get_cache_mode($cache_mode);
+
+        $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);
+
+        return $value;
+    }
+
+    /**
+     * @param string $key
+     * @param string|boolean $value
+     * @param string $group
+     * @param int $expires
+     * @param string $cache_mode
+     * @return string|boolean
+     */
+    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'])) {
+            $object_cache = true;
+        }
+
+        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);
+
+        return $value;
+    }
+
+    /**
+     * @param string $cache_mode
+     * @return string
+     */
+    private function _get_cache_mode($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)) {
+            $cache_mode = self::CACHE_OBJECT;
+        }
+
+        return $cache_mode;
+    }
 
 }

Spacing +69 added lines, -69 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @param bool|string   $caller the calling directory or false
 	 */
-	function __construct($caller = false) {
+	function __construct( $caller = false ) {
 		$this->locations = $this->get_locations($caller);
 		$this->cache_mode = apply_filters('timber_cache_mode', $this->cache_mode);
 		$this->cache_mode = apply_filters('timber/cache/mode', $this->cache_mode);
@@ -39,10 +39,10 @@ 
 	 * @param string        $cache_mode
 	 * @return bool|string
 	 */
-	function render($file, $data = null, $expires = false, $cache_mode = self::CACHE_USE_DEFAULT) {
+	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);
@@ -80,11 +80,11 @@ 
 	 * @param array $filenames
 	 * @return bool
 	 */
-	public function choose_template($filenames) {
-		if (is_array($filenames)) {
+	public function choose_template( $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)) {
+			foreach ( $filenames as $filename ) {
+				if ( self::template_exists($filename) ) {
 					return $filename;
 				}
 			}
@@ -97,10 +97,10 @@ 
 	 * @param string $file
 	 * @return bool
 	 */
-	protected function template_exists($file) {
-		foreach ($this->locations as $dir) {
+	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,17 +114,17 @@ 
 		$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);
 		}
 		$theme_locs[] = $child_loc;
-		foreach ($this->get_locations_theme_dir() as $dirname) {
+		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) {
+			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) {
+			foreach ( Timber::$locations as $tloc ) {
 				$tloc = realpath($tloc);
-				if (is_dir($tloc)) {
+				if ( is_dir($tloc) ) {
 					$locs[] = $tloc;
 				}
 			}
@@ -167,16 +167,16 @@ 
 	 * @param bool|string   $caller the calling directory
 	 * @return array
 	 */
-	function get_locations_caller($caller = false) {
+	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) {
+			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;
 				}
 			}
@@ -188,7 +188,7 @@ 
 	 * @param bool|string   $caller the calling directory (or false)
 	 * @return array
 	 */
-	function get_locations($caller = false) {
+	function get_locations( $caller = false ) {
 		//prioirty: user locations, caller (but not theme), child theme, parent theme, caller
 		$locs = array();
 		$locs = array_merge($locs, $this->get_locations_user());
@@ -208,16 +208,16 @@ 
 	 */
 	function get_loader() {
 		$paths = array();
-		foreach ($this->locations as $loc) {
+		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;
 		}
@@ -299,16 +299,16 @@ 
 	/**
 	 * @param string|false $dirPath
 	 */
-	public static function rrmdir($dirPath) {
-		if (! is_dir($dirPath)) {
+	public static function rrmdir( $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)) {
+		foreach ( $files as $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;
 	}
@@ -336,10 +336,10 @@ 
 	 * @param string $cache_mode
 	 * @return bool
 	 */
-	public function get_cache($key, $group = self::CACHEGROUP, $cache_mode = self::CACHE_USE_DEFAULT) {
+	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;
@@ -368,26 +368,26 @@ 
 	 * @param string $cache_mode
 	 * @return string|boolean
 	 */
-	public function set_cache($key, $value, $group = self::CACHEGROUP, $expires = 0, $cache_mode = self::CACHE_USE_DEFAULT) {
+	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;
@@ -397,13 +397,13 @@ 
 	 * @param string $cache_mode
 	 * @return string
 	 */
-	private function _get_cache_mode($cache_mode) {
-		if (empty($cache_mode) || self::CACHE_USE_DEFAULT === $cache_mode) {
+	private function _get_cache_mode( $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

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 ) {

Indentation +87 added lines, -87 removed lines

@@ -2,103 +2,103 @@
 
 class TimberPostGetter {
 
-	/**
-	 * @param mixed $query
-	 * @param string $PostClass
-	 * @return array|bool|null
-	 */
-	static function get_post($query = false, $PostClass = 'TimberPost') {
-		$posts = self::get_posts( $query, $PostClass );
-		if ( $post = reset($posts ) ) {
-			return $post;
-		}
-	}
+    /**
+     * @param mixed $query
+     * @param string $PostClass
+     * @return array|bool|null
+     */
+    static function get_post($query = false, $PostClass = 'TimberPost') {
+        $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 );
-		if ( method_exists($posts, 'current') && $post = $posts->current() ) {
-			return $post;
-		}
-	}
+    static function query_post( $query = false, $PostClass = 'TimberPost' ) {
+        $posts = self::query_posts( $query, $PostClass );
+        if ( method_exists($posts, 'current') && $post = $posts->current() ) {
+            return $post;
+        }
+    }
 
-	/**
-	 * @param mixed $query
-	 * @param string $PostClass
-	 * @return array|bool|null
-	 */
-	static function query_posts($query = false, $PostClass = 'TimberPost' ) {
-		if (self::is_post_class_or_class_map($query)) {
-			$PostClass = $query;
-			$query = false;
-		}
+    /**
+     * @param mixed $query
+     * @param string $PostClass
+     * @return array|bool|null
+     */
+    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') ){
-			// The only object other than a query is a type of post object
-			$query = array( $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 );
+        }
 
-		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 );
-		} else {
-			// We have a query (of sorts) to work with
-			$tqi = new TimberQueryIterator( $query, $PostClass );
-			return $tqi;
-		}
-	}
+        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 );
+        } else {
+            // We have a query (of sorts) to work with
+            $tqi = new TimberQueryIterator( $query, $PostClass );
+            return $tqi;
+        }
+    }
 
-	static function get_pids($query){
-		$posts = self::get_posts($query);
-		$pids = array();
-		foreach($posts as $post){
-			if (isset($post->ID)){
-				$pids[] = $post->ID;
-			}
-		}
-		return $pids;
-	}
+    static function get_pids($query){
+        $posts = self::get_posts($query);
+        $pids = array();
+        foreach($posts as $post){
+            if (isset($post->ID)){
+                $pids[] = $post->ID;
+            }
+        }
+        return $pids;
+    }
 
-	static function loop_to_id() {
-		if (!self::wp_query_has_posts()) { return false; }
+    static function loop_to_id() {
+        if (!self::wp_query_has_posts()) { return false; }
 
-		global $wp_query;
-		$post_num = property_exists($wp_query, 'current_post')
-				  ? $wp_query->current_post + 1
-				  : 0
-				  ;
+        global $wp_query;
+        $post_num = property_exists($wp_query, 'current_post')
+                  ? $wp_query->current_post + 1
+                  : 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;
-	}
+        return $wp_query->posts[$post_num]->ID;
+    }
 
-	/**
-	 * @return bool
-	 */
-	static function wp_query_has_posts() {
-		global $wp_query;
-		return ($wp_query && property_exists($wp_query, 'posts') && $wp_query->posts);
-	}
+    /**
+     * @return bool
+     */
+    static function wp_query_has_posts() {
+        global $wp_query;
+        return ($wp_query && property_exists($wp_query, 'posts') && $wp_query->posts);
+    }
 
-	/**
-	 * @param string|array $arg
-	 * @return bool
-	 */
-	static function is_post_class_or_class_map($arg){
-		if (is_string($arg) && class_exists($arg)) {
-			return true;
-		}
-		if (is_array($arg)) {
-			foreach ($arg as $item) {
-				if (is_string($item) && (class_exists($item) && is_subclass_of($item, 'TimberPost'))) {
-					return true;
-				}
-			}
-		}
-	}
+    /**
+     * @param string|array $arg
+     * @return bool
+     */
+    static function is_post_class_or_class_map($arg){
+        if (is_string($arg) && class_exists($arg)) {
+            return true;
+        }
+        if (is_array($arg)) {
+            foreach ($arg as $item) {
+                if (is_string($item) && (class_exists($item) && is_subclass_of($item, 'TimberPost'))) {
+                    return true;
+                }
+            }
+        }
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -7,20 +7,20 @@ 
 	 * @param string $PostClass
 	 * @return array|bool|null
 	 */
-	static function get_post($query = false, $PostClass = 'TimberPost') {
-		$posts = self::get_posts( $query, $PostClass );
-		if ( $post = reset($posts ) ) {
+	static function get_post( $query = false, $PostClass = 'TimberPost' ) {
+		$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 ));
+		$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 );
+		$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)) {
-			foreach ($arg as $item) {
-				if (is_string($item) && (class_exists($item) && is_subclass_of($item, 'TimberPost'))) {
+		if ( is_array($arg) ) {
+			foreach ( $arg as $item ) {
+				if ( is_string($item) && (class_exists($item) && is_subclass_of($item, 'TimberPost')) ) {
 					return true;
 				}
 			}

lib/timber-posts-collection.php

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 ) {

Indentation +4 added lines, -4 removed lines

@@ -51,10 +51,10 @@
         return $this->getArrayCopy();
     }
 
-     /**
-     * @param array $posts
-     * @return array
-     */
+        /**
+         * @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']

Spacing +20 added lines, -20 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' ) {
         $returned_posts = array();
-        if ( is_null( $posts ) ){
+        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 );
+            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() {
@@ -56,16 +56,16 @@ 
      * @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'] ) ) {
+        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);
                     }
                 }
             }

lib/timber-query-iterator.php

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',

Indentation +4 added lines, -4 removed lines

@@ -145,10 +145,10 @@
      * @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'));
-        	}
+        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 +29 added lines, -29 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) )
+if ( !defined('ABSPATH') )
     exit;
 
 class TimberQueryIterator implements Iterator {
@@ -14,37 +14,37 @@ 
     private $_posts_class = 'TimberPost';
 
     public function __construct( $query = false, $posts_class = 'TimberPost' ) {
-        add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
+        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();
@@ -55,9 +55,9 @@ 
     }
 
     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();
+        if ( isset($this->_query->posts) ) {
+            $posts = new TimberPostsCollection($this->_query->posts, $this->_posts_class);
+            return ($return_collection) ? $posts : $posts->get_posts();
         }
     }
 
@@ -65,38 +65,38 @@ 
     // GET POSTS
     //
     public static function get_query_from_array_of_ids( $query = array() ) {
-        if ( !is_array( $query ) || !count( $query ) )
+        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 = '' ) {
         $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);
     }
 
     /**
@@ -132,9 +132,9 @@ 
 
     //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'] );
+        if ( isset($query->query) && isset($query->query['numberposts'])
+                && !isset($query->query['posts_per_page']) ) {
+            $query->set('posts_per_page', $query->query['numberposts']);
         }
         return $query;
     }
@@ -145,7 +145,7 @@ 
      * @return WP_Query
      */
     static function handle_maybe_custom_posts_page( $query ) {
-    	if ($custom_posts_page = get_option('page_for_posts')) {
+    	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'));
         	}

lib/timber-term.php

Braces +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 			//echo 'bad call using '.$tid;
 			//TimberHelper::error_log(debug_backtrace());
 		}
-		if ( isset($term->ID) ){
+		if ( isset($term->ID) ) {
 			$term->id = $term->ID;
 			$this->import($term);
 			if ( isset($term->term_id) ) {

Indentation +387 added lines, -387 removed lines

@@ -32,398 +32,398 @@
  */
 class TimberTerm extends TimberCore implements TimberCoreInterface {
 
-	public $PostClass = 'TimberPost';
-	public $TermClass = 'TimberTerm';
-
-	public $object_type = 'term';
-	public static $representation = 'term';
-
-	public $_children;
-	/**
-	 * @api
-	 * @var string the human-friendly name of the term (ex: French Cuisine)
-	 */
-	public $name;
-	/**
-	 * @api
-	 * @var strng the WordPress taxonomy slug (ex: `post_tag` or `actors`)
-	 */
-	public $taxonomy;
-
-	/**
-	 * @param int $tid
-	 * @param string $tax
-	 */
-	public function __construct( $tid = null, $tax = '' ) {
-		if ($tid === null) {
-			$tid = $this->get_term_from_query();
-		}
-		if (strlen($tax)) {
-			$this->taxonomy = $tax;
-		}
-		$this->init($tid);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return $this->name;
-	}
-
-	/**
-	 * @param $tid
-	 * @param $taxonomy
-	 *
-	 * @return static
-	 */
-	public static function from( $tid, $taxonomy ) {
-		return new static($tid, $taxonomy);
-	}
-
-
-	/* Setup
+    public $PostClass = 'TimberPost';
+    public $TermClass = 'TimberTerm';
+
+    public $object_type = 'term';
+    public static $representation = 'term';
+
+    public $_children;
+    /**
+     * @api
+     * @var string the human-friendly name of the term (ex: French Cuisine)
+     */
+    public $name;
+    /**
+     * @api
+     * @var strng the WordPress taxonomy slug (ex: `post_tag` or `actors`)
+     */
+    public $taxonomy;
+
+    /**
+     * @param int $tid
+     * @param string $tax
+     */
+    public function __construct( $tid = null, $tax = '' ) {
+        if ($tid === null) {
+            $tid = $this->get_term_from_query();
+        }
+        if (strlen($tax)) {
+            $this->taxonomy = $tax;
+        }
+        $this->init($tid);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return $this->name;
+    }
+
+    /**
+     * @param $tid
+     * @param $taxonomy
+     *
+     * @return static
+     */
+    public static function from( $tid, $taxonomy ) {
+        return new static($tid, $taxonomy);
+    }
+
+
+    /* Setup
 	===================== */
 
-	/**
-	 * @internal
-	 * @return integer
-	 */
-	protected function get_term_from_query() {
-		global $wp_query;
-		if ( isset($wp_query->queried_object) ) {
-			$qo = $wp_query->queried_object;
-			if (isset($qo->term_id)) {
-				return $qo->term_id;
-			}
-		}
-		if ( isset($wp_query->tax_query->queries[0]['terms'][0]) ) {
-			return $wp_query->tax_query->queries[0]['terms'][0];
-		}
-	}
-
-	/**
-	 * @internal
-	 * @param int $tid
-	 */
-	protected function init( $tid ) {
-		$term = $this->get_term($tid);
-		if ( isset($term->id) ) {
-			$term->ID = $term->id;
-		} else if ( isset($term->term_id) ) {
-			$term->ID = $term->term_id;
-		} else if ( is_string($tid) ) {
-			//echo 'bad call using '.$tid;
-			//TimberHelper::error_log(debug_backtrace());
-		}
-		if ( isset($term->ID) ){
-			$term->id = $term->ID;
-			$this->import($term);
-			if ( isset($term->term_id) ) {
-				$custom = $this->get_term_meta($term->term_id);
-				$this->import($custom);
-			}
-		}
-	}
-
-	/**
-	 * @internal
-	 * @param int $tid
-	 * @return array
-	 */
-	protected function get_term_meta($tid) {
-		$customs = array();
-		$customs = apply_filters('timber_term_get_meta', $customs, $tid, $this);
-		return apply_filters('timber/term/meta', $customs, $tid, $this);
-	}
-
-	/**
-	 * @internal
-	 * @param int $tid
-	 * @return mixed
-	 */
-	protected function get_term( $tid ) {
-		if ( is_object($tid) || is_array($tid) ) {
-			return $tid;
-		}
-		$tid = self::get_tid($tid);
-
-		if ( isset($this->taxonomy) && strlen($this->taxonomy) ) {
-			return get_term($tid, $this->taxonomy);
-		} else {
-			global $wpdb;
-			$query = $wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $tid);
-			$tax = $wpdb->get_var($query);
-			if (isset($tax) && strlen($tax)) {
-				$this->taxonomy = $tax;
-				return get_term($tid, $tax);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @internal
-	 * @param int $tid
-	 * @return int
-	 */
-	protected function get_tid( $tid ) {
-		global $wpdb;
-		if ( is_numeric($tid) ) {
-			return $tid;
-		}
-		if ( gettype($tid) == 'object' ) {
-			$tid = $tid->term_id;
-		}
-		if ( is_numeric($tid) ) {
-			$query = $wpdb->prepare("SELECT * FROM $wpdb->terms WHERE term_id = %d", $tid);
-		} else {
-			$query = $wpdb->prepare("SELECT * FROM $wpdb->terms WHERE slug = %s", $tid);
-		}
-		$result = $wpdb->get_row($query);
-		if ( isset($result->term_id) ) {
-			$result->ID = $result->term_id;
-			$result->id = $result->term_id;
-			return $result->ID;
-		}
-		return 0;
-	}
-
-	/* Public methods
+    /**
+     * @internal
+     * @return integer
+     */
+    protected function get_term_from_query() {
+        global $wp_query;
+        if ( isset($wp_query->queried_object) ) {
+            $qo = $wp_query->queried_object;
+            if (isset($qo->term_id)) {
+                return $qo->term_id;
+            }
+        }
+        if ( isset($wp_query->tax_query->queries[0]['terms'][0]) ) {
+            return $wp_query->tax_query->queries[0]['terms'][0];
+        }
+    }
+
+    /**
+     * @internal
+     * @param int $tid
+     */
+    protected function init( $tid ) {
+        $term = $this->get_term($tid);
+        if ( isset($term->id) ) {
+            $term->ID = $term->id;
+        } else if ( isset($term->term_id) ) {
+            $term->ID = $term->term_id;
+        } else if ( is_string($tid) ) {
+            //echo 'bad call using '.$tid;
+            //TimberHelper::error_log(debug_backtrace());
+        }
+        if ( isset($term->ID) ){
+            $term->id = $term->ID;
+            $this->import($term);
+            if ( isset($term->term_id) ) {
+                $custom = $this->get_term_meta($term->term_id);
+                $this->import($custom);
+            }
+        }
+    }
+
+    /**
+     * @internal
+     * @param int $tid
+     * @return array
+     */
+    protected function get_term_meta($tid) {
+        $customs = array();
+        $customs = apply_filters('timber_term_get_meta', $customs, $tid, $this);
+        return apply_filters('timber/term/meta', $customs, $tid, $this);
+    }
+
+    /**
+     * @internal
+     * @param int $tid
+     * @return mixed
+     */
+    protected function get_term( $tid ) {
+        if ( is_object($tid) || is_array($tid) ) {
+            return $tid;
+        }
+        $tid = self::get_tid($tid);
+
+        if ( isset($this->taxonomy) && strlen($this->taxonomy) ) {
+            return get_term($tid, $this->taxonomy);
+        } else {
+            global $wpdb;
+            $query = $wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $tid);
+            $tax = $wpdb->get_var($query);
+            if (isset($tax) && strlen($tax)) {
+                $this->taxonomy = $tax;
+                return get_term($tid, $tax);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @internal
+     * @param int $tid
+     * @return int
+     */
+    protected function get_tid( $tid ) {
+        global $wpdb;
+        if ( is_numeric($tid) ) {
+            return $tid;
+        }
+        if ( gettype($tid) == 'object' ) {
+            $tid = $tid->term_id;
+        }
+        if ( is_numeric($tid) ) {
+            $query = $wpdb->prepare("SELECT * FROM $wpdb->terms WHERE term_id = %d", $tid);
+        } else {
+            $query = $wpdb->prepare("SELECT * FROM $wpdb->terms WHERE slug = %s", $tid);
+        }
+        $result = $wpdb->get_row($query);
+        if ( isset($result->term_id) ) {
+            $result->ID = $result->term_id;
+            $result->id = $result->term_id;
+            return $result->ID;
+        }
+        return 0;
+    }
+
+    /* Public methods
 	===================== */
 
-	/**
-	 * @internal
-	 * @return string
-	 */
-	public function get_edit_url() {
-		return get_edit_term_link($this->ID, $this->taxonomy);
-	}
-
-	/**
-	 * @internal
-	 * @param string $field_name
-	 * @return string
-	 */
-	public function get_meta_field( $field_name ) {
-		if (!isset($this->$field_name)) {
-			$field_value = '';
-			$field_value = apply_filters('timber_term_get_meta_field', $field_value, $this->ID, $field_name, $this);
-			$field_value = apply_filters('timber/term/meta/field', $field_value, $this->ID, $field_name, $this);
-			$this->$field_name = $field_value;
-		}
-		return $this->$field_name;
-	}
-
-	/**
-	 * @internal
-	 * @return string
-	 */
-	public function get_path() {
-		$link = $this->get_link();
-		$rel = TimberURLHelper::get_rel_url($link, true);
-		$rel = apply_filters('timber_term_path', $rel, $this);
-		return apply_filters('timber/term/path', $rel, $this);
-	}
-
-	/**
-	 * @internal
-	 * @return string
-	 */
-	public function get_link() {
-		$link = get_term_link($this);
-		$link = apply_filters('timber_term_link', $link, $this);
-		return apply_filters('timber/term/link', $link, $this);
-	}
-
-	/**
-	 * Get Posts that have been "tagged" with the particular term
-	 * @internal
-	 * @param int $numberposts
-	 * @param string $post_type
-	 * @param string $PostClass
-	 * @return array|bool|null
-	 */
-	public function get_posts( $numberposts = 10, $post_type = 'any', $PostClass = '' ) {
-		if (!strlen($PostClass)) {
-			$PostClass = $this->PostClass;
-		}
-		$default_tax_query = array(array(
-			'field' => 'id',
-			'terms' => $this->ID,
-			'taxonomy' => $this->taxonomy,
-		));
-		if ( is_string($numberposts) && strstr($numberposts, '=') ) {
-			$args = $numberposts;
-			$new_args = array();
-			parse_str($args, $new_args);
-			$args = $new_args;
-			$args['tax_query'] = $default_tax_query;
-			if (!isset($args['post_type'])) {
-				$args['post_type'] = 'any';
-			}
-			if (class_exists($post_type)) {
-				$PostClass = $post_type;
-			}
-		} else if ( is_array($numberposts) ) {
-			//they sent us an array already baked
-			$args = $numberposts;
-			if ( !isset($args['tax_query']) ) {
-				$args['tax_query'] = $default_tax_query;
-			}
-			if ( class_exists($post_type) ) {
-				$PostClass = $post_type;
-			}
-			if ( !isset($args['post_type']) ) {
-				$args['post_type'] = 'any';
-			}
-		} else {
-			$args = array(
-				'numberposts' => $numberposts,
-				'tax_query' => $default_tax_query,
-				'post_type' => $post_type
-			);
-		}
-		return Timber::get_posts($args, $PostClass);
-	}
-
-	/**
-	 * @internal
-	 * @return array
-	 */
-	public function get_children() {
-		if ( !isset($this->_children) ) {
-			$children = get_term_children($this->ID, $this->taxonomy);
-			foreach ($children as &$child) {
-				$child = new TimberTerm($child);
-			}
-			$this->_children = $children;
-		}
-		return $this->_children;
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $key
-	 * @param mixed   $value
-	 */
-	function update( $key, $value ) {
-		$value = apply_filters( 'timber_term_set_meta', $value, $key, $this->ID, $this );
-		$this->$key = $value;
-	}
-
-	/* Alias
+    /**
+     * @internal
+     * @return string
+     */
+    public function get_edit_url() {
+        return get_edit_term_link($this->ID, $this->taxonomy);
+    }
+
+    /**
+     * @internal
+     * @param string $field_name
+     * @return string
+     */
+    public function get_meta_field( $field_name ) {
+        if (!isset($this->$field_name)) {
+            $field_value = '';
+            $field_value = apply_filters('timber_term_get_meta_field', $field_value, $this->ID, $field_name, $this);
+            $field_value = apply_filters('timber/term/meta/field', $field_value, $this->ID, $field_name, $this);
+            $this->$field_name = $field_value;
+        }
+        return $this->$field_name;
+    }
+
+    /**
+     * @internal
+     * @return string
+     */
+    public function get_path() {
+        $link = $this->get_link();
+        $rel = TimberURLHelper::get_rel_url($link, true);
+        $rel = apply_filters('timber_term_path', $rel, $this);
+        return apply_filters('timber/term/path', $rel, $this);
+    }
+
+    /**
+     * @internal
+     * @return string
+     */
+    public function get_link() {
+        $link = get_term_link($this);
+        $link = apply_filters('timber_term_link', $link, $this);
+        return apply_filters('timber/term/link', $link, $this);
+    }
+
+    /**
+     * Get Posts that have been "tagged" with the particular term
+     * @internal
+     * @param int $numberposts
+     * @param string $post_type
+     * @param string $PostClass
+     * @return array|bool|null
+     */
+    public function get_posts( $numberposts = 10, $post_type = 'any', $PostClass = '' ) {
+        if (!strlen($PostClass)) {
+            $PostClass = $this->PostClass;
+        }
+        $default_tax_query = array(array(
+            'field' => 'id',
+            'terms' => $this->ID,
+            'taxonomy' => $this->taxonomy,
+        ));
+        if ( is_string($numberposts) && strstr($numberposts, '=') ) {
+            $args = $numberposts;
+            $new_args = array();
+            parse_str($args, $new_args);
+            $args = $new_args;
+            $args['tax_query'] = $default_tax_query;
+            if (!isset($args['post_type'])) {
+                $args['post_type'] = 'any';
+            }
+            if (class_exists($post_type)) {
+                $PostClass = $post_type;
+            }
+        } else if ( is_array($numberposts) ) {
+            //they sent us an array already baked
+            $args = $numberposts;
+            if ( !isset($args['tax_query']) ) {
+                $args['tax_query'] = $default_tax_query;
+            }
+            if ( class_exists($post_type) ) {
+                $PostClass = $post_type;
+            }
+            if ( !isset($args['post_type']) ) {
+                $args['post_type'] = 'any';
+            }
+        } else {
+            $args = array(
+                'numberposts' => $numberposts,
+                'tax_query' => $default_tax_query,
+                'post_type' => $post_type
+            );
+        }
+        return Timber::get_posts($args, $PostClass);
+    }
+
+    /**
+     * @internal
+     * @return array
+     */
+    public function get_children() {
+        if ( !isset($this->_children) ) {
+            $children = get_term_children($this->ID, $this->taxonomy);
+            foreach ($children as &$child) {
+                $child = new TimberTerm($child);
+            }
+            $this->_children = $children;
+        }
+        return $this->_children;
+    }
+
+    /**
+     *
+     *
+     * @param string  $key
+     * @param mixed   $value
+     */
+    function update( $key, $value ) {
+        $value = apply_filters( 'timber_term_set_meta', $value, $key, $this->ID, $this );
+        $this->$key = $value;
+    }
+
+    /* Alias
 	====================== */
 
-	/**
-	 * @api
-	 * @return array
-	 */
-	public function children() {
-		return $this->get_children();
-	}
-
-	/**
-	 * @api
-	 * @return string
-	 */
-	public function description() {
-		$prefix = '<p>';
-		$suffix = '</p>';
-		$desc = term_description( $this->ID, $this->taxonomy );
-		if (substr($desc, 0, strlen($prefix)) == $prefix) {
-    		$desc = substr($desc, strlen($prefix));
-		}
-		$desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc);
-		return trim($desc);
-	}
-
-	/**
-	 * @api
-	 * @return string
-	 */
-	public function edit_link() {
-		return $this->get_edit_url();
-	}
-
-	/**
-	 * @internal
-	 * @deprecated 0.21.8 use TimberTerm::link() instead
-	 * @return string
-	 */
-	public function get_url() {
-		return $this->get_link();
-	}
-
-	/**
-	 * @api
-	 * @return string
-	 */
-	public function link() {
-		return $this->get_link();
-	}
-
-	/**
-	 * @api
-	 * @param string $field_name
-	 * @return string
-	 */
-	public function meta( $field_name ) {
-		return $this->get_meta_field($field_name);
-	}
-
-	/**
-	 * @api
-	 * @return string
-	 */
-	public function path() {
-		return $this->get_path();
-	}
-
-	/**
-	 * @api
-	 * @param int $numberposts_or_args
-	 * @param string $post_type_or_class
-	 * @param string $post_class
-	 * @example
-	 * ```twig
-	 * <h4>Recent posts in {{term.name}}</h4>
-	 * <ul>
-	 * {% for post in term.posts(3, 'post') %}
-	 *     <li><a href="{{post.link}}">{{post.title}}</a></li>
-	 * {% endfor %}
-	 * </ul>
-	 * ```
-	 * @return array|bool|null
-	 */
-	public function posts( $numberposts_or_args = 10, $post_type_or_class = 'any', $post_class = '' ) {
-		return $this->get_posts($numberposts_or_args, $post_type_or_class, $post_class);
-	}
-
-	/**
-	 * @api
-	 * @return string
-	 */
-	public function title() {
-		return $this->name;
-	}
-
-	/**
-	 * @deprecated 0.21.9 use TimberTerm::link() instead
-	 * @return string
-	 */
-	public function url() {
-		return $this->get_url();
-	}
-
-	/**
-	 * @deprecated 0.20.0 this was a dumb idea
-	 * @param int $i
-	 * @return string
-	 */
-	function get_page( $i ) {
-		return $this->get_path() . '/page/' . $i;
-	}
+    /**
+     * @api
+     * @return array
+     */
+    public function children() {
+        return $this->get_children();
+    }
+
+    /**
+     * @api
+     * @return string
+     */
+    public function description() {
+        $prefix = '<p>';
+        $suffix = '</p>';
+        $desc = term_description( $this->ID, $this->taxonomy );
+        if (substr($desc, 0, strlen($prefix)) == $prefix) {
+            $desc = substr($desc, strlen($prefix));
+        }
+        $desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc);
+        return trim($desc);
+    }
+
+    /**
+     * @api
+     * @return string
+     */
+    public function edit_link() {
+        return $this->get_edit_url();
+    }
+
+    /**
+     * @internal
+     * @deprecated 0.21.8 use TimberTerm::link() instead
+     * @return string
+     */
+    public function get_url() {
+        return $this->get_link();
+    }
+
+    /**
+     * @api
+     * @return string
+     */
+    public function link() {
+        return $this->get_link();
+    }
+
+    /**
+     * @api
+     * @param string $field_name
+     * @return string
+     */
+    public function meta( $field_name ) {
+        return $this->get_meta_field($field_name);
+    }
+
+    /**
+     * @api
+     * @return string
+     */
+    public function path() {
+        return $this->get_path();
+    }
+
+    /**
+     * @api
+     * @param int $numberposts_or_args
+     * @param string $post_type_or_class
+     * @param string $post_class
+     * @example
+     * ```twig
+     * <h4>Recent posts in {{term.name}}</h4>
+     * <ul>
+     * {% for post in term.posts(3, 'post') %}
+     *     <li><a href="{{post.link}}">{{post.title}}</a></li>
+     * {% endfor %}
+     * </ul>
+     * ```
+     * @return array|bool|null
+     */
+    public function posts( $numberposts_or_args = 10, $post_type_or_class = 'any', $post_class = '' ) {
+        return $this->get_posts($numberposts_or_args, $post_type_or_class, $post_class);
+    }
+
+    /**
+     * @api
+     * @return string
+     */
+    public function title() {
+        return $this->name;
+    }
+
+    /**
+     * @deprecated 0.21.9 use TimberTerm::link() instead
+     * @return string
+     */
+    public function url() {
+        return $this->get_url();
+    }
+
+    /**
+     * @deprecated 0.20.0 this was a dumb idea
+     * @param int $i
+     * @return string
+     */
+    function get_page( $i ) {
+        return $this->get_path() . '/page/' . $i;
+    }
 
 }

Spacing +15 added lines, -15 removed lines

@@ -55,10 +55,10 @@ 
 	 * @param string $tax
 	 */
 	public function __construct( $tid = null, $tax = '' ) {
-		if ($tid === null) {
+		if ( $tid === null ) {
 			$tid = $this->get_term_from_query();
 		}
-		if (strlen($tax)) {
+		if ( strlen($tax) ) {
 			$this->taxonomy = $tax;
 		}
 		$this->init($tid);
@@ -93,7 +93,7 @@ 
 		global $wp_query;
 		if ( isset($wp_query->queried_object) ) {
 			$qo = $wp_query->queried_object;
-			if (isset($qo->term_id)) {
+			if ( isset($qo->term_id) ) {
 				return $qo->term_id;
 			}
 		}
@@ -116,7 +116,7 @@ 
 			//echo 'bad call using '.$tid;
 			//TimberHelper::error_log(debug_backtrace());
 		}
-		if ( isset($term->ID) ){
+		if ( isset($term->ID) ) {
 			$term->id = $term->ID;
 			$this->import($term);
 			if ( isset($term->term_id) ) {
@@ -131,7 +131,7 @@ 
 	 * @param int $tid
 	 * @return array
 	 */
-	protected function get_term_meta($tid) {
+	protected function get_term_meta( $tid ) {
 		$customs = array();
 		$customs = apply_filters('timber_term_get_meta', $customs, $tid, $this);
 		return apply_filters('timber/term/meta', $customs, $tid, $this);
@@ -154,7 +154,7 @@ 
 			global $wpdb;
 			$query = $wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $tid);
 			$tax = $wpdb->get_var($query);
-			if (isset($tax) && strlen($tax)) {
+			if ( isset($tax) && strlen($tax) ) {
 				$this->taxonomy = $tax;
 				return get_term($tid, $tax);
 			}
@@ -206,7 +206,7 @@ 
 	 * @return string
 	 */
 	public function get_meta_field( $field_name ) {
-		if (!isset($this->$field_name)) {
+		if ( !isset($this->$field_name) ) {
 			$field_value = '';
 			$field_value = apply_filters('timber_term_get_meta_field', $field_value, $this->ID, $field_name, $this);
 			$field_value = apply_filters('timber/term/meta/field', $field_value, $this->ID, $field_name, $this);
@@ -245,7 +245,7 @@ 
 	 * @return array|bool|null
 	 */
 	public function get_posts( $numberposts = 10, $post_type = 'any', $PostClass = '' ) {
-		if (!strlen($PostClass)) {
+		if ( !strlen($PostClass) ) {
 			$PostClass = $this->PostClass;
 		}
 		$default_tax_query = array(array(
@@ -259,10 +259,10 @@ 
 			parse_str($args, $new_args);
 			$args = $new_args;
 			$args['tax_query'] = $default_tax_query;
-			if (!isset($args['post_type'])) {
+			if ( !isset($args['post_type']) ) {
 				$args['post_type'] = 'any';
 			}
-			if (class_exists($post_type)) {
+			if ( class_exists($post_type) ) {
 				$PostClass = $post_type;
 			}
 		} else if ( is_array($numberposts) ) {
@@ -294,7 +294,7 @@ 
 	public function get_children() {
 		if ( !isset($this->_children) ) {
 			$children = get_term_children($this->ID, $this->taxonomy);
-			foreach ($children as &$child) {
+			foreach ( $children as &$child ) {
 				$child = new TimberTerm($child);
 			}
 			$this->_children = $children;
@@ -309,7 +309,7 @@ 
 	 * @param mixed   $value
 	 */
 	function update( $key, $value ) {
-		$value = apply_filters( 'timber_term_set_meta', $value, $key, $this->ID, $this );
+		$value = apply_filters('timber_term_set_meta', $value, $key, $this->ID, $this);
 		$this->$key = $value;
 	}
 
@@ -331,11 +331,11 @@ 
 	public function description() {
 		$prefix = '<p>';
 		$suffix = '</p>';
-		$desc = term_description( $this->ID, $this->taxonomy );
-		if (substr($desc, 0, strlen($prefix)) == $prefix) {
+		$desc = term_description($this->ID, $this->taxonomy);
+		if ( substr($desc, 0, strlen($prefix)) == $prefix ) {
     		$desc = substr($desc, strlen($prefix));
 		}
-		$desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc);
+		$desc = preg_replace('/' . preg_quote('</p>', '/') . '$/', '', $desc);
 		return trim($desc);
 	}