jarednova / timber

lib/timber-integrations.php

Spacing +4 added lines, -4 removed lines

@@ -7,16 +7,16 @@
 class TimberIntegrations {
     public static function init() {
 
-        add_action( 'init', array( __CLASS__, 'maybe_init_acftimber' ) );
+        add_action('init', array(__CLASS__, 'maybe_init_acftimber'));
 
-        if ( class_exists( 'WP_CLI_Command' ) ) {
-            WP_CLI::add_command( 'timber', 'Timber_WP_CLI_Command' );
+        if ( class_exists('WP_CLI_Command') ) {
+            WP_CLI::add_command('timber', 'Timber_WP_CLI_Command');
         }
     }
 
     public static function maybe_init_acftimber() {
 
-        if ( class_exists( 'ACF' ) ) {
+        if ( class_exists('ACF') ) {
             new ACFTimber();
         }
 

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-posts-collection.php

Spacing +20 added lines, -20 removed lines

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

lib/timber-url-helper.php

Spacing +55 added lines, -55 removed lines

@@ -9,8 +9,8 @@ 
 	 */
 	public static function get_current_url() {
 		$pageURL = "http://";
-		if ( isset( $_SERVER['HTTPS'] ) && $_SERVER["HTTPS"] == "on" ) {
-			$pageURL = "https://";;
+		if ( isset($_SERVER['HTTPS']) && $_SERVER["HTTPS"] == "on" ) {
+			$pageURL = "https://"; ;
 		}
 		if ( isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] && $_SERVER["SERVER_PORT"] != "80" ) {
 			$pageURL .= self::get_host() . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
@@ -27,11 +27,11 @@ 
 	 * @return bool
 	 */
 	public static function is_url( $url ) {
-		if ( !is_string( $url ) ) {
+		if ( !is_string($url) ) {
 			return false;
 		}
-		$url = strtolower( $url );
-		if ( strstr( $url, '://' ) ) {
+		$url = strtolower($url);
+		if ( strstr($url, '://') ) {
 			return true;
 		}
 		return false;
@@ -43,11 +43,11 @@ 
 	 * @return string
 	 */
 	public static function get_path_base() {
-		$struc = get_option( 'permalink_structure' );
-		$struc = explode( '/', $struc );
+		$struc = get_option('permalink_structure');
+		$struc = explode('/', $struc);
 		$p = '/';
 		foreach ( $struc as $s ) {
-			if ( !strstr( $s, '%' ) && strlen( $s ) ) {
+			if ( !strstr($s, '%') && strlen($s) ) {
 				$p .= $s . '/';
 			}
 		}
@@ -62,21 +62,21 @@ 
 	 * @return string
 	 */
 	public static function get_rel_url( $url, $force = false ) {
-		$url_info = parse_url( $url );
-		if ( isset( $url_info['host'] ) && $url_info['host'] != self::get_host() && !$force ) {
+		$url_info = parse_url($url);
+		if ( isset($url_info['host']) && $url_info['host'] != self::get_host() && !$force ) {
 			return $url;
 		}
 		$link = '';
-		if ( isset( $url_info['path'] ) ) {
+		if ( isset($url_info['path']) ) {
 			$link = $url_info['path'];
 		}
-		if ( isset( $url_info['query'] ) && strlen( $url_info['query'] ) ) {
+		if ( isset($url_info['query']) && strlen($url_info['query']) ) {
 			$link .= '?' . $url_info['query'];
 		}
-		if ( isset( $url_info['fragment'] ) && strlen( $url_info['fragment'] ) ) {
+		if ( isset($url_info['fragment']) && strlen($url_info['fragment']) ) {
 			$link .= '#' . $url_info['fragment'];
 		}
-		$link = TimberURLHelper::remove_double_slashes( $link );
+		$link = TimberURLHelper::remove_double_slashes($link);
 		return $link;
 	}
 
@@ -86,10 +86,10 @@ 
 	 * @return string the HTTP_HOST or SERVER_NAME
 	 */
 	public static function get_host() {
-		if (isset($_SERVER['HTTP_HOST'])) {
+		if ( isset($_SERVER['HTTP_HOST']) ) {
 			return $_SERVER['HTTP_HOST'];
 		}
-		if (isset($_SERVER['SERVER_NAME'])) {
+		if ( isset($_SERVER['SERVER_NAME']) ) {
 			return $_SERVER['SERVER_NAME'];
 		}
 		return '';
@@ -102,7 +102,7 @@ 
 	 * @return bool
 	 */
 	public static function is_local( $url ) {
-		if ( strstr( $url, self::get_host() ) ) {
+		if ( strstr($url, self::get_host()) ) {
 			return true;
 		}
 		return false;
@@ -117,7 +117,7 @@ 
 	public static function get_full_path( $src ) {
 		$root = ABSPATH;
 		$old_root_path = $root . $src;
-		$old_root_path = str_replace( '//', '/', $old_root_path );
+		$old_root_path = str_replace('//', '/', $old_root_path);
 		return $old_root_path;
 	}
 
@@ -130,15 +130,15 @@ 
 	 * @return string
 	 */
 	public static function url_to_file_system( $url ) {
-		$url_parts = parse_url( $url );
+		$url_parts = parse_url($url);
 		$path = ABSPATH . $url_parts['path'];
-		$path = str_replace( '//', '/', $path );
+		$path = str_replace('//', '/', $path);
 		return $path;
 	}
 
 	public static function file_system_to_url( $fs ) {
-		$relative_path = self::get_rel_path( $fs );
-		$home = home_url( '/'.$relative_path );
+		$relative_path = self::get_rel_path($fs);
+		$home = home_url('/' . $relative_path);
 		return $home;
 	}
 
@@ -149,11 +149,11 @@ 
 	 * @return string
 	 */
 	public static function get_rel_path( $src ) {
-		if ( strstr( $src, ABSPATH ) ) {
-			return str_replace( ABSPATH, '', $src );
+		if ( strstr($src, ABSPATH) ) {
+			return str_replace(ABSPATH, '', $src);
 		}
 		//its outside the wordpress directory, alternate setups:
-		$src = str_replace( WP_CONTENT_DIR, '', $src );
+		$src = str_replace(WP_CONTENT_DIR, '', $src);
 		return WP_CONTENT_SUBDIR . $src;
 	}
 
@@ -164,9 +164,9 @@ 
 	 * @return string
 	 */
 	public static function remove_double_slashes( $url ) {
-		$url = str_replace( '//', '/', $url );
-		if ( strstr( $url, 'http:' ) && !strstr( $url, 'http://' ) ) {
-			$url = str_replace( 'http:/', 'http://', $url );
+		$url = str_replace('//', '/', $url);
+		if ( strstr($url, 'http:') && !strstr($url, 'http://') ) {
+			$url = str_replace('http:/', 'http://', $url);
 		}
 		return $url;
 	}
@@ -179,19 +179,19 @@ 
 	 * @return string
 	 */
 	public static function prepend_to_url( $url, $path ) {
-		if ( strstr( strtolower( $url ), 'http' ) ) {
-			$url_parts = parse_url( $url );
+		if ( strstr(strtolower($url), 'http') ) {
+			$url_parts = parse_url($url);
 			$url = $url_parts['scheme'] . '://' . $url_parts['host'] . $path . $url_parts['path'];
-			if ( isset( $url_parts['query'] ) ) {
+			if ( isset($url_parts['query']) ) {
 				$url .= $url_parts['query'];
 			}
-			if ( isset( $url_parts['fragment'] ) ) {
+			if ( isset($url_parts['fragment']) ) {
 				$url .= $url_parts['fragment'];
 			}
 		} else {
 			$url = $url . $path;
 		}
-		return self::remove_double_slashes( $url );
+		return self::remove_double_slashes($url);
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 * @return string
 	 */
 	public static function preslashit( $path ) {
-		if ( strpos( $path, '/' ) != 0 ) {
+		if ( strpos($path, '/') != 0 ) {
 			$path = '/' . $path;
 		}
 		return $path;
@@ -213,7 +213,7 @@ 
 	 * @return boolean true if $path is an absolute url, false if relative.
 	 */
 	public static function is_absolute( $path ) {
-		return (boolean) ( strstr( $path, 'http' ) );
+		return (boolean) (strstr($path, 'http'));
 	}
 
 	/**
@@ -225,21 +225,21 @@ 
 	 * @return boolean if $url points to an external location returns true
 	 */
 	public static function is_external_content( $url ) {
-		$is_external = TimberURLHelper::is_absolute( $url ) && ! TimberURLHelper::is_internal_content( $url );
+		$is_external = TimberURLHelper::is_absolute($url) && !TimberURLHelper::is_internal_content($url);
 
 		return $is_external;
 	}
 
-	private static function is_internal_content($url) {
+	private static function is_internal_content( $url ) {
 		// using content_url() instead of site_url or home_url is IMPORTANT
 		// otherwise you run into errors with sites that:
 		// 1. use WPML plugin
 		// 2. or redefine content directory
-		$is_content_url = strstr( $url, content_url() );
+		$is_content_url = strstr($url, content_url());
 
 		// this case covers when the upload directory has been redefined
 		$upload_dir = wp_upload_dir();
-		$is_upload_url = strstr( $url, $upload_dir['baseurl'] );
+		$is_upload_url = strstr($url, $upload_dir['baseurl']);
 
 		return $is_content_url || $is_upload_url;
 	}
@@ -252,8 +252,8 @@ 
 	 *                  true if it's a subdomain (http://cdn.example.org = true)
 	 */
 	public static function is_external( $url ) {
-		$has_http = strstr( strtolower( $url ), 'http' );
-		$on_domain = strstr( $url, self::get_host() );
+		$has_http = strstr(strtolower($url), 'http');
+		$on_domain = strstr($url, self::get_host());
 		if ( $has_http && !$on_domain ) {
 			return true;
 		}
@@ -268,7 +268,7 @@ 
 	 */
 	public static function remove_trailing_slash( $link ) {
 		if ( $link != "/" )
-			$link = untrailingslashit( $link );
+			$link = untrailingslashit($link);
 		return $link;
 	}
 
@@ -282,23 +282,23 @@ 
 	 */
 	static function download_url( $url, $timeout = 300 ) {
 		if ( !$url ) {
-			return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
+			return new WP_Error('http_no_url', __('Invalid URL Provided.'));
 		}
 
-		$tmpfname = wp_tempnam( $url );
+		$tmpfname = wp_tempnam($url);
 		if ( !$tmpfname ) {
-			return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
+			return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 		}
 
-		$response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+		$response = wp_remote_get($url, array('timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname));
 
-		if ( is_wp_error( $response ) ) {
-			unlink( $tmpfname );
+		if ( is_wp_error($response) ) {
+			unlink($tmpfname);
 			return $response;
 		}
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $tmpfname );
-			return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+		if ( 200 != wp_remote_retrieve_response_code($response) ) {
+			unlink($tmpfname);
+			return new WP_Error('http_404', trim(wp_remote_retrieve_response_message($response)));
 		}
 		return $tmpfname;
 	}
@@ -312,10 +312,10 @@ 
 	 * @return array|string
 	 */
 	public static function get_params( $i = false ) {
-		$args = explode( '/', trim( strtolower( $_SERVER['REQUEST_URI'] ) ) );
+		$args = explode('/', trim(strtolower($_SERVER['REQUEST_URI'])));
 		$newargs = array();
 		foreach ( $args as $arg ) {
-			if ( strlen( $arg ) ) {
+			if ( strlen($arg) ) {
 				$newargs[] = $arg;
 			}
 		}
@@ -324,9 +324,9 @@ 
 		}
 		if ( $i < 0 ) {
 			//count from end
-			$i = count( $newargs ) + $i;
+			$i = count($newargs) + $i;
 		}
-		if ( isset( $newargs[$i] ) ) {
+		if ( isset($newargs[$i]) ) {
 			return $newargs[$i];
 		}
 	}

lib/timber-site.php

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

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
      * Construct our operation
      * @param float   $factor to multiply original dimensions by
      */
-    function __construct($factor) {
+    function __construct( $factor ) {
         $this->factor = $factor;
     }
 
@@ -28,7 +28,7 @@ 
      * @param   string    $src_extension    the extension (ex: .jpg)
      * @return  string    the final filename to be used (ex: my-awesome-pic@2x.jpg)
      */
-    function filename($src_filename, $src_extension) {
+    function filename( $src_filename, $src_extension ) {
         $newbase = $src_filename . '@' . $this->factor . 'x'; // add @2x, @3x, @1.5x, etc.
         $new_name = $newbase . '.' . $src_extension;
         return $new_name;
@@ -44,30 +44,30 @@ 
      *                               (ex: /src/var/www/wp-content/uploads/my-pic@2x.jpg)
      * @return bool                  true if everything went fine, false otherwise
      */
-    function run($load_filename, $save_filename){
-        $image = wp_get_image_editor( $load_filename );
-        if ( !is_wp_error( $image ) ) {
+    function run( $load_filename, $save_filename ) {
+        $image = wp_get_image_editor($load_filename);
+        if ( !is_wp_error($image) ) {
             $current_size = $image->get_size();
             $src_w = $current_size['width'];
             $src_h = $current_size['height'];
             // Get ratios
             $w = $src_w * $this->factor;
             $h = $src_h * $this->factor;
-            $image->crop( 0, 0, $src_w, $src_h, $w, $h );
-            $result = $image->save( $save_filename );
-            if ( is_wp_error( $result ) ) {
+            $image->crop(0, 0, $src_w, $src_h, $w, $h);
+            $result = $image->save($save_filename);
+            if ( is_wp_error($result) ) {
             	// @codeCoverageIgnoreStart
-				TimberHelper::error_log( 'Error resizing image' );
-				TimberHelper::error_log( $result );
+				TimberHelper::error_log('Error resizing image');
+				TimberHelper::error_log($result);
 				return false;
 				// @codeCoverageIgnoreEnd
             } else {
                 return true;
             }
-        } else if ( isset( $image->error_data['error_loading_image'] ) ) {
-            TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
+        } else if ( isset($image->error_data['error_loading_image']) ) {
+            TimberHelper::error_log('Error loading ' . $image->error_data['error_loading_image']);
         } else {
-            TimberHelper::error_log( $image );
+            TimberHelper::error_log($image);
         }
         return false;
     }

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

Spacing +32 added lines, -32 removed lines

@@ -17,12 +17,12 @@ 
 	 * @param int    $h    height of new image
 	 * @param string $crop cropping method, one of: 'default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center'.
 	 */
-	function __construct($w, $h, $crop) {
+	function __construct( $w, $h, $crop ) {
 		$this->w = $w;
 		$this->h = $h;
 		// Sanitize crop position
-		$allowed_crop_positions = array( 'default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center' );
-		if ( $crop !== false && !in_array( $crop, $allowed_crop_positions ) ) {
+		$allowed_crop_positions = array('default', 'center', 'top', 'bottom', 'left', 'right', 'top-center', 'bottom-center');
+		if ( $crop !== false && !in_array($crop, $allowed_crop_positions) ) {
 			$crop = $allowed_crop_positions[0];
 		}
 		$this->crop = $crop;
@@ -33,7 +33,7 @@ 
 	 * @param   string    $src_extension    the extension (ex: .jpg)
 	 * @return  string    the final filename to be used (ex: my-awesome-pic-300x200-c-default.jpg)
 	 */
-	public function filename($src_filename, $src_extension) {
+	public function filename( $src_filename, $src_extension ) {
 		$w = 0;
 		$h = 0;
 		if ( $this->w ) {
@@ -42,9 +42,9 @@ 
 		if ( $this->h ) {
 			$h = $this->h;
 		}
-		$result = $src_filename . '-' . $w . 'x' . $h . '-c-' . ( $this->crop ? $this->crop : 'f' ); // Crop will be either user named or f (false)
-		if($src_extension) {
-			$result .= '.'.$src_extension;
+		$result = $src_filename . '-' . $w . 'x' . $h . '-c-' . ($this->crop ? $this->crop : 'f'); // Crop will be either user named or f (false)
+		if ( $src_extension ) {
+			$result .= '.' . $src_extension;
 		}
 		return $result;
 	}
@@ -54,7 +54,7 @@ 
 	 * @param string $save_filename
 	 */
 	protected function run_animated_gif( $load_filename, $save_filename ) {
-		$image = wp_get_image_editor( $load_filename );
+		$image = wp_get_image_editor($load_filename);
 		$current_size = $image->get_size();
 		$src_w = $current_size['width'];
 		$src_h = $current_size['height'];
@@ -65,8 +65,8 @@ 
 		}
 		$image = new Imagick($load_filename);
 		$image = $image->coalesceImages();
-		$crop = self::get_target_sizes( $load_filename );
-		foreach ($image as $frame) {
+		$crop = self::get_target_sizes($load_filename);
+		foreach ( $image as $frame ) {
 			$frame->cropImage($crop['src_w'], $crop['src_h'], $crop['x'], $crop['y']);
 			$frame->thumbnailImage($w, $h);
 			$frame->setImagePage($w, $h, 0, 0);
@@ -76,7 +76,7 @@ 
 	}
 
 	protected function get_target_sizes( $load_filename ) {
-		$image = wp_get_image_editor( $load_filename );
+		$image = wp_get_image_editor($load_filename);
 		$w = $this->w;
 		$h = $this->h;
 		$crop = $this->crop;
@@ -86,11 +86,11 @@ 
 		$src_h = $current_size['height'];
 		$src_ratio = $src_w / $src_h;
 		if ( !$h ) {
-			$h = round( $w / $src_ratio );
+			$h = round($w / $src_ratio);
 		}
 		if ( !$w ) {
 			//the user wants to resize based on constant height
-			$w = round( $h * $src_ratio );
+			$w = round($h * $src_ratio);
 		}
 		if ( !$crop ) {
 			return array(
@@ -104,13 +104,13 @@ 
 		$src_wt = $src_h * $dest_ratio;
 		$src_ht = $src_w / $dest_ratio;
 		$src_x = $src_w / 2 - $src_wt / 2;
-		$src_y = ( $src_h - $src_ht ) / 6;
+		$src_y = ($src_h - $src_ht) / 6;
 		//now specific overrides based on options:
 		switch ( $crop ) {
 			case 'center':
 				// Get source x and y
-				$src_x = round( ( $src_w - $src_wt ) / 2 );
-				$src_y = round( ( $src_h - $src_ht ) / 2 );
+				$src_x = round(($src_w - $src_wt) / 2);
+				$src_y = round(($src_h - $src_ht) / 2);
 				break;
 
 			case 'top':
@@ -122,11 +122,11 @@ 
 				break;
 
 			case 'top-center':
-				$src_y = round( ( $src_h - $src_ht ) / 4 );
+				$src_y = round(($src_h - $src_ht) / 4);
 				break;
 
 			case 'bottom-center':
-				$src_y = $src_h - $src_ht - round( ( $src_h - $src_ht ) / 4 );
+				$src_y = $src_h - $src_ht - round(($src_h - $src_ht) / 4);
 				break;
 
 			case 'left':
@@ -138,7 +138,7 @@ 
 				break;
 		}
 		// Crop the image
-		return ( $dest_ratio > $src_ratio )
+		return ($dest_ratio > $src_ratio)
 			? array(
 				'x' => 0, 'y' => $src_y,
 				'src_w' => $src_w, 'src_h' => $src_ht,
@@ -161,42 +161,42 @@ 
 	 *                               (ex: /src/var/www/wp-content/uploads/my-pic-300x200-c-default.jpg)
 	 * @return bool                  true if everything went fine, false otherwise
 	 */
-	public function run($load_filename, $save_filename) {
+	public function run( $load_filename, $save_filename ) {
 		//should be resized by gif resizer
 		if ( TimberImageHelper::is_animated_gif($load_filename) ) {
 			//attempt to resize
 			//return if successful
 			//proceed if not
 			$gif = self::run_animated_gif($load_filename, $save_filename);
-			if ($gif) {
+			if ( $gif ) {
 				return true;
 			}
 		}
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
-			$crop = self::get_target_sizes( $load_filename );
-			$image->crop( 	$crop['x'],
+		$image = wp_get_image_editor($load_filename);
+		if ( !is_wp_error($image) ) {
+			$crop = self::get_target_sizes($load_filename);
+			$image->crop($crop['x'],
 							$crop['y'],
 							$crop['src_w'],
 							$crop['src_h'],
 							$crop['target_w'],
 							$crop['target_h']
 			);
-			$result = $image->save( $save_filename );
-			if ( is_wp_error( $result ) ) {
+			$result = $image->save($save_filename);
+			if ( is_wp_error($result) ) {
 				// @codeCoverageIgnoreStart
-				TimberHelper::error_log( 'Error resizing image' );
-				TimberHelper::error_log( $result );
+				TimberHelper::error_log('Error resizing image');
+				TimberHelper::error_log($result);
 				return false;
 				// @codeCoverageIgnoreEnd
 			} else {
 				return true;
 			}
-		} else if ( isset( $image->error_data['error_loading_image'] ) ) {
+		} else if ( isset($image->error_data['error_loading_image']) ) {
 			// @codeCoverageIgnoreStart
-			TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
+			TimberHelper::error_log('Error loading ' . $image->error_data['error_loading_image']);
 		} else {
-			TimberHelper::error_log( $image );
+			TimberHelper::error_log($image);
 			// @codeCoverageIgnoreEnd
 		}
 	}

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

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

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