litefeel / writing-on-github

lib/import.php

Indentation +26 added lines, -26 removed lines

@@ -26,24 +26,24 @@ 
 		$this->app = $app;
 	}
 
-    /**
-     * Imports a payload.
-     * @param  Writing_On_GitHub_Payload $payload
-     *
-     * @return string|WP_Error
-     */
+	/**
+	 * Imports a payload.
+	 * @param  Writing_On_GitHub_Payload $payload
+	 *
+	 * @return string|WP_Error
+	 */
 	public function payload( Writing_On_GitHub_Payload $payload ) {
 
 		$result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
 
 		if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
+			/* @var WP_Error $result */
 			return $result;
 		}
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
-        }
+		if ( is_array( $result ) ) {
+			$result = $this->import_files( $result );
+		}
 
 		if ( is_wp_error( $result ) ) {
 			return $files;
@@ -55,7 +55,7 @@ 
 	/**
 	 * import blob by files
 	 * @param  Writing_On_GitHub_File_Info[] $files
-     *
+	 *
 	 * @return string|WP_Error
 	 */
 	protected function import_files( $files ) {
@@ -73,8 +73,8 @@ 
 			foreach ($delete_ids as $id) {
 				$result = $this->app->database()->delete_post( $id );
 				if ( is_wp_error( $result ) ) {
-                    /* @var WP_Error $result */
-                    $error = wogh_append_error( $error, $result );
+					/* @var WP_Error $result */
+					$error = wogh_append_error( $error, $result );
 				}
 			}
 		}
@@ -91,32 +91,32 @@ 
 		$result = $this->app->api()->fetch()->tree_recursive();
 
 		if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
+			/* @var WP_Error $result */
 			return $result;
 		}
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
-        }
+		if ( is_array( $result ) ) {
+			$result = $this->import_files( $result );
+		}
 
 		if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
+			/* @var WP_Error $result */
 			return $result;
 		}
 
 		return __( 'Payload processed', 'writing-on-github' );
 	}
 
-    /**
-     * Do compare
-     * @param  Writing_On_GitHub_File_Info[]|WP_Error $files
-     * @param  int[] &$delete_ids
-     *
-     * @return string|WP_Error
-     */
+	/**
+	 * Do compare
+	 * @param  Writing_On_GitHub_File_Info[]|WP_Error $files
+	 * @param  int[] &$delete_ids
+	 *
+	 * @return string|WP_Error
+	 */
 	protected function compare( $files, &$delete_ids ) {
 		if ( is_wp_error( $files ) ) {
-            /* @var WP_Error $files */
+			/* @var WP_Error $files */
 			return $files;
 		}
 

Spacing +79 added lines, -79 removed lines

@@ -22,7 +22,7 @@ 
 	 *
 	 * @param Writing_On_GitHub $app Application container.
 	 */
-	public function __construct( Writing_On_GitHub $app ) {
+	public function __construct(Writing_On_GitHub $app) {
 		$this->app = $app;
 	}
 
@@ -32,24 +32,24 @@ 
      *
      * @return string|WP_Error
      */
-	public function payload( Writing_On_GitHub_Payload $payload ) {
+	public function payload(Writing_On_GitHub_Payload $payload) {
 
-		$result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
+		$result = $this->app->api()->fetch()->compare($payload->get_before_commit_id());
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
             /* @var WP_Error $result */
 			return $result;
 		}
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($result)) {
+            $result = $this->import_files($result);
         }
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			return $files;
 		}
 
-		return __( 'Payload processed', 'writing-on-github' );
+		return __('Payload processed', 'writing-on-github');
 	}
 
 	/**
@@ -58,23 +58,23 @@ 
      *
 	 * @return string|WP_Error
 	 */
-	protected function import_files( $files ) {
+	protected function import_files($files) {
 
-		$error 		= false;
+		$error = false;
 		$delete_ids = false;
 
-		$result = $this->compare( $files, $delete_ids );
+		$result = $this->compare($files, $delete_ids);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			return $result;
 		}
 
-		if ( $delete_ids ) {
+		if ($delete_ids) {
 			foreach ($delete_ids as $id) {
-				$result = $this->app->database()->delete_post( $id );
-				if ( is_wp_error( $result ) ) {
+				$result = $this->app->database()->delete_post($id);
+				if (is_wp_error($result)) {
                     /* @var WP_Error $result */
-                    $error = wogh_append_error( $error, $result );
+                    $error = wogh_append_error($error, $result);
 				}
 			}
 		}
@@ -90,21 +90,21 @@ 
 	public function master() {
 		$result = $this->app->api()->fetch()->tree_recursive();
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
             /* @var WP_Error $result */
 			return $result;
 		}
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($result)) {
+            $result = $this->import_files($result);
         }
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
             /* @var WP_Error $result */
 			return $result;
 		}
 
-		return __( 'Payload processed', 'writing-on-github' );
+		return __('Payload processed', 'writing-on-github');
 	}
 
     /**
@@ -114,8 +114,8 @@ 
      *
      * @return string|WP_Error
      */
-	protected function compare( $files, &$delete_ids ) {
-		if ( is_wp_error( $files ) ) {
+	protected function compare($files, &$delete_ids) {
+		if (is_wp_error($files)) {
             /* @var WP_Error $files */
 			return $files;
 		}
@@ -125,62 +125,62 @@ 
 
 		$idsmap = array();
 
-		foreach ( $files as $file ) {
-			if ( ! $this->importable_file( $file ) ) {
+		foreach ($files as $file) {
+			if ( ! $this->importable_file($file)) {
 				continue;
 			}
 
-			$blob = $this->app->api()->fetch()->blob( $file );
+			$blob = $this->app->api()->fetch()->blob($file);
 			// network error ?
-			if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+			if ( ! $blob instanceof Writing_On_GitHub_Blob) {
 				continue;
 			}
 
-			if ( $this->importable_raw_file( $blob ) ) {
-				$this->import_raw_file( $blob, $file->status == 'removed' );
+			if ($this->importable_raw_file($blob)) {
+				$this->import_raw_file($blob, $file->status == 'removed');
 				continue;
 			}
 
-			if ( ! $this->importable_blob( $blob ) ) {
+			if ( ! $this->importable_blob($blob)) {
 				continue;
 			}
 
-			$post = $this->blob_to_post( $blob );
+			$post = $this->blob_to_post($blob);
 
-			if ( $file->status == 'removed' ) {
-				if ( $blob->id() ) {
+			if ($file->status == 'removed') {
+				if ($blob->id()) {
 					$idsmap[$blob->id()] = true;
 				}
-			} elseif ( $post != false ) {
+			} elseif ($post != false) {
 				$posts[] = $post;
-				if ( $post->is_new() ) {
+				if ($post->is_new()) {
 					$new[] = $post;
 				}
 			}
 		}
 
-		foreach ( $posts as $post ) {
-			if ( $post->id() && isset( $idsmap[ $post->id() ] ) ) {
-				unset( $idsmap[ $post->id() ] );
+		foreach ($posts as $post) {
+			if ($post->id() && isset($idsmap[$post->id()])) {
+				unset($idsmap[$post->id()]);
 			}
 		}
 		$delete_ids = array();
-		foreach ( $idsmap as $id => $value ) {
+		foreach ($idsmap as $id => $value) {
 			$delete_ids[] = $id;
 		}
 
 		// $this->app->database()->save_posts( $posts, $commit->author_email() );
 
-		$result = $this->app->database()->save_posts( $posts );
+		$result = $this->app->database()->save_posts($posts);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			return $result;
 		}
 
-		if ( ! empty( $new ) ) {
-			$result = $this->app->export()->new_posts( $new );
+		if ( ! empty($new)) {
+			$result = $this->app->export()->new_posts($new);
 
-			if ( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				return $result;
 			}
 		}
@@ -195,12 +195,12 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+	protected function importable_file(Writing_On_GitHub_File_Info $file) {
 
 		// only _pages and _posts
-		if ( strncasecmp($file->path, '_pages/', strlen('_pages/') ) != 0 &&
-			 strncasecmp($file->path, '_posts/', strlen('_posts/') ) != 0 &&
-			 strncasecmp($file->path, 'images/', strlen('images/') ) != 0 ) {
+		if (strncasecmp($file->path, '_pages/', strlen('_pages/')) != 0 &&
+			 strncasecmp($file->path, '_posts/', strlen('_posts/')) != 0 &&
+			 strncasecmp($file->path, 'images/', strlen('images/')) != 0) {
 			return false;
 		}
 
@@ -219,7 +219,7 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function importable_blob( Writing_On_GitHub_Blob $blob ) {
+	protected function importable_blob(Writing_On_GitHub_Blob $blob) {
 		// global $wpdb;
 
 		// // Skip the repo's readme.
@@ -232,20 +232,20 @@ 
 		// 	return false;
 		// }
 
-		if ( ! $blob->has_frontmatter() ) {
+		if ( ! $blob->has_frontmatter()) {
 			return false;
 		}
 
 		return true;
 	}
 
-	protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
-		if ( $blob->has_frontmatter() ) {
+	protected function importable_raw_file(Writing_On_GitHub_Blob $blob) {
+		if ($blob->has_frontmatter()) {
 			return false;
 		}
 
 		// only images
-		if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
+		if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) {
 			return false;
 		}
 
@@ -257,16 +257,16 @@ 
 	 * @param  Writing_On_GitHub_Blob $blob
 	 * @param  bool                   $is_remove
 	 */
-	protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
+	protected function import_raw_file(Writing_On_GitHub_Blob $blob, $is_remove) {
 		$arr = wp_upload_dir();
 		$path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
-		if ( $is_remove ) {
-			if ( file_exists($path) ) {
+		if ($is_remove) {
+			if (file_exists($path)) {
 				unlink($path);
 			}
 		} else {
 			$dirname = dirname($path);
-			if ( ! file_exists($dirname) ) {
+			if ( ! file_exists($dirname)) {
 				wp_mkdir_p($dirname);
 			}
 
@@ -281,57 +281,57 @@ 
 	 *
 	 * @return Writing_On_GitHub_Post|false
 	 */
-	protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
-		$args = array( 'post_content' => $blob->content_import() );
+	protected function blob_to_post(Writing_On_GitHub_Blob $blob) {
+		$args = array('post_content' => $blob->content_import());
 		$meta = $blob->meta();
 
 		$id = false;
 
-		if ( ! empty( $meta ) ) {
-			if ( array_key_exists( 'layout', $meta ) ) {
+		if ( ! empty($meta)) {
+			if (array_key_exists('layout', $meta)) {
 				$args['post_type'] = $meta['layout'];
-				unset( $meta['layout'] );
+				unset($meta['layout']);
 			}
 
-			if ( array_key_exists( 'published', $meta ) ) {
+			if (array_key_exists('published', $meta)) {
 				$args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
-				unset( $meta['published'] );
+				unset($meta['published']);
 			}
 
-			if ( array_key_exists( 'post_title', $meta ) ) {
+			if (array_key_exists('post_title', $meta)) {
 				$args['post_title'] = $meta['post_title'];
-				unset( $meta['post_title'] );
+				unset($meta['post_title']);
 			}
 
-			if ( array_key_exists( 'post_name', $meta ) ) {
+			if (array_key_exists('post_name', $meta)) {
 				$args['post_name'] = $meta['post_name'];
-				unset( $meta['post_name'] );
+				unset($meta['post_name']);
 			}
 
-			if ( array_key_exists( 'ID', $meta ) ) {
+			if (array_key_exists('ID', $meta)) {
 				$id = $args['ID'] = $meta['ID'];
 				$blob->set_id($id);
-				unset( $meta['ID'] );
+				unset($meta['ID']);
 			}
 		}
 
 		$meta['_wogh_sha'] = $blob->sha();
 
-		if ( $id ) {
-			$old_sha = get_post_meta( $id, '_wogh_sha', true );
-			$old_github_path = get_post_meta( $id, '_wogh_github_path', true );
+		if ($id) {
+			$old_sha = get_post_meta($id, '_wogh_sha', true);
+			$old_github_path = get_post_meta($id, '_wogh_github_path', true);
 
 			// dont save post when has same sha
-			if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
-				 $old_github_path && $old_github_path == $blob->path() ) {
+			if ($old_sha && $old_sha == $meta['_wogh_sha'] &&
+				 $old_github_path && $old_github_path == $blob->path()) {
 				return false;
 			}
 		}
 
-		$post = new Writing_On_GitHub_Post( $args, $this->app->api() );
-		$post->set_old_github_path( $blob->path() );
-		$post->set_meta( $meta );
-		$blob->set_id( $post->id() );
+		$post = new Writing_On_GitHub_Post($args, $this->app->api());
+		$post->set_old_github_path($blob->path());
+		$post->set_meta($meta);
+		$blob->set_id($post->id());
 
 		return $post;
 	}

lib/export.php

Indentation +26 added lines, -26 removed lines

@@ -29,34 +29,34 @@ 
 	/**
 	 * Updates all of the current posts in the database on master.
 	 *
-     * @param  bool    $force
-     *
-     * @return string|WP_Error
-     */
+	 * @param  bool    $force
+	 *
+	 * @return string|WP_Error
+	 */
 	public function full( $force = false ) {
 		$posts = $this->app->database()->fetch_all_supported( $force );
 
 		if ( is_wp_error( $posts ) ) {
-            /*　@var WP_Error $posts */
+			/*　@var WP_Error $posts */
 			return $posts;
 		}
 
-        $error = '';
+		$error = '';
 
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
-            }
-        }
+		foreach ( $posts as $post ) {
+			$result = $this->update( $post->id() );
+			if ( is_wp_error( $result ) ) {
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
+			}
+		}
 
-        if ( is_wp_error( $error ) ) {
-            /* @var WP_Error $error */
-            return $error;
-        }
+		if ( is_wp_error( $error ) ) {
+			/* @var WP_Error $error */
+			return $error;
+		}
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
 	}
 
 
@@ -86,7 +86,7 @@ 
 		$post = $this->app->database()->fetch_by_id( $post_id );
 
 		if ( is_wp_error( $post ) ) {
-            /*　@var WP_Error $post */
+			/*　@var WP_Error $post */
 			return $post;
 		}
 
@@ -102,7 +102,7 @@ 
 		$result = $this->new_posts( array( $post ) );
 
 		if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
+			/* @var WP_Error $result */
 			return $result;
 		}
 
@@ -117,14 +117,14 @@ 
 	 * @return string|WP_Error
 	 */
 	public function new_posts( array $posts ) {
-        $persist = $this->app->api()->persist();
+		$persist = $this->app->api()->persist();
 
 		$error = '';
 		foreach ( $posts as $post ) {
 			$result = $this->new_post( $post, $persist );
 			if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
 			}
 		}
 
@@ -132,7 +132,7 @@ 
 			return $error;
 		}
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
 	}
 
 	protected function new_post( $post, $persist ) {
@@ -212,7 +212,7 @@ 
 		$post = $this->app->database()->fetch_by_id( $post_id );
 
 		if ( is_wp_error( $post ) ) {
-            /*　@var WP_Error $post */
+			/*　@var WP_Error $post */
 			return $post;
 		}
 
@@ -232,7 +232,7 @@ 
 		$result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
 
 		if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
+			/*　@var WP_Error $result */
 			return $result;
 		}
 

Spacing +57 added lines, -57 removed lines

@@ -22,7 +22,7 @@ 
 	 *
 	 * @param Writing_On_GitHub $app Application container.
 	 */
-	public function __construct( Writing_On_GitHub $app ) {
+	public function __construct(Writing_On_GitHub $app) {
 		$this->app = $app;
 	}
 
@@ -33,30 +33,30 @@ 
      *
      * @return string|WP_Error
      */
-	public function full( $force = false ) {
-		$posts = $this->app->database()->fetch_all_supported( $force );
+	public function full($force = false) {
+		$posts = $this->app->database()->fetch_all_supported($force);
 
-		if ( is_wp_error( $posts ) ) {
+		if (is_wp_error($posts)) {
             /*　@var WP_Error $posts */
 			return $posts;
 		}
 
         $error = '';
 
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
+        foreach ($posts as $post) {
+            $result = $this->update($post->id());
+            if (is_wp_error($result)) {
                 /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+                $error = wogh_append_error($error, $result);
             }
         }
 
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             /* @var WP_Error $error */
             return $error;
         }
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
 
@@ -65,10 +65,10 @@ 
 	 * @param  int  $post_id
 	 * @return boolean
 	 */
-	protected function github_path( $post_id ) {
-		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+	protected function github_path($post_id) {
+		$github_path = get_post_meta($post_id, '_wogh_github_path', true);
 
-		if ( $github_path && $this->app->api()->fetch()->exists( $github_path ) ) {
+		if ($github_path && $this->app->api()->fetch()->exists($github_path)) {
 			return $github_path;
 		}
 
@@ -82,31 +82,31 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function update( $post_id ) {
-		$post = $this->app->database()->fetch_by_id( $post_id );
+	public function update($post_id) {
+		$post = $this->app->database()->fetch_by_id($post_id);
 
-		if ( is_wp_error( $post ) ) {
+		if (is_wp_error($post)) {
             /*　@var WP_Error $post */
 			return $post;
 		}
 
-		if ( 'trash' === $post->status() ) {
-			return $this->delete( $post_id );
+		if ('trash' === $post->status()) {
+			return $this->delete($post_id);
 		}
 
-		if ( $old_github_path = $this->github_path( $post->id() ) ) {
+		if ($old_github_path = $this->github_path($post->id())) {
 			error_log("old_github_path: $old_github_path");
 			$post->set_old_github_path($old_github_path);
 		}
 
-		$result = $this->new_posts( array( $post ) );
+		$result = $this->new_posts(array($post));
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
             /* @var WP_Error $result */
 			return $result;
 		}
 
-		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
 	/**
@@ -116,32 +116,32 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function new_posts( array $posts ) {
+	public function new_posts(array $posts) {
         $persist = $this->app->api()->persist();
 
 		$error = '';
-		foreach ( $posts as $post ) {
-			$result = $this->new_post( $post, $persist );
-			if ( is_wp_error( $result ) ) {
+		foreach ($posts as $post) {
+			$result = $this->new_post($post, $persist);
+			if (is_wp_error($result)) {
                 /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+                $error = wogh_append_error($error, $result);
 			}
 		}
 
-		if ( is_wp_error( $error ) ) {
+		if (is_wp_error($error)) {
 			return $error;
 		}
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
-	protected function new_post( $post, $persist ) {
+	protected function new_post($post, $persist) {
 		$github_path = $post->github_path();
 		$old_github_path = $post->old_github_path();
 		$blob = $post->to_blob();
 		$result = false;
 
-		if ( $old_github_path && $old_github_path != $github_path ) {
+		if ($old_github_path && $old_github_path != $github_path) {
 			// rename
 			$message = apply_filters(
 				'wogh_commit_msg_move_post',
@@ -149,20 +149,20 @@ 
 					'Move %s to %s via WordPress at %s (%s)',
 					$old_github_path, $github_path,
 					site_url(),
-					get_bloginfo( 'name' )
+					get_bloginfo('name')
 				)
 			) . $this->get_commit_msg_tag();
 
-			$result = $persist->delete_file( $post->old_github_path(), $blob->sha(), $message );
-			if ( is_wp_error( $result ) ) {
+			$result = $persist->delete_file($post->old_github_path(), $blob->sha(), $message);
+			if (is_wp_error($result)) {
 				return $result;
 			}
 
-			$result = $persist->create_file( $blob, $message );
-			if ( is_wp_error( $result ) ) {
+			$result = $persist->create_file($blob, $message);
+			if (is_wp_error($result)) {
 				return $result;
 			}
-		} elseif ( ! $old_github_path ) {
+		} elseif ( ! $old_github_path) {
 			// create new
 			$message = apply_filters(
 				'wogh_commit_msg_new_post',
@@ -170,14 +170,14 @@ 
 					'Create new post %s from WordPress at %s (%s)',
 					$github_path,
 					site_url(),
-					get_bloginfo( 'name' )
+					get_bloginfo('name')
 				)
 			) . $this->get_commit_msg_tag();
-			$result = $persist->create_file( $blob, $message );
-			if ( is_wp_error( $result ) ) {
+			$result = $persist->create_file($blob, $message);
+			if (is_wp_error($result)) {
 				return $result;
 			}
-		} elseif ( $old_github_path && $old_github_path == $github_path ) {
+		} elseif ($old_github_path && $old_github_path == $github_path) {
 			// update
 			$message = apply_filters(
 				'wogh_commit_msg_update_post',
@@ -185,11 +185,11 @@ 
 					'Update post %s from WordPress at %s (%s)',
 					$github_path,
 					site_url(),
-					get_bloginfo( 'name' )
+					get_bloginfo('name')
 				)
 			) . $this->get_commit_msg_tag();
-			$result = $persist->update_file( $blob, $message );
-			if ( is_wp_error( $result ) ) {
+			$result = $persist->update_file($blob, $message);
+			if (is_wp_error($result)) {
 				return $result;
 			}
 		}
@@ -208,15 +208,15 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function delete( $post_id ) {
-		$post = $this->app->database()->fetch_by_id( $post_id );
+	public function delete($post_id) {
+		$post = $this->app->database()->fetch_by_id($post_id);
 
-		if ( is_wp_error( $post ) ) {
+		if (is_wp_error($post)) {
             /*　@var WP_Error $post */
 			return $post;
 		}
 
-		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+		$github_path = get_post_meta($post_id, '_wogh_github_path', true);
 
 		$message = apply_filters(
 			'wogh_commit_msg_delete',
@@ -224,19 +224,19 @@ 
 				'Deleting %s via WordPress at %s (%s)',
 				$github_path,
 				site_url(),
-				get_bloginfo( 'name' )
+				get_bloginfo('name')
 			),
 			$post
 		) . $this->get_commit_msg_tag();
 
-		$result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
+		$result = $this->app->api()->persist()->delete_file($github_path, $post->sha(), $message);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
             /*　@var WP_Error $result */
 			return $result;
 		}
 
-		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
 
@@ -247,8 +247,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function set_user( $user_id ) {
-		return update_option( self::EXPORT_USER_OPTION, (int) $user_id );
+	public function set_user($user_id) {
+		return update_option(self::EXPORT_USER_OPTION, (int) $user_id);
 	}
 
 	/**
@@ -257,10 +257,10 @@ 
 	 * @return string
 	 */
 	protected function get_commit_msg_tag() {
-		$tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+		$tag = apply_filters('wogh_commit_msg_tag', 'wogh');
 
-		if ( ! $tag ) {
-			throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+		if ( ! $tag) {
+			throw new Exception(__('Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github'));
 		}
 
 		return ' - ' . $tag;

lib/database.php

Indentation +63 added lines, -63 removed lines

@@ -42,10 +42,10 @@ 
 	/**
 	 * Queries the database for all of the supported posts.
 	 *
-     * @param  bool $force
-     *
-     * @return Writing_On_GitHub_Post[]|WP_Error
-     */
+	 * @param  bool $force
+	 *
+	 * @return Writing_On_GitHub_Post[]|WP_Error
+	 */
 	public function fetch_all_supported( $force = false ) {
 		$args  = array(
 			'post_type'   => $this->get_whitelisted_post_types(),
@@ -65,7 +65,7 @@ 
 			);
 		}
 
-        /* @var Writing_On_GitHub_Post[] $results */
+		/* @var Writing_On_GitHub_Post[] $results */
 		$results = array();
 		foreach ( $post_ids as $post_id ) {
 			// Do not export posts that have already been exported
@@ -132,8 +132,8 @@ 
 			add_filter( 'content_save_pre', 'wp_filter_post_kses' );
 
 			if ( is_wp_error( $post_id ) ) {
-                /* @var WP_Error $post_id */
-                $error = wogh_append_error( $error, $post_id );
+				/* @var WP_Error $post_id */
+				$error = wogh_append_error( $error, $post_id );
 
 				// Abort saving if updating the post fails.
 				continue;
@@ -183,65 +183,65 @@ 
 
 		// update tags
 		if ( ! empty( $meta['tags'] ) ) {
-		    $args['tags_input'] = $meta['tags'];
+			$args['tags_input'] = $meta['tags'];
 		}
 
 		// update categories
 		if ( ! empty( $meta['categories'] ) ) {
-		    $categories = $meta['categories'];
-		    if ( ! is_array( $categories ) ) {
-		        $categories = array( $categories );
-		    }
-		    $terms = get_terms( array(
-		        'taxonomy' => 'category',
-		        'fields' => 'id=>name',
-		        'hide_empty' => 0,
-		        'name' => $categories
-		        )
-		    );
-		    $map = array();
-		    foreach ( $categories as $name ) {
-		        $map[$name] = 1;
-		    }
-
-		    $ids = array();
-		    if ( ! empty( $terms ) ) {
-		        foreach ( $terms as $id => $name ) {
-		            $ids[] = $id;
-		            unset( $map[$name] );
-		        }
-		    }
-
-		    // create new terms
-		    if ( ! empty( $map ) ) {
-		        foreach ( $map as $name => $value ) {
-		            $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
-		            // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
-		            $ids[] = $term['term_id'];
-		        }
-		    }
-
-		    $args['post_category'] = $ids;
+			$categories = $meta['categories'];
+			if ( ! is_array( $categories ) ) {
+				$categories = array( $categories );
+			}
+			$terms = get_terms( array(
+				'taxonomy' => 'category',
+				'fields' => 'id=>name',
+				'hide_empty' => 0,
+				'name' => $categories
+				)
+			);
+			$map = array();
+			foreach ( $categories as $name ) {
+				$map[$name] = 1;
+			}
+
+			$ids = array();
+			if ( ! empty( $terms ) ) {
+				foreach ( $terms as $id => $name ) {
+					$ids[] = $id;
+					unset( $map[$name] );
+				}
+			}
+
+			// create new terms
+			if ( ! empty( $map ) ) {
+				foreach ( $map as $name => $value ) {
+					$term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
+					// array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
+					$ids[] = $term['term_id'];
+				}
+			}
+
+			$args['post_category'] = $ids;
 		}
 
 		return $args;
 	}
 
-    private function get_post_id_by_filename( $filename, $pattern  ) {
-        preg_match( $pattern , $filename, $matches );
-        $title = $matches[4];
+	private function get_post_id_by_filename( $filename, $pattern  ) {
+		preg_match( $pattern , $filename, $matches );
+		$title = $matches[4];
 
-        $query = new WP_Query( array(
-            'name'     => $title,
-            'posts_per_page' => 1,
-            'post_type' => $this->get_whitelisted_post_types(),
-            'fields'         => 'ids',
-        ) );
+		$query = new WP_Query( array(
+			'name'     => $title,
+			'posts_per_page' => 1,
+			'post_type' => $this->get_whitelisted_post_types(),
+			'fields'         => 'ids',
+		) );
 
-        $post_id = $query->get_posts();
-        $post_id = array_pop( $post_id );
-        return $post_id;
-    }
+		$post_id = $query->get_posts();
+		$post_id = array_pop( $post_id );
+		return $post_id;
+	}
 
 	/**
 	 * Deletes a post from the database based on its GitHub path.
@@ -268,11 +268,11 @@ 
 			$directory = $parts ? array_shift( $parts ) : '';
 
 			if ( false !== strpos( $directory, 'post' ) ) {
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
+				$post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
 			}
 
 			if ( ! $post_id ) {
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
+				$post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
 			}
 		}
 
@@ -417,12 +417,12 @@ 
 		if ( ! empty( $display_name ) ) {
 			$search_string = esc_attr( $display_name );
 			$query = new WP_User_Query( array(
-			    'search'         => "{$search_string}",
-			    'search_columns' => array(
-			        'display_name',
-			        'user_nicename',
-			        'user_login',
-			    )
+				'search'         => "{$search_string}",
+				'search_columns' => array(
+					'display_name',
+					'user_nicename',
+					'user_login',
+				)
 			) );
 			$users = $query->get_results();
 			$user = empty($users) ? false : $users[0];

Spacing +108 added lines, -109 removed lines

@@ -21,21 +21,21 @@ 
 	 *
 	 * @var array
 	 */
-	protected $whitelisted_post_types = array( 'post', 'page' );
+	protected $whitelisted_post_types = array('post', 'page');
 
 	/**
 	 * Currently whitelisted post statuses.
 	 *
 	 * @var array
 	 */
-	protected $whitelisted_post_statuses = array( 'publish' );
+	protected $whitelisted_post_statuses = array('publish');
 
 	/**
 	 * Instantiates a new Database object.
 	 *
 	 * @param Writing_On_GitHub $app Application container.
 	 */
-	public function __construct( Writing_On_GitHub $app ) {
+	public function __construct(Writing_On_GitHub $app) {
 		$this->app = $app;
 	}
 
@@ -46,33 +46,33 @@ 
      *
      * @return Writing_On_GitHub_Post[]|WP_Error
      */
-	public function fetch_all_supported( $force = false ) {
-		$args  = array(
+	public function fetch_all_supported($force = false) {
+		$args = array(
 			'post_type'   => $this->get_whitelisted_post_types(),
 			'post_status' => $this->get_whitelisted_post_statuses(),
 			'nopaging'    => true,
 			'fields'      => 'ids',
 		);
 
-		$query = new WP_Query( apply_filters( 'wogh_pre_fetch_all_supported', $args ) );
+		$query = new WP_Query(apply_filters('wogh_pre_fetch_all_supported', $args));
 
 		$post_ids = $query->get_posts();
 
-		if ( ! $post_ids ) {
+		if ( ! $post_ids) {
 			return new WP_Error(
 				'no_results',
-				__( 'Querying for supported posts returned no results.', 'writing-on-github' )
+				__('Querying for supported posts returned no results.', 'writing-on-github')
 			);
 		}
 
         /* @var Writing_On_GitHub_Post[] $results */
 		$results = array();
-		foreach ( $post_ids as $post_id ) {
+		foreach ($post_ids as $post_id) {
 			// Do not export posts that have already been exported
-			if ( $force || ! get_post_meta( $post_id, '_wogh_sha', true ) ||
-				 ! get_post_meta( $post_id, '_wogh_github_path', true ) ) {
+			if ($force || ! get_post_meta($post_id, '_wogh_sha', true) ||
+				 ! get_post_meta($post_id, '_wogh_github_path', true)) {
 
-				$results[] = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+				$results[] = new Writing_On_GitHub_Post($post_id, $this->app->api());
 			}
 		}
 
@@ -86,10 +86,10 @@ 
 	 *
 	 * @return WP_Error|Writing_On_GitHub_Post
 	 */
-	public function fetch_by_id( $post_id ) {
-		$post = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+	public function fetch_by_id($post_id) {
+		$post = new Writing_On_GitHub_Post($post_id, $this->app->api());
 
-		if ( ! $this->is_post_supported( $post ) ) {
+		if ( ! $this->is_post_supported($post)) {
 			return new WP_Error(
 				'unsupported_post',
 				sprintf(
@@ -113,7 +113,7 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function save_posts( array $posts ) {
+	public function save_posts(array $posts) {
 
 		/**
 		 * Whether an error has occurred.
@@ -122,37 +122,36 @@ 
 		 */
 		$error = false;
 
-		foreach ( $posts as $post ) {
-			$args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
+		foreach ($posts as $post) {
+			$args = apply_filters('wogh_pre_import_args', $this->post_args($post), $post);
 
-			remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
+			remove_filter('content_save_pre', 'wp_filter_post_kses');
 			$post_id = $post->is_new() ?
-				wp_insert_post( $args, true ) :
-				wp_update_post( $args, true );
-			add_filter( 'content_save_pre', 'wp_filter_post_kses' );
+				wp_insert_post($args, true) : wp_update_post($args, true);
+			add_filter('content_save_pre', 'wp_filter_post_kses');
 
-			if ( is_wp_error( $post_id ) ) {
+			if (is_wp_error($post_id)) {
                 /* @var WP_Error $post_id */
-                $error = wogh_append_error( $error, $post_id );
+                $error = wogh_append_error($error, $post_id);
 
 				// Abort saving if updating the post fails.
 				continue;
 			}
 
-			if ( $post->is_new() ) {
+			if ($post->is_new()) {
 				$author = false;
 				$meta = $post->get_meta();
-				if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
+				if ( ! empty($meta) && ! empty($meta['author'])) {
 					$author = $meta['author'];
 				}
-				$user    = $this->fetch_commit_user( $author );
-				$user_id = is_wp_error( $user ) ? 0 : $user->ID;
-				$this->set_post_author( $post_id, $user_id );
+				$user    = $this->fetch_commit_user($author);
+				$user_id = is_wp_error($user) ? 0 : $user->ID;
+				$this->set_post_author($post_id, $user_id);
 			}
 
-			$post->set_post( get_post( $post_id ) );
+			$post->set_post(get_post($post_id));
 
-			$meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
+			$meta = apply_filters('wogh_pre_import_meta', $post->get_meta(), $post);
 
 			// unset( $meta['tags'] );
 			// unset( $meta['categories'] );
@@ -167,32 +166,32 @@ 
 			// }
 		}
 
-		if ( $error ) {
+		if ($error) {
 			return $error;
 		}
 
-		return __( 'Successfully saved posts.', 'writing-on-github' );
+		return __('Successfully saved posts.', 'writing-on-github');
 	}
 
-	protected function post_args( $post ) {
+	protected function post_args($post) {
 		$args = $post->get_args();
 		$meta = $post->get_meta();
 
 		// prevent backslash loss
-		$args['post_content'] = addslashes( $args['post_content'] );
+		$args['post_content'] = addslashes($args['post_content']);
 
 		// update tags
-		if ( ! empty( $meta['tags'] ) ) {
+		if ( ! empty($meta['tags'])) {
 		    $args['tags_input'] = $meta['tags'];
 		}
 
 		// update categories
-		if ( ! empty( $meta['categories'] ) ) {
+		if ( ! empty($meta['categories'])) {
 		    $categories = $meta['categories'];
-		    if ( ! is_array( $categories ) ) {
-		        $categories = array( $categories );
+		    if ( ! is_array($categories)) {
+		        $categories = array($categories);
 		    }
-		    $terms = get_terms( array(
+		    $terms = get_terms(array(
 		        'taxonomy' => 'category',
 		        'fields' => 'id=>name',
 		        'hide_empty' => 0,
@@ -200,22 +199,22 @@ 
 		        )
 		    );
 		    $map = array();
-		    foreach ( $categories as $name ) {
+		    foreach ($categories as $name) {
 		        $map[$name] = 1;
 		    }
 
 		    $ids = array();
-		    if ( ! empty( $terms ) ) {
-		        foreach ( $terms as $id => $name ) {
+		    if ( ! empty($terms)) {
+		        foreach ($terms as $id => $name) {
 		            $ids[] = $id;
-		            unset( $map[$name] );
+		            unset($map[$name]);
 		        }
 		    }
 
 		    // create new terms
-		    if ( ! empty( $map ) ) {
-		        foreach ( $map as $name => $value ) {
-		            $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
+		    if ( ! empty($map)) {
+		        foreach ($map as $name => $value) {
+		            $term = wp_insert_term($name, 'category', array('parent' => 0));
 		            // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 		            $ids[] = $term['term_id'];
 		        }
@@ -227,19 +226,19 @@ 
 		return $args;
 	}
 
-    private function get_post_id_by_filename( $filename, $pattern  ) {
-        preg_match( $pattern , $filename, $matches );
+    private function get_post_id_by_filename($filename, $pattern) {
+        preg_match($pattern, $filename, $matches);
         $title = $matches[4];
 
-        $query = new WP_Query( array(
+        $query = new WP_Query(array(
             'name'     => $title,
             'posts_per_page' => 1,
             'post_type' => $this->get_whitelisted_post_types(),
             'fields'         => 'ids',
-        ) );
+        ));
 
         $post_id = $query->get_posts();
-        $post_id = array_pop( $post_id );
+        $post_id = array_pop($post_id);
         return $post_id;
     }
 
@@ -250,55 +249,55 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function delete_post_by_path( $path ) {
-		$query = new WP_Query( array(
+	public function delete_post_by_path($path) {
+		$query = new WP_Query(array(
 			'meta_key'       => '_wogh_github_path',
 			'meta_value'     => $path,
 			'meta_compare'   => '=',
 			'posts_per_page' => 1,
 			'fields'         => 'ids',
-		) );
+		));
 
 		$post_id = $query->get_posts();
-		$post_id = array_pop( $post_id );
+		$post_id = array_pop($post_id);
 
-		if ( ! $post_id ) {
-			$parts     = explode( '/', $path );
-			$filename  = array_pop( $parts );
-			$directory = $parts ? array_shift( $parts ) : '';
+		if ( ! $post_id) {
+			$parts     = explode('/', $path);
+			$filename  = array_pop($parts);
+			$directory = $parts ? array_shift($parts) : '';
 
-			if ( false !== strpos( $directory, 'post' ) ) {
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
+			if (false !== strpos($directory, 'post')) {
+                $post_id = get_post_id_by_filename($filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/');
 			}
 
-			if ( ! $post_id ) {
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
+			if ( ! $post_id) {
+                $post_id = get_post_id_by_filename($filename, '/(.*)\.md/');
 			}
 		}
 
-		if ( ! $post_id ) {
+		if ( ! $post_id) {
 			return new WP_Error(
 				'path_not_found',
 				sprintf(
-					__( 'Post not found for path %s.', 'writing-on-github' ),
+					__('Post not found for path %s.', 'writing-on-github'),
 					$path
 				)
 			);
 		}
 
-		$result = wp_delete_post( $post_id );
+		$result = wp_delete_post($post_id);
 
 		// If deleting fails...
-		if ( false === $result ) {
-			$post = get_post( $post_id );
+		if (false === $result) {
+			$post = get_post($post_id);
 
 			// ...and the post both exists and isn't in the trash...
-			if ( $post && 'trash' !== $post->post_status ) {
+			if ($post && 'trash' !== $post->post_status) {
 				// ... then something went wrong.
 				return new WP_Error(
 					'db_error',
 					sprintf(
-						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
+						__('Failed to delete post ID %d.', 'writing-on-github'),
 						$post_id
 					)
 				);
@@ -306,25 +305,25 @@ 
 		}
 
 		return sprintf(
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}
 
-	public function delete_post( $post_id ) {
-		$result = wp_delete_post( $post_id );
+	public function delete_post($post_id) {
+		$result = wp_delete_post($post_id);
 
 		// If deleting fails...
-		if ( false === $result ) {
-			$post = get_post( $post_id );
+		if (false === $result) {
+			$post = get_post($post_id);
 
 			// ...and the post both exists and isn't in the trash...
-			if ( $post && 'trash' !== $post->post_status ) {
+			if ($post && 'trash' !== $post->post_status) {
 				// ... then something went wrong.
 				return new WP_Error(
 					'db_error',
 					sprintf(
-						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
+						__('Failed to delete post ID %d.', 'writing-on-github'),
 						$post_id
 					)
 				);
@@ -332,7 +331,7 @@ 
 		}
 
 		return sprintf(
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}
@@ -343,7 +342,7 @@ 
 	 * @return array
 	 */
 	protected function get_whitelisted_post_types() {
-		return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
+		return apply_filters('wogh_whitelisted_post_types', $this->whitelisted_post_types);
 	}
 
 	/**
@@ -352,7 +351,7 @@ 
 	 * @return array
 	 */
 	protected function get_whitelisted_post_statuses() {
-		return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
+		return apply_filters('wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses);
 	}
 
 	/**
@@ -362,12 +361,12 @@ 
 	 *
 	 * @return string Whitelist formatted for query
 	 */
-	protected function format_for_query( $whitelist ) {
-		foreach ( $whitelist as $key => $value ) {
-			$whitelist[ $key ] = "'$value'";
+	protected function format_for_query($whitelist) {
+		foreach ($whitelist as $key => $value) {
+			$whitelist[$key] = "'$value'";
 		}
 
-		return implode( ', ', $whitelist );
+		return implode(', ', $whitelist);
 	}
 
 	/**
@@ -378,25 +377,25 @@ 
 	 *
 	 * @return boolean                          True if supported, false if not.
 	 */
-	protected function is_post_supported( Writing_On_GitHub_Post $post ) {
-		if ( wp_is_post_revision( $post->id ) ) {
+	protected function is_post_supported(Writing_On_GitHub_Post $post) {
+		if (wp_is_post_revision($post->id)) {
 			return false;
 		}
 
 		// We need to allow trashed posts to be queried, but they are not whitelisted for export.
-		if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
+		if ( ! in_array($post->status(), $this->get_whitelisted_post_statuses()) && 'trash' !== $post->status()) {
 			return false;
 		}
 
-		if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
+		if ( ! in_array($post->type(), $this->get_whitelisted_post_types())) {
 			return false;
 		}
 
-		if ( $post->has_password() ) {
+		if ($post->has_password()) {
 			return false;
 		}
 
-		return apply_filters( 'wogh_is_post_supported', true, $post );
+		return apply_filters('wogh_is_post_supported', true, $post);
 	}
 
 	/**
@@ -409,35 +408,35 @@ 
 	 *
 	 * @return WP_Error|WP_User
 	 */
-	protected function fetch_commit_user( $display_name ) {
+	protected function fetch_commit_user($display_name) {
 		// If we can't find a user and a default hasn't been set,
 		// we're just going to set the revision author to 0.
 		$user = false;
 
-		if ( ! empty( $display_name ) ) {
-			$search_string = esc_attr( $display_name );
-			$query = new WP_User_Query( array(
+		if ( ! empty($display_name)) {
+			$search_string = esc_attr($display_name);
+			$query = new WP_User_Query(array(
 			    'search'         => "{$search_string}",
 			    'search_columns' => array(
 			        'display_name',
 			        'user_nicename',
 			        'user_login',
 			    )
-			) );
+			));
 			$users = $query->get_results();
 			$user = empty($users) ? false : $users[0];
 		}
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			// Use the default user.
-			$user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
+			$user = get_user_by('id', (int) get_option('wogh_default_user'));
 		}
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			return new WP_Error(
 				'user_not_found',
 				sprintf(
-					__( 'Commit user not found for email %s', 'writing-on-github' ),
+					__('Commit user not found for email %s', 'writing-on-github'),
 					$email
 				)
 			);
@@ -489,7 +488,7 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	protected function set_post_author( $post_id, $user_id ) {
+	protected function set_post_author($post_id, $user_id) {
 		global $wpdb;
 
 		$result = $wpdb->update(
@@ -500,25 +499,25 @@ 
 			array(
 				'ID' => (int) $post_id,
 			),
-			array( '%d' ),
-			array( '%d' )
+			array('%d'),
+			array('%d')
 		);
 
-		if ( false === $result ) {
-			return new WP_Error( 'db_error', $wpdb->last_error );
+		if (false === $result) {
+			return new WP_Error('db_error', $wpdb->last_error);
 		}
 
-		if ( 0 === $result ) {
+		if (0 === $result) {
 			return sprintf(
-				__( 'No change for post ID %d.', 'writing-on-github' ),
+				__('No change for post ID %d.', 'writing-on-github'),
 				$post_id
 			);
 		}
 
-		clean_post_cache( $post_id );
+		clean_post_cache($post_id);
 
 		return sprintf(
-			__( 'Successfully updated post ID %d.', 'writing-on-github' ),
+			__('Successfully updated post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}

lib/function.php

Indentation +4 added lines, -4 removed lines

@@ -8,8 +8,8 @@
  * @return WP_Error
  */
 function wogh_append_error( $error, $error2 ) {
-    if ( is_wp_error( $error ) ) {
-        $error->add( $error2->get_error_code(), $error2->get_error_message() );
-    }
-    return $error2;
+	if ( is_wp_error( $error ) ) {
+		$error->add( $error2->get_error_code(), $error2->get_error_message() );
+	}
+	return $error2;
 }

Spacing +3 added lines, -3 removed lines

@@ -7,9 +7,9 @@
  * @param  WP_Error   $error2
  * @return WP_Error
  */
-function wogh_append_error( $error, $error2 ) {
-    if ( is_wp_error( $error ) ) {
-        $error->add( $error2->get_error_code(), $error2->get_error_message() );
+function wogh_append_error($error, $error2) {
+    if (is_wp_error($error)) {
+        $error->add($error2->get_error_code(), $error2->get_error_message());
     }
     return $error2;
 }