jarednova / timber

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

Spacing +23 added lines, -23 removed lines

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

lib/timber-posts-collection.php

Indentation +84 added lines, -84 removed lines

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

Spacing +23 added lines, -23 removed lines

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

Braces +3 added lines, -2 removed lines

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

lib/timber-query-iterator.php

Indentation +148 added lines, -148 removed lines

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

Spacing +35 added lines, -35 removed lines

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

Braces +9 added lines, -6 removed lines

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

lib/timber-site.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	/** @api
 	 * @var string for people who like trackback spam
-	*/
+	 */
 	public $pingback_url;
 	public $siteurl;
 	/**

Spacing +33 added lines, -33 removed lines

@@ -101,10 +101,10 @@ 
 	 * ```
 	 * @param string|int $site_name_or_id
 	 */
-	function __construct( $site_name_or_id = null ) {
+	function __construct($site_name_or_id = null) {
 		$this->init();
 		if ( is_multisite() ) {
-			$this->init_as_multisite( $site_name_or_id );
+			$this->init_as_multisite($site_name_or_id);
 		} else {
 			$this->init_as_singlesite();
 		}
@@ -114,7 +114,7 @@ 
 	 * @internal
 	 * @param string|int $site_name_or_id
 	 */
-	protected function init_as_multisite( $site_name_or_id ) {
+	protected function init_as_multisite($site_name_or_id) {
 		if ( $site_name_or_id === null ) {
 			//this is necessary for some reason, otherwise returns 1 all the time
 			if ( is_multisite() ) {
@@ -122,17 +122,17 @@ 
 				$site_name_or_id = get_current_blog_id();
 			}
 		}
-		$info = get_blog_details( $site_name_or_id );
-		$this->import( $info );
+		$info = get_blog_details($site_name_or_id);
+		$this->import($info);
 		$this->ID = $info->blog_id;
 		$this->id = $this->ID;
 		$this->name = $this->blogname;
 		$this->title = $this->blogname;
 		$this->url = $this->siteurl;
-		$theme_slug = get_blog_option( $info->blog_id, 'stylesheet' );
-		$this->theme = new TimberTheme( $theme_slug );
-		$this->description = get_blog_option( $info->blog_id, 'blogdescription' );
-		$this->admin_email = get_blog_option( $info->blog_id, 'admin_email' );
+		$theme_slug = get_blog_option($info->blog_id, 'stylesheet');
+		$this->theme = new TimberTheme($theme_slug);
+		$this->description = get_blog_option($info->blog_id, 'blogdescription');
+		$this->admin_email = get_blog_option($info->blog_id, 'admin_email');
 		$this->multisite = true;
 	}
 
@@ -141,13 +141,13 @@ 
 	 * @internal
 	 */
 	protected function init_as_singlesite() {
-		$this->admin_email = get_bloginfo( 'admin_email' );
-		$this->name = get_bloginfo( 'name' );
+		$this->admin_email = get_bloginfo('admin_email');
+		$this->name = get_bloginfo('name');
 		$this->title = $this->name;
-		$this->description = get_bloginfo( 'description' );
-		$this->url = get_bloginfo( 'url' );
+		$this->description = get_bloginfo('description');
+		$this->url = get_bloginfo('url');
 		$this->theme = new TimberTheme();
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
+		$this->language_attributes = TimberHelper::function_wrapper('language_attributes');
 		$this->multisite = false;
 	}
 
@@ -156,16 +156,16 @@ 
 	 * @internal
 	 */
 	protected function init() {
-		$this->rdf = get_bloginfo( 'rdf_url' );
-		$this->rss = get_bloginfo( 'rss_url' );
-		$this->rss2 = get_bloginfo( 'rss2_url' );
-		$this->atom = get_bloginfo( 'atom_url' );
-		$this->language = get_bloginfo( 'language' );
-		$this->charset = get_bloginfo( 'charset' );
-		$this->pingback = get_bloginfo( 'pingback_url' );
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
+		$this->rdf = get_bloginfo('rdf_url');
+		$this->rss = get_bloginfo('rss_url');
+		$this->rss2 = get_bloginfo('rss2_url');
+		$this->atom = get_bloginfo('atom_url');
+		$this->language = get_bloginfo('language');
+		$this->charset = get_bloginfo('charset');
+		$this->pingback = get_bloginfo('pingback_url');
+		$this->language_attributes = TimberHelper::function_wrapper('language_attributes');
 		/* deprecated benath this comment */
-		$this->pingback_url = get_bloginfo( 'pingback_url' );
+		$this->pingback_url = get_bloginfo('pingback_url');
 	}
 
 	/**
@@ -174,12 +174,12 @@ 
 	 * @param string  $field
 	 * @return mixed
 	 */
-	function __get( $field ) {
-		if ( !isset( $this->$field ) ) {
+	function __get($field) {
+		if ( !isset($this->$field) ) {
 			if ( is_multisite() ) {
-				$this->$field = get_blog_option( $this->ID, $field );
+				$this->$field = get_blog_option($this->ID, $field);
 			} else {
-				$this->$field = get_option( $field );
+				$this->$field = get_option($field);
 			}
 		}
 		return $this->$field;
@@ -226,8 +226,8 @@ 
 	/**
 	 * @ignore
 	 */
-	public function meta( $field ) {
-		return $this->__get( $field );
+	public function meta($field) {
+		return $this->__get($field);
 	}
 
 	/**
@@ -236,12 +236,12 @@ 
 	 * @param string  $key
 	 * @param mixed   $value
 	 */
-	public function update( $key, $value ) {
-		$value = apply_filters( 'timber_site_set_meta', $value, $key, $this->ID, $this );
+	public function update($key, $value) {
+		$value = apply_filters('timber_site_set_meta', $value, $key, $this->ID, $this);
 		if ( is_multisite() ) {
-			update_blog_option( $this->ID, $key, $value );
+			update_blog_option($this->ID, $key, $value);
 		} else {
-			update_option( $key, $value );
+			update_option($key, $value);
 		}
 		$this->$key = $value;
 	}

lib/timber-term.php

Spacing +24 added lines, -24 removed lines

@@ -54,11 +54,11 @@ 
 	 * @param int $tid
 	 * @param string $tax
 	 */
-	public function __construct( $tid = null, $tax = '' ) {
-		if ($tid === null) {
+	public function __construct($tid = null, $tax = '') {
+		if ( $tid === null ) {
 			$tid = $this->get_term_from_query();
 		}
-		if (strlen($tax)) {
+		if ( strlen($tax) ) {
 			$this->taxonomy = $tax;
 		}
 		$this->init($tid);
@@ -77,7 +77,7 @@ 
 	 *
 	 * @return static
 	 */
-	public static function from( $tid, $taxonomy ) {
+	public static function from($tid, $taxonomy) {
 		return new static($tid, $taxonomy);
 	}
 
@@ -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;
 			}
 		}
@@ -106,7 +106,7 @@ 
 	 * @internal
 	 * @param int $tid
 	 */
-	protected function init( $tid ) {
+	protected function init($tid) {
 		$term = $this->get_term($tid);
 		if ( isset($term->id) ) {
 			$term->ID = $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) ) {
@@ -142,7 +142,7 @@ 
 	 * @param int $tid
 	 * @return mixed
 	 */
-	protected function get_term( $tid ) {
+	protected function get_term($tid) {
 		if ( is_object($tid) || is_array($tid) ) {
 			return $tid;
 		}
@@ -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);
 			}
@@ -167,7 +167,7 @@ 
 	 * @param int $tid
 	 * @return int
 	 */
-	protected function get_tid( $tid ) {
+	protected function get_tid($tid) {
 		global $wpdb;
 		if ( is_numeric($tid) ) {
 			return $tid;
@@ -205,8 +205,8 @@ 
 	 * @param string $field_name
 	 * @return string
 	 */
-	public function get_meta_field( $field_name ) {
-		if (!isset($this->$field_name)) {
+	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);
@@ -244,8 +244,8 @@ 
 	 * @param string $PostClass
 	 * @return array|bool|null
 	 */
-	public function get_posts( $numberposts = 10, $post_type = 'any', $PostClass = '' ) {
-		if (!strlen($PostClass)) {
+	public function get_posts($numberposts = 10, $post_type = 'any', $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) ) {
@@ -308,8 +308,8 @@ 
 	 * @param string  $key
 	 * @param mixed   $value
 	 */
-	function update( $key, $value ) {
-		$value = apply_filters( 'timber_term_set_meta', $value, $key, $this->ID, $this );
+	function update($key, $value) {
+		$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);
 	}
 
@@ -369,7 +369,7 @@ 
 	 * @param string $field_name
 	 * @return string
 	 */
-	public function meta( $field_name ) {
+	public function meta($field_name) {
 		return $this->get_meta_field($field_name);
 	}
 
@@ -397,7 +397,7 @@ 
 	 * ```
 	 * @return array|bool|null
 	 */
-	public function posts( $numberposts_or_args = 10, $post_type_or_class = 'any', $post_class = '' ) {
+	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);
 	}
 
@@ -422,7 +422,7 @@ 
 	 * @param int $i
 	 * @return string
 	 */
-	function get_page( $i ) {
+	function get_page($i) {
 		return $this->get_path() . '/page/' . $i;
 	}
 

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 +31 added lines, -31 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 /**
- * Terms: WordPress has got 'em, you want 'em. Categories. Tags. Custom Taxonomies. You don't care, you're a fiend. Well let's get this under control
- * @example
- * ```php
- * //Get a term by its ID
- * $context['term'] = new TimberTerm(6);
- * //Get a term when on a term archive page
- * $context['term_page'] = new TimberTerm();
- * //Get a term with a slug
- * $context['team'] = new TimberTerm('patriots');
- * //Get a team with a slug from a specific taxonomy
- * $context['st_louis'] = new TimberTerm('cardinals', 'baseball');
- * Timber::render('index.twig', $context);
- * ```
- * ```twig
- * <h2>{{term_page.name}} Archives</h2>
- * <h3>Teams</h3>
- * <ul>
- *     <li>{{st_louis.name}} - {{st_louis.description}}</li>
- *     <li>{{team.name}} - {{team.description}}</li>
- * </ul>
- * ```
- * ```html
- * <h2>Team Archives</h2>
- * <h3>Teams</h3>
- * <ul>
- *     <li>St. Louis Cardinals - Winner of 11 World Series</li>
- *     <li>New England Patriots - Winner of 4 Super Bowls</li>
- * </ul>
- * ```
- */
+	 * Terms: WordPress has got 'em, you want 'em. Categories. Tags. Custom Taxonomies. You don't care, you're a fiend. Well let's get this under control
+	 * @example
+	 * ```php
+	 * //Get a term by its ID
+	 * $context['term'] = new TimberTerm(6);
+	 * //Get a term when on a term archive page
+	 * $context['term_page'] = new TimberTerm();
+	 * //Get a term with a slug
+	 * $context['team'] = new TimberTerm('patriots');
+	 * //Get a team with a slug from a specific taxonomy
+	 * $context['st_louis'] = new TimberTerm('cardinals', 'baseball');
+	 * Timber::render('index.twig', $context);
+	 * ```
+	 * ```twig
+	 * <h2>{{term_page.name}} Archives</h2>
+	 * <h3>Teams</h3>
+	 * <ul>
+	 *     <li>{{st_louis.name}} - {{st_louis.description}}</li>
+	 *     <li>{{team.name}} - {{team.description}}</li>
+	 * </ul>
+	 * ```
+	 * ```html
+	 * <h2>Team Archives</h2>
+	 * <h3>Teams</h3>
+	 * <ul>
+	 *     <li>St. Louis Cardinals - Winner of 11 World Series</li>
+	 *     <li>New England Patriots - Winner of 4 Super Bowls</li>
+	 * </ul>
+	 * ```
+	 */
 class TimberTerm extends TimberCore implements TimberCoreInterface {
 
 	public $PostClass = 'TimberPost';
@@ -333,7 +333,7 @@ 
 		$suffix = '</p>';
 		$desc = term_description( $this->ID, $this->taxonomy );
 		if (substr($desc, 0, strlen($prefix)) == $prefix) {
-    		$desc = substr($desc, strlen($prefix));
+			$desc = substr($desc, strlen($prefix));
 		}
 		$desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc);
 		return trim($desc);

lib/timber-theme.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 		$ss = $data->get_stylesheet();
 		$this->slug = $ss;
 
-		if ( ! function_exists( 'get_home_path' ) ) {
+		if ( !function_exists('get_home_path') ) {
 			require_once(ABSPATH . 'wp-admin/includes/file.php');
 		}
 
@@ -103,7 +103,7 @@ 
 	 * @return  string the relative path to the theme (ex: `/wp-content/themes/my-timber-theme`)
 	 */
 	public function path() {
-		return TimberURLHelper::get_rel_url( $this->link() );
+		return TimberURLHelper::get_rel_url($this->link());
 	}
 
 	/**

lib/timber-twig.php

Spacing +149 added lines, -149 removed lines

@@ -12,8 +12,8 @@ 
 	}
 
 	function __construct() {
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters_deprecated' ) );
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters' ) );
+		add_action('timber/twig/filters', array($this, 'add_timber_filters_deprecated'));
+		add_action('timber/twig/filters', array($this, 'add_timber_filters'));
 	}
 
 	/**
@@ -23,14 +23,14 @@ 
 	 * @deprecated since 0.20.7
 	 * @return Twig_Environment
 	 */
-	function add_timber_filters_deprecated( $twig ) {
-		$twig->addFilter( new Twig_SimpleFilter( 'get_src_from_attachment_id', 'twig_get_src_from_attachment_id' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'wp_body_class', array( $this, 'body_class' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterify', array( 'TimberHelper', 'twitterify' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterfy', array( 'TimberHelper', 'twitterify' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'string', function($arr, $glue = ' '){
+	function add_timber_filters_deprecated($twig) {
+		$twig->addFilter(new Twig_SimpleFilter('get_src_from_attachment_id', 'twig_get_src_from_attachment_id'));
+		$twig->addFilter(new Twig_SimpleFilter('wp_body_class', array($this, 'body_class')));
+		$twig->addFilter(new Twig_SimpleFilter('twitterify', array('TimberHelper', 'twitterify')));
+		$twig->addFilter(new Twig_SimpleFilter('twitterfy', array('TimberHelper', 'twitterify')));
+		$twig->addFilter(new Twig_SimpleFilter('string', function($arr, $glue = ' ') {
 			return twig_join_filter($arr, $glue);
-		} ) );
+		} ));
 		return $twig;
 	}
 
@@ -40,151 +40,151 @@ 
 	 * @param Twig_Environment $twig
 	 * @return Twig_Environment
 	 */
-	function add_timber_filters( $twig ) {
+	function add_timber_filters($twig) {
 		/* image filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'resize', array( 'TimberImageHelper', 'resize' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'retina', array( 'TimberImageHelper', 'retina_resize' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'letterbox', array( 'TimberImageHelper', 'letterbox' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'tojpg', array( 'TimberImageHelper', 'img_to_jpg' ) ) );
+		$twig->addFilter(new Twig_SimpleFilter('resize', array('TimberImageHelper', 'resize')));
+		$twig->addFilter(new Twig_SimpleFilter('retina', array('TimberImageHelper', 'retina_resize')));
+		$twig->addFilter(new Twig_SimpleFilter('letterbox', array('TimberImageHelper', 'letterbox')));
+		$twig->addFilter(new Twig_SimpleFilter('tojpg', array('TimberImageHelper', 'img_to_jpg')));
 
 		/* debugging filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'docs', 'twig_object_docs' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'get_class',  'get_class' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'get_type', 'get_type' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'print_r', function( $arr ) {
-					return print_r( $arr, true );
-				} ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'print_a', function( $arr ) {
-					return '<pre>' . self::object_docs( $arr, true ) . '</pre>';
-				} ) );
+		$twig->addFilter(new Twig_SimpleFilter('docs', 'twig_object_docs'));
+		$twig->addFilter(new Twig_SimpleFilter('get_class', 'get_class'));
+		$twig->addFilter(new Twig_SimpleFilter('get_type', 'get_type'));
+		$twig->addFilter(new Twig_SimpleFilter('print_r', function($arr) {
+					return print_r($arr, true);
+				} ));
+		$twig->addFilter(new Twig_SimpleFilter('print_a', function($arr) {
+					return '<pre>' . self::object_docs($arr, true) . '</pre>';
+				} ));
 
 		/* other filters */
-		$twig->addFilter( new Twig_SimpleFilter( 'stripshortcodes', 'strip_shortcodes' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'array', array( $this, 'to_array' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'excerpt', 'wp_trim_words' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'function', array( $this, 'exec_function' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'pretags', array( $this, 'twig_pretags' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'sanitize', 'sanitize_title' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'shortcodes', 'do_shortcode' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'time_ago', array( $this, 'time_ago' ) ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'wpautop', 'wpautop' ) );
-		$twig->addFilter( new Twig_SimpleFilter( 'list', array( $this, 'add_list_separators' ) ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'relative', function ( $link ) {
-					return TimberURLHelper::get_rel_url( $link, true );
-				} ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'date', array( $this, 'intl_date' ) ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'truncate', function ( $text, $len ) {
-					return TimberHelper::trim_words( $text, $len );
-				} ) );
+		$twig->addFilter(new Twig_SimpleFilter('stripshortcodes', 'strip_shortcodes'));
+		$twig->addFilter(new Twig_SimpleFilter('array', array($this, 'to_array')));
+		$twig->addFilter(new Twig_SimpleFilter('excerpt', 'wp_trim_words'));
+		$twig->addFilter(new Twig_SimpleFilter('function', array($this, 'exec_function')));
+		$twig->addFilter(new Twig_SimpleFilter('pretags', array($this, 'twig_pretags')));
+		$twig->addFilter(new Twig_SimpleFilter('sanitize', 'sanitize_title'));
+		$twig->addFilter(new Twig_SimpleFilter('shortcodes', 'do_shortcode'));
+		$twig->addFilter(new Twig_SimpleFilter('time_ago', array($this, 'time_ago')));
+		$twig->addFilter(new Twig_SimpleFilter('wpautop', 'wpautop'));
+		$twig->addFilter(new Twig_SimpleFilter('list', array($this, 'add_list_separators')));
+
+		$twig->addFilter(new Twig_SimpleFilter('relative', function($link) {
+					return TimberURLHelper::get_rel_url($link, true);
+				} ));
+
+		$twig->addFilter(new Twig_SimpleFilter('date', array($this, 'intl_date')));
+
+		$twig->addFilter(new Twig_SimpleFilter('truncate', function($text, $len) {
+					return TimberHelper::trim_words($text, $len);
+				} ));
 
 		/* actions and filters */
-		$twig->addFunction( new Twig_SimpleFunction( 'action', function ( $context ) {
+		$twig->addFunction(new Twig_SimpleFunction('action', function($context) {
 					$args = func_get_args();
-					array_shift( $args );
+					array_shift($args);
 					$args[] = $context;
-					call_user_func_array( 'do_action', $args );
-				}, array( 'needs_context' => true ) ) );
+					call_user_func_array('do_action', $args);
+				}, array('needs_context' => true)));
 
-		$twig->addFilter( new Twig_SimpleFilter( 'apply_filters', function () {
+		$twig->addFilter(new Twig_SimpleFilter('apply_filters', function() {
 					$args = func_get_args();
-					$tag = current( array_splice( $args, 1, 1 ) );
+					$tag = current(array_splice($args, 1, 1));
 
-					return apply_filters_ref_array( $tag, $args );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'function', array( &$this, 'exec_function' ) ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'fn', array( &$this, 'exec_function' ) ) );
+					return apply_filters_ref_array($tag, $args);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('function', array(&$this, 'exec_function')));
+		$twig->addFunction(new Twig_SimpleFunction('fn', array(&$this, 'exec_function')));
 
-		$twig->addFunction( new Twig_SimpleFunction( 'shortcode', 'do_shortcode' ) );
+		$twig->addFunction(new Twig_SimpleFunction('shortcode', 'do_shortcode'));
 
 		/* TimberObjects */
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberPost', function ( $pid, $PostClass = 'TimberPost' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $PostClass( $p );
+		$twig->addFunction(new Twig_SimpleFunction('TimberPost', function($pid, $PostClass = 'TimberPost') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $PostClass($p);
 						}
 						return $pid;
 					}
-					return new $PostClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberImage', function ( $pid, $ImageClass = 'TimberImage' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $ImageClass( $p );
+					return new $PostClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberImage', function($pid, $ImageClass = 'TimberImage') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $ImageClass($p);
 						}
 						return $pid;
 					}
-					return new $ImageClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberTerm', function ( $pid, $TermClass = 'TimberTerm' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $TermClass( $p );
+					return new $ImageClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberTerm', function($pid, $TermClass = 'TimberTerm') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $TermClass($p);
 						}
 						return $pid;
 					}
-					return new $TermClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberUser', function ( $pid, $UserClass = 'TimberUser' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $UserClass( $p );
+					return new $TermClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('TimberUser', function($pid, $UserClass = 'TimberUser') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $UserClass($p);
 						}
 						return $pid;
 					}
-					return new $UserClass( $pid );
-				} ) );
+					return new $UserClass($pid);
+				} ));
 
 		/* TimberObjects Alias */
-		$twig->addFunction( new Twig_SimpleFunction( 'Post', function ( $pid, $PostClass = 'TimberPost' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $PostClass( $p );
+		$twig->addFunction(new Twig_SimpleFunction('Post', function($pid, $PostClass = 'TimberPost') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $PostClass($p);
 						}
 						return $pid;
 					}
-					return new $PostClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'Image', function ( $pid, $ImageClass = 'TimberImage' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $ImageClass( $p );
+					return new $PostClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('Image', function($pid, $ImageClass = 'TimberImage') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $ImageClass($p);
 						}
 						return $pid;
 					}
-					return new $ImageClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'Term', function ( $pid, $TermClass = 'TimberTerm' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $TermClass( $p );
+					return new $ImageClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('Term', function($pid, $TermClass = 'TimberTerm') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $TermClass($p);
 						}
 						return $pid;
 					}
-					return new $TermClass( $pid );
-				} ) );
-		$twig->addFunction( new Twig_SimpleFunction( 'User', function ( $pid, $UserClass = 'TimberUser' ) {
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
-						foreach ( $pid as &$p ) {
-							$p = new $UserClass( $p );
+					return new $TermClass($pid);
+				} ));
+		$twig->addFunction(new Twig_SimpleFunction('User', function($pid, $UserClass = 'TimberUser') {
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
+						foreach ($pid as &$p) {
+							$p = new $UserClass($p);
 						}
 						return $pid;
 					}
-					return new $UserClass( $pid );
-				} ) );
+					return new $UserClass($pid);
+				} ));
 
 		/* bloginfo and translate */
-		$twig->addFunction( 'bloginfo', new Twig_SimpleFunction( 'bloginfo', function ( $show = '', $filter = 'raw' ) {
-					return get_bloginfo( $show, $filter );
-				} ) );
-		$twig->addFunction( '__', new Twig_SimpleFunction( '__', function ( $text, $domain = 'default' ) {
-					return __( $text, $domain );
-				} ) );
+		$twig->addFunction('bloginfo', new Twig_SimpleFunction('bloginfo', function($show = '', $filter = 'raw') {
+					return get_bloginfo($show, $filter);
+				} ));
+		$twig->addFunction('__', new Twig_SimpleFunction('__', function($text, $domain = 'default') {
+					return __($text, $domain);
+				} ));
 		/* get_twig is deprecated, use timber/twig */
-		$twig = apply_filters( 'get_twig', $twig );
-		$twig = apply_filters( 'timber/twig', $twig );
+		$twig = apply_filters('get_twig', $twig);
+		$twig = apply_filters('timber/twig', $twig);
 		return $twig;
 	}
 
@@ -194,11 +194,11 @@ 
 	 * @param mixed   $arr
 	 * @return array
 	 */
-	function to_array( $arr ) {
-		if ( is_array( $arr ) ) {
+	function to_array($arr) {
+		if ( is_array($arr) ) {
 			return $arr;
 		}
-		$arr = array( $arr );
+		$arr = array($arr);
 		return $arr;
 	}
 
@@ -208,13 +208,13 @@ 
 	 * @param string  $function_name
 	 * @return mixed
 	 */
-	function exec_function( $function_name ) {
+	function exec_function($function_name) {
 		$args = func_get_args();
-		array_shift( $args );
+		array_shift($args);
 		if ( is_string($function_name) ) {
-			$function_name = trim( $function_name );
+			$function_name = trim($function_name);
 		}
-		return call_user_func_array( $function_name, ( $args ) );
+		return call_user_func_array($function_name, ($args));
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 * @param string  $content
 	 * @return string
 	 */
-	function twig_pretags( $content ) {
-		return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
+	function twig_pretags($content) {
+		return preg_replace_callback('|<pre.*>(.*)</pre|isU', array(&$this, 'convert_pre_entities'), $content);
 	}
 
 	/**
@@ -233,8 +233,8 @@ 
 	 * @param array   $matches
 	 * @return string
 	 */
-	function convert_pre_entities( $matches ) {
-		return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
+	function convert_pre_entities($matches) {
+		return str_replace($matches[1], htmlentities($matches[1]), $matches[0]);
 	}
 
 	/**
@@ -242,12 +242,12 @@ 
 	 * @deprecated 0.20.7
 	 * @return string
 	 */
-	function body_class( $body_classes ) {
+	function body_class($body_classes) {
 		ob_start();
-		if ( is_array( $body_classes ) ) {
-			$body_classes = explode( ' ', $body_classes );
+		if ( is_array($body_classes) ) {
+			$body_classes = explode(' ', $body_classes);
 		}
-		body_class( $body_classes );
+		body_class($body_classes);
 		$return = ob_get_contents();
 		ob_end_clean();
 		return $return;
@@ -260,20 +260,20 @@ 
 	 * @param string  $format (optional)
 	 * @return string
 	 */
-	function intl_date( $date, $format = null ) {
+	function intl_date($date, $format = null) {
 		if ( $format === null ) {
-			$format = get_option( 'date_format' );
+			$format = get_option('date_format');
 		}
 
 		if ( $date instanceof DateTime ) {
 			$timestamp = $date->getTimestamp();
-		} else if (is_numeric( $date ) && strtotime( $date ) === false ) {
-			$timestamp = intval( $date );
+		} else if ( is_numeric($date) && strtotime($date) === false ) {
+			$timestamp = intval($date);
 		} else {
-			$timestamp = strtotime( $date );
+			$timestamp = strtotime($date);
 		}
 
-		return date_i18n( $format, $timestamp );
+		return date_i18n($format, $timestamp);
 	}
 
 	//debug
@@ -285,17 +285,17 @@ 
 	 * @param bool    $methods
 	 * @return string
 	 */
-	function object_docs( $obj, $methods = true ) {
-		$class = get_class( $obj );
-		$properties = (array)$obj;
+	function object_docs($obj, $methods = true) {
+		$class = get_class($obj);
+		$properties = (array) $obj;
 		if ( $methods ) {
 			/** @var array $methods */
 			$methods = $obj->get_method_values();
 		}
-		$rets = array_merge( $properties, $methods );
-		ksort( $rets );
-		$str = print_r( $rets, true );
-		$str = str_replace( 'Array', $class . ' Object', $str );
+		$rets = array_merge($properties, $methods);
+		ksort($rets);
+		$str = print_r($rets, true);
+		$str = str_replace('Array', $class . ' Object', $str);
 		return $str;
 	}
 
@@ -306,15 +306,15 @@ 
 	 * @param string $format_future
 	 * @return string
 	 */
-	function time_ago( $from, $to = null, $format_past = '%s ago', $format_future = '%s from now' ) {
+	function time_ago($from, $to = null, $format_past = '%s ago', $format_future = '%s from now') {
 		$to = $to === null ? time() : $to;
-		$to = is_int( $to ) ? $to : strtotime( $to );
-		$from = is_int( $from ) ? $from : strtotime( $from );
+		$to = is_int($to) ? $to : strtotime($to);
+		$from = is_int($from) ? $from : strtotime($from);
 
 		if ( $from < $to ) {
-			return sprintf( $format_past, human_time_diff( $from, $to ) );
+			return sprintf($format_past, human_time_diff($from, $to));
 		} else {
-			return sprintf( $format_future, human_time_diff( $to, $from ) );
+			return sprintf($format_future, human_time_diff($to, $from));
 		}
 	}
 
@@ -324,18 +324,18 @@ 
 	 * @param string $second_delimiter
 	 * @return string
 	 */
-	function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
-		$length = count( $arr );
+	function add_list_separators($arr, $first_delimiter = ',', $second_delimiter = 'and') {
+		$length = count($arr);
 		$list = '';
-		foreach( $arr as $index => $item ) {
+		foreach ($arr as $index => $item) {
 			if ( $index < $length - 2 ) {
-				$delimiter = $first_delimiter.' ';
+				$delimiter = $first_delimiter . ' ';
 			} elseif ( $index == $length - 2 ) {
-				$delimiter = ' '.$second_delimiter.' ';
+				$delimiter = ' ' . $second_delimiter . ' ';
 			} else {
 				$delimiter = '';
 			}
-			$list = $list.$item.$delimiter;
+			$list = $list . $item . $delimiter;
 		}
 		return $list;
 	}

lib/image/timber-image-operation-resize.php

Doc Comments +4 added lines, -1 removed lines

@@ -75,6 +75,9 @@ 
 		return $image->writeImages($save_filename, true);
 	}
 
+	/**
+	 * @param string $load_filename
+	 */
 	protected function get_target_sizes( $load_filename ) {
 		$image = wp_get_image_editor( $load_filename );
 		$w = $this->w;
@@ -142,7 +145,7 @@ 
 	 *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
 	 * @param  string $save_filename filepath (not URL) where result file should be saved
 	 *                               (ex: /src/var/www/wp-content/uploads/my-pic-300x200-c-default.jpg)
-	 * @return bool                  true if everything went fine, false otherwise
+	 * @return boolean|null                  true if everything went fine, false otherwise
 	 */
 	public function run($load_filename, $save_filename) {
 		//should be resized by gif resizer

Spacing +31 added lines, -31 removed lines

@@ -21,8 +21,8 @@ 
 		$this->w = $w;
 		$this->h = $h;
 		// Sanitize crop position
-		$allowed_crop_positions = array( 'default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center' );
-		if ( $crop !== false && !in_array( $crop, $allowed_crop_positions ) ) {
+		$allowed_crop_positions = array('default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center');
+		if ( $crop !== false && !in_array($crop, $allowed_crop_positions) ) {
 			$crop = $allowed_crop_positions[0];
 		}
 		$this->crop = $crop;
@@ -42,9 +42,9 @@ 
 		if ( $this->h ) {
 			$h = $this->h;
 		}
-		$result = $src_filename . '-' . $w . 'x' . $h . '-c-' . ( $this->crop ? $this->crop : 'f' ); // Crop will be either user named or f (false)
-		if($src_extension) {
-			$result .= '.'.$src_extension;
+		$result = $src_filename . '-' . $w . 'x' . $h . '-c-' . ($this->crop ? $this->crop : 'f'); // Crop will be either user named or f (false)
+		if ( $src_extension ) {
+			$result .= '.' . $src_extension;
 		}
 		return $result;
 	}
@@ -53,8 +53,8 @@ 
 	 * @param string $load_filename
 	 * @param string $save_filename
 	 */
-	protected function run_animated_gif( $load_filename, $save_filename ) {
-		$image = wp_get_image_editor( $load_filename );
+	protected function run_animated_gif($load_filename, $save_filename) {
+		$image = wp_get_image_editor($load_filename);
 		$current_size = $image->get_size();
 		$src_w = $current_size['width'];
 		$src_h = $current_size['height'];
@@ -65,7 +65,7 @@ 
 		}
 		$image = new Imagick($load_filename);
 		$image = $image->coalesceImages();
-		$crop = self::get_target_sizes( $load_filename );
+		$crop = self::get_target_sizes($load_filename);
 		foreach ($image as $frame) {
 			$frame->cropImage($crop['src_w'], $crop['src_h'], $crop['x'], $crop['y']);
 			$frame->thumbnailImage($w, $h);
@@ -75,8 +75,8 @@ 
 		return $image->writeImages($save_filename, true);
 	}
 
-	protected function get_target_sizes( $load_filename ) {
-		$image = wp_get_image_editor( $load_filename );
+	protected function get_target_sizes($load_filename) {
+		$image = wp_get_image_editor($load_filename);
 		$w = $this->w;
 		$h = $this->h;
 		$crop = $this->crop;
@@ -86,11 +86,11 @@ 
 		$src_h = $current_size['height'];
 		$src_ratio = $src_w / $src_h;
 		if ( !$h ) {
-			$h = round( $w / $src_ratio );
+			$h = round($w / $src_ratio);
 		}
 		if ( !$w ) {
 			//the user wants to resize based on constant height
-			$w = round( $h * $src_ratio );
+			$w = round($h * $src_ratio);
 		}
 		if ( !$crop ) {
 			return array(
@@ -104,13 +104,13 @@ 
 		$src_wt = $src_h * $dest_ratio;
 		$src_ht = $src_w / $dest_ratio;
 		$src_x = $src_w / 2 - $src_wt / 2;
-		$src_y = ( $src_h - $src_ht ) / 6;
+		$src_y = ($src_h - $src_ht) / 6;
 		//now specific overrides based on options:
-		switch ( $crop ) {
+		switch ($crop) {
 			case 'center':
 				// Get source x and y
-				$src_x = round( ( $src_w - $src_wt ) / 2 );
-				$src_y = round( ( $src_h - $src_ht ) / 2 );
+				$src_x = round(($src_w - $src_wt) / 2);
+				$src_y = round(($src_h - $src_ht) / 2);
 				break;
 
 			case 'top':
@@ -122,11 +122,11 @@ 
 				break;
 
 			case 'top-center':
-				$src_y = round( ( $src_h - $src_ht ) / 4 );
+				$src_y = round(($src_h - $src_ht) / 4);
 				break;
 
 			case 'bottom-center':
-				$src_y = $src_h - $src_ht - round( ( $src_h - $src_ht ) / 4 );
+				$src_y = $src_h - $src_ht - round(($src_h - $src_ht) / 4);
 				break;
 
 			case 'left':
@@ -138,7 +138,7 @@ 
 				break;
 		}
 		// Crop the image
-		return ( $dest_ratio > $src_ratio )
+		return ($dest_ratio > $src_ratio)
 			? array(
 				'x' => 0, 'y' => $src_y,
 				'src_w' => $src_w, 'src_h' => $src_ht,
@@ -168,35 +168,35 @@ 
 			//return if successful
 			//proceed if not
 			$gif = self::run_animated_gif($load_filename, $save_filename);
-			if ($gif) {
+			if ( $gif ) {
 				return true;
 			}
 		}
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
-			$crop = self::get_target_sizes( $load_filename );
-			$image->crop( 	$crop['x'],
+		$image = wp_get_image_editor($load_filename);
+		if ( !is_wp_error($image) ) {
+			$crop = self::get_target_sizes($load_filename);
+			$image->crop($crop['x'],
 							$crop['y'],
 							$crop['src_w'],
 							$crop['src_h'],
 							$crop['target_w'],
 							$crop['target_h']
 			);
-			$result = $image->save( $save_filename );
-			if ( is_wp_error( $result ) ) {
+			$result = $image->save($save_filename);
+			if ( is_wp_error($result) ) {
 				// @codeCoverageIgnoreStart
-				TimberHelper::error_log( 'Error resizing image' );
-				TimberHelper::error_log( $result );
+				TimberHelper::error_log('Error resizing image');
+				TimberHelper::error_log($result);
 				return false;
 				// @codeCoverageIgnoreEnd
 			} else {
 				return true;
 			}
-		} else if ( isset( $image->error_data['error_loading_image'] ) ) {
+		} else if ( isset($image->error_data['error_loading_image']) ) {
 			// @codeCoverageIgnoreStart
-			TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
+			TimberHelper::error_log('Error loading ' . $image->error_data['error_loading_image']);
 		} else {
-			TimberHelper::error_log( $image );
+			TimberHelper::error_log($image);
 			// @codeCoverageIgnoreEnd
 		}
 	}

lib/timber-comment.php

Spacing +30 added lines, -30 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	function init($cid) {
 		$comment_data = $cid;
-		if (is_integer($cid)) {
+		if ( is_integer($cid) ) {
 			$comment_data = get_comment($cid);
 		}
 		$this->import($comment_data);
@@ -86,11 +86,11 @@ 
 	 * @return TimberUser
 	 */
 	public function author() {
-		if ($this->user_id) {
+		if ( $this->user_id ) {
 			return new TimberUser($this->user_id);
 		} else {
 			$author = new TimberUser(0);
-			if (isset($this->comment_author) && $this->comment_author) {
+			if ( isset($this->comment_author) && $this->comment_author ) {
 				$author->name = $this->comment_author;
 			} else {
 				$author->name = 'Anonymous';
@@ -114,21 +114,21 @@ 
 	 * @return bool|mixed|string
 	 */
 	public function avatar($size = 92, $default = '') {
-		if (!get_option('show_avatars')) {
+		if ( !get_option('show_avatars') ) {
 			return false;
 		}
-		if (!is_numeric($size)) {
+		if ( !is_numeric($size) ) {
 			$size = '92';
 		}
 
 		$email = $this->avatar_email();
 		$email_hash = '';
-		if (!empty($email)) {
+		if ( !empty($email) ) {
 			$email_hash = md5(strtolower(trim($email)));
 		}
 		$host = $this->avatar_host($email_hash);
 		$default = $this->avatar_default($default, $email, $size, $host);
-		if (!empty($email)) {
+		if ( !empty($email) ) {
 			$avatar = $this->avatar_out($default, $host, $email_hash, $size);
 		} else {
 			$avatar = $default;
@@ -179,9 +179,9 @@ 
 	 * ```
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	public function date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->comment_date);
+		$the_date = (string) mysql2date($df, $this->comment_date);
 		return apply_filters('get_comment_date ', $the_date, $df);
 	}
 
@@ -204,9 +204,9 @@ 
 	 * ```
 	 * @return string
 	 */
-	public function time( $time_format = '' ) {
+	public function time($time_format = '') {
 		$tf = $time_format ? $time_format : get_option('time_format');
-		$the_time = (string)mysql2date($tf, $this->comment_date);
+		$the_time = (string) mysql2date($tf, $this->comment_date);
 		return apply_filters('get_comment_time', $the_time, $tf);
 	}
 
@@ -232,14 +232,14 @@ 
 	 * @return mixed
 	 */
 	protected function get_meta_fields($comment_id = null) {
-		if ($comment_id === null) {
+		if ( $comment_id === null ) {
 			$comment_id = $this->ID;
 		}
 		//Could not find a WP function to fetch all comment meta data, so I made one.
 		apply_filters('timber_comment_get_meta_pre', array(), $comment_id);
 		$comment_metas = get_comment_meta($comment_id);
 		foreach ($comment_metas as &$cm) {
-			if (is_array($cm) && count($cm) == 1) {
+			if ( is_array($cm) && count($cm) == 1 ) {
 				$cm = $cm[0];
 			}
 		}
@@ -254,7 +254,7 @@ 
 	 */
 	protected function get_meta_field($field_name) {
 		$value = apply_filters('timber_comment_get_meta_field_pre', null, $this->ID, $field_name, $this);
-		if ($value === null) {
+		if ( $value === null ) {
 			$value = get_comment_meta($this->ID, $field_name, true);
 		}
 		$value = apply_filters('timber_comment_get_meta_field', $value, $this->ID, $field_name, $this);
@@ -267,9 +267,9 @@ 
 	 * @api
 	 * @return string
 	 */
-	public function reply_link( $reply_text = 'Reply' ) {
+	public function reply_link($reply_text = 'Reply') {
 		if ( is_singular() && comments_open() && get_option('thread_comments') ) {
-			wp_enqueue_script( 'comment-reply' );
+			wp_enqueue_script('comment-reply');
 		}
 
 		// Get the comments depth option from the admin panel
@@ -284,7 +284,7 @@ 
 			'max_depth' => $max_depth,
 		);
 
-		return get_comment_reply_link( $args, $this->ID, $this->post_id );
+		return get_comment_reply_link($args, $this->ID, $this->post_id);
 	}
 
 	/* AVATAR Stuff
@@ -295,9 +295,9 @@ 
 	 * @return string
 	 */
 	protected function avatar_email() {
-		$id = (int)$this->user_id;
+		$id = (int) $this->user_id;
 		$user = get_userdata($id);
-		if ($user) {
+		if ( $user ) {
 			$email = $user->user_email;
 		} else {
 			$email = $this->comment_author_email;
@@ -311,10 +311,10 @@ 
 	 * @return string
 	 */
 	protected function avatar_host($email_hash) {
-		if (is_ssl()) {
+		if ( is_ssl() ) {
 			$host = 'https://secure.gravatar.com';
 		} else {
-			if (!empty($email_hash)) {
+			if ( !empty($email_hash) ) {
 				$host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
 			} else {
 				$host = 'http://0.gravatar.com';
@@ -333,28 +333,28 @@ 
 	 * @return string
 	 */
 	protected function avatar_default($default, $email, $size, $host) {
-		if (substr($default, 0, 1) == '/') {
+		if ( substr($default, 0, 1) == '/' ) {
 			$default = home_url() . $default;
 		}
 
-		if (empty($default)) {
+		if ( empty($default) ) {
 			$avatar_default = get_option('avatar_default');
-			if (empty($avatar_default)) {
+			if ( empty($avatar_default) ) {
 				$default = 'mystery';
 			} else {
 				$default = $avatar_default;
 			}
 		}
-		if ('mystery' == $default) {
+		if ( 'mystery' == $default ) {
 			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
 			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ('blank' == $default) {
+		} else if ( 'blank' == $default ) {
 			$default = $email ? 'blank' : includes_url('images/blank.gif');
-		} else if (!empty($email) && 'gravatar_default' == $default) {
+		} else if ( !empty($email) && 'gravatar_default' == $default ) {
 			$default = '';
-		} else if ('gravatar_default' == $default) {
+		} else if ( 'gravatar_default' == $default ) {
 			$default = $host . '/avatar/?s=' . $size;
-		} else if (empty($email) && !strstr($default, 'http://')) {
+		} else if ( empty($email) && !strstr($default, 'http://') ) {
 			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
 		}
 		return $default;
@@ -371,7 +371,7 @@ 
 	protected function avatar_out($default, $host, $email_hash, $size) {
 		$out = $host . '/avatar/' . $email_hash . '?s=' . $size . '&d=' . urlencode($default);
 		$rating = get_option('avatar_rating');
-		if (!empty($rating)) {
+		if ( !empty($rating) ) {
 			$out .= '&r=' . $rating;
 		}
 		return str_replace('&', '&', esc_url($out));