litefeel / writing-on-github

views/options.php

Spacing +12 added lines, -12 removed lines

@@ -6,27 +6,27 @@
 
 ?>
 <div class="wrap">
-	<h2><?php esc_html_e( 'Writing On GitHub', 'writing-on-github' ); ?></h2>
+	<h2><?php esc_html_e('Writing On GitHub', 'writing-on-github'); ?></h2>
 
 	<form method="post" action="options.php">
-		<?php settings_fields( Writing_On_GitHub::$text_domain ); ?>
-		<?php do_settings_sections( Writing_On_GitHub::$text_domain ); ?>
+		<?php settings_fields(Writing_On_GitHub::$text_domain); ?>
+		<?php do_settings_sections(Writing_On_GitHub::$text_domain); ?>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Webhook callback', 'writing-on-github' ); ?></th>
-				<td><code><?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>?action=wogh_push_request</code></td>
+				<th scope="row"><?php esc_html_e('Webhook callback', 'writing-on-github'); ?></th>
+				<td><code><?php echo esc_url(admin_url('admin-ajax.php')); ?>?action=wogh_push_request</code></td>
 			</tr>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Bulk actions', 'writing-on-github' ); ?></th>
+				<th scope="row"><?php esc_html_e('Bulk actions', 'writing-on-github'); ?></th>
 				<td>
-					<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'export' ) ) ); ?>">
-						<?php esc_html_e( 'Export to GitHub', 'writing-on-github' ); ?>
+					<a href="<?php echo esc_url(add_query_arg(array('action' => 'export'))); ?>">
+						<?php esc_html_e('Export to GitHub', 'writing-on-github'); ?>
 					</a> |
-                    <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'force_export' ) ) ); ?>">
-                        <?php esc_html_e( 'Force export to GitHub', 'writing-on-github' ); ?>
+                    <a href="<?php echo esc_url(add_query_arg(array('action' => 'force_export'))); ?>">
+                        <?php esc_html_e('Force export to GitHub', 'writing-on-github'); ?>
                     </a> |
-					<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'import' ) ) ); ?>">
-						<?php esc_html_e( 'Import from GitHub', 'writing-on-github' ); ?>
+					<a href="<?php echo esc_url(add_query_arg(array('action' => 'import'))); ?>">
+						<?php esc_html_e('Import from GitHub', 'writing-on-github'); ?>
 					</a>
 				</td>
 		</table>

views/user-setting-field.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<select name="<?php echo esc_attr( $args['name'] ) ?>" id="<?php echo esc_attr( $args['name'] ) ?>">
-	<?php foreach ( get_users() as $user ) : ?>
-		<option value="<?php echo esc_attr( $user->ID ); ?>"<?php echo (int) $value === $user->ID ? ' selected' : '';?>>
-			<?php echo esc_html( $user->display_name ); ?>
+<?php $value = get_option($args['name'], $args['default']); ?>
+<select name="<?php echo esc_attr($args['name']) ?>" id="<?php echo esc_attr($args['name']) ?>">
+	<?php foreach (get_users() as $user) : ?>
+		<option value="<?php echo esc_attr($user->ID); ?>"<?php echo (int) $value === $user->ID ? ' selected' : ''; ?>>
+			<?php echo esc_html($user->display_name); ?>
 		</option>
 	<?php endforeach; ?>
 </select>

views/checkbox-setting-field.php

Spacing +2 added lines, -2 removed lines

@@ -5,6 +5,6 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<input type="checkbox" name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" value="yes" <?php echo 'yes' === $value ? 'checked' : '';  ?> />
+<?php $value = get_option($args['name'], $args['default']); ?>
+<input type="checkbox" name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" value="yes" <?php echo 'yes' === $value ? 'checked' : ''; ?> />
 <p class="description"><?php echo $args['help_text']; ?></p>

views/setting-field.php

Spacing +2 added lines, -2 removed lines

@@ -5,6 +5,6 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<input name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr( $value ); ?>" />
+<?php $value = get_option($args['name'], $args['default']); ?>
+<input name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr($value); ?>" />
 <p class="description"><?php echo $args['help_text']; ?></p>

writing-on-github.php

Spacing +58 added lines, -58 removed lines

@@ -12,12 +12,12 @@ 
 
 // If the functions have already been autoloaded, don't reload.
 // This fixes function duplication during unit testing.
-$path = dirname( __FILE__ ) . '/vendor/autoload.php';
-if ( file_exists( $path ) ) {
-    require_once( $path );
+$path = dirname(__FILE__) . '/vendor/autoload.php';
+if (file_exists($path)) {
+    require_once($path);
 }
 
-add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) );
+add_action('plugins_loaded', array(new Writing_On_GitHub, 'boot'));
 
 class Writing_On_GitHub {
 
@@ -107,14 +107,14 @@ 
 	public function __construct() {
 		self::$instance = $this;
 
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->admin = new Writing_On_GitHub_Admin;
 		}
 
-		$this->controller = new Writing_On_GitHub_Controller( $this );
+		$this->controller = new Writing_On_GitHub_Controller($this);
 
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			WP_CLI::add_command( 'wogh', $this->cli() );
+		if (defined('WP_CLI') && WP_CLI) {
+			WP_CLI::add_command('wogh', $this->cli());
 		}
 	}
 
@@ -122,30 +122,30 @@ 
 	 * Attaches the plugin's hooks into WordPress.
 	 */
 	public function boot() {
-		register_activation_hook( __FILE__, array( $this, 'activate' ) );
-		add_action( 'admin_notices', array( $this, 'activation_notice' ) );
+		register_activation_hook(__FILE__, array($this, 'activate'));
+		add_action('admin_notices', array($this, 'activation_notice'));
 
-		add_action( 'init', array( $this, 'l10n' ) );
+		add_action('init', array($this, 'l10n'));
 
 		// Controller actions.
-		add_action( 'save_post', array( $this->controller, 'export_post' ) );
-		add_action( 'delete_post', array( $this->controller, 'delete_post' ) );
-		add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) );
-        add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 );
-		add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 );
-		add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 );
+		add_action('save_post', array($this->controller, 'export_post'));
+		add_action('delete_post', array($this->controller, 'delete_post'));
+		add_action('wp_ajax_nopriv_wogh_push_request', array($this->controller, 'pull_posts'));
+        add_action('wogh_export', array($this->controller, 'export_all'), 10, 2);
+		add_action('wogh_import', array($this->controller, 'import_master'), 10, 1);
+		add_filter('get_edit_post_link', array($this, 'edit_post_link'), 10, 3);
 
 		// add_filter( 'wogh_post_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
 		// add_filter( 'wogh_pre_import_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
-		add_filter( 'the_content', array( $this, 'the_content' ) );
+		add_filter('the_content', array($this, 'the_content'));
 
-		do_action( 'wogh_boot', $this );
+		do_action('wogh_boot', $this);
 	}
 
 	public function edit_post_link($link, $postID, $context) {
-		if ( ! wp_is_post_revision( $postID ) ) {
-			$post = new Writing_On_GitHub_Post( $postID, Writing_On_GitHub::$instance->api() );
-			if ( $post->is_on_github() ) {
+		if ( ! wp_is_post_revision($postID)) {
+			$post = new Writing_On_GitHub_Post($postID, Writing_On_GitHub::$instance->api());
+			if ($post->is_on_github()) {
 				return $post->github_edit_url();
 			}
 		}
@@ -204,29 +204,29 @@ 
 	 * Init i18n files
 	 */
 	public function l10n() {
-		load_plugin_textdomain( self::$text_domain );
+		load_plugin_textdomain(self::$text_domain);
 	}
 
 	/**
 	 * Sets and kicks off the export cronjob
 	 */
-	public function start_export( $force = false ) {
-		$this->start_cron( 'export', $force );
+	public function start_export($force = false) {
+		$this->start_cron('export', $force);
 	}
 
 	/**
 	 * Sets and kicks off the import cronjob
 	 */
 	public function start_import() {
-		$this->start_cron( 'import' );
+		$this->start_cron('import');
 	}
 
 	/**
 	 * Enables the admin notice on initial activation
 	 */
 	public function activate() {
-		if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) {
-			set_transient( '_wogh_activated', 'yes' );
+		if ('yes' !== get_option('_wogh_fully_exported')) {
+			set_transient('_wogh_activated', 'yes');
 		}
 	}
 
@@ -234,18 +234,18 @@ 
 	 * Displays the activation admin notice
 	 */
 	public function activation_notice() {
-		if ( ! get_transient( '_wogh_activated' ) ) {
+		if ( ! get_transient('_wogh_activated')) {
 			return;
 		}
 
-		delete_transient( '_wogh_activated' );
+		delete_transient('_wogh_activated');
 
 		?><div class="updated">
 			<p>
 				<?php
 					printf(
-						__( 'To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github' ),
-						admin_url( 'options-general.php?page=' . static::$text_domain)
+						__('To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github'),
+						admin_url('options-general.php?page=' . static::$text_domain)
 					);
 				?>
 			</p>
@@ -267,7 +267,7 @@ 
 	 * @return Writing_On_GitHub_CLI
 	 */
 	public function cli() {
-		if ( ! $this->cli ) {
+		if ( ! $this->cli) {
 			$this->cli = new Writing_On_GitHub_CLI;
 		}
 
@@ -280,8 +280,8 @@ 
 	 * @return Writing_On_GitHub_Request
 	 */
 	public function request() {
-		if ( ! $this->request ) {
-			$this->request = new Writing_On_GitHub_Request( $this );
+		if ( ! $this->request) {
+			$this->request = new Writing_On_GitHub_Request($this);
 		}
 
 		return $this->request;
@@ -293,8 +293,8 @@ 
 	 * @return Writing_On_GitHub_Response
 	 */
 	public function response() {
-		if ( ! $this->response ) {
-			$this->response = new Writing_On_GitHub_Response( $this );
+		if ( ! $this->response) {
+			$this->response = new Writing_On_GitHub_Response($this);
 		}
 
 		return $this->response;
@@ -306,8 +306,8 @@ 
 	 * @return Writing_On_GitHub_Api
 	 */
 	public function api() {
-		if ( ! $this->api ) {
-			$this->api = new Writing_On_GitHub_Api( $this );
+		if ( ! $this->api) {
+			$this->api = new Writing_On_GitHub_Api($this);
 		}
 
 		return $this->api;
@@ -319,8 +319,8 @@ 
 	 * @return Writing_On_GitHub_Import
 	 */
 	public function import() {
-		if ( ! $this->import ) {
-			$this->import = new Writing_On_GitHub_Import( $this );
+		if ( ! $this->import) {
+			$this->import = new Writing_On_GitHub_Import($this);
 		}
 
 		return $this->import;
@@ -332,8 +332,8 @@ 
 	 * @return Writing_On_GitHub_Export
 	 */
 	public function export() {
-		if ( ! $this->export ) {
-			$this->export = new Writing_On_GitHub_Export( $this );
+		if ( ! $this->export) {
+			$this->export = new Writing_On_GitHub_Export($this);
 		}
 
 		return $this->export;
@@ -345,7 +345,7 @@ 
 	 * @return Writing_On_GitHub_Semaphore
 	 */
 	public function semaphore() {
-		if ( ! $this->semaphore ) {
+		if ( ! $this->semaphore) {
 			$this->semaphore = new Writing_On_GitHub_Semaphore;
 		}
 
@@ -358,8 +358,8 @@ 
 	 * @return Writing_On_GitHub_Database
 	 */
 	public function database() {
-		if ( ! $this->database ) {
-			$this->database = new Writing_On_GitHub_Database( $this );
+		if ( ! $this->database) {
+			$this->database = new Writing_On_GitHub_Database($this);
 		}
 
 		return $this->database;
@@ -373,18 +373,18 @@ 
 	 * @param mixed $msg
 	 * @param string $write
 	 */
-	public static function write_log( $msg, $write = 'line' ) {
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			if ( is_array( $msg ) || is_object( $msg ) ) {
-				WP_CLI::print_value( $msg );
+	public static function write_log($msg, $write = 'line') {
+		if (defined('WP_CLI') && WP_CLI) {
+			if (is_array($msg) || is_object($msg)) {
+				WP_CLI::print_value($msg);
 			} else {
-				WP_CLI::$write( $msg );
+				WP_CLI::$write($msg);
 			}
-		} elseif ( true === WP_DEBUG ) {
-			if ( is_array( $msg ) || is_object( $msg ) ) {
-				error_log( print_r( $msg, true ) );
+		} elseif (true === WP_DEBUG) {
+			if (is_array($msg) || is_object($msg)) {
+				error_log(print_r($msg, true));
 			} else {
-				error_log( $msg );
+				error_log($msg);
 			}
 		}
 	}
@@ -395,10 +395,10 @@ 
      * @param bool   $force
      * @param string $type
      */
-	protected function start_cron( $type, $force = false ) {
-		update_option( '_wogh_' . $type . '_started', 'yes' );
+	protected function start_cron($type, $force = false) {
+		update_option('_wogh_' . $type . '_started', 'yes');
 		$user_id = get_current_user_id();
-		wp_schedule_single_event( time(), 'wogh_' . $type . '', array( $user_id, $force ) );
+		wp_schedule_single_event(time(), 'wogh_' . $type . '', array($user_id, $force));
 		spawn_cron();
 	}
 }

lib/client/fetch.php

Spacing +19 added lines, -19 removed lines

@@ -16,13 +16,13 @@ 
 	 *
 	 * @return 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_File_Info[]|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,14 +97,14 @@ 
 	 *
 	 * @return Writing_On_GitHub_Blob|WP_Error
 	 */
-	public function blob( Writing_On_GitHub_File_Info $fileinfo ) {
-		$data = $this->call( 'GET', $this->blob_endpoint() . '/' . $fileinfo->sha );
+	public function blob(Writing_On_GitHub_File_Info $fileinfo) {
+		$data = $this->call('GET', $this->blob_endpoint() . '/' . $fileinfo->sha);
 
-		if ( is_wp_error( $data ) ) {
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
 		$data->path = $fileinfo->path;
-		return new Writing_On_GitHub_Blob( $data );
+		return new Writing_On_GitHub_Blob($data);
 	}
 }

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,58 +34,58 @@ 
 	 */
 	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 ) ) {
+		if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-			return $this->app->response()->error( $result );
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -93,36 +93,36 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function import_master( $user_id = 0 ) {
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+	public function import_master($user_id = 0) {
+		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 ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            update_option( '_wogh_import_error', $result->get_error_message() );
+            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);
 	}
 
 	/**
@@ -132,34 +132,34 @@ 
      * @param  boolean    $force
      * @return boolean
      */
-	public function export_all( $user_id = 0, $force = false ) {
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+	public function export_all($user_id = 0, $force = false) {
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::export_all()')
+			));
 		}
 
 		$this->app->semaphore()->lock();
 
-		if ( $user_id ) {
-			wp_set_current_user( $user_id );
+		if ($user_id) {
+			wp_set_current_user($user_id);
 		}
 
 		$result = $this->app->export()->full($force);
 		$this->app->semaphore()->unlock();
 
 		// Maybe move option updating out of this class/upgrade message display?
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-			update_option( '_wogh_export_error', $result->get_error_message() );
+			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);
 		}
 	}
 
@@ -172,28 +172,28 @@ 
 	 *
 	 * @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 ) ) {
+		if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-			return $this->app->response()->error( $result );
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -205,28 +205,28 @@ 
 	 *
 	 * @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 ) ) {
+		if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-			return $this->app->response()->error( $result );
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -235,8 +235,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/request.php

Spacing +11 added lines, -11 removed lines

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

lib/import.php

Spacing +79 added lines, -79 removed lines

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