jarednova / timber

lib/cache/KeyGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -11,16 +11,16 @@
 	 * @return string
 	 */
 	public function generateKey($value) {
-		if (is_a($value, 'TimberKeyGeneratorInterface')) {
+		if ( is_a($value, 'TimberKeyGeneratorInterface') ) {
 			return $value->_get_cache_key();
 		}
 
-		if (is_array($value) && isset($value['_cache_key'])) {
+		if ( is_array($value) && isset($value['_cache_key']) ) {
 			return $value['_cache_key'];
 		}
 
 		$key = md5(json_encode($value));
-		if (is_object($value)) {
+		if ( is_object($value) ) {
 			$key = get_class($value) . '|' . $key;
 		}
 

lib/image/timber-image-operation.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?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

Spacing +5 added lines, -5 removed lines

@@ -36,14 +36,14 @@
 	 * @return array          array('red', 'green', 'blue') to int
 	 *                        ex: array('red' => 255, 'green' => 20, 'blue' => 85);
 	 */
-	public static function hexrgb( $hexstr ) {
-		if ( !strstr( $hexstr, '#' ) ) {
+	public static function hexrgb($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/integrations/acf-timber.php

Indentation +51 added lines, -51 removed lines

@@ -2,57 +2,57 @@
 
 class ACFTimber {
 
-    function __construct() {
-        add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 );
-        add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 );
-        add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 );
-        add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 );
-    }
-
-    function post_get_meta( $customs, $post_id ) {
-        return $customs;
-    }
-
-    function post_get_meta_field( $value, $post_id, $field_name ) {
-        return get_field( $field_name, $post_id );
-    }
-
-    function term_get_meta_field( $value, $term_id, $field_name, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID;
-        return get_field( $field_name, $searcher );
-    }
-
-    function term_set_meta( $value, $field, $term_id, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID;
-        update_field( $field, $value, $searcher );
-        return $value;
-    }
-
-    function term_get_meta( $fields, $term_id, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category
-        $fds = get_fields( $searcher );
-        if ( is_array( $fds ) ) {
-            foreach ( $fds as $key => $value ) {
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $key = str_replace( $searcher, '', $key );
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $field = get_field( $key, $searcher );
-                $fields[$key] = $field;
-            }
-            $fields = array_merge( $fields, $fds );
-        }
-        return $fields;
-    }
-
-    function user_get_meta( $fields, $user_id ) {
-        return $fields;
-    }
-
-    function user_get_meta_field( $value, $uid, $field ) {
-        return get_field( $field, 'user_' . $uid );
-    }
+	function __construct() {
+		add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 );
+		add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 );
+		add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 );
+		add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 );
+		add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 );
+		add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 );
+	}
+
+	function post_get_meta( $customs, $post_id ) {
+		return $customs;
+	}
+
+	function post_get_meta_field( $value, $post_id, $field_name ) {
+		return get_field( $field_name, $post_id );
+	}
+
+	function term_get_meta_field( $value, $term_id, $field_name, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID;
+		return get_field( $field_name, $searcher );
+	}
+
+	function term_set_meta( $value, $field, $term_id, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID;
+		update_field( $field, $value, $searcher );
+		return $value;
+	}
+
+	function term_get_meta( $fields, $term_id, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category
+		$fds = get_fields( $searcher );
+		if ( is_array( $fds ) ) {
+			foreach ( $fds as $key => $value ) {
+				$key = preg_replace( '/_/', '', $key, 1 );
+				$key = str_replace( $searcher, '', $key );
+				$key = preg_replace( '/_/', '', $key, 1 );
+				$field = get_field( $key, $searcher );
+				$fields[$key] = $field;
+			}
+			$fields = array_merge( $fields, $fds );
+		}
+		return $fields;
+	}
+
+	function user_get_meta( $fields, $user_id ) {
+		return $fields;
+	}
+
+	function user_get_meta_field( $value, $uid, $field ) {
+		return get_field( $field, 'user_' . $uid );
+	}
 }
 
 

Spacing +25 added lines, -25 removed lines

@@ -3,55 +3,55 @@
 class ACFTimber {
 
     function __construct() {
-        add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 );
-        add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 );
-        add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 );
-        add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 );
+        add_filter('timber_post_get_meta', array($this, 'post_get_meta'), 10, 2);
+        add_filter('timber_post_get_meta_field', array($this, 'post_get_meta_field'), 10, 3);
+        add_filter('timber_term_get_meta', array($this, 'term_get_meta'), 10, 3);
+        add_filter('timber_term_get_meta_field', array($this, 'term_get_meta_field'), 10, 4);
+        add_filter('timber_user_get_meta_field_pre', array($this, 'user_get_meta_field'), 10, 3);
+        add_filter('timber_term_set_meta', array($this, 'term_set_meta'), 10, 4);
     }
 
-    function post_get_meta( $customs, $post_id ) {
+    function post_get_meta($customs, $post_id) {
         return $customs;
     }
 
-    function post_get_meta_field( $value, $post_id, $field_name ) {
-        return get_field( $field_name, $post_id );
+    function post_get_meta_field($value, $post_id, $field_name) {
+        return get_field($field_name, $post_id);
     }
 
-    function term_get_meta_field( $value, $term_id, $field_name, $term ) {
+    function term_get_meta_field($value, $term_id, $field_name, $term) {
         $searcher = $term->taxonomy . "_" . $term->ID;
-        return get_field( $field_name, $searcher );
+        return get_field($field_name, $searcher);
     }
 
-    function term_set_meta( $value, $field, $term_id, $term ) {
+    function term_set_meta($value, $field, $term_id, $term) {
         $searcher = $term->taxonomy . "_" . $term->ID;
-        update_field( $field, $value, $searcher );
+        update_field($field, $value, $searcher);
         return $value;
     }
 
-    function term_get_meta( $fields, $term_id, $term ) {
+    function term_get_meta($fields, $term_id, $term) {
         $searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category
-        $fds = get_fields( $searcher );
-        if ( is_array( $fds ) ) {
-            foreach ( $fds as $key => $value ) {
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $key = str_replace( $searcher, '', $key );
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $field = get_field( $key, $searcher );
+        $fds = get_fields($searcher);
+        if ( is_array($fds) ) {
+            foreach ($fds as $key => $value) {
+                $key = preg_replace('/_/', '', $key, 1);
+                $key = str_replace($searcher, '', $key);
+                $key = preg_replace('/_/', '', $key, 1);
+                $field = get_field($key, $searcher);
                 $fields[$key] = $field;
             }
-            $fields = array_merge( $fields, $fds );
+            $fields = array_merge($fields, $fds);
         }
         return $fields;
     }
 
-    function user_get_meta( $fields, $user_id ) {
+    function user_get_meta($fields, $user_id) {
         return $fields;
     }
 
-    function user_get_meta_field( $value, $uid, $field ) {
-        return get_field( $field, 'user_' . $uid );
+    function user_get_meta_field($value, $uid, $field) {
+        return get_field($field, 'user_' . $uid);
     }
 }
 

lib/integrations/timber-command.php

Indentation +24 added lines, -24 removed lines

@@ -6,31 +6,31 @@
  */
 class TimberCommand {
 
-    public static function clear_cache($mode = 'all'){
-        if (is_array($mode)){
-            $mode = reset($mode);
-        }
-        if ($mode == 'all') {
-            $twig_cache = self::clear_cache_twig();
-            $timber_cache = self::clear_cache_timber();
-            if ($twig_cache && $timber_cache){
-                return true;
-            }
-        } else if ($mode == 'twig') {
-            return self::clear_cache_twig();
-        } else if ($mode == 'timber') {
-            return self::clear_cache_timber();
-        }
-    }
+	public static function clear_cache($mode = 'all'){
+		if (is_array($mode)){
+			$mode = reset($mode);
+		}
+		if ($mode == 'all') {
+			$twig_cache = self::clear_cache_twig();
+			$timber_cache = self::clear_cache_timber();
+			if ($twig_cache && $timber_cache){
+				return true;
+			}
+		} else if ($mode == 'twig') {
+			return self::clear_cache_twig();
+		} else if ($mode == 'timber') {
+			return self::clear_cache_timber();
+		}
+	}
 
-    static function clear_cache_timber(){
-        $loader = new TimberLoader();
-        return $loader->clear_cache_timber();
-    }
+	static function clear_cache_timber(){
+		$loader = new TimberLoader();
+		return $loader->clear_cache_timber();
+	}
 
-    static function clear_cache_twig(){
-        $loader = new TimberLoader();
-        return $loader->clear_cache_twig();
-    }
+	static function clear_cache_twig(){
+		$loader = new TimberLoader();
+		return $loader->clear_cache_twig();
+	}
 
 }

Spacing +8 added lines, -8 removed lines

@@ -6,29 +6,29 @@
  */
 class TimberCommand {
 
-    public static function clear_cache($mode = 'all'){
-        if (is_array($mode)){
+    public static function clear_cache($mode = 'all') {
+        if ( is_array($mode) ) {
             $mode = reset($mode);
         }
-        if ($mode == 'all') {
+        if ( $mode == 'all' ) {
             $twig_cache = self::clear_cache_twig();
             $timber_cache = self::clear_cache_timber();
-            if ($twig_cache && $timber_cache){
+            if ( $twig_cache && $timber_cache ) {
                 return true;
             }
-        } else if ($mode == 'twig') {
+        } else if ( $mode == 'twig' ) {
             return self::clear_cache_twig();
-        } else if ($mode == 'timber') {
+        } else if ( $mode == 'timber' ) {
             return self::clear_cache_timber();
         }
     }
 
-    static function clear_cache_timber(){
+    static function clear_cache_timber() {
         $loader = new TimberLoader();
         return $loader->clear_cache_timber();
     }
 
-    static function clear_cache_twig(){
+    static function clear_cache_twig() {
         $loader = new TimberLoader();
         return $loader->clear_cache_twig();
     }

lib/integrations/wpcli-timber.php

Indentation +46 added lines, -46 removed lines

@@ -5,53 +5,53 @@
 
 class Timber_WP_CLI_Command extends WP_CLI_Command {
 
-    /**
-     * Clears Timber and Twig's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache
-     *
-     */
-    public function clear_cache($mode = 'all') {
-        TimberCommand::clear_cache($mode);
-    }
+	/**
+	 * Clears Timber and Twig's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache
+	 *
+	 */
+	public function clear_cache($mode = 'all') {
+		TimberCommand::clear_cache($mode);
+	}
 
-    /**
-     * Clears Twig's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache_twig
-     *
-     */
-    function clear_cache_twig(){
-        $clear = TimberCommand::clear_cache_twig();
-        if ($clear){
-            WP_CLI::success('Cleared contents of twig cache');
-        } else {
-            WP_CLI::warning('Failed to clear twig cache');
-        }
-    }
+	/**
+	 * Clears Twig's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache_twig
+	 *
+	 */
+	function clear_cache_twig(){
+		$clear = TimberCommand::clear_cache_twig();
+		if ($clear){
+			WP_CLI::success('Cleared contents of twig cache');
+		} else {
+			WP_CLI::warning('Failed to clear twig cache');
+		}
+	}
 
-    /**
-     * Clears Timber's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache_timber
-     *
-     */
-    function clear_cache_timber() {
-        $clear = TimberCommand::clear_cache_timber();
-        $message = 'Failed to clear timber cache';
-        if ($clear){
-            $message = "Cleared contents of Timber's Cache";
-            WP_CLI::success($message);
-        } else {
-            WP_CLI::warning($message);
-        }
-        return $message;
-    }
+	/**
+	 * Clears Timber's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache_timber
+	 *
+	 */
+	function clear_cache_timber() {
+		$clear = TimberCommand::clear_cache_timber();
+		$message = 'Failed to clear timber cache';
+		if ($clear){
+			$message = "Cleared contents of Timber's Cache";
+			WP_CLI::success($message);
+		} else {
+			WP_CLI::warning($message);
+		}
+		return $message;
+	}
 
 }

Spacing +4 added lines, -4 removed lines

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

lib/timber-admin.php

Indentation +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
 
 class TimberAdmin {
 
-    public static function init() {
-        return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
-    }
+	public static function init() {
+		return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
+	}
 
 	/**
 	 * @param array   $links

Spacing +3 added lines, -3 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);
     }
 
 	/**
@@ -11,8 +11,8 @@ 
 	 * @param string  $file
 	 * @return array
 	 */
-	public static function meta_links( $links, $file ) {
-		if ( strstr( $file, '/timber.php' ) ) {
+	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>';

lib/timber-core-interface.php

Spacing +4 added lines, -4 removed lines

@@ -2,15 +2,15 @@
 
 interface TimberCoreInterface {
 
-	public function __call( $field, $args );
+	public function __call($field, $args);
 
-	public function __get( $field );
+	public function __get($field);
 
 	/**
 	 * @return boolean
 	 */
-	public function __isset( $field );
+	public function __isset($field);
 
-	public function meta( $key );
+	public function meta($key);
 
 }

lib/timber-core.php

Indentation +103 added lines, -103 removed lines

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

Spacing +17 added lines, -17 removed lines

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

lib/timber-image-helper.php

Indentation +15 added lines, -15 removed lines

@@ -108,23 +108,23 @@
 		//its a gif so test
 		if(!($fh = @fopen($file, 'rb'))) {
 		  	return false;
-	    }
-	    $count = 0;
-	    //an animated gif contains multiple "frames", with each frame having a
-	    //header made up of:
-	    // * a static 4-byte sequence (\x00\x21\xF9\x04)
-	    // * 4 variable bytes
-	    // * a static 2-byte sequence (\x00\x2C)
+		}
+		$count = 0;
+		//an animated gif contains multiple "frames", with each frame having a
+		//header made up of:
+		// * a static 4-byte sequence (\x00\x21\xF9\x04)
+		// * 4 variable bytes
+		// * a static 2-byte sequence (\x00\x2C)
 
-	    // We read through the file til we reach the end of the file, or we've found
-	    // at least 2 frame headers
-	    while(!feof($fh) && $count < 2) {
-	        $chunk = fread($fh, 1024 * 100); //read 100kb at a time
-	        $count += preg_match_all('#\x00\x21\xF9\x04.{4}\x00[\x2C\x21]#s', $chunk, $matches);
-	    }
+		// We read through the file til we reach the end of the file, or we've found
+		// at least 2 frame headers
+		while(!feof($fh) && $count < 2) {
+			$chunk = fread($fh, 1024 * 100); //read 100kb at a time
+			$count += preg_match_all('#\x00\x21\xF9\x04.{4}\x00[\x2C\x21]#s', $chunk, $matches);
+		}
 
-	    fclose($fh);
-	    return $count > 1;
+		fclose($fh);
+		return $count > 1;
 	}
 
 	/**

Spacing +84 added lines, -84 removed lines

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