litefeel / writing-on-github

lib/client/base.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 * @param string $endpoint API endpoint.
 	 * @param array  $body Request body.
 	 *
-	 * @return stdClass|WP_Error
+	 * @return stdClass
 	 */
 	protected function call( $method, $endpoint, $body = array() ) {
 		if ( is_wp_error( $error = $this->can_call() ) ) {

Spacing +25 added lines, -26 removed lines

@@ -26,7 +26,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;
 	}
 
@@ -39,8 +39,8 @@ 
 	 *
 	 * @return stdClass|WP_Error
 	 */
-	protected function call( $method, $endpoint, $body = array() ) {
-		if ( is_wp_error( $error = $this->can_call() ) ) {
+	protected function call($method, $endpoint, $body = array()) {
+		if (is_wp_error($error = $this->can_call())) {
 			return $error;
 		}
 
@@ -51,24 +51,23 @@ 
 			),
 		);
 
-		if ( 'GET' !== $method ) {
-			$args['body'] = function_exists( 'wp_json_encode' ) ?
-				wp_json_encode( $body ) :
-				json_encode( $body );
+		if ('GET' !== $method) {
+			$args['body'] = function_exists('wp_json_encode') ?
+				wp_json_encode($body) : json_encode($body);
 		}
 
 		$tmpbody = isset($args['body']) ? $args['body'] : '';
 		error_log("writing-on-github-call $method $endpoint $tmpbody");
 
-		$response = wp_remote_request( $endpoint, $args );
-		$status   = wp_remote_retrieve_header( $response, 'status' );
-		$body     = json_decode( wp_remote_retrieve_body( $response ) );
+		$response = wp_remote_request($endpoint, $args);
+		$status   = wp_remote_retrieve_header($response, 'status');
+		$body     = json_decode(wp_remote_retrieve_body($response));
 
-		if ( '2' !== substr( $status, 0, 1 ) && '3' !== substr( $status, 0, 1 ) ) {
+		if ('2' !== substr($status, 0, 1) && '3' !== substr($status, 0, 1)) {
 			return new WP_Error(
-				strtolower( str_replace( ' ', '_', $status ) ),
+				strtolower(str_replace(' ', '_', $status)),
 				sprintf(
-					__( 'Method %s to endpoint %s failed with error: %s', 'writing-on-github' ),
+					__('Method %s to endpoint %s failed with error: %s', 'writing-on-github'),
 					$method,
 					$endpoint,
 					$body && $body->message ? $body->message : 'Unknown error'
@@ -85,28 +84,28 @@ 
 	 * @return true|WP_Error
 	 */
 	protected function can_call() {
-		if ( ! $this->oauth_token() ) {
+		if ( ! $this->oauth_token()) {
 			return new WP_Error(
 				'missing_token',
-				__( 'Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github' )
+				__('Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github')
 			);
 		}
 
 		$repo = $this->repository();
 
-		if ( ! $repo ) {
+		if ( ! $repo) {
 			return new WP_Error(
 				'missing_repository',
-				__( 'Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github' )
+				__('Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github')
 			);
 		}
 
-		$parts = explode( '/', $repo );
+		$parts = explode('/', $repo);
 
-		if ( 2 !== count( $parts ) ) {
+		if (2 !== count($parts)) {
 			return new WP_Error(
 				'malformed_repository',
-				__( 'Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github' )
+				__('Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github')
 			);
 		}
 
@@ -119,7 +118,7 @@ 
 	 * @return string
 	 */
 	public function repository() {
-		return (string) get_option( self::REPO_OPTION_KEY );
+		return (string) get_option(self::REPO_OPTION_KEY);
 	}
 
 	/**
@@ -128,18 +127,18 @@ 
 	 * @return string
 	 */
 	public function oauth_token() {
-		return (string) get_option( self::TOKEN_OPTION_KEY );
+		return (string) get_option(self::TOKEN_OPTION_KEY);
 	}
 
 	/**
 	 * Returns the GitHub host to sync with (for GitHub Enterprise support)
 	 */
 	public function api_base() {
-		return get_option( self::HOST_OPTION_KEY );
+		return get_option(self::HOST_OPTION_KEY);
 	}
 
 	public function branch() {
-		$branch = get_option( self::BRANCH_OPTION_KEY );
+		$branch = get_option(self::BRANCH_OPTION_KEY);
 		return $branch ? $branch : 'master';
 	}
 
@@ -200,11 +199,11 @@ 
 	 *
 	 * Returns String the relative API call path
 	 */
-	public function content_endpoint( $path = false ) {
+	public function content_endpoint($path = false) {
 		$url = $this->api_base() . '/repos/';
 		$url = $url . $this->repository() . '/contents';
 
-		if ( ! empty($path) ) {
+		if ( ! empty($path)) {
 			$url .= '/' . $path;
 		}
 

lib/client/persist.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 	/**
 	 * Delete the file.
 	 *
+	 * @param string $message
 	 * @return array
 	 */
 	public function delete_file( $path, $sha, $message ) {

Spacing +11 added lines, -11 removed lines

@@ -16,9 +16,9 @@ 
 	 */
 	protected function export_user() {
 		$user_id = get_current_user_id();
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-		if ( $user ) {
+		if ($user) {
 			return array(
 				'name'  => $user->display_name,
 				'email' => $user->user_email,
@@ -33,17 +33,17 @@ 
 	 *
 	 * @return array
 	 */
-	public function delete_file( $path, $sha, $message ) {
+	public function delete_file($path, $sha, $message) {
 		$body = new stdClass();
 		$body->message = $message;
 		$body->sha = $sha;
 		$body->branch = $this->branch();
 
-		if ( $author = $this->export_user() ) {
+		if ($author = $this->export_user()) {
 			$body->author = $author;
 		}
 
-		return $this->call( 'DELETE', $this->content_endpoint( $path ), $body );
+		return $this->call('DELETE', $this->content_endpoint($path), $body);
 	}
 
 	/**
@@ -51,17 +51,17 @@ 
 	 *
 	 * @return array
 	 */
-	public function create_file( $blob, $message ) {
+	public function create_file($blob, $message) {
 		$body = $blob->to_body();
 		$body->message = $message;
 		$body->branch = $this->branch();
 		unset($body->sha);
 
-		if ( $author = $this->export_user() ) {
+		if ($author = $this->export_user()) {
 			$body->author = $author;
 		}
 
-		return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
+		return $this->call('PUT', $this->content_endpoint($blob->path()), $body);
 	}
 
 	/**
@@ -69,15 +69,15 @@ 
 	 *
 	 * @return array
 	 */
-	public function update_file( $blob, $message ) {
+	public function update_file($blob, $message) {
 		$body = $blob->to_body();
 		$body->message = $message;
 		$body->branch = $this->branch();
 
-		if ( $author = $this->export_user() ) {
+		if ($author = $this->export_user()) {
 			$body->author = $author;
 		}
 
-		return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
+		return $this->call('PUT', $this->content_endpoint($blob->path()), $body);
 	}
 }

lib/controller.php

Doc Comments +2 added lines, -2 removed lines

@@ -167,7 +167,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 *
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function export_post( $post_id ) {
 		if ( wp_is_post_revision( $post_id ) ) {
@@ -199,7 +199,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 *
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function delete_post( $post_id ) {
 		if ( wp_is_post_revision( $post_id ) ) {

Indentation +4 added lines, -4 removed lines

@@ -126,10 +126,10 @@
 	/**
 	 * Export all the posts in the database to GitHub.
 	 *
-     * @param  int        $user_id
-     * @param  boolean    $force
-     * @return boolean
-     */
+	 * @param  int        $user_id
+	 * @param  boolean    $force
+	 * @return boolean
+	 */
 	public function export_all( $user_id, $force = false ) {
 		if ( ! $this->app->semaphore()->is_open() ) {
 			return $this->app->response()->error( new WP_Error(

Spacing +75 added lines, -75 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @param Writing_On_GitHub $app Applicatio container.
 	 */
-	public function __construct( Writing_On_GitHub $app ) {
+	public function __construct(Writing_On_GitHub $app) {
 		$this->app = $app;
 	}
 
@@ -34,57 +34,57 @@ 
 	 */
 	public function pull_posts() {
 		$this->set_ajax();
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::pull_posts()')
+			));
 		}
 
-		if ( ! $this->app->request()->is_secret_valid() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->request()->is_secret_valid()) {
+			return $this->app->response()->error(new WP_Error(
 				'invalid_headers',
-				__( 'Failed to validate secret.', 'writing-on-github' )
-			) );
+				__('Failed to validate secret.', 'writing-on-github')
+			));
 		}
 
 		// ping
-		if ( $this->app->request()->is_ping() ) {
-			return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
+		if ($this->app->request()->is_ping()) {
+			return $this->app->response()->success(__('Wordpress is ready.', 'writing-on-github'));
 		}
 
 		// push
-		if ( ! $this->app->request()->is_push() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->request()->is_push()) {
+			return $this->app->response()->error(new WP_Error(
 				'invalid_headers',
-				__( 'Failed to validate webhook event.', 'writing-on-github' )
-			) );
+				__('Failed to validate webhook event.', 'writing-on-github')
+			));
 		}
 		$payload = $this->app->request()->payload();
 
-		if ( ! $payload->should_import() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $payload->should_import()) {
+			return $this->app->response()->error(new WP_Error(
 				'invalid_payload',
 				sprintf(
-					__( "%s won't be imported.", 'writing-on-github' ),
-					strtolower( $payload->get_commit_id() ) ? : '[Missing Commit ID]'
+					__("%s won't be imported.", 'writing-on-github'),
+					strtolower($payload->get_commit_id()) ?: '[Missing Commit ID]'
 				)
-			) );
+			));
 		}
 
 		$this->app->semaphore()->lock();
-		remove_action( 'save_post', array( $this, 'export_post' ) );
-		remove_action( 'delete_post', array( $this, 'delete_post' ) );
+		remove_action('save_post', array($this, 'export_post'));
+		remove_action('delete_post', array($this, 'delete_post'));
 
-		$result = $this->app->import()->payload( $payload );
+		$result = $this->app->import()->payload($payload);
 
 		$this->app->semaphore()->unlock();
 
-		if ( is_wp_error( $result ) ) {
-			return $this->app->response()->error( $result );
+		if (is_wp_error($result)) {
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -92,35 +92,35 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function import_master( $user_id ) {
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+	public function import_master($user_id) {
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::import_master()')
+			));
 		}
 
 		$this->app->semaphore()->lock();
-		remove_action( 'save_post', array( $this, 'export_post' ) );
-		remove_action( 'save_post', array( $this, 'delete_post' ) );
+		remove_action('save_post', array($this, 'export_post'));
+		remove_action('save_post', array($this, 'delete_post'));
 
-		if ( $user_id ) {
-			wp_set_current_user( $user_id );
+		if ($user_id) {
+			wp_set_current_user($user_id);
 		}
 
 		$result = $this->app->import()->master();
 
 		$this->app->semaphore()->unlock();
 
-		if ( is_wp_error( $result ) ) {
-			update_option( '_wogh_import_error', $result->get_error_message() );
+		if (is_wp_error($result)) {
+			update_option('_wogh_import_error', $result->get_error_message());
 
-			return $this->app->response()->error( $result );
+			return $this->app->response()->error($result);
 		}
 
-		update_option( '_wogh_import_complete', 'yes' );
+		update_option('_wogh_import_complete', 'yes');
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -130,33 +130,33 @@ 
      * @param  boolean    $force
      * @return boolean
      */
-	public function export_all( $user_id, $force = false ) {
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+	public function export_all($user_id, $force = false) {
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::export_all()')
+			));
 		}
 
 		$this->app->semaphore()->lock();
 
-		if ( $user_id ) {
-			wp_set_current_user( $user_id );
+		if ($user_id) {
+			wp_set_current_user($user_id);
 		}
 
 		$result = $this->app->export()->full($force);
 		$this->app->semaphore()->unlock();
 
 		// Maybe move option updating out of this class/upgrade message display?
-		if ( is_wp_error( $result ) ) {
-			update_option( '_wogh_export_error', $result->get_error_message() );
+		if (is_wp_error($result)) {
+			update_option('_wogh_export_error', $result->get_error_message());
 
-			return $this->app->response()->error( $result );
+			return $this->app->response()->error($result);
 		} else {
-			update_option( '_wogh_export_complete', 'yes' );
-			update_option( '_wogh_fully_exported', 'yes' );
+			update_option('_wogh_export_complete', 'yes');
+			update_option('_wogh_fully_exported', 'yes');
 
-			return $this->app->response()->success( $result );
+			return $this->app->response()->success($result);
 		}
 	}
 
@@ -169,27 +169,27 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function export_post( $post_id ) {
-		if ( wp_is_post_revision( $post_id ) ) {
+	public function export_post($post_id) {
+		if (wp_is_post_revision($post_id)) {
 			return;
 		}
 
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::export_post()')
+			));
 		}
 
 		$this->app->semaphore()->lock();
-		$result = $this->app->export()->update( $post_id );
+		$result = $this->app->export()->update($post_id);
 		$this->app->semaphore()->unlock();
 
-		if ( is_wp_error( $result ) ) {
-			return $this->app->response()->error( $result );
+		if (is_wp_error($result)) {
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -201,27 +201,27 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function delete_post( $post_id ) {
-		if ( wp_is_post_revision( $post_id ) ) {
+	public function delete_post($post_id) {
+		if (wp_is_post_revision($post_id)) {
 			return;
 		}
 
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::delete_post()')
+			));
 		}
 
 		$this->app->semaphore()->lock();
-		$result = $this->app->export()->delete( $post_id );
+		$result = $this->app->export()->delete($post_id);
 		$this->app->semaphore()->unlock();
 
-		if ( is_wp_error( $result ) ) {
-			return $this->app->response()->error( $result );
+		if (is_wp_error($result)) {
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * than just returning data.
 	 */
 	protected function set_ajax() {
-		if ( ! defined( 'WOGH_AJAX' ) ) {
-			define( 'WOGH_AJAX', true );
+		if ( ! defined('WOGH_AJAX')) {
+			define('WOGH_AJAX', true);
 		}
 	}
 }

lib/database.php

Doc Comments +3 added lines, -1 removed lines

@@ -108,7 +108,6 @@ 
 	 * and associates their author as well as their latest
 	 *
 	 * @param Writing_On_GitHub_Post[] $posts Array of Posts to save.
-	 * @param string                       $email Author email.
 	 *
 	 * @return string|WP_Error
 	 */
@@ -178,6 +177,9 @@ 
 		return __( 'Successfully saved posts.', 'writing-on-github' );
 	}
 
+	/**
+	 * @param Writing_On_GitHub_Post $post
+	 */
 	protected function post_args( $post ) {
 		$args = $post->get_args();
 		$meta = $post->get_meta();

Indentation +44 added lines, -44 removed lines

@@ -42,9 +42,9 @@ 
 	/**
 	 * 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(),
@@ -187,45 +187,45 @@ 
 
 		// update tags
 		if ( isset( $meta['tags'] ) && $meta['tags'] ) {
-		    $args['tags_input'] = $meta['tags'];
+			$args['tags_input'] = $meta['tags'];
 		}
 
 		// update categories
 		if ( isset( $meta['categories'] ) && $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;
@@ -427,12 +427,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 +122 added lines, -123 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;
 	}
 
@@ -45,32 +45,32 @@ 
      * @param  bool $force
      * @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')
 			);
 		}
 
 		$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());
 			}
 		}
 
@@ -84,10 +84,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(
@@ -112,7 +112,7 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function save_posts( array $posts ) {
+	public function save_posts(array $posts) {
 
 		/**
 		 * Whether an error has occurred.
@@ -121,20 +121,19 @@ 
 		 */
 		$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');
 			$post_id = $post->is_new() ?
-				wp_insert_post( $args, true ) :
-				wp_update_post( $args, true );
+				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 ( ! $error ) {
+			if (is_wp_error($post_id)) {
+				if ( ! $error) {
 					$error = $post_id;
 				} else {
-					$error->add( $post_id->get_error_code(), $post_id->get_error_message() );
+					$error->add($post_id->get_error_code(), $post_id->get_error_message());
 				}
 
 				// Abort saving if updating the post fails.
@@ -143,42 +142,42 @@ 
 
 			// $this->set_revision_author( $post_id, $user_id );
 
-			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 ) ? $user->ID : 0;
-				$this->set_post_author( $post_id, $user_id );
+				$user    = $this->fetch_commit_user($author);
+				$user_id = ! is_wp_error($user) ? $user->ID : 0;
+				$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'] );
-			unset( $meta['author'] );
-			unset( $meta['post_date'] );
-			unset( $meta['post_excerpt'] );
-			unset( $meta['permalink'] );
-			unset( $meta['link'] );
+			unset($meta['tags']);
+			unset($meta['categories']);
+			unset($meta['author']);
+			unset($meta['post_date']);
+			unset($meta['post_excerpt']);
+			unset($meta['permalink']);
+			unset($meta['link']);
 
-			foreach ( $meta as $key => $value ) {
-				update_post_meta( $post_id, $key, $value );
+			foreach ($meta as $key => $value) {
+				update_post_meta($post_id, $key, $value);
 			}
 		}
 
-		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();
 
@@ -186,14 +185,14 @@ 
 		$args['post_content'] = addslashes($args['post_content']);
 
 		// update tags
-		if ( isset( $meta['tags'] ) && $meta['tags'] ) {
+		if (isset($meta['tags']) && $meta['tags']) {
 		    $args['tags_input'] = $meta['tags'];
 		}
 
 		// update categories
-		if ( isset( $meta['categories'] ) && $meta['categories'] ) {
+		if (isset($meta['categories']) && $meta['categories']) {
 		    $categories = $meta['categories'];
-		    if (!is_array($categories)) {
+		    if ( ! is_array($categories)) {
 		        $categories = array($categories);
 		    }
 		    $terms = get_terms(array(
@@ -209,7 +208,7 @@ 
 		    }
 
 		    $ids = array();
-		    if (!empty($terms)) {
+		    if ( ! empty($terms)) {
 		        foreach ($terms as $id => $name) {
 		            $ids[] = $id;
 		            unset($map[$name]);
@@ -217,7 +216,7 @@ 
 		    }
 
 		    // create new terms
-		    if (!empty($map)) {
+		    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);
@@ -238,77 +237,77 @@ 
 	 *
 	 * @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' ) ) {
-				preg_match( '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/', $filename, $matches );
+			if (false !== strpos($directory, 'post')) {
+				preg_match('/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/', $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);
 			}
 
-			if ( ! $post_id ) {
-				preg_match( '/(.*)\.md/', $filename, $matches );
+			if ( ! $post_id) {
+				preg_match('/(.*)\.md/', $filename, $matches);
 				$title = $matches[1];
 
-				$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);
 			}
 		}
 
-		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
 					)
 				);
@@ -316,25 +315,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
 					)
 				);
@@ -342,7 +341,7 @@ 
 		}
 
 		return sprintf(
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}
@@ -353,7 +352,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);
 	}
 
 	/**
@@ -362,7 +361,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);
 	}
 
 	/**
@@ -372,12 +371,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);
 	}
 
 	/**
@@ -388,25 +387,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);
 	}
 
 	/**
@@ -419,35 +418,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
 				)
 			);
@@ -465,28 +464,28 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	protected function set_revision_author( $post_id, $user_id ) {
-		$revision = wp_get_post_revisions( $post_id );
+	protected function set_revision_author($post_id, $user_id) {
+		$revision = wp_get_post_revisions($post_id);
 
-		if ( ! $revision ) {
-			$new_revision = wp_save_post_revision( $post_id );
+		if ( ! $revision) {
+			$new_revision = wp_save_post_revision($post_id);
 
-			if ( ! $new_revision || is_wp_error( $new_revision ) ) {
-				return new WP_Error( 'db_error', 'There was a problem saving a new revision.' );
+			if ( ! $new_revision || is_wp_error($new_revision)) {
+				return new WP_Error('db_error', 'There was a problem saving a new revision.');
 			}
 
 			// `wp_save_post_revision` returns the ID, whereas `get_post_revision` returns the whole object
 			// in order to be consistent, let's make sure we have the whole object before continuing.
-			$revision = get_post( $new_revision );
+			$revision = get_post($new_revision);
 
-			if ( ! $revision ) {
-				return new WP_Error( 'db_error', 'There was a problem retrieving the newly recreated revision.' );
+			if ( ! $revision) {
+				return new WP_Error('db_error', 'There was a problem retrieving the newly recreated revision.');
 			}
 		} else {
-			$revision = array_shift( $revision );
+			$revision = array_shift($revision);
 		}
 
-		return $this->set_post_author( $revision->ID, $user_id );
+		return $this->set_post_author($revision->ID, $user_id);
 	}
 
 	/**
@@ -499,7 +498,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(
@@ -510,25 +509,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
 		);
 	}
@@ -541,7 +540,7 @@ 
 	 *
 	 * @return bool|int
 	 */
-	public function set_post_sha( $post, $sha ) {
-		return update_post_meta( $post->id, '_wogh_sha', $sha );
+	public function set_post_sha($post, $sha) {
+		return update_post_meta($post->id, '_wogh_sha', $sha);
 	}
 }

lib/export.php

Doc Comments +4 added lines

@@ -142,6 +142,10 @@
 		return true;
 	}
 
+	/**
+	 * @param Writing_On_GitHub_Post $post
+	 * @param Writing_On_GitHub_Persist_Client $persist
+	 */
 	protected function new_post( $post, $persist ) {
 		$github_path = $post->github_path();
 		$old_github_path = $post->old_github_path();

Indentation +18 added lines, -18 removed lines

@@ -29,9 +29,9 @@ 
 	/**
 	 * Updates all of the current posts in the database on master.
 	 *
-     * @param  bool    $force_all
-     * @return string|WP_Error
-     */
+	 * @param  bool    $force_all
+	 * @return string|WP_Error
+	 */
 	public function full( $force_all = false ) {
 		$posts = $this->app->database()->fetch_all_supported($force_all);
 
@@ -39,24 +39,24 @@ 
 			return $posts;
 		}
 
-        $error = false;
+		$error = false;
 
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
-                if ( $error ) {
-                    $error->add( $result->get_error_code(), $result->get_error_message() );
-                } else {
-                    $error = $result;
-                }
-            }
-        }
+		foreach ( $posts as $post ) {
+			$result = $this->update( $post->id() );
+			if ( is_wp_error( $result ) ) {
+				if ( $error ) {
+					$error->add( $result->get_error_code(), $result->get_error_message() );
+				} else {
+					$error = $result;
+				}
+			}
+		}
 
-        if ( is_wp_error( $error ) ) {
-            return $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' );
 	}
 
 

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;
 	}
 
@@ -32,31 +32,31 @@ 
      * @param  bool    $force_all
      * @return string|WP_Error
      */
-	public function full( $force_all = false ) {
+	public function full($force_all = false) {
 		$posts = $this->app->database()->fetch_all_supported($force_all);
 
-		if ( is_wp_error( $posts ) ) {
+		if (is_wp_error($posts)) {
 			return $posts;
 		}
 
         $error = false;
 
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
-                if ( $error ) {
-                    $error->add( $result->get_error_code(), $result->get_error_message() );
+        foreach ($posts as $post) {
+            $result = $this->update($post->id());
+            if (is_wp_error($result)) {
+                if ($error) {
+                    $error->add($result->get_error_code(), $result->get_error_message());
                 } else {
                     $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');
 	}
 
 
@@ -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,29 +82,29 @@ 
 	 *
 	 * @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)) {
 			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)) {
 			return $result;
 		}
 
-		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
 	/**
@@ -114,16 +114,16 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function new_posts( array $posts ) {
+	public function new_posts(array $posts) {
 		$error = false;
 
 		$persist = $this->app->api()->persist();
 
-		foreach ( $posts as $post ) {
-			$result = $this->new_post( $post, $persist );
-			if ( is_wp_error( $result ) ) {
-				if ( $error ) {
-					$error->add( $result->get_error_code(), $result->get_error_message() );
+		foreach ($posts as $post) {
+			$result = $this->new_post($post, $persist);
+			if (is_wp_error($result)) {
+				if ($error) {
+					$error->add($result->get_error_code(), $result->get_error_message());
 				} else {
 					$error = $result;
 				}
@@ -134,7 +134,7 @@ 
 
 		// $result = $this->app->api()->persist()->commit( $master );
 
-		if ( is_wp_error( $error ) ) {
+		if (is_wp_error($error)) {
 			return $error;
 		}
 
@@ -142,13 +142,13 @@ 
 		return true;
 	}
 
-	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',
@@ -156,20 +156,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',
@@ -177,14 +177,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',
@@ -192,11 +192,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;
 			}
 		}
@@ -215,14 +215,14 @@ 
 	 *
 	 * @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)) {
 			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',
@@ -230,18 +230,18 @@ 
 				'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)) {
 			return $result;
 		}
 
-		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
 
@@ -252,8 +252,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);
 	}
 
 	/**
@@ -262,10 +262,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/import.php

Doc Comments +3 added lines, -1 removed lines

@@ -140,6 +140,9 @@ 
 		return __( 'Payload processed', 'writing-on-github' );
 	}
 
+	/**
+	 * @param boolean $delete_ids
+	 */
 	protected function compare( $files, &$delete_ids ) {
 		if ( is_wp_error( $files ) ) {
 			return $files;
@@ -217,7 +220,6 @@ 
 	/**
 	 * Checks whether the provided blob should be imported.
 	 *
-	 * @param Writing_On_GitHub_Blob $blob Blob to validate.
 	 *
 	 * @return bool
 	 */

Spacing +74 added lines, -74 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;
 	}
 
@@ -70,21 +70,21 @@ 
 	// 	return __( 'Payload processed', 'writing-on-github' );
 	// }
 
-	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)) {
 			return $result;
 		}
 
-		$result = $this->import_files( $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');
 	}
 
 	/**
@@ -92,23 +92,23 @@ 
 	 * @param  array $files [Writing_On_GitHub_File_Info]
 	 * @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 ) ) {
-					if ( $error ) {
-						$error->add( $result->get_error_code(), $result->get_error_message() );
+				$result = $this->app->database()->delete_post($id);
+				if (is_wp_error($result)) {
+					if ($error) {
+						$error->add($result->get_error_code(), $result->get_error_message());
 					} else {
 						$error = $result;
 					}
@@ -127,21 +127,21 @@ 
 	public function master() {
 		$result = $this->app->api()->fetch()->tree_recursive();
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			return $result;
 		}
 
-		$result = $this->import_files( $result );
+		$result = $this->import_files($result);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			return $result;
 		}
 
-		return __( 'Payload processed', 'writing-on-github' );
+		return __('Payload processed', 'writing-on-github');
 	}
 
-	protected function compare( $files, &$delete_ids ) {
-		if ( is_wp_error( $files ) ) {
+	protected function compare($files, &$delete_ids) {
+		if (is_wp_error($files)) {
 			return $files;
 		}
 
@@ -150,44 +150,44 @@ 
 
 		$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);
 			// network error ?
-			if ( is_wp_error($blob) ) {
+			if (is_wp_error($blob)) {
 				continue;
 			}
 
 
-			if ( $this->importable_raw_file($blob) ) {
+			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()] );
+			if ($post->id() && isset($idsmap[$post->id()])) {
+				unset($idsmap[$post->id()]);
 			}
 		}
 		$delete_ids = array();
@@ -197,16 +197,16 @@ 
 
 		// $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 ( $new ) {
-			$result = $this->app->export()->new_posts( $new );
+		if ($new) {
+			$result = $this->app->export()->new_posts($new);
 
-			if ( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				return $result;
 			}
 		}
@@ -221,12 +221,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;
 		}
 
@@ -245,7 +245,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.
@@ -258,20 +258,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;
 		}
 
@@ -283,16 +283,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);
 			}
 
@@ -307,57 +307,57 @@ 
 	 *
 	 * @return Writing_On_GitHub_Post
 	 */
-	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 ( $meta ) {
-			if ( array_key_exists( 'layout', $meta ) ) {
+		if ($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/request.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	/**
 	 * Validates the header's secret.
 	 *
-	 * @return true|WP_Error
+	 * @return boolean
 	 */
 	public function is_secret_valid() {
 		$headers = $this->headers();

Spacing +11 added lines, -11 removed lines

@@ -34,7 +34,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;
 	}
 
@@ -49,8 +49,8 @@ 
 		$this->raw_data = $this->read_raw_data();
 
 		// Validate request secret.
-		$hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
-		if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
+		$hash = hash_hmac('sha1', $this->raw_data, $this->secret());
+		if ('sha1=' . $hash !== $headers['X-Hub-Signature']) {
 			return false;
 		}
 
@@ -90,7 +90,7 @@ 
 	 * @return Writing_On_GitHub_Payload
 	 */
 	public function payload() {
-		return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
+		return new Writing_On_GitHub_Payload($this->app, $this->raw_data);
 	}
 
 	/**
@@ -101,11 +101,11 @@ 
 	 * @return array
 	 */
 	protected function headers() {
-		if ( $this->headers ) {
+		if ($this->headers) {
 			return $this->headers;
 		}
 
-		if ( function_exists( 'getallheaders' ) ) {
+		if (function_exists('getallheaders')) {
 
 			$this->headers = getallheaders();
 			return $this->headers;
@@ -115,9 +115,9 @@ 
 		 * @see http://www.php.net/manual/en/function.getallheaders.php
 		 */
 		$this->headers = array();
-		foreach ( $_SERVER as $name => $value ) {
-			if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
-				$this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
+		foreach ($_SERVER as $name => $value) {
+			if ('HTTP_' === substr($name, 0, 5)) {
+				$this->headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
 			}
 		}
 
@@ -130,7 +130,7 @@ 
 	 * @return string
 	 */
 	protected function read_raw_data() {
-		return file_get_contents( 'php://input' );
+		return file_get_contents('php://input');
 	}
 
 	/**
@@ -139,6 +139,6 @@ 
 	 * @return string
 	 */
 	protected function secret() {
-		return get_option( 'wogh_secret' );
+		return get_option('wogh_secret');
 	}
 }

lib/response.php

Spacing +16 added lines, -16 removed lines

@@ -21,7 +21,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,30 +32,30 @@ 
 	 *
 	 * @return false
 	 */
-	public function error( WP_Error $error ) {
+	public function error(WP_Error $error) {
 		global $wp_version;
 
-		$this->log( $error );
+		$this->log($error);
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX && defined('WOGH_AJAX') && WOGH_AJAX) {
 			/**
 			 * WordPress 4.1.0 introduced allowing WP_Error objects to be
 			 * passed directly into `wp_send_json_error`. This shims in
 			 * compatibility for older versions. We're currently supporting 3.9+.
 			 */
-			if ( version_compare( $wp_version, '4.1.0', '<' ) ) {
+			if (version_compare($wp_version, '4.1.0', '<')) {
 				$result = array();
 
-				foreach ( $error->errors as $code => $messages ) {
-					foreach ( $messages as $message ) {
-						$result[] = array( 'code' => $code, 'message' => $message );
+				foreach ($error->errors as $code => $messages) {
+					foreach ($messages as $message) {
+						$result[] = array('code' => $code, 'message' => $message);
 					}
 				}
 
 				$error = $result;
 			}
 
-			wp_send_json_error( $error );
+			wp_send_json_error($error);
 		}
 
 		return false;
@@ -68,11 +68,11 @@ 
 	 *
 	 * @return true
 	 */
-	public function success( $success ) {
-		$this->log( $success );
+	public function success($success) {
+		$this->log($success);
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
-			wp_send_json_success( $success );
+		if (defined('DOING_AJAX') && DOING_AJAX && defined('WOGH_AJAX') && WOGH_AJAX) {
+			wp_send_json_success($success);
 		}
 
 		return true;
@@ -85,11 +85,11 @@ 
 	 *
 	 * @param string|WP_Error $msg Message to log.
 	 */
-	protected function log( $msg ) {
-		if ( is_wp_error( $msg ) ) {
+	protected function log($msg) {
+		if (is_wp_error($msg)) {
 			$msg = $msg->get_error_message();
 		}
 
-		Writing_On_GitHub::write_log( $msg );
+		Writing_On_GitHub::write_log($msg);
 	}
 }

lib/admin.php

Indentation +18 added lines, -18 removed lines

@@ -84,13 +84,13 @@ 
 			)
 		);
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
-            )
-        );
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
+		add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_ignore_author',
+				'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+			)
+		);
 
 		// register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
 		// add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
@@ -128,14 +128,14 @@ 
 		include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
 	}
 
-    /**
-     * Callback to render the checkbox field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
-    }
+	/**
+	 * Callback to render the checkbox field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function checkbox_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+	}
 
 	/**
 	 * Displays settings messages from background processes
@@ -221,9 +221,9 @@ 
 			Writing_On_GitHub::$instance->start_export();
 		}
 
-        if ( 'force_export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export(true);
-        }
+		if ( 'force_export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export(true);
+		}
 
 		if ( 'import' === $_GET['action'] ) {
 			Writing_On_GitHub::$instance->start_import();

Spacing +63 added lines, -63 removed lines

@@ -13,16 +13,16 @@ 
 	 * Hook into GitHub API
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-		add_action( 'admin_init', array( $this, 'register_settings' ) );
-		add_action( 'current_screen', array( $this, 'trigger_cron' ) );
+		add_action('admin_menu', array($this, 'add_admin_menu'));
+		add_action('admin_init', array($this, 'register_settings'));
+		add_action('current_screen', array($this, 'trigger_cron'));
 	}
 
 	/**
 	 * Callback to render the settings page view
 	 */
 	public function settings_page() {
-		include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+		include dirname(dirname(__FILE__)) . '/views/options.php';
 	}
 
 	/**
@@ -32,63 +32,63 @@ 
 		add_settings_section(
 			'general',
 			'General Settings',
-			array( $this, 'section_callback' ),
+			array($this, 'section_callback'),
 			Writing_On_GitHub::$text_domain
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
-		add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_host');
+		add_settings_field('wogh_host', __('GitHub hostname', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => 'https://api.github.com',
 				'name'      => 'wogh_host',
-				'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
+				'help_text' => __('The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
-		add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_repository');
+		add_settings_field('wogh_repository', __('Repository', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_repository',
-				'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
+				'help_text' => __('The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
-		add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_branch');
+		add_settings_field('wogh_branch', __('Branch', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => 'master',
 				'name'      => 'wogh_branch',
-				'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
+				'help_text' => __('The GitHub branch to commit to, default is master.', 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
-		add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_oauth_token');
+		add_settings_field('wogh_oauth_token', __('Oauth Token', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_oauth_token',
-				'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
+				'help_text' => __("A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
-		add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_secret');
+		add_settings_field('wogh_secret', __('Webhook Secret', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_secret',
-				'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
+				'help_text' => __("The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
-		add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_default_user');
+		add_settings_field('wogh_default_user', __('Default Import User', 'writing-on-github'), array(&$this, 'user_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_default_user',
-				'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
+				'help_text' => __('The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github'),
 			)
 		);
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_ignore_author');
+        add_settings_field('wogh_ignore_author', __('Ignore author', 'writing-on-github'), array(&$this, 'checkbox_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+                'help_text' => __('Do not export author and do not use author info from GitHub.', 'writing-on-github'),
             )
         );
 
@@ -106,8 +106,8 @@ 
 	 *
 	 * @param array $args Field arguments.
 	 */
-	public function field_callback( $args ) {
-		include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+	public function field_callback($args) {
+		include dirname(dirname(__FILE__)) . '/views/setting-field.php';
 	}
 
 	/**
@@ -115,8 +115,8 @@ 
 	 *
 	 * @param array $args Field arguments.
 	 */
-	public function user_field_callback( $args ) {
-		include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+	public function user_field_callback($args) {
+		include dirname(dirname(__FILE__)) . '/views/user-setting-field.php';
 	}
 
 	/**
@@ -124,8 +124,8 @@ 
 	 *
 	 * @param array $args Field arguments.
 	 */
-	public function textarea_field_callback( $args ) {
-		include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+	public function textarea_field_callback($args) {
+		include dirname(dirname(__FILE__)) . '/views/textarea-setting-field.php';
 	}
 
     /**
@@ -133,58 +133,58 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+    public function checkbox_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/checkbox-setting-field.php';
     }
 
 	/**
 	 * Displays settings messages from background processes
 	 */
 	public function section_callback() {
-		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+		if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
 			return;
 		}
 
-		if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+		if ('yes' === get_option('_wogh_export_started')) { ?>
 			<div class="updated">
-				<p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
+				<p><?php esc_html_e('Export to GitHub started.', 'writing-on-github'); ?></p>
 			</div><?php
-			delete_option( '_wogh_export_started' );
+			delete_option('_wogh_export_started');
 		}
 
-		if ( $message = get_option( '_wogh_export_error' ) ) { ?>
+		if ($message = get_option('_wogh_export_error')) { ?>
 			<div class="error">
-				<p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+				<p><?php esc_html_e('Export to GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
 			</div><?php
-			delete_option( '_wogh_export_error' );
+			delete_option('_wogh_export_error');
 		}
 
-		if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
+		if ('yes' === get_option('_wogh_export_complete')) { ?>
 			<div class="updated">
-				<p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
+				<p><?php esc_html_e('Export to GitHub completed successfully.', 'writing-on-github'); ?></p>
 			</div><?php
-			delete_option( '_wogh_export_complete' );
+			delete_option('_wogh_export_complete');
 		}
 
-		if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
+		if ('yes' === get_option('_wogh_import_started')) { ?>
 			<div class="updated">
-			<p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
+			<p><?php esc_html_e('Import from GitHub started.', 'writing-on-github'); ?></p>
 			</div><?php
-			delete_option( '_wogh_import_started' );
+			delete_option('_wogh_import_started');
 		}
 
-		if ( $message = get_option( '_wogh_import_error' ) ) { ?>
+		if ($message = get_option('_wogh_import_error')) { ?>
 			<div class="error">
-			<p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+			<p><?php esc_html_e('Import from GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
 			</div><?php
-			delete_option( '_wogh_import_error' );
+			delete_option('_wogh_import_error');
 		}
 
-		if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
+		if ('yes' === get_option('_wogh_import_complete')) { ?>
 			<div class="updated">
-			<p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
+			<p><?php esc_html_e('Import from GitHub completed successfully.', 'writing-on-github'); ?></p>
 			</div><?php
-			delete_option( '_wogh_import_complete' );
+			delete_option('_wogh_import_complete');
 		}
 	}
 
@@ -193,11 +193,11 @@ 
 	 */
 	public function add_admin_menu() {
 		add_options_page(
-			__( 'Writing On GitHub', 'writing-on-github' ),
-			__( 'Writing On GitHub', 'writing-on-github' ),
+			__('Writing On GitHub', 'writing-on-github'),
+			__('Writing On GitHub', 'writing-on-github'),
 			'manage_options',
 			Writing_On_GitHub::$text_domain,
-			array( $this, 'settings_page' )
+			array($this, 'settings_page')
 		);
 	}
 
@@ -205,31 +205,31 @@ 
 	 * Admin callback to trigger import/export because WordPress admin routing lol
 	 */
 	public function trigger_cron() {
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			return;
 		}
 
-		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+		if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
 			return;
 		}
 
-		if ( ! isset( $_GET['action'] ) ) {
+		if ( ! isset($_GET['action'])) {
 			return;
 		}
 
-		if ( 'export' === $_GET['action'] ) {
+		if ('export' === $_GET['action']) {
 			Writing_On_GitHub::$instance->start_export();
 		}
 
-        if ( 'force_export' === $_GET['action'] ) {
+        if ('force_export' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_export(true);
         }
 
-		if ( 'import' === $_GET['action'] ) {
+		if ('import' === $_GET['action']) {
 			Writing_On_GitHub::$instance->start_import();
 		}
 
-		wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+		wp_redirect(admin_url('options-general.php?page=writing-on-github'));
 		die;
 	}
 }