litefeel / writing-on-github

lib/database.php

Indentation +45 added lines, -45 removed lines

@@ -42,10 +42,10 @@ 
 	/**
 	 * Queries the database for all of the supported posts.
 	 *
-     * @param  bool $force
-     *
-     * @return Writing_On_GitHub_Post[]|WP_Error
-     */
+	 * @param  bool $force
+	 *
+	 * @return Writing_On_GitHub_Post[]|WP_Error
+	 */
 	public function fetch_all_supported( $force = false ) {
 		$args  = array(
 			'post_type'   => $this->get_whitelisted_post_types(),
@@ -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 +115 added lines, -116 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,32 +46,32 @@ 
      *
      * @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());
 			}
 		}
 
@@ -85,10 +85,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' );
+			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 ( ! $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,20 +142,20 @@ 
 
 			// $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'] );
@@ -171,14 +170,14 @@ 
 			// }
 		}
 
-		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);
 	}
 }