litefeel / writing-on-github

lib/admin.php

Spacing +60 added lines, -60 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_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(
+		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(
 				'default'   => '',
 				'name'      => 'wogh_ignore_metas',
-				'help_text' => __( 'These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github' ),
+				'help_text' => __('These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github'),
 			)
 		);
 	}
@@ -98,8 +98,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';
 	}
 
 	/**
@@ -107,8 +107,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';
 	}
 
 	/**
@@ -116,58 +116,58 @@ 
 	 *
 	 * @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';
 	}
 
 	/**
 	 * 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');
 		}
 	}
 
@@ -176,11 +176,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')
 		);
 	}
 
@@ -188,27 +188,27 @@ 
 	 * 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 ( '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;
 	}
 }

lib/post.php

Spacing +63 added lines, -63 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);
 	}
 
 
@@ -184,13 +184,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;
@@ -198,35 +198,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);
 	}
 
 	/**
@@ -235,11 +235,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));
 	}
 
 	/**
@@ -247,9 +247,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;
@@ -261,7 +261,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();
 
@@ -274,7 +274,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();
 
@@ -288,9 +288,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;
 	}
@@ -301,11 +301,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);
 			}
 		}
 
@@ -319,7 +319,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.
@@ -335,7 +335,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 = '';
 		}
 
@@ -347,8 +347,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);
 	}
 
 	/**
@@ -359,32 +359,32 @@ 
 	public function meta() {
 		$meta = array(
 			'ID'           => $this->id,
-			'post_title'   => get_the_title( $this->post ),
-			'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+			'post_title'   => get_the_title($this->post),
+			'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 ),
-			'permalink'    => get_permalink( $this->post ),
+			'layout'       => get_post_type($this->post),
+			'permalink'    => 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)) {
 			$meta['post_name'] = $this->post->post_name;
 		}
 
 		//convert traditional post_meta values, hide hidden values, skip already populated values
-		foreach ( get_post_custom( $this->id ) as $key => $value ) {
+		foreach (get_post_custom($this->id) as $key => $value) {
 
-			if ( '_' === substr( $key, 0, 1 ) || isset( $meta[ $key ] ) ) {
+			if ('_' === substr($key, 0, 1) || isset($meta[$key])) {
 				continue;
 			}
 
-			$meta[ $key ] = $value;
+			$meta[$key] = $value;
 
 		}
 
-		return apply_filters( 'wogh_post_meta', $meta, $this );
+		return apply_filters('wogh_post_meta', $meta, $this);
 	}
 
 	/**
@@ -401,7 +401,7 @@ 
 	 *
 	 * @param array $meta
 	 */
-	public function set_meta( $meta ) {
+	public function set_meta($meta) {
 		$this->meta = $meta;
 	}
 
@@ -430,7 +430,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set_post( WP_Post $post ) {
+	public function set_post(WP_Post $post) {
 		$this->post = $post;
 		$this->id   = $post->ID;
 
@@ -449,6 +449,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 +65 added lines, -65 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,38 +150,38 @@ 
 
 		$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_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();
@@ -191,16 +191,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;
 			}
 		}
@@ -215,11 +215,11 @@ 
 	 *
 	 * @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 ) {
+		if (strncasecmp($file->path, '_pages/', strlen('_pages/')) != 0 &&
+			 strncasecmp($file->path, '_posts/', strlen('_posts/')) != 0) {
 			return false;
 		}
 
@@ -238,7 +238,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.
@@ -251,7 +251,7 @@ 
 		// 	return false;
 		// }
 
-		if ( ! $blob->has_frontmatter() ) {
+		if ( ! $blob->has_frontmatter()) {
 			return false;
 		}
 
@@ -265,57 +265,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/database.php

Spacing +120 added lines, -121 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,31 +45,31 @@ 
 	 * @return Writing_On_GitHub_Post[]|WP_Error
 	 */
 	public function fetch_all_supported() {
-		$args  = array(
+		$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 ( ! get_post_meta( $post_id, '_wogh_sha', true ) ||
-				 ! get_post_meta( $post_id, '_wogh_github_path', true) ) {
+			if ( ! 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());
 			}
 		}
 
@@ -83,10 +83,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(
@@ -111,7 +111,7 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function save_posts( array $posts ) {
+	public function save_posts(array $posts) {
 
 		/**
 		 * Whether an error has occurred.
@@ -120,20 +120,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.
@@ -142,53 +141,53 @@ 
 
 			// $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['tags']);
+			unset($meta['categories']);
+			unset($meta['author']);
+			unset($meta['post_date']);
+			unset($meta['post_excerpt']);
+			unset($meta['permalink']);
 
-			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();
 
 		// 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(
@@ -204,7 +203,7 @@ 
 		    }
 
 		    $ids = array();
-		    if (!empty($terms)) {
+		    if ( ! empty($terms)) {
 		        foreach ($terms as $id => $name) {
 		            $ids[] = $id;
 		            unset($map[$name]);
@@ -212,7 +211,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);
@@ -233,77 +232,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
 					)
 				);
@@ -311,25 +310,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
 					)
 				);
@@ -337,7 +336,7 @@ 
 		}
 
 		return sprintf(
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}
@@ -348,7 +347,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);
 	}
 
 	/**
@@ -357,7 +356,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);
 	}
 
 	/**
@@ -367,12 +366,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);
 	}
 
 	/**
@@ -383,25 +382,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);
 	}
 
 	/**
@@ -414,35 +413,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
 				)
 			);
@@ -460,28 +459,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);
 	}
 
 	/**
@@ -494,7 +493,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(
@@ -505,25 +504,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
 		);
 	}
@@ -536,7 +535,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/client/fetch.php

Spacing +21 added lines, -21 removed lines

@@ -16,13 +16,13 @@ 
 	 *
 	 * @return array[Writing_On_GitHub_File_Info]|WP_Error
 	 */
-	public function compare( $sha ) {
+	public function compare($sha) {
 		// https://api.github.com/repos/litefeel/testwpsync/compare/861f87e8851b8debb78db548269d29f8da4d94ac...master
 		$endpoint = $this->compare_endpoint();
 		$branch = $this->branch();
-		$data = $this->call( 'GET', "$endpoint/$sha...$branch" );
+		$data = $this->call('GET', "$endpoint/$sha...$branch");
 
-		if ( is_wp_error( $data ) ) {
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
@@ -44,13 +44,13 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function remote_contents( $post ) {
-		return $this->call( 'GET', $this->content_endpoint( $post->github_path() ) );
+	public function remote_contents($post) {
+		return $this->call('GET', $this->content_endpoint($post->github_path()));
 	}
 
-	public function exists( $path ) {
-		$result = $this->call( 'GET', $this->content_endpoint( $path ) );
-		if ( is_wp_error( $result ) ) {
+	public function exists($path) {
+		$result = $this->call('GET', $this->content_endpoint($path));
+		if (is_wp_error($result)) {
 			return false;
 		}
 		return true;
@@ -63,27 +63,27 @@ 
 	 *
 	 * @return Writing_On_GitHub_Tree|WP_Error
 	 */
-	public function tree_recursive( $sha = '_default' ) {
+	public function tree_recursive($sha = '_default') {
 
-		if ( '_default' === $sha ) {
+		if ('_default' === $sha) {
 			$sha = $this->branch();
 		}
 
-		$data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' );
+		$data = $this->call('GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1');
 
-		if ( is_wp_error( $data ) ) {
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
 		$files = array();
 
-		foreach ( $data->tree as $index => $thing ) {
+		foreach ($data->tree as $index => $thing) {
 			// We need to remove the trees because
 			// the recursive tree includes both
 			// the subtrees as well the subtrees' blobs.
-			if ( 'blob' === $thing->type ) {
+			if ('blob' === $thing->type) {
 				$thing->status = '';
-				$files[] = new Writing_On_GitHub_File_Info( $thing );
+				$files[] = new Writing_On_GitHub_File_Info($thing);
 			}
 		}
 
@@ -97,20 +97,20 @@ 
 	 *
 	 * @return Writing_On_GitHub_Blob|WP_Error
 	 */
-	public function blob( $blob ) {
-		if ( $cache = $this->app->cache()->fetch_blob( $blob->sha ) ) {
+	public function blob($blob) {
+		if ($cache = $this->app->cache()->fetch_blob($blob->sha)) {
 			return $cache;
 		}
 
-		$data = $this->call( 'GET', $this->blob_endpoint() . '/' . $blob->sha );
+		$data = $this->call('GET', $this->blob_endpoint() . '/' . $blob->sha);
 
-		if ( is_wp_error( $data ) ) {
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
 		$data->path = $blob->path;
-		$obj = new Writing_On_GitHub_Blob( $data );
+		$obj = new Writing_On_GitHub_Blob($data);
 
-		return $this->app->cache()->set_blob( $obj->sha(), $obj );
+		return $this->app->cache()->set_blob($obj->sha(), $obj);
 	}
 }

lib/controller.php

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);
 	}
 
 	/**
@@ -128,33 +128,33 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function export_all( $user_id ) {
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+	public function export_all($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::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();
 		$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);
 		}
 	}
 
@@ -167,27 +167,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);
 	}
 
 	/**
@@ -199,27 +199,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);
 	}
 
 	/**
@@ -228,8 +228,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/export.php

Spacing +51 added lines, -51 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;
 	}
 
@@ -34,7 +34,7 @@ 
 	public function full() {
 		$posts = $this->app->database()->fetch_all_supported();
 
-		if ( is_wp_error( $posts ) ) {
+		if (is_wp_error($posts)) {
 			return $posts;
 		}
 
@@ -53,11 +53,11 @@ 
 
 		// $result = $this->app->api()->persist()->commit( $master );
 
-		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');
 	}
 
 
@@ -66,10 +66,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;
 		}
 
@@ -83,29 +83,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');
 	}
 
 	/**
@@ -115,16 +115,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;
 				}
@@ -135,7 +135,7 @@ 
 
 		// $result = $this->app->api()->persist()->commit( $master );
 
-		if ( is_wp_error( $error ) ) {
+		if (is_wp_error($error)) {
 			return $error;
 		}
 
@@ -143,13 +143,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',
@@ -157,20 +157,20 @@ 
 					'Moving %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',
@@ -178,14 +178,14 @@ 
 					'Creating new posts %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',
@@ -193,11 +193,11 @@ 
 					'Creating new posts %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;
 			}
 		}
@@ -216,14 +216,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',
@@ -231,18 +231,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');
 	}
 
 
@@ -253,8 +253,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);
 	}
 
 	/**
@@ -263,10 +263,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;

tests/unit/client/test-fetch.php

Spacing +35 added lines, -35 removed lines

@@ -9,77 +9,77 @@ 
 	public function setUp() {
 		parent::setUp();
 
-		$this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+		$this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
 		$this->api_cache
-			->shouldReceive( 'fetch_blob' )
-			->andReturn( false )
+			->shouldReceive('fetch_blob')
+			->andReturn(false)
 			->byDefault();
 	}
 
 	public function test_should_fail_if_missing_token() {
-		delete_option( Base::TOKEN_OPTION_KEY );
+		delete_option(Base::TOKEN_OPTION_KEY);
 
-		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-		$this->assertSame( 'missing_token', $error->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+		$this->assertSame('missing_token', $error->get_error_code());
 	}
 
 	public function test_should_fail_if_missing_repo() {
-		delete_option( Base::REPO_OPTION_KEY );
+		delete_option(Base::REPO_OPTION_KEY);
 
-		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-		$this->assertSame( 'missing_repository', $error->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+		$this->assertSame('missing_repository', $error->get_error_code());
 	}
 
 	public function test_should_fail_if_malformed_repo() {
 		// If you find a particular name passing that shouldn't,
 		// add it to the list here and make it pass.
-		$this->malformed_repo( 'repositoryname' );
+		$this->malformed_repo('repositoryname');
 	}
 
 	public function test_should_return_files_with_tree() {
 		// $this->set_get_refs_heads_master( true );
 		// $this->set_get_commits( true );
-		$this->set_get_trees( true, 'master' );
+		$this->set_get_trees(true, 'master');
 
-		$this->assertCount( 3, $this->fetch->tree_recursive() );
+		$this->assertCount(3, $this->fetch->tree_recursive());
 	}
 
 	public function test_should_fail_if_cant_fetch_tree() {
-		$this->set_get_trees( false, 'master' );
+		$this->set_get_trees(false, 'master');
 
-		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-		$this->assertSame( '422_unprocessable_entity', $error->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+		$this->assertSame('422_unprocessable_entity', $error->get_error_code());
 	}
 
 	public function test_should_return_commit_with_blobs_from_cache() {
-		$this->set_get_trees( true, 'master' );
-		$this->set_get_blobs( true );
+		$this->set_get_trees(true, 'master');
+		$this->set_get_blobs(true);
 		$this->api_cache
-			->shouldReceive( 'fetch_blob' )
-			->times( 3 )
-			->with( Mockery::anyOf(
+			->shouldReceive('fetch_blob')
+			->times(3)
+			->with(Mockery::anyOf(
 				'9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
 				'8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
 				'2d73165945b0ccbe4932f1363457986b0ed49f19'
-			) )
-			->andReturn( $this->blob );
+			))
+			->andReturn($this->blob);
 
-		$this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+		$this->assertCount(3, $files = $this->fetch->tree_recursive());
 
-		foreach ( $files as $file ) {
-			$this->assertSame( $this->blob, $this->fetch->blob( $file ) );
+		foreach ($files as $file) {
+			$this->assertSame($this->blob, $this->fetch->blob($file));
 		}
 	}
 
 	public function test_should_return_commit_with_no_blobs_if_api_fails() {
-		$this->set_get_trees( true, 'master' );
-		$this->set_get_blobs( false );
+		$this->set_get_trees(true, 'master');
+		$this->set_get_blobs(false);
 
-		$this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+		$this->assertCount(3, $files = $this->fetch->tree_recursive());
 
-		foreach ( $files as $file ) {
-			$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->blob( $file ) );
-			$this->assertSame( '404_not_found', $error->get_error_code() );
+		foreach ($files as $file) {
+			$this->assertInstanceOf('WP_Error', $error = $this->fetch->blob($file));
+			$this->assertSame('404_not_found', $error->get_error_code());
 		}
 	}
 
@@ -159,10 +159,10 @@ 
 	// 	}
 	// }
 
-	protected function malformed_repo( $repo ) {
-		update_option( Base::REPO_OPTION_KEY, $repo );
+	protected function malformed_repo($repo) {
+		update_option(Base::REPO_OPTION_KEY, $repo);
 
-		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-		$this->assertSame( 'malformed_repository', $error->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+		$this->assertSame('malformed_repository', $error->get_error_code());
 	}
 }