jarednova / timber

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

Spacing +13 added lines, -13 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'];
 			}
 		}
@@ -65,9 +65,9 @@ 
 		if ( $ext == 'png' ) {
 			return imagecreatefrompng($filename);
 		}
-		if ( $ext == 'jpg' || $ext == 'jpeg') {
+		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

Braces +15 added lines, -15 removed lines

@@ -8,36 +8,36 @@ 
      * @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);
@@ -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;