jarednova / timber

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

Spacing +11 added lines, -11 removed lines

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

@@ -21,8 +21,8 @@ 
 		$this->w = $w;
 		$this->h = $h;
 		// Sanitize crop position
-		$allowed_crop_positions = array( 'default', 'center', 'top', 'bottom', 'left', 'right' );
-		if ( $crop !== false && !in_array( $crop, $allowed_crop_positions ) ) {
+		$allowed_crop_positions = array('default', 'center', 'top', 'bottom', 'left', 'right');
+		if ( $crop !== false && !in_array($crop, $allowed_crop_positions) ) {
 			$crop = $allowed_crop_positions[0];
 		}
 		$this->crop = $crop;
@@ -42,15 +42,15 @@ 
 		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;
 	}
 
-	protected function run_animated_gif( $load_filename, $save_filename ) {
-		$image = wp_get_image_editor( $load_filename );
+	protected function run_animated_gif($load_filename, $save_filename) {
+		$image = wp_get_image_editor($load_filename);
 		$current_size = $image->get_size();
 		$src_w = $current_size['width'];
 		$src_h = $current_size['height'];
@@ -61,7 +61,7 @@ 
 		}
 		$image = new Imagick($load_filename);
 		$image = $image->coalesceImages();
-		$crop = self::get_target_sizes( $load_filename );
+		$crop = self::get_target_sizes($load_filename);
 		foreach ($image as $frame) {
 			$frame->cropImage($crop['src_w'], $crop['src_h'], $crop['x'], $crop['y']);
 			$frame->thumbnailImage($w, $h);
@@ -71,8 +71,8 @@ 
 		return $image->writeImages($save_filename, true);
 	}
 
-	protected function get_target_sizes( $load_filename ) {
-		$image = wp_get_image_editor( $load_filename );
+	protected function get_target_sizes($load_filename) {
+		$image = wp_get_image_editor($load_filename);
 		$w = $this->w;
 		$h = $this->h;
 		$crop = $this->crop;
@@ -82,11 +82,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(
@@ -100,12 +100,12 @@ 
 		$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:
 		if ( $crop == '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);
 		} else if ( $crop == 'top' ) {
 			$src_y = 0;
 		} else if ( $crop == 'bottom' ) {
@@ -147,35 +147,35 @@ 
 			//return if successful
 			//proceed if not
 			$gif = self::run_animated_gif($load_filename, $save_filename);
-			if ($gif) {
+			if ( $gif ) {
 				return true;
 			}
 		}
-		$image = wp_get_image_editor( $load_filename );
-		if ( !is_wp_error( $image ) ) {
-			$crop = self::get_target_sizes( $load_filename );
-			$image->crop( 	$crop['x'],
+		$image = wp_get_image_editor($load_filename);
+		if ( !is_wp_error($image) ) {
+			$crop = self::get_target_sizes($load_filename);
+			$image->crop($crop['x'],
 							$crop['y'],
 							$crop['src_w'],
 							$crop['src_h'],
 							$crop['target_w'],
 							$crop['target_h']
 			);
-			$result = $image->save( $save_filename );
-			if ( is_wp_error( $result ) ) {
+			$result = $image->save($save_filename);
+			if ( is_wp_error($result) ) {
 				// @codeCoverageIgnoreStart
-				TimberHelper::error_log( 'Error resizing image' );
-				TimberHelper::error_log( $result );
+				TimberHelper::error_log('Error resizing image');
+				TimberHelper::error_log($result);
 				return false;
 				// @codeCoverageIgnoreEnd
 			} else {
 				return true;
 			}
-		} else if ( isset( $image->error_data['error_loading_image'] ) ) {
+		} else if ( isset($image->error_data['error_loading_image']) ) {
 			// @codeCoverageIgnoreStart
-			TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
+			TimberHelper::error_log('Error loading ' . $image->error_data['error_loading_image']);
 		} else {
-			TimberHelper::error_log( $image );
+			TimberHelper::error_log($image);
 			// @codeCoverageIgnoreEnd
 		}
 	}

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

Spacing +12 added lines, -12 removed lines

@@ -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;
 	}
 
@@ -51,10 +51,10 @@ 
 	 * @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' ) {
+	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'];
 			}
 		}
@@ -68,6 +68,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/timber-term-getter.php

Spacing +29 added lines, -29 removed lines

@@ -8,40 +8,40 @@ 
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
-		if (is_string($maybe_args) && !strstr($maybe_args, '=')){
+	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+		if ( is_string($maybe_args) && !strstr($maybe_args, '=') ) {
 			//the user is sending the $TermClass in the second argument
 			$TermClass = $maybe_args;
 		}
-		if (is_string($maybe_args) && strstr($maybe_args, '=')){
+		if ( is_string($maybe_args) && strstr($maybe_args, '=') ) {
 			parse_str($maybe_args, $maybe_args);
 		}
-		if (is_string($args) && strstr($args, '=')){
+		if ( is_string($args) && strstr($args, '=') ) {
 			//a string and a query string!
 			$parsed = self::get_term_query_from_query_string($args);
-			if (is_array($maybe_args)){
+			if ( is_array($maybe_args) ) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_string($args)){
+		} else if ( is_string($args) ) {
 			//its just a string with a single taxonomy
 			$parsed = self::get_term_query_from_string($args);
-			if (is_array($maybe_args)){
+			if ( is_array($maybe_args) ) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_array($args) && TimberHelper::is_array_assoc($args)){
+		} else if ( is_array($args) && TimberHelper::is_array_assoc($args) ) {
 			//its an associative array, like a good ole query
 			$parsed = self::get_term_query_from_assoc_array($args);
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_array($args)){
+		} else if ( is_array($args) ) {
 			//its just an array of strings or IDs (hopefully)
 			$parsed = self::get_term_query_from_array($args);
-			if (is_array($maybe_args)){
+			if ( is_array($maybe_args) ) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_null($args)) {
+		} else if ( is_null($args) ) {
 			return self::handle_term_query(get_taxonomies(), array(), $TermClass);
 		}
 		return null;
@@ -53,18 +53,18 @@ 
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function handle_term_query($taxonomies, $args, $TermClass){
-		if (!isset($args['hide_empty'])){
+	public static function handle_term_query($taxonomies, $args, $TermClass) {
+		if ( !isset($args['hide_empty']) ) {
 			$args['hide_empty'] = false;
 		}
-		if (isset($args['term_id']) && is_int($args['term_id'])){
+		if ( isset($args['term_id']) && is_int($args['term_id']) ) {
 			$args['term_id'] = array($args['term_id']);
 		}
-		if (isset($args['term_id'])){
+		if ( isset($args['term_id']) ) {
 			$args['include'] = $args['term_id'];
 		}
 		$terms = get_terms($taxonomies, $args);
-		foreach($terms as &$term){
+		foreach ($terms as &$term) {
 			$term = new $TermClass($term->term_id, $term->taxonomy);
 		}
 		return $terms;
@@ -88,7 +88,7 @@ 
 	protected static function get_term_query_from_string($taxs) {
 		$ret = new stdClass();
 		$ret->args = array();
-		if (is_string($taxs)) {
+		if ( is_string($taxs) ) {
 			$taxs = array($taxs);
 		}
 		$ret->taxonomies = self::correct_taxonomy_names($taxs);
@@ -102,17 +102,17 @@ 
 	public static function get_term_query_from_assoc_array($args) {
 		$ret = new stdClass();
 		$ret->args = $args;
-		if (isset($ret->args['tax'])) {
+		if ( isset($ret->args['tax']) ) {
 			$ret->taxonomies = $ret->args['tax'];
-		} else if (isset($ret->args['taxonomies'])) {
+		} else if ( isset($ret->args['taxonomies']) ) {
 			$ret->taxonomies = $ret->args['taxonomies'];
-		} else if (isset($ret->args['taxs'])) {
+		} else if ( isset($ret->args['taxs']) ) {
 			$ret->taxonomies = $ret->args['taxs'];
-		} else if (isset($ret->args['taxonomy'])) {
+		} else if ( isset($ret->args['taxonomy']) ) {
 			$ret->taxonomies = $ret->args['taxonomy'];
 		}
-		if (isset($ret->taxonomies)) {
-			if (is_string($ret->taxonomies)) {
+		if ( isset($ret->taxonomies) ) {
+			if ( is_string($ret->taxonomies) ) {
 				$ret->taxonomies = array($ret->taxonomies);
 			}
 			$ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
@@ -127,11 +127,11 @@ 
 	 * @return stdClass
 	 */
 	public static function get_term_query_from_array($args) {
-		if (is_array($args) && !empty($args)) {
+		if ( is_array($args) && !empty($args) ) {
 			//okay its an array with content
-			if (is_int($args[0])) {
+			if ( is_int($args[0]) ) {
 				return self::get_term_query_from_array_of_ids($args);
-			} else if (is_string($args[0])) {
+			} else if ( is_string($args[0]) ) {
 				return self::get_term_query_from_array_of_strings($args);
 			}
 		}
@@ -165,13 +165,13 @@ 
 	 * @return array
 	 */
 	private static function correct_taxonomy_names($taxs) {
-		if (is_string($taxs)) {
+		if ( is_string($taxs) ) {
 			$taxs = array($taxs);
 		}
 		foreach ($taxs as &$tax) {
-			if ($tax == 'tags' || $tax == 'tag') {
+			if ( $tax == 'tags' || $tax == 'tag' ) {
 				$tax = 'post_tag';
-			} else if ($tax == 'categories') {
+			} else if ( $tax == 'categories' ) {
 				$tax = 'category';
 			}
 		}