litefeel / writing-on-github

lib/client/base.php

Spacing +25 added lines, -25 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())) {
             /*　@var WP_Error $error */
 			return $error;
 		}
@@ -52,25 +52,25 @@ 
 			),
 		);
 
-		if ( 'GET' !== $method ) {
-			$args['body'] = json_encode( $body );
+		if ('GET' !== $method) {
+			$args['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'
+					($body && $body->message) ? $body->message : 'Unknown error'
 				)
 			);
 		}
@@ -84,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')
 			);
 		}
 
@@ -118,7 +118,7 @@ 
 	 * @return string
 	 */
 	public function repository() {
-		return (string) get_option( self::REPO_OPTION_KEY );
+		return (string) get_option(self::REPO_OPTION_KEY);
 	}
 
 	/**
@@ -127,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';
 	}
 
@@ -199,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/database.php

Spacing +109 added lines, -110 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,39 +122,38 @@ 
 		 */
 		$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);
 
-            update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
+            update_post_meta($post_id, '_wogh_sha', $meta['_wogh_sha']);
 
 			// unset( $meta['tags'] );
 			// unset( $meta['categories'] );
@@ -169,32 +168,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,
@@ -202,22 +201,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'];
 		        }
@@ -229,19 +228,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;
     }
 
@@ -252,55 +251,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
 					)
 				);
@@ -308,25 +307,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
 					)
 				);
@@ -334,7 +333,7 @@ 
 		}
 
 		return sprintf(
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}
@@ -345,7 +344,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);
 	}
 
 	/**
@@ -354,7 +353,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);
 	}
 
 	/**
@@ -364,12 +363,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);
 	}
 
 	/**
@@ -380,25 +379,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);
 	}
 
 	/**
@@ -411,35 +410,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
 				)
 			);
@@ -491,7 +490,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(
@@ -502,25 +501,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/post.php

Spacing +62 added lines, -62 removed lines

@@ -60,26 +60,26 @@ 
      *
      * @todo remove database operations from this method
      */
-    public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
+    public function __construct($id_or_args, Writing_On_GitHub_Api $api) {
         $this->api = $api;
 
-        if ( is_numeric( $id_or_args ) ) {
+        if (is_numeric($id_or_args)) {
             $this->id   = (int) $id_or_args;
-            $this->post = get_post( $this->id );
+            $this->post = get_post($this->id);
             $this->new  = false;
         }
 
-        if ( is_array( $id_or_args ) ) {
+        if (is_array($id_or_args)) {
             $this->args = $id_or_args;
 
-            if ( isset( $this->args['ID'] ) ) {
-                $this->post = get_post( $this->args['ID'] );
+            if (isset($this->args['ID'])) {
+                $this->post = get_post($this->args['ID']);
 
-                if ( $this->post ) {
+                if ($this->post) {
                     $this->id  = $this->post->ID;
                     $this->new = false;
                 } else {
-                    unset( $this->args['ID'] );
+                    unset($this->args['ID']);
                 }
             }
         }
@@ -115,7 +115,7 @@ 
      * @return bool
      */
     public function has_password() {
-        return ! empty( $this->post->post_password );
+        return ! empty($this->post->post_password);
     }
 
     /**
@@ -123,9 +123,9 @@ 
      */
     public function github_content() {
         $content = $this->front_matter() . $this->post_content();
-        $ending  = apply_filters( 'wogh_line_endings', "\n" );
+        $ending  = apply_filters('wogh_line_endings', "\n");
 
-        return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
+        return preg_replace('~(*BSR_ANYCRLF)\R~', $ending, $content);
     }
 
     /**
@@ -134,7 +134,7 @@ 
      * Returns String the YAML frontmatter, ready to be written to the file
      */
     public function front_matter() {
-        return "---\n" . spyc_dump( $this->meta() ) . "---\n";
+        return "---\n" . spyc_dump($this->meta()) . "---\n";
     }
 
     /**
@@ -145,24 +145,24 @@ 
     public function post_content() {
         $content = $this->post->post_content;
 
-        if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
-            $content = wpmarkdown_html_to_markdown( $content );
-        } else if ( class_exists( 'WPCom_Markdown' ) ) {
-            if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
+        if (function_exists('wpmarkdown_html_to_markdown')) {
+            $content = wpmarkdown_html_to_markdown($content);
+        } else if (class_exists('WPCom_Markdown')) {
+            if (WPCom_Markdown::get_instance()->is_markdown($this->post->ID)) {
                 $content = $this->post->post_content_filtered;
             }
         }
 
-        return apply_filters( 'wogh_content_export', $content, $this );
+        return apply_filters('wogh_content_export', $content, $this);
     }
 
     public function old_github_path() {
         return $this->old_github_path;
     }
 
-    public function set_old_github_path( $path ) {
+    public function set_old_github_path($path) {
         $this->old_github_path = $path;
-        update_post_meta( $this->id, '_wogh_github_path', $path );
+        update_post_meta($this->id, '_wogh_github_path', $path);
     }
 
 
@@ -183,13 +183,13 @@ 
      * @return string
      */
     public function github_directory() {
-        if ( 'publish' !== $this->status() ) {
-            return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
+        if ('publish' !== $this->status()) {
+            return apply_filters('wogh_directory_unpublished', '_drafts/', $this);
         }
 
         $name = '';
 
-        switch ( $this->type() ) {
+        switch ($this->type()) {
             case 'post':
                 $name = 'posts';
                 break;
@@ -197,35 +197,35 @@ 
                 $name = 'pages';
                 break;
             default:
-                $obj = get_post_type_object( $this->type() );
+                $obj = get_post_type_object($this->type());
 
-                if ( $obj ) {
-                    $name = strtolower( $obj->labels->name );
+                if ($obj) {
+                    $name = strtolower($obj->labels->name);
                 }
 
-                if ( ! $name ) {
+                if ( ! $name) {
                     $name = '';
                 }
         }
 
-        if ( $name ) {
+        if ($name) {
             $name = '_' . $name . '/';
         }
 
-        return apply_filters( 'wogh_directory_published', $name, $this );
+        return apply_filters('wogh_directory_published', $name, $this);
     }
 
     /**
      * Build GitHub filename based on post
      */
     public function github_filename() {
-        if ( 'post' === $this->type() ) {
-            $filename = get_the_time( 'Y-m-d-', $this->id ) . $this->get_name() . '.md';
+        if ('post' === $this->type()) {
+            $filename = get_the_time('Y-m-d-', $this->id) . $this->get_name() . '.md';
         } else {
             $filename = $this->get_name() . '.md';
         }
 
-        return apply_filters( 'wogh_filename', $filename, $this );
+        return apply_filters('wogh_filename', $filename, $this);
     }
 
     /**
@@ -234,11 +234,11 @@ 
      * @return string
      */
     protected function get_name() {
-        if ( '' !== $this->name() ) {
+        if ('' !== $this->name()) {
             return $this->name();
         }
 
-        return sanitize_title( get_the_title( $this->post ) );
+        return sanitize_title(get_the_title($this->post));
     }
 
     /**
@@ -246,9 +246,9 @@ 
      * @return boolean
      */
     public function is_on_github() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        if ( $sha && $github_path ) {
+        $sha = get_post_meta($this->id, '_wogh_sha', true);
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
+        if ($sha && $github_path) {
             return true;
         }
         return false;
@@ -260,7 +260,7 @@ 
      * @return string
      */
     public function github_view_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
         $repository = $this->api->fetch()->repository();
         $branch = $this->api->fetch()->branch();
 
@@ -273,7 +273,7 @@ 
      * @return string
      */
     public function github_edit_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
         $repository = $this->api->fetch()->repository();
         $branch = $this->api->fetch()->branch();
 
@@ -287,9 +287,9 @@ 
      *
      * @return string
      */
-    public function get_directory_from_path( $path ) {
-        $directory = explode( '/', $path );
-        $directory = count( $directory ) > 0 ? $directory[0] : '';
+    public function get_directory_from_path($path) {
+        $directory = explode('/', $path);
+        $directory = count($directory) > 0 ? $directory[0] : '';
 
         return $directory;
     }
@@ -300,11 +300,11 @@ 
      * Returns Array an array containing the author name and email
      */
     public function last_modified_author() {
-        if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
-            $user = get_userdata( $last_id );
+        if ($last_id = get_post_meta($this->id, '_edit_last', true)) {
+            $user = get_userdata($last_id);
 
-            if ( $user ) {
-                return array( 'name' => $user->display_name, 'email' => $user->user_email );
+            if ($user) {
+                return array('name' => $user->display_name, 'email' => $user->user_email);
             }
         }
 
@@ -318,7 +318,7 @@ 
      * Returns String the sha1 hash
      */
     public function sha() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
+        $sha = get_post_meta($this->id, '_wogh_sha', true);
 
         // If we've done a full export and we have no sha
         // then we should try a live check to see if it exists.
@@ -334,7 +334,7 @@ 
         // }
 
         // if the sha still doesn't exist, then it's empty
-        if ( ! $sha || is_wp_error( $sha ) ) {
+        if ( ! $sha || is_wp_error($sha)) {
             $sha = '';
         }
 
@@ -346,8 +346,8 @@ 
      *
      * @param string $sha
      */
-    public function set_sha( $sha ) {
-        update_post_meta( $this->id, '_wogh_sha', $sha );
+    public function set_sha($sha) {
+        update_post_meta($this->id, '_wogh_sha', $sha);
     }
 
     /**
@@ -358,24 +358,24 @@ 
     public function meta() {
         $meta = array(
             'ID'           => $this->id,
-            'post_title'   => get_the_title( $this->post ),
+            'post_title'   => get_the_title($this->post),
             'post_name'    => $this->post->post_name,
-            'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+            'author'       => ($author = get_userdata($this->post->post_author)) ? $author->display_name : '',
             'post_date'    => $this->post->post_date,
             'post_excerpt' => $this->post->post_excerpt,
-            'layout'       => get_post_type( $this->post ),
-            'link'         => get_permalink( $this->post ),
+            'layout'       => get_post_type($this->post),
+            'link'         => get_permalink($this->post),
             'published'    => 'publish' === $this->status() ? true : false,
-            'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
-            'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
+            'tags'         => wp_get_post_tags($this->id, array('fields' => 'names')),
+            'categories'   => wp_get_post_categories($this->id, array('fields' => 'names'))
         );
-        if ( empty($this->post->post_name) ) {
+        if (empty($this->post->post_name)) {
             unset($meta['post_name']);
         }
-        if ( empty($this->post->post_excerpt) ) {
+        if (empty($this->post->post_excerpt)) {
             unset($meta['post_excerpt']);
         }
-        if ( 'yes' == get_option('wogh_ignore_author') ) {
+        if ('yes' == get_option('wogh_ignore_author')) {
             unset($meta['author']);
         }
 
@@ -390,7 +390,7 @@ 
 
         // }
 
-        return apply_filters( 'wogh_post_meta', $meta, $this );
+        return apply_filters('wogh_post_meta', $meta, $this);
     }
 
     /**
@@ -407,7 +407,7 @@ 
      *
      * @param array $meta
      */
-    public function set_meta( $meta ) {
+    public function set_meta($meta) {
         $this->meta = $meta;
     }
 
@@ -436,7 +436,7 @@ 
      *
      * @return $this
      */
-    public function set_post( WP_Post $post ) {
+    public function set_post(WP_Post $post) {
         $this->post = $post;
         $this->id   = $post->ID;
 
@@ -455,6 +455,6 @@ 
         $data->content = $this->github_content();
         $data->sha     = $this->sha();
 
-        return new Writing_On_GitHub_Blob( $data );
+        return new Writing_On_GitHub_Blob($data);
     }
 }

lib/import.php

Spacing +78 added lines, -78 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;
         $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;
     }