jarednova / timber

timber.php

Spacing +5 added lines, -5 removed lines

@@ -14,11 +14,11 @@
 // we look for Composer files first in the plugins dir.
 // then in the wp-content dir (site install).
 // and finally in the current themes directories.
-if (   file_exists( $composer_autoload = __DIR__ . '/vendor/autoload.php' ) /* check in self */
-    || file_exists( $composer_autoload = WP_CONTENT_DIR.'/vendor/autoload.php') /* check in wp-content */
-    || file_exists( $composer_autoload = plugin_dir_path( __FILE__ ).'vendor/autoload.php') /* check in plugin directory */
-    || file_exists( $composer_autoload = get_stylesheet_directory().'/vendor/autoload.php') /* check in child theme */
-    || file_exists( $composer_autoload = get_template_directory().'/vendor/autoload.php') /* check in parent theme */
+if ( file_exists($composer_autoload = __DIR__ . '/vendor/autoload.php') /* check in self */
+    || file_exists($composer_autoload = WP_CONTENT_DIR . '/vendor/autoload.php') /* check in wp-content */
+    || file_exists($composer_autoload = plugin_dir_path(__FILE__) . 'vendor/autoload.php') /* check in plugin directory */
+    || file_exists($composer_autoload = get_stylesheet_directory() . '/vendor/autoload.php') /* check in child theme */
+    || file_exists($composer_autoload = get_template_directory() . '/vendor/autoload.php') /* check in parent theme */
 ) {
     require_once $composer_autoload;
 }

lib/timber-request.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	public function __get( $field ) {}
 
 	/**
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function __isset( $field ) {}
 

Indentation +23 added lines, -23 removed lines

@@ -3,32 +3,32 @@
  * TimberRequest exposes $_GET and $_POST to the context
  */
 class TimberRequest extends TimberCore implements TimberCoreInterface {
-	public $post = array();
-	public $get = array();
+    public $post = array();
+    public $get = array();
 	
-	/**
-	 * Constructs a TimberRequest object
-	 * @example
-	 */
-	function __construct() {
-		$this->init();
-	}
-	/**
-	 * @internal
-	 */
-	protected function init() {
-		$this->post = $_POST;
-		$this->get = $_GET;
-	}
+    /**
+     * Constructs a TimberRequest object
+     * @example
+     */
+    function __construct() {
+        $this->init();
+    }
+    /**
+     * @internal
+     */
+    protected function init() {
+        $this->post = $_POST;
+        $this->get = $_GET;
+    }
 
-	public function __call( $field, $args ) {}
+    public function __call( $field, $args ) {}
 
-	public function __get( $field ) {}
+    public function __get( $field ) {}
 
-	/**
-	 * @return boolean
-	 */
-	public function __isset( $field ) {}
+    /**
+     * @return boolean
+     */
+    public function __isset( $field ) {}
 
-	public function meta( $key ) {}
+    public function meta( $key ) {}
 }

lib/timber.php

Doc Comments +1 added lines, -1 removed lines

@@ -345,7 +345,7 @@
 	 * Get widgets.
 	 *
 	 * @param int     $widget_id
-	 * @return TimberFunctionWrapper
+	 * @return string
 	 */
 	public static function get_widgets( $widget_id ) {
 		return trim( TimberHelper::function_wrapper( 'dynamic_sidebar', array( $widget_id ), true ) );

Indentation +442 added lines, -442 removed lines

@@ -17,468 +17,468 @@
  */
 class Timber {
 
-	public static $locations;
-	public static $dirname;
-	public static $twig_cache = false;
-	public static $cache = false;
-	public static $auto_meta = true;
-	public static $autoescape = false;
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public function __construct() {
-		if ( !defined('ABSPATH') ) {
-			return;
-		}
-		$this->test_compatibility();
-		$this->init_constants();
-		$this->init();
-	}
-
-	/**
-	 * Tests whether we can use Timber
-	 * @codeCoverageIgnore
-	 * @return
-	 */
-	protected function test_compatibility() {
-		if ( is_admin() || $_SERVER['PHP_SELF'] == '/wp-login.php' ) {
-			return;
-		}
-		if ( version_compare( phpversion(), '5.3.0', '<' ) && !is_admin() ) {
-			trigger_error( 'Timber requires PHP 5.3.0 or greater. You have '.phpversion(), E_USER_ERROR );
-		}
-		if ( !class_exists( 'Twig_Autoloader' ) ) {
-			trigger_error( 'You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR );
-		}
-	}
-
-	function init_constants() {
-		defined( "TIMBER_LOC" ) or define( "TIMBER_LOC", realpath( dirname(__DIR__) ) );
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	protected function init() {
-		TimberTwig::init();
-		TimberRoutes::init( $this );
-		TimberImageHelper::init();
-		TimberAdmin::init();
-		TimberIntegrations::init();
-	}
-
-	/* Post Retrieval Routine
+    public static $locations;
+    public static $dirname;
+    public static $twig_cache = false;
+    public static $cache = false;
+    public static $auto_meta = true;
+    public static $autoescape = false;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __construct() {
+        if ( !defined('ABSPATH') ) {
+            return;
+        }
+        $this->test_compatibility();
+        $this->init_constants();
+        $this->init();
+    }
+
+    /**
+     * Tests whether we can use Timber
+     * @codeCoverageIgnore
+     * @return
+     */
+    protected function test_compatibility() {
+        if ( is_admin() || $_SERVER['PHP_SELF'] == '/wp-login.php' ) {
+            return;
+        }
+        if ( version_compare( phpversion(), '5.3.0', '<' ) && !is_admin() ) {
+            trigger_error( 'Timber requires PHP 5.3.0 or greater. You have '.phpversion(), E_USER_ERROR );
+        }
+        if ( !class_exists( 'Twig_Autoloader' ) ) {
+            trigger_error( 'You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR );
+        }
+    }
+
+    function init_constants() {
+        defined( "TIMBER_LOC" ) or define( "TIMBER_LOC", realpath( dirname(__DIR__) ) );
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function init() {
+        TimberTwig::init();
+        TimberRoutes::init( $this );
+        TimberImageHelper::init();
+        TimberAdmin::init();
+        TimberIntegrations::init();
+    }
+
+    /* Post Retrieval Routine
 	================================ */
 
-	/**
-	 * Get post.
-	 *
-	 * @param mixed   $query
-	 * @param string  $PostClass
-	 * @return array|bool|null
-	 */
-	public static function get_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_post( $query, $PostClass );
-	}
-
-	/**
-	 * Get posts.
-	 *
-	 * @param mixed   $query
-	 * @param string  $PostClass
-	 * @return array|bool|null
-	 */
-	public static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
-		return TimberPostGetter::get_posts( $query, $PostClass, $return_collection );
-	}
-
-	/**
-	 * Query post.
-	 *
-	 * @param mixed   $query
-	 * @param string  $PostClass
-	 * @return array|bool|null
-	 */
-	public static function query_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_post( $query, $PostClass );
-	}
-
-	/**
-	 * Query posts.
-	 *
-	 * @param mixed   $query
-	 * @param string  $PostClass
-	 * @return array|bool|null
-	 */
-	public static function query_posts( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_posts( $query, $PostClass );
-	}
-
-	/**
-	 * WP_Query has posts.
-	 *
-	 * @return bool
-	 * @deprecated since 0.20.0
-	 */
-	static function wp_query_has_posts() {
-		return TimberPostGetter::wp_query_has_posts();
-	}
-
-	/* Term Retrieval
+    /**
+     * Get post.
+     *
+     * @param mixed   $query
+     * @param string  $PostClass
+     * @return array|bool|null
+     */
+    public static function get_post( $query = false, $PostClass = 'TimberPost' ) {
+        return TimberPostGetter::get_post( $query, $PostClass );
+    }
+
+    /**
+     * Get posts.
+     *
+     * @param mixed   $query
+     * @param string  $PostClass
+     * @return array|bool|null
+     */
+    public static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
+        return TimberPostGetter::get_posts( $query, $PostClass, $return_collection );
+    }
+
+    /**
+     * Query post.
+     *
+     * @param mixed   $query
+     * @param string  $PostClass
+     * @return array|bool|null
+     */
+    public static function query_post( $query = false, $PostClass = 'TimberPost' ) {
+        return TimberPostGetter::query_post( $query, $PostClass );
+    }
+
+    /**
+     * Query posts.
+     *
+     * @param mixed   $query
+     * @param string  $PostClass
+     * @return array|bool|null
+     */
+    public static function query_posts( $query = false, $PostClass = 'TimberPost' ) {
+        return TimberPostGetter::query_posts( $query, $PostClass );
+    }
+
+    /**
+     * WP_Query has posts.
+     *
+     * @return bool
+     * @deprecated since 0.20.0
+     */
+    static function wp_query_has_posts() {
+        return TimberPostGetter::wp_query_has_posts();
+    }
+
+    /* Term Retrieval
 	================================ */
 
-	/**
-	 * Get terms.
-	 *
-	 * @param string|array $args
-	 * @param array   $maybe_args
-	 * @param string  $TermClass
-	 * @return mixed
-	 */
-	public static function get_terms( $args = null, $maybe_args = array(), $TermClass = 'TimberTerm' ) {
-		return TimberTermGetter::get_terms( $args, $maybe_args, $TermClass );
-	}
-
-	/* Site Retrieval
+    /**
+     * Get terms.
+     *
+     * @param string|array $args
+     * @param array   $maybe_args
+     * @param string  $TermClass
+     * @return mixed
+     */
+    public static function get_terms( $args = null, $maybe_args = array(), $TermClass = 'TimberTerm' ) {
+        return TimberTermGetter::get_terms( $args, $maybe_args, $TermClass );
+    }
+
+    /* Site Retrieval
 	================================ */
 
-	/**
-	 * Get sites.
-	 *
-	 * @param array|bool $blog_ids
-	 * @return array
-	 */
-	public static function get_sites( $blog_ids = false ) {
-		if ( !is_array( $blog_ids ) ) {
-			global $wpdb;
-			$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC" );
-		}
-		$return = array();
-		foreach ( $blog_ids as $blog_id ) {
-			$return[] = new TimberSite( $blog_id );
-		}
-		return $return;
-	}
-
-
-	/*  Template Setup and Display
+    /**
+     * Get sites.
+     *
+     * @param array|bool $blog_ids
+     * @return array
+     */
+    public static function get_sites( $blog_ids = false ) {
+        if ( !is_array( $blog_ids ) ) {
+            global $wpdb;
+            $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC" );
+        }
+        $return = array();
+        foreach ( $blog_ids as $blog_id ) {
+            $return[] = new TimberSite( $blog_id );
+        }
+        return $return;
+    }
+
+
+    /*  Template Setup and Display
 	================================ */
 
-	/**
-	 * Get context.
-	 *
-	 * @return array
-	 */
-	public static function get_context() {
-		$data = array();
-		$data['http_host'] = 'http://' . TimberURLHelper::get_host();
-		$data['wp_title'] = TimberHelper::get_wp_title();
-		$data['wp_head'] = TimberHelper::function_wrapper( 'wp_head' );
-		$data['wp_footer'] = TimberHelper::function_wrapper( 'wp_footer' );
-		$data['body_class'] = implode( ' ', get_body_class() );
-
-		$data['site'] = new TimberSite();
-		$data['request'] = new TimberRequest();
-		$data['theme'] = $data['site']->theme;
-
-		$data['posts'] = Timber::query_posts();
-
-		$data = apply_filters( 'timber_context', $data );
-		$data = apply_filters( 'timber/context', $data );
-		return $data;
-	}
-
-	/**
-	 * Compile function.
-	 *
-	 * @param array   $filenames
-	 * @param array   $data
-	 * @param bool    $expires
-	 * @param string  $cache_mode
-	 * @param bool    $via_render
-	 * @return bool|string
-	 */
-	public static function compile( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT, $via_render = false ) {
-		$caller = self::get_calling_script_dir();
-		$caller_file = self::get_calling_script_file();
-		$caller_file = apply_filters( 'timber_calling_php_file', $caller_file );
-		$loader = new TimberLoader( $caller );
-		$file = $loader->choose_template( $filenames );
-		$output = '';
-		if ( is_null( $data ) ) {
-			$data = array();
-		}
-		if ( strlen( $file ) ) {
-			if ( $via_render ) {
-				$file = apply_filters( 'timber_render_file', $file );
-				$data = apply_filters( 'timber_render_data', $data );
-			} else {
-				$file = apply_filters( 'timber_compile_file', $file );
-				$data = apply_filters( 'timber_compile_data', $data );
-			}
-			$output = $loader->render( $file, $data, $expires, $cache_mode );
-		}
-		do_action( 'timber_compile_done' );
-		return $output;
-	}
-
-	/**
-	 * Compile string.
-	 *
-	 * @param string  $string a string with twig variables.
-	 * @param array   $data   an array with data in it.
-	 * @return  bool|string
-	 */
-	public static function compile_string( $string, $data = array() ) {
-		$dummy_loader = new TimberLoader();
-		$dummy_loader->get_twig();
-		$loader = new Twig_Loader_String();
-		$twig = new Twig_Environment( $loader );
-		$twig = apply_filters( 'timber/twig/filters', $twig );
-		$twig = apply_filters( 'twig_apply_filters', $twig );
-		return $twig->render( $string, $data );
-	}
-
-	/**
-	 * Fetch function.
-	 *
-	 * @param array   $filenames
-	 * @param array   $data
-	 * @param bool    $expires
-	 * @param string  $cache_mode
-	 * @return bool|string
-	 */
-	public static function fetch( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
-		if ( $expires === true ) {
-			//if this is reading as true; the user probably is using the old $echo param
-			//so we should move all vars up by a spot
-			$expires = $cache_mode;
-			$cache_mode = TimberLoader::CACHE_USE_DEFAULT;
-		}
-		$output = self::compile( $filenames, $data, $expires, $cache_mode, true );
-		$output = apply_filters( 'timber_compile_result', $output );
-		return $output;
-	}
-
-	/**
-	 * Render function.
-	 *
-	 * @param array   $filenames
-	 * @param array   $data
-	 * @param bool    $expires
-	 * @param string  $cache_mode
-	 * @return bool|string
-	 */
-	public static function render( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
-		$output = static::fetch( $filenames, $data, $expires, $cache_mode );
-		echo $output;
-		return $output;
-	}
-
-	/**
-	 * Render string.
-	 *
-	 * @param string  $string a string with twig variables.
-	 * @param array   $data   an array with data in it.
-	 * @return  bool|string
-	 */
-	public static function render_string( $string, $data = array() ) {
-		$compiled = self::compile_string( $string, $data );
-		echo $compiled;
-		return $compiled;
-	}
-
-
-	/*  Sidebar
+    /**
+     * Get context.
+     *
+     * @return array
+     */
+    public static function get_context() {
+        $data = array();
+        $data['http_host'] = 'http://' . TimberURLHelper::get_host();
+        $data['wp_title'] = TimberHelper::get_wp_title();
+        $data['wp_head'] = TimberHelper::function_wrapper( 'wp_head' );
+        $data['wp_footer'] = TimberHelper::function_wrapper( 'wp_footer' );
+        $data['body_class'] = implode( ' ', get_body_class() );
+
+        $data['site'] = new TimberSite();
+        $data['request'] = new TimberRequest();
+        $data['theme'] = $data['site']->theme;
+
+        $data['posts'] = Timber::query_posts();
+
+        $data = apply_filters( 'timber_context', $data );
+        $data = apply_filters( 'timber/context', $data );
+        return $data;
+    }
+
+    /**
+     * Compile function.
+     *
+     * @param array   $filenames
+     * @param array   $data
+     * @param bool    $expires
+     * @param string  $cache_mode
+     * @param bool    $via_render
+     * @return bool|string
+     */
+    public static function compile( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT, $via_render = false ) {
+        $caller = self::get_calling_script_dir();
+        $caller_file = self::get_calling_script_file();
+        $caller_file = apply_filters( 'timber_calling_php_file', $caller_file );
+        $loader = new TimberLoader( $caller );
+        $file = $loader->choose_template( $filenames );
+        $output = '';
+        if ( is_null( $data ) ) {
+            $data = array();
+        }
+        if ( strlen( $file ) ) {
+            if ( $via_render ) {
+                $file = apply_filters( 'timber_render_file', $file );
+                $data = apply_filters( 'timber_render_data', $data );
+            } else {
+                $file = apply_filters( 'timber_compile_file', $file );
+                $data = apply_filters( 'timber_compile_data', $data );
+            }
+            $output = $loader->render( $file, $data, $expires, $cache_mode );
+        }
+        do_action( 'timber_compile_done' );
+        return $output;
+    }
+
+    /**
+     * Compile string.
+     *
+     * @param string  $string a string with twig variables.
+     * @param array   $data   an array with data in it.
+     * @return  bool|string
+     */
+    public static function compile_string( $string, $data = array() ) {
+        $dummy_loader = new TimberLoader();
+        $dummy_loader->get_twig();
+        $loader = new Twig_Loader_String();
+        $twig = new Twig_Environment( $loader );
+        $twig = apply_filters( 'timber/twig/filters', $twig );
+        $twig = apply_filters( 'twig_apply_filters', $twig );
+        return $twig->render( $string, $data );
+    }
+
+    /**
+     * Fetch function.
+     *
+     * @param array   $filenames
+     * @param array   $data
+     * @param bool    $expires
+     * @param string  $cache_mode
+     * @return bool|string
+     */
+    public static function fetch( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
+        if ( $expires === true ) {
+            //if this is reading as true; the user probably is using the old $echo param
+            //so we should move all vars up by a spot
+            $expires = $cache_mode;
+            $cache_mode = TimberLoader::CACHE_USE_DEFAULT;
+        }
+        $output = self::compile( $filenames, $data, $expires, $cache_mode, true );
+        $output = apply_filters( 'timber_compile_result', $output );
+        return $output;
+    }
+
+    /**
+     * Render function.
+     *
+     * @param array   $filenames
+     * @param array   $data
+     * @param bool    $expires
+     * @param string  $cache_mode
+     * @return bool|string
+     */
+    public static function render( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
+        $output = static::fetch( $filenames, $data, $expires, $cache_mode );
+        echo $output;
+        return $output;
+    }
+
+    /**
+     * Render string.
+     *
+     * @param string  $string a string with twig variables.
+     * @param array   $data   an array with data in it.
+     * @return  bool|string
+     */
+    public static function render_string( $string, $data = array() ) {
+        $compiled = self::compile_string( $string, $data );
+        echo $compiled;
+        return $compiled;
+    }
+
+
+    /*  Sidebar
 	================================ */
 
-	/**
-	 * Get sidebar.
-	 *
-	 * @param string  $sidebar
-	 * @param array   $data
-	 * @return bool|string
-	 */
-	public static function get_sidebar( $sidebar = '', $data = array() ) {
-		if ( $sidebar == '' ) {
-			$sidebar = 'sidebar.php';
-		}
-		if ( strstr( strtolower( $sidebar ), '.php' ) ) {
-			return self::get_sidebar_from_php( $sidebar, $data );
-		}
-		return self::compile( $sidebar, $data );
-	}
-
-	/**
-	 * Get sidebar from PHP
-	 *
-	 * @param string  $sidebar
-	 * @param array   $data
-	 * @return string
-	 */
-	public static function get_sidebar_from_php( $sidebar = '', $data ) {
-		$caller = self::get_calling_script_dir();
-		$loader = new TimberLoader();
-		$uris = $loader->get_locations( $caller );
-		ob_start();
-		$found = false;
-		foreach ( $uris as $uri ) {
-			if ( file_exists( trailingslashit( $uri ) . $sidebar ) ) {
-				include trailingslashit( $uri ) . $sidebar;
-				$found = true;
-				break;
-			}
-		}
-		if ( !$found ) {
-			TimberHelper::error_log( 'error loading your sidebar, check to make sure the file exists' );
-		}
-		$ret = ob_get_contents();
-		ob_end_clean();
-		return $ret;
-	}
-
-	/* Widgets
+    /**
+     * Get sidebar.
+     *
+     * @param string  $sidebar
+     * @param array   $data
+     * @return bool|string
+     */
+    public static function get_sidebar( $sidebar = '', $data = array() ) {
+        if ( $sidebar == '' ) {
+            $sidebar = 'sidebar.php';
+        }
+        if ( strstr( strtolower( $sidebar ), '.php' ) ) {
+            return self::get_sidebar_from_php( $sidebar, $data );
+        }
+        return self::compile( $sidebar, $data );
+    }
+
+    /**
+     * Get sidebar from PHP
+     *
+     * @param string  $sidebar
+     * @param array   $data
+     * @return string
+     */
+    public static function get_sidebar_from_php( $sidebar = '', $data ) {
+        $caller = self::get_calling_script_dir();
+        $loader = new TimberLoader();
+        $uris = $loader->get_locations( $caller );
+        ob_start();
+        $found = false;
+        foreach ( $uris as $uri ) {
+            if ( file_exists( trailingslashit( $uri ) . $sidebar ) ) {
+                include trailingslashit( $uri ) . $sidebar;
+                $found = true;
+                break;
+            }
+        }
+        if ( !$found ) {
+            TimberHelper::error_log( 'error loading your sidebar, check to make sure the file exists' );
+        }
+        $ret = ob_get_contents();
+        ob_end_clean();
+        return $ret;
+    }
+
+    /* Widgets
 	================================ */
 
-	/**
-	 * Get widgets.
-	 *
-	 * @param int     $widget_id
-	 * @return TimberFunctionWrapper
-	 */
-	public static function get_widgets( $widget_id ) {
-		return trim( TimberHelper::function_wrapper( 'dynamic_sidebar', array( $widget_id ), true ) );
-	}
+    /**
+     * Get widgets.
+     *
+     * @param int     $widget_id
+     * @return TimberFunctionWrapper
+     */
+    public static function get_widgets( $widget_id ) {
+        return trim( TimberHelper::function_wrapper( 'dynamic_sidebar', array( $widget_id ), true ) );
+    }
 
 
-	/*  Routes
+    /*  Routes
 	================================ */
 
-	/**
-	 * Add route.
-	 *
-	 * @param string  $route
-	 * @param callable $callback
-	 * @param array   $args
-	 * @deprecated since 0.20.0
-	 */
-	public static function add_route( $route, $callback, $args = array() ) {
-		Routes::map( $route, $callback, $args );
-	}
-
-	/**
-	 * Load template.
-	 *
-	 * @deprecated since 0.20.0
-	 */
-	public static function load_template( $template, $query = false, $status_code = 200, $tparams = false ) {
-		return Routes::load( $template, $tparams, $query, $status_code );
-	}
-
-	/**
-	 * Load view.
-	 *
-	 * @deprecated since 0.20.2
-	 */
-	public static function load_view( $template, $query = false, $status_code = 200, $tparams = false ) {
-		return Routes::load( $template, $tparams, $query, $status_code );
-	}
-
-
-	/*  Pagination
+    /**
+     * Add route.
+     *
+     * @param string  $route
+     * @param callable $callback
+     * @param array   $args
+     * @deprecated since 0.20.0
+     */
+    public static function add_route( $route, $callback, $args = array() ) {
+        Routes::map( $route, $callback, $args );
+    }
+
+    /**
+     * Load template.
+     *
+     * @deprecated since 0.20.0
+     */
+    public static function load_template( $template, $query = false, $status_code = 200, $tparams = false ) {
+        return Routes::load( $template, $tparams, $query, $status_code );
+    }
+
+    /**
+     * Load view.
+     *
+     * @deprecated since 0.20.2
+     */
+    public static function load_view( $template, $query = false, $status_code = 200, $tparams = false ) {
+        return Routes::load( $template, $tparams, $query, $status_code );
+    }
+
+
+    /*  Pagination
 	================================ */
 
-	/**
-	 * Get pagination.
-	 *
-	 * @param array   $prefs
-	 * @return array mixed
-	 */
-	public static function get_pagination( $prefs = array() ) {
-		global $wp_query;
-		global $paged;
-		global $wp_rewrite;
-		$args = array();
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
-		if ( $wp_rewrite->using_permalinks() ) {
-			$url = explode( '?', get_pagenum_link( 0 ) );
-			if ( isset( $url[1] ) ) {
-				parse_str( $url[1], $query );
-				$args['add_args'] = $query;
-			}
-			$args['format'] = 'page/%#%';
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
-		} else {
-			$big = 999999999;
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
-		}
-		$args['type'] = 'array';
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
-		if ( is_int( $prefs ) ) {
-			$args['mid_size'] = $prefs - 2;
-		} else {
-			$args = array_merge( $args, $prefs );
-		}
-		$data = array();
-		$data['current'] = $args['current'];
-		$data['total'] = $args['total'];
-		$data['pages'] = TimberHelper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
-		if ( $next ) {
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
-		}
-		$prev = previous_posts( false );
-		if ( $prev ) {
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
-		}
-		if ( $paged < 2 ) {
-			$data['prev'] = '';
-		}
-		return $data;
-	}
-
-	/*  Utility
+    /**
+     * Get pagination.
+     *
+     * @param array   $prefs
+     * @return array mixed
+     */
+    public static function get_pagination( $prefs = array() ) {
+        global $wp_query;
+        global $paged;
+        global $wp_rewrite;
+        $args = array();
+        $args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
+        if ( $wp_rewrite->using_permalinks() ) {
+            $url = explode( '?', get_pagenum_link( 0 ) );
+            if ( isset( $url[1] ) ) {
+                parse_str( $url[1], $query );
+                $args['add_args'] = $query;
+            }
+            $args['format'] = 'page/%#%';
+            $args['base'] = trailingslashit( $url[0] ).'%_%';
+        } else {
+            $big = 999999999;
+            $args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
+        }
+        $args['type'] = 'array';
+        $args['current'] = max( 1, get_query_var( 'paged' ) );
+        $args['mid_size'] = max( 9 - $args['current'], 3 );
+        if ( is_int( $prefs ) ) {
+            $args['mid_size'] = $prefs - 2;
+        } else {
+            $args = array_merge( $args, $prefs );
+        }
+        $data = array();
+        $data['current'] = $args['current'];
+        $data['total'] = $args['total'];
+        $data['pages'] = TimberHelper::paginate_links( $args );
+        $next = get_next_posts_page_link( $args['total'] );
+        if ( $next ) {
+            $data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
+        }
+        $prev = previous_posts( false );
+        if ( $prev ) {
+            $data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
+        }
+        if ( $paged < 2 ) {
+            $data['prev'] = '';
+        }
+        return $data;
+    }
+
+    /*  Utility
 	================================ */
 
-	/**
-	 * Get calling script dir.
-	 *
-	 * @return string
-	 */
-	public static function get_calling_script_dir( $offset = 0 ) {
-		$caller = self::get_calling_script_file( $offset );
-		if ( !is_null( $caller ) ) {
-			$pathinfo = pathinfo( $caller );
-			$dir = $pathinfo['dirname'];
-			return $dir;
-		}
-	}
-
-	/**
-	 * Get calling script file.
-	 *
-	 * @param int     $offset
-	 * @return string|null
-	 * @deprecated since 0.20.0
-	 */
-	public static function get_calling_script_file( $offset = 0 ) {
-		$caller = null;
-		$backtrace = debug_backtrace();
-		$i = 0;
-		foreach ( $backtrace as $trace ) {
-			if ( array_key_exists('file', $trace) && $trace['file'] != __FILE__ ) {
-				$caller = $trace['file'];
-				break;
-			}
-			$i++;
-		}
-		if ( $offset ) {
-			$caller = $backtrace[$i + $offset]['file'];
-		}
-		return $caller;
-	}
+    /**
+     * Get calling script dir.
+     *
+     * @return string
+     */
+    public static function get_calling_script_dir( $offset = 0 ) {
+        $caller = self::get_calling_script_file( $offset );
+        if ( !is_null( $caller ) ) {
+            $pathinfo = pathinfo( $caller );
+            $dir = $pathinfo['dirname'];
+            return $dir;
+        }
+    }
+
+    /**
+     * Get calling script file.
+     *
+     * @param int     $offset
+     * @return string|null
+     * @deprecated since 0.20.0
+     */
+    public static function get_calling_script_file( $offset = 0 ) {
+        $caller = null;
+        $backtrace = debug_backtrace();
+        $i = 0;
+        foreach ( $backtrace as $trace ) {
+            if ( array_key_exists('file', $trace) && $trace['file'] != __FILE__ ) {
+                $caller = $trace['file'];
+                break;
+            }
+            $i++;
+        }
+        if ( $offset ) {
+            $caller = $backtrace[$i + $offset]['file'];
+        }
+        return $caller;
+    }
 
 
 }

Spacing +67 added lines, -67 removed lines

@@ -45,16 +45,16 @@ 
 		if ( is_admin() || $_SERVER['PHP_SELF'] == '/wp-login.php' ) {
 			return;
 		}
-		if ( version_compare( phpversion(), '5.3.0', '<' ) && !is_admin() ) {
-			trigger_error( 'Timber requires PHP 5.3.0 or greater. You have '.phpversion(), E_USER_ERROR );
+		if ( version_compare(phpversion(), '5.3.0', '<') && !is_admin() ) {
+			trigger_error('Timber requires PHP 5.3.0 or greater. You have ' . phpversion(), E_USER_ERROR);
 		}
-		if ( !class_exists( 'Twig_Autoloader' ) ) {
-			trigger_error( 'You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR );
+		if ( !class_exists('Twig_Autoloader') ) {
+			trigger_error('You have not run "composer install" to download required dependencies for Timber, you can read more on https://github.com/jarednova/timber#installation', E_USER_ERROR);
 		}
 	}
 
 	function init_constants() {
-		defined( "TIMBER_LOC" ) or define( "TIMBER_LOC", realpath( dirname(__DIR__) ) );
+		defined("TIMBER_LOC") or define("TIMBER_LOC", realpath(dirname(__DIR__)));
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	 */
 	protected function init() {
 		TimberTwig::init();
-		TimberRoutes::init( $this );
+		TimberRoutes::init($this);
 		TimberImageHelper::init();
 		TimberAdmin::init();
 		TimberIntegrations::init();
@@ -79,7 +79,7 @@ 
 	 * @return array|bool|null
 	 */
 	public static function get_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::get_post( $query, $PostClass );
+		return TimberPostGetter::get_post($query, $PostClass);
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 * @return array|bool|null
 	 */
 	public static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
-		return TimberPostGetter::get_posts( $query, $PostClass, $return_collection );
+		return TimberPostGetter::get_posts($query, $PostClass, $return_collection);
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 * @return array|bool|null
 	 */
 	public static function query_post( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_post( $query, $PostClass );
+		return TimberPostGetter::query_post($query, $PostClass);
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 * @return array|bool|null
 	 */
 	public static function query_posts( $query = false, $PostClass = 'TimberPost' ) {
-		return TimberPostGetter::query_posts( $query, $PostClass );
+		return TimberPostGetter::query_posts($query, $PostClass);
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 * @return mixed
 	 */
 	public static function get_terms( $args = null, $maybe_args = array(), $TermClass = 'TimberTerm' ) {
-		return TimberTermGetter::get_terms( $args, $maybe_args, $TermClass );
+		return TimberTermGetter::get_terms($args, $maybe_args, $TermClass);
 	}
 
 	/* Site Retrieval
@@ -150,13 +150,13 @@ 
 	 * @return array
 	 */
 	public static function get_sites( $blog_ids = false ) {
-		if ( !is_array( $blog_ids ) ) {
+		if ( !is_array($blog_ids) ) {
 			global $wpdb;
-			$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC" );
+			$blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs ORDER BY blog_id ASC");
 		}
 		$return = array();
 		foreach ( $blog_ids as $blog_id ) {
-			$return[] = new TimberSite( $blog_id );
+			$return[] = new TimberSite($blog_id);
 		}
 		return $return;
 	}
@@ -174,9 +174,9 @@ 
 		$data = array();
 		$data['http_host'] = 'http://' . TimberURLHelper::get_host();
 		$data['wp_title'] = TimberHelper::get_wp_title();
-		$data['wp_head'] = TimberHelper::function_wrapper( 'wp_head' );
-		$data['wp_footer'] = TimberHelper::function_wrapper( 'wp_footer' );
-		$data['body_class'] = implode( ' ', get_body_class() );
+		$data['wp_head'] = TimberHelper::function_wrapper('wp_head');
+		$data['wp_footer'] = TimberHelper::function_wrapper('wp_footer');
+		$data['body_class'] = implode(' ', get_body_class());
 
 		$data['site'] = new TimberSite();
 		$data['request'] = new TimberRequest();
@@ -184,8 +184,8 @@ 
 
 		$data['posts'] = Timber::query_posts();
 
-		$data = apply_filters( 'timber_context', $data );
-		$data = apply_filters( 'timber/context', $data );
+		$data = apply_filters('timber_context', $data);
+		$data = apply_filters('timber/context', $data);
 		return $data;
 	}
 
@@ -202,24 +202,24 @@ 
 	public static function compile( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT, $via_render = false ) {
 		$caller = self::get_calling_script_dir();
 		$caller_file = self::get_calling_script_file();
-		$caller_file = apply_filters( 'timber_calling_php_file', $caller_file );
-		$loader = new TimberLoader( $caller );
-		$file = $loader->choose_template( $filenames );
+		$caller_file = apply_filters('timber_calling_php_file', $caller_file);
+		$loader = new TimberLoader($caller);
+		$file = $loader->choose_template($filenames);
 		$output = '';
-		if ( is_null( $data ) ) {
+		if ( is_null($data) ) {
 			$data = array();
 		}
-		if ( strlen( $file ) ) {
+		if ( strlen($file) ) {
 			if ( $via_render ) {
-				$file = apply_filters( 'timber_render_file', $file );
-				$data = apply_filters( 'timber_render_data', $data );
+				$file = apply_filters('timber_render_file', $file);
+				$data = apply_filters('timber_render_data', $data);
 			} else {
-				$file = apply_filters( 'timber_compile_file', $file );
-				$data = apply_filters( 'timber_compile_data', $data );
+				$file = apply_filters('timber_compile_file', $file);
+				$data = apply_filters('timber_compile_data', $data);
 			}
-			$output = $loader->render( $file, $data, $expires, $cache_mode );
+			$output = $loader->render($file, $data, $expires, $cache_mode);
 		}
-		do_action( 'timber_compile_done' );
+		do_action('timber_compile_done');
 		return $output;
 	}
 
@@ -234,10 +234,10 @@ 
 		$dummy_loader = new TimberLoader();
 		$dummy_loader->get_twig();
 		$loader = new Twig_Loader_String();
-		$twig = new Twig_Environment( $loader );
-		$twig = apply_filters( 'timber/twig/filters', $twig );
-		$twig = apply_filters( 'twig_apply_filters', $twig );
-		return $twig->render( $string, $data );
+		$twig = new Twig_Environment($loader);
+		$twig = apply_filters('timber/twig/filters', $twig);
+		$twig = apply_filters('twig_apply_filters', $twig);
+		return $twig->render($string, $data);
 	}
 
 	/**
@@ -256,8 +256,8 @@ 
 			$expires = $cache_mode;
 			$cache_mode = TimberLoader::CACHE_USE_DEFAULT;
 		}
-		$output = self::compile( $filenames, $data, $expires, $cache_mode, true );
-		$output = apply_filters( 'timber_compile_result', $output );
+		$output = self::compile($filenames, $data, $expires, $cache_mode, true);
+		$output = apply_filters('timber_compile_result', $output);
 		return $output;
 	}
 
@@ -271,7 +271,7 @@ 
 	 * @return bool|string
 	 */
 	public static function render( $filenames, $data = array(), $expires = false, $cache_mode = TimberLoader::CACHE_USE_DEFAULT ) {
-		$output = static::fetch( $filenames, $data, $expires, $cache_mode );
+		$output = static::fetch($filenames, $data, $expires, $cache_mode);
 		echo $output;
 		return $output;
 	}
@@ -284,7 +284,7 @@ 
 	 * @return  bool|string
 	 */
 	public static function render_string( $string, $data = array() ) {
-		$compiled = self::compile_string( $string, $data );
+		$compiled = self::compile_string($string, $data);
 		echo $compiled;
 		return $compiled;
 	}
@@ -304,10 +304,10 @@ 
 		if ( $sidebar == '' ) {
 			$sidebar = 'sidebar.php';
 		}
-		if ( strstr( strtolower( $sidebar ), '.php' ) ) {
-			return self::get_sidebar_from_php( $sidebar, $data );
+		if ( strstr(strtolower($sidebar), '.php') ) {
+			return self::get_sidebar_from_php($sidebar, $data);
 		}
-		return self::compile( $sidebar, $data );
+		return self::compile($sidebar, $data);
 	}
 
 	/**
@@ -320,18 +320,18 @@ 
 	public static function get_sidebar_from_php( $sidebar = '', $data ) {
 		$caller = self::get_calling_script_dir();
 		$loader = new TimberLoader();
-		$uris = $loader->get_locations( $caller );
+		$uris = $loader->get_locations($caller);
 		ob_start();
 		$found = false;
 		foreach ( $uris as $uri ) {
-			if ( file_exists( trailingslashit( $uri ) . $sidebar ) ) {
-				include trailingslashit( $uri ) . $sidebar;
+			if ( file_exists(trailingslashit($uri) . $sidebar) ) {
+				include trailingslashit($uri) . $sidebar;
 				$found = true;
 				break;
 			}
 		}
 		if ( !$found ) {
-			TimberHelper::error_log( 'error loading your sidebar, check to make sure the file exists' );
+			TimberHelper::error_log('error loading your sidebar, check to make sure the file exists');
 		}
 		$ret = ob_get_contents();
 		ob_end_clean();
@@ -348,7 +348,7 @@ 
 	 * @return TimberFunctionWrapper
 	 */
 	public static function get_widgets( $widget_id ) {
-		return trim( TimberHelper::function_wrapper( 'dynamic_sidebar', array( $widget_id ), true ) );
+		return trim(TimberHelper::function_wrapper('dynamic_sidebar', array($widget_id), true));
 	}
 
 
@@ -364,7 +364,7 @@ 
 	 * @deprecated since 0.20.0
 	 */
 	public static function add_route( $route, $callback, $args = array() ) {
-		Routes::map( $route, $callback, $args );
+		Routes::map($route, $callback, $args);
 	}
 
 	/**
@@ -373,7 +373,7 @@ 
 	 * @deprecated since 0.20.0
 	 */
 	public static function load_template( $template, $query = false, $status_code = 200, $tparams = false ) {
-		return Routes::load( $template, $tparams, $query, $status_code );
+		return Routes::load($template, $tparams, $query, $status_code);
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 * @deprecated since 0.20.2
 	 */
 	public static function load_view( $template, $query = false, $status_code = 200, $tparams = false ) {
-		return Routes::load( $template, $tparams, $query, $status_code );
+		return Routes::load($template, $tparams, $query, $status_code);
 	}
 
 
@@ -400,38 +400,38 @@ 
 		global $paged;
 		global $wp_rewrite;
 		$args = array();
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
 		if ( $wp_rewrite->using_permalinks() ) {
-			$url = explode( '?', get_pagenum_link( 0 ) );
-			if ( isset( $url[1] ) ) {
-				parse_str( $url[1], $query );
+			$url = explode('?', get_pagenum_link(0));
+			if ( isset($url[1]) ) {
+				parse_str($url[1], $query);
 				$args['add_args'] = $query;
 			}
 			$args['format'] = 'page/%#%';
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
+			$args['base'] = trailingslashit($url[0]) . '%_%';
 		} else {
 			$big = 999999999;
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
 		}
 		$args['type'] = 'array';
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
-		if ( is_int( $prefs ) ) {
+		$args['current'] = max(1, get_query_var('paged'));
+		$args['mid_size'] = max(9 - $args['current'], 3);
+		if ( is_int($prefs) ) {
 			$args['mid_size'] = $prefs - 2;
 		} else {
-			$args = array_merge( $args, $prefs );
+			$args = array_merge($args, $prefs);
 		}
 		$data = array();
 		$data['current'] = $args['current'];
 		$data['total'] = $args['total'];
-		$data['pages'] = TimberHelper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
+		$data['pages'] = TimberHelper::paginate_links($args);
+		$next = get_next_posts_page_link($args['total']);
 		if ( $next ) {
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
 		}
-		$prev = previous_posts( false );
+		$prev = previous_posts(false);
 		if ( $prev ) {
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
 		}
 		if ( $paged < 2 ) {
 			$data['prev'] = '';
@@ -448,9 +448,9 @@ 
 	 * @return string
 	 */
 	public static function get_calling_script_dir( $offset = 0 ) {
-		$caller = self::get_calling_script_file( $offset );
-		if ( !is_null( $caller ) ) {
-			$pathinfo = pathinfo( $caller );
+		$caller = self::get_calling_script_file($offset);
+		if ( !is_null($caller) ) {
+			$pathinfo = pathinfo($caller);
 			$dir = $pathinfo['dirname'];
 			return $dir;
 		}

lib/timber-site.php

Indentation +221 added lines, -221 removed lines

@@ -18,242 +18,242 @@
  */
 class TimberSite extends TimberCore implements TimberCoreInterface {
 
-	/**
-	 * @api
-	 * @var string the admin email address set in the WP admin panel
-	 */
-	public $admin_email;
-	public $blogname;
-	/**
-	 * @api
-	 * @var string
-	 */
-	public $charset;
+    /**
+     * @api
+     * @var string the admin email address set in the WP admin panel
+     */
+    public $admin_email;
+    public $blogname;
+    /**
+     * @api
+     * @var string
+     */
+    public $charset;
 
-	/**
-	 * @api
-	 * @var string
-	 */
-	public $description;
-	/**
-	 * @api
-	 * @var int the ID of a site in multisite
-	 */
-	public $id;
-	/**
-	 * @api
-	 * @var string the language setting ex: en-US
-	 */
-	public $language;
-	/**
-	 * @api
-	 * @var string of language attributes for usage in the <html> tag
-	 */
-	public $language_attributes;
-	/**
-	 * @api
-	 * @var bool true if multisite, false if plain ole' WordPress
-	 */
-	public $multisite;
+    /**
+     * @api
+     * @var string
+     */
+    public $description;
+    /**
+     * @api
+     * @var int the ID of a site in multisite
+     */
+    public $id;
+    /**
+     * @api
+     * @var string the language setting ex: en-US
+     */
+    public $language;
+    /**
+     * @api
+     * @var string of language attributes for usage in the <html> tag
+     */
+    public $language_attributes;
+    /**
+     * @api
+     * @var bool true if multisite, false if plain ole' WordPress
+     */
+    public $multisite;
 
-	/**
-	 * @api
-	 * @var string
-	 */
-	public $name;
+    /**
+     * @api
+     * @var string
+     */
+    public $name;
 
-	/** @api
-	 * @var string for people who like trackback spam
-	*/
-	public $pingback_url;
-	public $siteurl;
-	/**
-	 * @api
-	 * @var [TimberTheme](#TimberTheme)
-	 */
-	public $theme;
-	/**
-	 * @api
-	 * @var string
-	 */
-	public $title;
-	public $url;
+    /** @api
+     * @var string for people who like trackback spam
+     */
+    public $pingback_url;
+    public $siteurl;
+    /**
+     * @api
+     * @var [TimberTheme](#TimberTheme)
+     */
+    public $theme;
+    /**
+     * @api
+     * @var string
+     */
+    public $title;
+    public $url;
 
-	/**
-	 * @api
-	 * @var string
-	 */
+    /**
+     * @api
+     * @var string
+     */
 
-	public $rdf;
-	public $rss;
-	public $rss2;
-	public $atom;
+    public $rdf;
+    public $rss;
+    public $rss2;
+    public $atom;
 	
-	/**
-	 * Constructs a TimberSite object
-	 * @example
-	 * ```php
-	 * //multisite setup
-	 * $site = new TimberSite(1);
-	 * $site_two = new TimberSite("My Cool Site");
-	 * //non-multisite
-	 * $site = new TimberSite();
-	 * ```
-	 * @param string|int $site_name_or_id
-	 */
-	function __construct( $site_name_or_id = null ) {
-		$this->init();
-		if ( is_multisite() ) {
-			$this->init_as_multisite( $site_name_or_id );
-		} else {
-			$this->init_as_singlesite();
-		}
-	}
+    /**
+     * Constructs a TimberSite object
+     * @example
+     * ```php
+     * //multisite setup
+     * $site = new TimberSite(1);
+     * $site_two = new TimberSite("My Cool Site");
+     * //non-multisite
+     * $site = new TimberSite();
+     * ```
+     * @param string|int $site_name_or_id
+     */
+    function __construct( $site_name_or_id = null ) {
+        $this->init();
+        if ( is_multisite() ) {
+            $this->init_as_multisite( $site_name_or_id );
+        } else {
+            $this->init_as_singlesite();
+        }
+    }
 
-	/**
-	 * @internal
-	 * @param string|int $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() ) {
-				restore_current_blog();
-				$site_name_or_id = get_current_blog_id();
-			}
-		}
-		$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' );
-		$this->multisite = true;
-	}
+    /**
+     * @internal
+     * @param string|int $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() ) {
+                restore_current_blog();
+                $site_name_or_id = get_current_blog_id();
+            }
+        }
+        $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' );
+        $this->multisite = true;
+    }
 
-	/**
-	 * Executed for single-blog sites
-	 * @internal
-	 */
-	protected function init_as_singlesite() {
-		$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->theme = new TimberTheme();
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
-		$this->multisite = false;
-	}
+    /**
+     * Executed for single-blog sites
+     * @internal
+     */
+    protected function init_as_singlesite() {
+        $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->theme = new TimberTheme();
+        $this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
+        $this->multisite = false;
+    }
 
-	/**
-	 * Executed for all types of sites: both multisite and "regular"
-	 * @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' );
-		/* deprecated benath this comment */
-		$this->pingback_url = get_bloginfo( 'pingback_url' );
-	}
+    /**
+     * Executed for all types of sites: both multisite and "regular"
+     * @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' );
+        /* deprecated benath this comment */
+        $this->pingback_url = get_bloginfo( 'pingback_url' );
+    }
 
-	/**
-	 *
-	 *
-	 * @param string  $field
-	 * @return mixed
-	 */
-	function __get( $field ) {
-		if ( !isset( $this->$field ) ) {
-			if ( is_multisite() ) {
-				$this->$field = get_blog_option( $this->ID, $field );
-			} else {
-				$this->$field = get_option( $field );
-			}
-		}
-		return $this->$field;
-	}
+    /**
+     *
+     *
+     * @param string  $field
+     * @return mixed
+     */
+    function __get( $field ) {
+        if ( !isset( $this->$field ) ) {
+            if ( is_multisite() ) {
+                $this->$field = get_blog_option( $this->ID, $field );
+            } else {
+                $this->$field = get_option( $field );
+            }
+        }
+        return $this->$field;
+    }
 
-	/**
-	 * @deprecated 0.21.9
-	 * @internal
-	 * @return string
-	 */
-	function get_link() {
-		return $this->link();
-	}
+    /**
+     * @deprecated 0.21.9
+     * @internal
+     * @return string
+     */
+    function get_link() {
+        return $this->link();
+    }
 
-	/**
-	 * @deprecated 0.21.9
-	 * @internal
-	 * @return string
-	 */
-	function get_url() {
-		return $this->get_link();
-	}
+    /**
+     * @deprecated 0.21.9
+     * @internal
+     * @return string
+     */
+    function get_url() {
+        return $this->get_link();
+    }
 
-	/**
-	 * Returns the link to the site's home.
-	 * @example
-	 * ```twig
-	 * <a href="{{ site.link }}" title="Home">
-	 * 	  <img src="/wp-content/uploads/logo.png" alt="Logo for some stupid thing" />
-	 * </a>
-	 * ```
-	 * ```html
-	 * <a href="http://example.org" title="Home">
-	 * 	  <img src="/wp-content/uploads/logo.png" alt="Logo for some stupid thing" />
-	 * </a>
-	 * ```
-	 * @api
-	 * @return string
-	 */
-	public function link() {
-		return $this->url;
-	}
+    /**
+     * Returns the link to the site's home.
+     * @example
+     * ```twig
+     * <a href="{{ site.link }}" title="Home">
+     * 	  <img src="/wp-content/uploads/logo.png" alt="Logo for some stupid thing" />
+     * </a>
+     * ```
+     * ```html
+     * <a href="http://example.org" title="Home">
+     * 	  <img src="/wp-content/uploads/logo.png" alt="Logo for some stupid thing" />
+     * </a>
+     * ```
+     * @api
+     * @return string
+     */
+    public function link() {
+        return $this->url;
+    }
 
-	/**
-	 * @ignore
-	 */
-	public function meta( $field ) {
-		return $this->__get( $field );
-	}
+    /**
+     * @ignore
+     */
+    public function meta( $field ) {
+        return $this->__get( $field );
+    }
 
-	/**
-	 *
-	 * @ignore
-	 * @param string  $key
-	 * @param mixed   $value
-	 */
-	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 );
-		} else {
-			update_option( $key, $value );
-		}
-		$this->$key = $value;
-	}
+    /**
+     *
+     * @ignore
+     * @param string  $key
+     * @param mixed   $value
+     */
+    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 );
+        } else {
+            update_option( $key, $value );
+        }
+        $this->$key = $value;
+    }
 
-	/**
-	 *
-	 * @api
-	 * @see TimberSite::link
-	 * @return string
-	 */
-	function url() {
-		return $this->get_link();
-	}
+    /**
+     *
+     * @api
+     * @see TimberSite::link
+     * @return string
+     */
+    function url() {
+        return $this->get_link();
+    }
 
 }

Spacing +28 added lines, -28 removed lines

@@ -104,7 +104,7 @@ 
 	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();
 		}
@@ -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');
 	}
 
 	/**
@@ -175,11 +175,11 @@ 
 	 * @return mixed
 	 */
 	function __get( $field ) {
-		if ( !isset( $this->$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;
@@ -227,7 +227,7 @@ 
 	 * @ignore
 	 */
 	public function meta( $field ) {
-		return $this->__get( $field );
+		return $this->__get($field);
 	}
 
 	/**
@@ -237,11 +237,11 @@ 
 	 * @param mixed   $value
 	 */
 	public function update( $key, $value ) {
-		$value = apply_filters( 'timber_site_set_meta', $value, $key, $this->ID, $this );
+		$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/image/timber-image-operation-letterbox.php

Indentation +90 added lines, -90 removed lines

@@ -10,98 +10,98 @@
  */
 class TimberImageOperationLetterbox extends TimberImageOperation {
 
-	private $w, $h, $color;
+    private $w, $h, $color;
 
-	/**
-	 * @param int    $w     width of result image
-	 * @param int    $h     height
-	 * @param string $color hex string, for color of padding bands
-	 */
-	function __construct($w, $h, $color) {
-		$this->w = $w;
-		$this->h = $h;
-		$this->color = $color;
-	}
+    /**
+     * @param int    $w     width of result image
+     * @param int    $h     height
+     * @param string $color hex string, for color of padding bands
+     */
+    function __construct($w, $h, $color) {
+        $this->w = $w;
+        $this->h = $h;
+        $this->color = $color;
+    }
 
-	/**
-	 * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
-	 * @param   string    $src_extension    the extension (ex: .jpg)
-	 * @return  string    the final filename to be used
-	 *                    (ex: my-awesome-pic-lbox-300x200-FF3366.jpg)
-	 */
-	public function filename($src_filename, $src_extension) {
-		$color = str_replace( '#', '', $this->color );
-		$newbase = $src_filename . '-lbox-' . $this->w . 'x' . $this->h . '-' . $color;
-		$new_name = $newbase . '.' . $src_extension;
-		return $new_name;
-	}
+    /**
+     * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
+     * @param   string    $src_extension    the extension (ex: .jpg)
+     * @return  string    the final filename to be used
+     *                    (ex: my-awesome-pic-lbox-300x200-FF3366.jpg)
+     */
+    public function filename($src_filename, $src_extension) {
+        $color = str_replace( '#', '', $this->color );
+        $newbase = $src_filename . '-lbox-' . $this->w . 'x' . $this->h . '-' . $color;
+        $new_name = $newbase . '.' . $src_extension;
+        return $new_name;
+    }
 
-	/**
-	 * Performs the actual image manipulation,
-	 * including saving the target file.
-	 *
-	 * @param  string $load_filename filepath (not URL) to source file
-	 *                               (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-lbox-300x200-FF3366.jpg)
-	 * @return bool                  true if everything went fine, false otherwise
-	 */
-	public function run($load_filename, $save_filename) {
-		$w = $this->w;
-		$h = $this->h;
+    /**
+     * Performs the actual image manipulation,
+     * including saving the target file.
+     *
+     * @param  string $load_filename filepath (not URL) to source file
+     *                               (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-lbox-300x200-FF3366.jpg)
+     * @return bool                  true if everything went fine, false otherwise
+     */
+    public function run($load_filename, $save_filename) {
+        $w = $this->w;
+        $h = $this->h;
 
-		$bg = imagecreatetruecolor( $w, $h );
-		$c = self::hexrgb( $this->color );
-		$bgColor = imagecolorallocate( $bg, $c['red'], $c['green'], $c['blue'] );
-		imagefill( $bg, 0, 0, $bgColor );
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
-			$current_size = $image->get_size();
-			$quality = $image->get_quality();
-			$ow = $current_size['width'];
-			$oh = $current_size['height'];
-			$new_aspect = $w / $h;
-			$old_aspect = $ow / $oh;
-			if ( $new_aspect > $old_aspect ) {
-				//taller than goal
-				$h_scale = $h / $oh;
-				$owt = $ow * $h_scale;
-				$y = 0;
-				$x = $w / 2 - $owt / 2;
-				$oht = $h;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
-			} else {
-				$w_scale = $w / $ow;
-				$oht = $oh * $w_scale;
-				$x = 0;
-				$y = $h / 2 - $oht / 2;
-				$owt = $w;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
-			}
-			$result = $image->save( $save_filename );
-			$func = 'imagecreatefromjpeg';
-			$save_func = 'imagejpeg';
-			$ext = pathinfo( $save_filename, PATHINFO_EXTENSION );
-			if ( $ext == 'gif' ) {
-				$func = 'imagecreatefromgif';
-				$save_func = 'imagegif';
-			} else if ( $ext == 'png' ) {
-				$func = 'imagecreatefrompng';
-				$save_func = 'imagepng';
-				if ($quality > 9) {
-					$quality = $quality/10;
-					$quality = round(10 - $quality);
-				}
-			}
-			$image = $func( $save_filename );
-			imagecopy( $bg, $image, $x, $y, 0, 0, $owt, $oht );
-			if ($save_func === 'imagegif') {
-				return $save_func( $bg, $save_filename );
-			}
-			return $save_func( $bg, $save_filename, $quality );
-		} else {
-			TimberHelper::error_log( $image );
-		}
-		return false;
-	}
+        $bg = imagecreatetruecolor( $w, $h );
+        $c = self::hexrgb( $this->color );
+        $bgColor = imagecolorallocate( $bg, $c['red'], $c['green'], $c['blue'] );
+        imagefill( $bg, 0, 0, $bgColor );
+        $image = wp_get_image_editor( $load_filename );
+        if ( !is_wp_error( $image ) ) {
+            $current_size = $image->get_size();
+            $quality = $image->get_quality();
+            $ow = $current_size['width'];
+            $oh = $current_size['height'];
+            $new_aspect = $w / $h;
+            $old_aspect = $ow / $oh;
+            if ( $new_aspect > $old_aspect ) {
+                //taller than goal
+                $h_scale = $h / $oh;
+                $owt = $ow * $h_scale;
+                $y = 0;
+                $x = $w / 2 - $owt / 2;
+                $oht = $h;
+                $image->crop( 0, 0, $ow, $oh, $owt, $oht );
+            } else {
+                $w_scale = $w / $ow;
+                $oht = $oh * $w_scale;
+                $x = 0;
+                $y = $h / 2 - $oht / 2;
+                $owt = $w;
+                $image->crop( 0, 0, $ow, $oh, $owt, $oht );
+            }
+            $result = $image->save( $save_filename );
+            $func = 'imagecreatefromjpeg';
+            $save_func = 'imagejpeg';
+            $ext = pathinfo( $save_filename, PATHINFO_EXTENSION );
+            if ( $ext == 'gif' ) {
+                $func = 'imagecreatefromgif';
+                $save_func = 'imagegif';
+            } else if ( $ext == 'png' ) {
+                $func = 'imagecreatefrompng';
+                $save_func = 'imagepng';
+                if ($quality > 9) {
+                    $quality = $quality/10;
+                    $quality = round(10 - $quality);
+                }
+            }
+            $image = $func( $save_filename );
+            imagecopy( $bg, $image, $x, $y, 0, 0, $owt, $oht );
+            if ($save_func === 'imagegif') {
+                return $save_func( $bg, $save_filename );
+            }
+            return $save_func( $bg, $save_filename, $quality );
+        } else {
+            TimberHelper::error_log( $image );
+        }
+        return false;
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -17,7 +17,7 @@ 
 	 * @param int    $h     height
 	 * @param string $color hex string, for color of padding bands
 	 */
-	function __construct($w, $h, $color) {
+	function __construct( $w, $h, $color ) {
 		$this->w = $w;
 		$this->h = $h;
 		$this->color = $color;
@@ -29,8 +29,8 @@ 
 	 * @return  string    the final filename to be used
 	 *                    (ex: my-awesome-pic-lbox-300x200-FF3366.jpg)
 	 */
-	public function filename($src_filename, $src_extension) {
-		$color = str_replace( '#', '', $this->color );
+	public function filename( $src_filename, $src_extension ) {
+		$color = str_replace('#', '', $this->color);
 		$newbase = $src_filename . '-lbox-' . $this->w . 'x' . $this->h . '-' . $color;
 		$new_name = $newbase . '.' . $src_extension;
 		return $new_name;
@@ -46,16 +46,16 @@ 
 	 *                               (ex: /src/var/www/wp-content/uploads/my-pic-lbox-300x200-FF3366.jpg)
 	 * @return bool                  true if everything went fine, false otherwise
 	 */
-	public function run($load_filename, $save_filename) {
+	public function run( $load_filename, $save_filename ) {
 		$w = $this->w;
 		$h = $this->h;
 
-		$bg = imagecreatetruecolor( $w, $h );
-		$c = self::hexrgb( $this->color );
-		$bgColor = imagecolorallocate( $bg, $c['red'], $c['green'], $c['blue'] );
-		imagefill( $bg, 0, 0, $bgColor );
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
+		$bg = imagecreatetruecolor($w, $h);
+		$c = self::hexrgb($this->color);
+		$bgColor = imagecolorallocate($bg, $c['red'], $c['green'], $c['blue']);
+		imagefill($bg, 0, 0, $bgColor);
+		$image = wp_get_image_editor($load_filename);
+		if ( !is_wp_error($image) ) {
 			$current_size = $image->get_size();
 			$quality = $image->get_quality();
 			$ow = $current_size['width'];
@@ -69,38 +69,38 @@ 
 				$y = 0;
 				$x = $w / 2 - $owt / 2;
 				$oht = $h;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
+				$image->crop(0, 0, $ow, $oh, $owt, $oht);
 			} else {
 				$w_scale = $w / $ow;
 				$oht = $oh * $w_scale;
 				$x = 0;
 				$y = $h / 2 - $oht / 2;
 				$owt = $w;
-				$image->crop( 0, 0, $ow, $oh, $owt, $oht );
+				$image->crop(0, 0, $ow, $oh, $owt, $oht);
 			}
-			$result = $image->save( $save_filename );
+			$result = $image->save($save_filename);
 			$func = 'imagecreatefromjpeg';
 			$save_func = 'imagejpeg';
-			$ext = pathinfo( $save_filename, PATHINFO_EXTENSION );
+			$ext = pathinfo($save_filename, PATHINFO_EXTENSION);
 			if ( $ext == 'gif' ) {
 				$func = 'imagecreatefromgif';
 				$save_func = 'imagegif';
 			} else if ( $ext == 'png' ) {
 				$func = 'imagecreatefrompng';
 				$save_func = 'imagepng';
-				if ($quality > 9) {
-					$quality = $quality/10;
+				if ( $quality > 9 ) {
+					$quality = $quality / 10;
 					$quality = round(10 - $quality);
 				}
 			}
-			$image = $func( $save_filename );
-			imagecopy( $bg, $image, $x, $y, 0, 0, $owt, $oht );
-			if ($save_func === 'imagegif') {
-				return $save_func( $bg, $save_filename );
+			$image = $func($save_filename);
+			imagecopy($bg, $image, $x, $y, 0, 0, $owt, $oht);
+			if ( $save_func === 'imagegif' ) {
+				return $save_func($bg, $save_filename);
 			}
-			return $save_func( $bg, $save_filename, $quality );
+			return $save_func($bg, $save_filename, $quality);
 		} else {
-			TimberHelper::error_log( $image );
+			TimberHelper::error_log($image);
 		}
 		return false;
 	}

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

Indentation +60 added lines, -60 removed lines

@@ -7,68 +7,68 @@
  */
 class TimberImageOperationToJpg extends TimberImageOperation {
 
-	private $color;
+    private $color;
 
-	/**
-	 * @param string $color hex string of color to use for transparent zones
-	 */
-	function __construct($color) {
-		$this->color = $color;
-	}
+    /**
+     * @param string $color hex string of color to use for transparent zones
+     */
+    function __construct($color) {
+        $this->color = $color;
+    }
 
-	/**
-	 * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
-	 * @param   string    $src_extension    ignored
-	 * @return  string    the final filename to be used (ex: my-awesome-pic.jpg)
-	 */
-	function filename($src_filename, $src_extension = 'jpg') {
-		$new_name = $src_filename . '.jpg';
-		return $new_name;
-	}
+    /**
+     * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
+     * @param   string    $src_extension    ignored
+     * @return  string    the final filename to be used (ex: my-awesome-pic.jpg)
+     */
+    function filename($src_filename, $src_extension = 'jpg') {
+        $new_name = $src_filename . '.jpg';
+        return $new_name;
+    }
 
-	/**
-	 * Performs the actual image manipulation,
-	 * including saving the target file.
-	 *
-	 * @param  string $load_filename filepath (not URL) to source file (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.png)
-	 * @return bool                  true if everything went fine, false otherwise
-	 */
-	function run($load_filename, $save_filename) {
-		$input = self::image_create( $load_filename );
-		list( $width, $height ) = getimagesize( $load_filename );
-		$output = imagecreatetruecolor( $width, $height );
-		$c = self::hexrgb( $this->color );
-		$color = imagecolorallocate( $output, $c['red'], $c['green'], $c['blue'] );
-		imagefilledrectangle( $output, 0, 0, $width, $height, $color );
-		imagecopy( $output, $input, 0, 0, 0, 0, $width, $height );
-		imagejpeg( $output, $save_filename );
-		return true;
-	}
+    /**
+     * Performs the actual image manipulation,
+     * including saving the target file.
+     *
+     * @param  string $load_filename filepath (not URL) to source file (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.png)
+     * @return bool                  true if everything went fine, false otherwise
+     */
+    function run($load_filename, $save_filename) {
+        $input = self::image_create( $load_filename );
+        list( $width, $height ) = getimagesize( $load_filename );
+        $output = imagecreatetruecolor( $width, $height );
+        $c = self::hexrgb( $this->color );
+        $color = imagecolorallocate( $output, $c['red'], $c['green'], $c['blue'] );
+        imagefilledrectangle( $output, 0, 0, $width, $height, $color );
+        imagecopy( $output, $input, 0, 0, 0, 0, $width, $height );
+        imagejpeg( $output, $save_filename );
+        return true;
+    }
 
-	/**
-	 * @param string $filename
-	 * @return resource an image identifier representing the image obtained from the given filename
-	 *                  will return the same data type regardless of whether the source is gif or png
-	 */
-	function image_create( $filename, $ext = 'auto' ) {
-		if ( $ext == 'auto' ) {
-			$ext = wp_check_filetype($filename);
-			if (isset($ext['ext'])) {
-				$ext = $ext['ext'];
-			}
-		}
-		$ext = strtolower($ext);
-		if ( $ext == 'gif' ) {
-			return imagecreatefromgif($filename);
-		}
-		if ( $ext == 'png' ) {
-			return imagecreatefrompng($filename);
-		}
-		if ( $ext == 'jpg' || $ext == 'jpeg' ) {
-			return imagecreatefromjpeg($filename);
-		}
-		throw new InvalidArgumentException( 'image_create only accepts PNG, GIF and JPGs. File extension was: '.$ext );
-	}
+    /**
+     * @param string $filename
+     * @return resource an image identifier representing the image obtained from the given filename
+     *                  will return the same data type regardless of whether the source is gif or png
+     */
+    function image_create( $filename, $ext = 'auto' ) {
+        if ( $ext == 'auto' ) {
+            $ext = wp_check_filetype($filename);
+            if (isset($ext['ext'])) {
+                $ext = $ext['ext'];
+            }
+        }
+        $ext = strtolower($ext);
+        if ( $ext == 'gif' ) {
+            return imagecreatefromgif($filename);
+        }
+        if ( $ext == 'png' ) {
+            return imagecreatefrompng($filename);
+        }
+        if ( $ext == 'jpg' || $ext == 'jpeg' ) {
+            return imagecreatefromjpeg($filename);
+        }
+        throw new InvalidArgumentException( 'image_create only accepts PNG, GIF and JPGs. File extension was: '.$ext );
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
 	/**
 	 * @param string $color hex string of color to use for transparent zones
 	 */
-	function __construct($color) {
+	function __construct( $color ) {
 		$this->color = $color;
 	}
 
@@ -21,7 +21,7 @@ 
 	 * @param   string    $src_extension    ignored
 	 * @return  string    the final filename to be used (ex: my-awesome-pic.jpg)
 	 */
-	function filename($src_filename, $src_extension = 'jpg') {
+	function filename( $src_filename, $src_extension = 'jpg' ) {
 		$new_name = $src_filename . '.jpg';
 		return $new_name;
 	}
@@ -35,15 +35,15 @@ 
 	 *                               (ex: /src/var/www/wp-content/uploads/my-pic.png)
 	 * @return bool                  true if everything went fine, false otherwise
 	 */
-	function run($load_filename, $save_filename) {
-		$input = self::image_create( $load_filename );
-		list( $width, $height ) = getimagesize( $load_filename );
-		$output = imagecreatetruecolor( $width, $height );
-		$c = self::hexrgb( $this->color );
-		$color = imagecolorallocate( $output, $c['red'], $c['green'], $c['blue'] );
-		imagefilledrectangle( $output, 0, 0, $width, $height, $color );
-		imagecopy( $output, $input, 0, 0, 0, 0, $width, $height );
-		imagejpeg( $output, $save_filename );
+	function run( $load_filename, $save_filename ) {
+		$input = self::image_create($load_filename);
+		list($width, $height) = getimagesize($load_filename);
+		$output = imagecreatetruecolor($width, $height);
+		$c = self::hexrgb($this->color);
+		$color = imagecolorallocate($output, $c['red'], $c['green'], $c['blue']);
+		imagefilledrectangle($output, 0, 0, $width, $height, $color);
+		imagecopy($output, $input, 0, 0, 0, 0, $width, $height);
+		imagejpeg($output, $save_filename);
 		return true;
 	}
 
@@ -55,7 +55,7 @@ 
 	function image_create( $filename, $ext = 'auto' ) {
 		if ( $ext == 'auto' ) {
 			$ext = wp_check_filetype($filename);
-			if (isset($ext['ext'])) {
+			if ( isset($ext['ext']) ) {
 				$ext = $ext['ext'];
 			}
 		}
@@ -69,6 +69,6 @@ 
 		if ( $ext == 'jpg' || $ext == 'jpeg' ) {
 			return imagecreatefromjpeg($filename);
 		}
-		throw new InvalidArgumentException( 'image_create only accepts PNG, GIF and JPGs. File extension was: '.$ext );
+		throw new InvalidArgumentException('image_create only accepts PNG, GIF and JPGs. File extension was: ' . $ext);
 	}
 }

lib/image/timber-image-operation.php

Indentation +43 added lines, -43 removed lines

@@ -1,49 +1,49 @@
 <?php
 /**
- * Each image filter is represented by a subclass of this class,m
- * and each filter call is a new instance, with call arguments as properties.
- * 
- * Only 3 methods need to be implemented:
- * - constructor, storing all filter arguments
- * - filename
- * - run
- */
+     * Each image filter is represented by a subclass of this class,m
+     * and each filter call is a new instance, with call arguments as properties.
+     * 
+     * Only 3 methods need to be implemented:
+     * - constructor, storing all filter arguments
+     * - filename
+     * - run
+     */
 abstract class TimberImageOperation {
-	/**
-	 * Builds the result filename, based on source filename and extension
-	 * 
-	 * @param  string $src_filename  source filename (excluding extension and path)
-	 * @param  string $src_extension source file extension
-	 * @return string                resulting filename (including extension but excluding path)
-	 *                               ex: my-awesome-file.jpg
-	 */
-	public abstract function filename($src_filename, $src_extension);
+    /**
+     * Builds the result filename, based on source filename and extension
+     * 
+     * @param  string $src_filename  source filename (excluding extension and path)
+     * @param  string $src_extension source file extension
+     * @return string                resulting filename (including extension but excluding path)
+     *                               ex: my-awesome-file.jpg
+     */
+    public abstract function filename($src_filename, $src_extension);
 
-	/**
-	 * Performs the actual image manipulation,
-	 * including saving the target file.
-	 * 
-	 * @param  string $load_filename filepath (not URL) to source file
-	 * @param  string $save_filename filepath (not URL) where result file should be saved
-	 * @return bool                  true if everything went fine, false otherwise
-	 */
-	public abstract function run($load_filename, $save_filename);
+    /**
+     * Performs the actual image manipulation,
+     * including saving the target file.
+     * 
+     * @param  string $load_filename filepath (not URL) to source file
+     * @param  string $save_filename filepath (not URL) where result file should be saved
+     * @return bool                  true if everything went fine, false otherwise
+     */
+    public abstract function run($load_filename, $save_filename);
 
-	/**
-	 * Helper method to convert hex string to rgb array
-	 * 
-	 * @param  string $hexstr hex color string (like '#FF1455')
-	 * @return array          array('red', 'green', 'blue') to int
-	 *                        ex: array('red' => 255, 'green' => 20, 'blue' => 85);
-	 */
-	public static function hexrgb( $hexstr ) {
-		if ( !strstr( $hexstr, '#' ) ) {
-			$hexstr = '#' . $hexstr;
-		}
-		if ( strlen( $hexstr ) == 4 ) {
-			$hexstr = '#' . $hexstr[1] . $hexstr[1] . $hexstr[2] . $hexstr[2] . $hexstr[3] . $hexstr[3];
-		}
-		$int = hexdec( $hexstr );
-		return array( "red" => 0xFF & ( $int >> 0x10 ), "green" => 0xFF & ( $int >> 0x8 ), "blue" => 0xFF & $int );
-	}
+    /**
+     * Helper method to convert hex string to rgb array
+     * 
+     * @param  string $hexstr hex color string (like '#FF1455')
+     * @return array          array('red', 'green', 'blue') to int
+     *                        ex: array('red' => 255, 'green' => 20, 'blue' => 85);
+     */
+    public static function hexrgb( $hexstr ) {
+        if ( !strstr( $hexstr, '#' ) ) {
+            $hexstr = '#' . $hexstr;
+        }
+        if ( strlen( $hexstr ) == 4 ) {
+            $hexstr = '#' . $hexstr[1] . $hexstr[1] . $hexstr[2] . $hexstr[2] . $hexstr[3] . $hexstr[3];
+        }
+        $int = hexdec( $hexstr );
+        return array( "red" => 0xFF & ( $int >> 0x10 ), "green" => 0xFF & ( $int >> 0x8 ), "blue" => 0xFF & $int );
+    }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 	 * @return string                resulting filename (including extension but excluding path)
 	 *                               ex: my-awesome-file.jpg
 	 */
-	public abstract function filename($src_filename, $src_extension);
+	public abstract function filename( $src_filename, $src_extension );
 
 	/**
 	 * Performs the actual image manipulation,
@@ -27,7 +27,7 @@ 
 	 * @param  string $save_filename filepath (not URL) where result file should be saved
 	 * @return bool                  true if everything went fine, false otherwise
 	 */
-	public abstract function run($load_filename, $save_filename);
+	public abstract function run( $load_filename, $save_filename );
 
 	/**
 	 * Helper method to convert hex string to rgb array
@@ -37,13 +37,13 @@ 
 	 *                        ex: array('red' => 255, 'green' => 20, 'blue' => 85);
 	 */
 	public static function hexrgb( $hexstr ) {
-		if ( !strstr( $hexstr, '#' ) ) {
+		if ( !strstr($hexstr, '#') ) {
 			$hexstr = '#' . $hexstr;
 		}
-		if ( strlen( $hexstr ) == 4 ) {
+		if ( strlen($hexstr) == 4 ) {
 			$hexstr = '#' . $hexstr[1] . $hexstr[1] . $hexstr[2] . $hexstr[2] . $hexstr[3] . $hexstr[3];
 		}
-		$int = hexdec( $hexstr );
-		return array( "red" => 0xFF & ( $int >> 0x10 ), "green" => 0xFF & ( $int >> 0x8 ), "blue" => 0xFF & $int );
+		$int = hexdec($hexstr);
+		return array("red" => 0xFF & ($int >> 0x10), "green" => 0xFF & ($int >> 0x8), "blue" => 0xFF & $int);
 	}
 }
\ No newline at end of file

lib/timber-twig.php

Indentation +341 added lines, -341 removed lines

@@ -2,346 +2,346 @@
 
 class TimberTwig {
 
-	public static $dir_name;
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public static function init() {
-		new TimberTwig();
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	function __construct() {
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters_deprecated' ) );
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters' ) );
-	}
-
-	/**
-	 * These are all deprecated and will be removed in 0.21.0
-	 *
-	 * @param Twig_Environment $twig
-	 * @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 = ' '){
-			return twig_join_filter($arr, $glue);
-		} ) );
-		return $twig;
-	}
-
-	/**
-	 *
-	 *
-	 * @param Twig_Environment $twig
-	 * @return Twig_Environment
-	 */
-	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' ) ) );
-
-		/* 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>';
-				} ) );
-
-		/* 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 );
-				} ) );
-
-		/* actions and filters */
-		$twig->addFunction( new Twig_SimpleFunction( 'action', function ( $context ) {
-					$args = func_get_args();
-					array_shift( $args );
-					$args[] = $context;
-					call_user_func_array( 'do_action', $args );
-				}, array( 'needs_context' => true ) ) );
-
-		$twig->addFilter( new Twig_SimpleFilter( 'apply_filters', function () {
-					$args = func_get_args();
-					$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' ) ) );
-
-		$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 );
-						}
-						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 $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 $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 $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 );
-						}
-						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 $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 $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 $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 );
-				} ) );
-		/* get_twig is deprecated, use timber/twig */
-		$twig = apply_filters( 'get_twig', $twig );
-		$twig = apply_filters( 'timber/twig', $twig );
-		return $twig;
-	}
-
-	/**
-	 *
-	 *
-	 * @param mixed   $arr
-	 * @return array
-	 */
-	function to_array( $arr ) {
-		if ( is_array( $arr ) ) {
-			return $arr;
-		}
-		$arr = array( $arr );
-		return $arr;
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $function_name
-	 * @return mixed
-	 */
-	function exec_function( $function_name ) {
-		$args = func_get_args();
-		array_shift( $args );
-		if ( is_string($function_name) ) {
-			$function_name = trim( $function_name );
-		}
-		return call_user_func_array( $function_name, ( $args ) );
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $content
-	 * @return string
-	 */
-	function twig_pretags( $content ) {
-		return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
-	}
-
-	/**
-	 *
-	 *
-	 * @param array   $matches
-	 * @return string
-	 */
-	function convert_pre_entities( $matches ) {
-		return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
-	}
-
-	/**
-	 * @param mixed   $body_classes
-	 * @deprecated 0.20.7
-	 * @return string
-	 */
-	function body_class( $body_classes ) {
-		ob_start();
-		if ( is_array( $body_classes ) ) {
-			$body_classes = explode( ' ', $body_classes );
-		}
-		body_class( $body_classes );
-		$return = ob_get_contents();
-		ob_end_clean();
-		return $return;
-	}
-
-	/**
-	 *
-	 *
-	 * @param string  $date
-	 * @param string  $format (optional)
-	 * @return string
-	 */
-	function intl_date( $date, $format = null ) {
-		if ( $format === null ) {
-			$format = get_option( 'date_format' );
-		}
-
-		if ( $date instanceof DateTime ) {
-			$timestamp = $date->getTimestamp() + $date->getOffset();
-		} else if (is_numeric( $date ) && strtotime( $date ) === false ) {
-			$timestamp = intval( $date );
-		} else {
-			$timestamp = strtotime( $date );
-		}
-
-		return date_i18n( $format, $timestamp );
-	}
-
-	//debug
-
-	/**
-	 *
-	 *
-	 * @param mixed   $obj
-	 * @param bool    $methods
-	 * @deprecated since 0.20.7
-	 * @return string
-	 */
-	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 );
-		return $str;
-	}
-
-	/**
-	 * @param int|string $from
-	 * @param int|string $to
-	 * @param string $format_past
-	 * @param string $format_future
-	 * @return string
-	 */
-	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 );
-
-		if ( $from < $to ) {
-			return sprintf( $format_past, human_time_diff( $from, $to ) );
-		} else {
-			return sprintf( $format_future, human_time_diff( $to, $from ) );
-		}
-	}
-
-	/**
-	 * @param array $arr
-	 * @param string $first_delimiter
-	 * @param string $second_delimiter
-	 * @return string
-	 */
-	function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
-		$length = count( $arr );
-		$list = '';
-		foreach( $arr as $index => $item ) {
-			if ( $index < $length - 2 ) {
-				$delimiter = $first_delimiter.' ';
-			} elseif ( $index == $length - 2 ) {
-				$delimiter = ' '.$second_delimiter.' ';
-			} else {
-				$delimiter = '';
-			}
-			$list = $list.$item.$delimiter;
-		}
-		return $list;
-	}
+    public static $dir_name;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public static function init() {
+        new TimberTwig();
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    function __construct() {
+        add_action( 'timber/twig/filters', array( $this, 'add_timber_filters_deprecated' ) );
+        add_action( 'timber/twig/filters', array( $this, 'add_timber_filters' ) );
+    }
+
+    /**
+     * These are all deprecated and will be removed in 0.21.0
+     *
+     * @param Twig_Environment $twig
+     * @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 = ' '){
+            return twig_join_filter($arr, $glue);
+        } ) );
+        return $twig;
+    }
+
+    /**
+     *
+     *
+     * @param Twig_Environment $twig
+     * @return Twig_Environment
+     */
+    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' ) ) );
+
+        /* 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>';
+                } ) );
+
+        /* 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 );
+                } ) );
+
+        /* actions and filters */
+        $twig->addFunction( new Twig_SimpleFunction( 'action', function ( $context ) {
+                    $args = func_get_args();
+                    array_shift( $args );
+                    $args[] = $context;
+                    call_user_func_array( 'do_action', $args );
+                }, array( 'needs_context' => true ) ) );
+
+        $twig->addFilter( new Twig_SimpleFilter( 'apply_filters', function () {
+                    $args = func_get_args();
+                    $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' ) ) );
+
+        $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 );
+                        }
+                        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 $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 $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 $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 );
+                        }
+                        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 $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 $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 $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 );
+                } ) );
+        /* get_twig is deprecated, use timber/twig */
+        $twig = apply_filters( 'get_twig', $twig );
+        $twig = apply_filters( 'timber/twig', $twig );
+        return $twig;
+    }
+
+    /**
+     *
+     *
+     * @param mixed   $arr
+     * @return array
+     */
+    function to_array( $arr ) {
+        if ( is_array( $arr ) ) {
+            return $arr;
+        }
+        $arr = array( $arr );
+        return $arr;
+    }
+
+    /**
+     *
+     *
+     * @param string  $function_name
+     * @return mixed
+     */
+    function exec_function( $function_name ) {
+        $args = func_get_args();
+        array_shift( $args );
+        if ( is_string($function_name) ) {
+            $function_name = trim( $function_name );
+        }
+        return call_user_func_array( $function_name, ( $args ) );
+    }
+
+    /**
+     *
+     *
+     * @param string  $content
+     * @return string
+     */
+    function twig_pretags( $content ) {
+        return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
+    }
+
+    /**
+     *
+     *
+     * @param array   $matches
+     * @return string
+     */
+    function convert_pre_entities( $matches ) {
+        return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
+    }
+
+    /**
+     * @param mixed   $body_classes
+     * @deprecated 0.20.7
+     * @return string
+     */
+    function body_class( $body_classes ) {
+        ob_start();
+        if ( is_array( $body_classes ) ) {
+            $body_classes = explode( ' ', $body_classes );
+        }
+        body_class( $body_classes );
+        $return = ob_get_contents();
+        ob_end_clean();
+        return $return;
+    }
+
+    /**
+     *
+     *
+     * @param string  $date
+     * @param string  $format (optional)
+     * @return string
+     */
+    function intl_date( $date, $format = null ) {
+        if ( $format === null ) {
+            $format = get_option( 'date_format' );
+        }
+
+        if ( $date instanceof DateTime ) {
+            $timestamp = $date->getTimestamp() + $date->getOffset();
+        } else if (is_numeric( $date ) && strtotime( $date ) === false ) {
+            $timestamp = intval( $date );
+        } else {
+            $timestamp = strtotime( $date );
+        }
+
+        return date_i18n( $format, $timestamp );
+    }
+
+    //debug
+
+    /**
+     *
+     *
+     * @param mixed   $obj
+     * @param bool    $methods
+     * @deprecated since 0.20.7
+     * @return string
+     */
+    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 );
+        return $str;
+    }
+
+    /**
+     * @param int|string $from
+     * @param int|string $to
+     * @param string $format_past
+     * @param string $format_future
+     * @return string
+     */
+    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 );
+
+        if ( $from < $to ) {
+            return sprintf( $format_past, human_time_diff( $from, $to ) );
+        } else {
+            return sprintf( $format_future, human_time_diff( $to, $from ) );
+        }
+    }
+
+    /**
+     * @param array $arr
+     * @param string $first_delimiter
+     * @param string $second_delimiter
+     * @return string
+     */
+    function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
+        $length = count( $arr );
+        $list = '';
+        foreach( $arr as $index => $item ) {
+            if ( $index < $length - 2 ) {
+                $delimiter = $first_delimiter.' ';
+            } elseif ( $index == $length - 2 ) {
+                $delimiter = ' '.$second_delimiter.' ';
+            } else {
+                $delimiter = '';
+            }
+            $list = $list.$item.$delimiter;
+        }
+        return $list;
+    }
 
 }

Spacing +130 added lines, -130 removed lines

@@ -15,8 +15,8 @@ 
 	 * @codeCoverageIgnore
 	 */
 	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'));
 	}
 
 	/**
@@ -27,13 +27,13 @@ 
 	 * @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 = ' '){
+		$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;
 	}
 
@@ -45,149 +45,149 @@ 
 	 */
 	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 ) ) {
+		$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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+		$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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+					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 );
+							$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 ) ) {
+					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 );
+							$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;
 	}
 
@@ -198,10 +198,10 @@ 
 	 * @return array
 	 */
 	function to_array( $arr ) {
-		if ( is_array( $arr ) ) {
+		if ( is_array($arr) ) {
 			return $arr;
 		}
-		$arr = array( $arr );
+		$arr = array($arr);
 		return $arr;
 	}
 
@@ -213,11 +213,11 @@ 
 	 */
 	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));
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 * @return string
 	 */
 	function twig_pretags( $content ) {
-		return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
+		return preg_replace_callback('|<pre.*>(.*)</pre|isU', array(&$this, 'convert_pre_entities'), $content);
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 * @return string
 	 */
 	function convert_pre_entities( $matches ) {
-		return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
+		return str_replace($matches[1], htmlentities($matches[1]), $matches[0]);
 	}
 
 	/**
@@ -247,10 +247,10 @@ 
 	 */
 	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;
@@ -265,18 +265,18 @@ 
 	 */
 	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() + $date->getOffset();
-		} 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
@@ -290,16 +290,16 @@ 
 	 * @return string
 	 */
 	function object_docs( $obj, $methods = true ) {
-		$class = get_class( $obj );
-		$properties = (array)$obj;
+		$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;
 	}
 
@@ -312,13 +312,13 @@ 
 	 */
 	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));
 		}
 	}
 
@@ -329,17 +329,17 @@ 
 	 * @return string
 	 */
 	function add_list_separators( $arr, $first_delimiter = ',', $second_delimiter = 'and' ) {
-		$length = count( $arr );
+		$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/timber-admin.php

Indentation +16 added lines, -16 removed lines

@@ -6,21 +6,21 @@
         return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
     }
 
-	/**
-	 * @param array   $links
-	 * @param string  $file
-	 * @return array
-	 */
-	public static function meta_links( $links, $file ) {
-		if ( strstr( $file, '/timber.php' ) ) {
-			unset($links[2]);
-			$links[] = '<a href="/wp-admin/plugin-install.php?tab=plugin-information&amp;plugin=timber-library&amp;TB_iframe=true&amp;width=600&amp;height=550" class="thickbox" aria-label="More information about Timber" data-title="Timber">View details</a>';
-			$links[] = '<a href="http://upstatement.com/timber" target="_blank">Homepage</a>';
-			$links[] = '<a href="https://github.com/jarednova/timber/wiki" target="_blank">Documentation</a>';
-			$links[] = '<a href="https://github.com/jarednova/timber/wiki/getting-started" target="_blank">Starter Guide</a>';
-			return $links;
-		}
-		return $links;
-	}
+    /**
+     * @param array   $links
+     * @param string  $file
+     * @return array
+     */
+    public static function meta_links( $links, $file ) {
+        if ( strstr( $file, '/timber.php' ) ) {
+            unset($links[2]);
+            $links[] = '<a href="/wp-admin/plugin-install.php?tab=plugin-information&amp;plugin=timber-library&amp;TB_iframe=true&amp;width=600&amp;height=550" class="thickbox" aria-label="More information about Timber" data-title="Timber">View details</a>';
+            $links[] = '<a href="http://upstatement.com/timber" target="_blank">Homepage</a>';
+            $links[] = '<a href="https://github.com/jarednova/timber/wiki" target="_blank">Documentation</a>';
+            $links[] = '<a href="https://github.com/jarednova/timber/wiki/getting-started" target="_blank">Starter Guide</a>';
+            return $links;
+        }
+        return $links;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 class TimberAdmin {
 
     public static function init() {
-        return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
+        return add_filter('plugin_row_meta', array(__CLASS__, 'meta_links'), 10, 2);
     }
 
 	/**
@@ -12,7 +12,7 @@ 
 	 * @return array
 	 */
 	public static function meta_links( $links, $file ) {
-		if ( strstr( $file, '/timber.php' ) ) {
+		if ( strstr($file, '/timber.php') ) {
 			unset($links[2]);
 			$links[] = '<a href="/wp-admin/plugin-install.php?tab=plugin-information&amp;plugin=timber-library&amp;TB_iframe=true&amp;width=600&amp;height=550" class="thickbox" aria-label="More information about Timber" data-title="Timber">View details</a>';
 			$links[] = '<a href="http://upstatement.com/timber" target="_blank">Homepage</a>';