litefeel / writing-on-github

writing-on-github.php

Indentation +377 added lines, -377 removed lines

@@ -14,391 +14,391 @@
 // This fixes function duplication during unit testing.
 $path = dirname( __FILE__ ) . '/vendor/autoload.php';
 if ( file_exists( $path ) ) {
-    require_once( $path );
+	require_once( $path );
 }
 
 add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) );
 
 class Writing_On_GitHub {
 
-    /**
-     * Object instance
-     * @var self
-     */
-    public static $instance;
-
-    /**
-     * Language text domain
-     * @var string
-     */
-    public static $text_domain = 'writing-on-github';
-
-    /**
-     * Controller object
-     * @var Writing_On_GitHub_Controller
-     */
-    public $controller;
-
-    /**
-     * Controller object
-     * @var Writing_On_GitHub_Admin
-     */
-    public $admin;
-
-    /**
-     * CLI object.
-     *
-     * @var Writing_On_GitHub_CLI
-     */
-    protected $cli;
-
-    /**
-     * Request object.
-     *
-     * @var Writing_On_GitHub_Request
-     */
-    protected $request;
-
-    /**
-     * Response object.
-     *
-     * @var Writing_On_GitHub_Response
-     */
-    protected $response;
-
-    /**
-     * Api object.
-     *
-     * @var Writing_On_GitHub_Api
-     */
-    protected $api;
-
-    /**
-     * Import object.
-     *
-     * @var Writing_On_GitHub_Import
-     */
-    protected $import;
-
-    /**
-     * Export object.
-     *
-     * @var Writing_On_GitHub_Export
-     */
-    protected $export;
-
-    /**
-     * Semaphore object.
-     *
-     * @var Writing_On_GitHub_Semaphore
-     */
-    protected $semaphore;
-
-    /**
-     * Database object.
-     *
-     * @var Writing_On_GitHub_Database
-     */
-    protected $database;
-
-    /**
-     * Called at load time, hooks into WP core
-     */
-    public function __construct() {
-        self::$instance = $this;
-
-        if ( is_admin() ) {
-            $this->admin = new Writing_On_GitHub_Admin;
-        }
-
-        $this->controller = new Writing_On_GitHub_Controller( $this );
-
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            WP_CLI::add_command( 'wogh', $this->cli() );
-        }
-    }
-
-    /**
-     * 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' ) );
-
-        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_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' ) );
-
-        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() ) {
-                return $post->github_edit_url();
-            }
-        }
-
-        return $link;
-    }
-
-    public function ignore_post_meta($meta) {
-        $ignore_meta_keys = get_option('wogh_ignore_metas');
-        if (empty($ignore_meta_keys)) {
-            return $meta;
-        }
-
-        $keys = preg_split("/\\r\\n|\\r|\\n/", $ignore_meta_keys);
-        if (empty($keys)) {
-            return $meta;
-        }
-        foreach ($keys as $key => $value) {
-            $keys[$key] = trim($value);
-        }
-
-        foreach ($meta as $key => $value) {
-            if (in_array($key, $keys)) {
-                unset($meta[$key]);
-            }
-        }
-
-        return $meta;
-    }
-
-    public function the_content($content) {
-        $arr = wp_upload_dir();
-        $baseurl = $arr['baseurl'] . '/writing-on-github';
-
-        $content = preg_replace_callback(
-            '/(<img [^>]*?src=[\'"])\s*(\/images\/[^\s#]\S+)\s*([\'"][^>]*?>)/',
-            function($matchs) use ($baseurl) {
-                $url = $baseurl . $matchs[2];
-                return "${matchs[1]}$url${matchs[3]}";
-            },
-            $content
-        );
-
-        $content = preg_replace_callback(
-            '/(<a [^>]*?href=[\'"])\s*(\/images\/[^\s#]\S+)\s*([\'"][^>]*?>)/',
-            function($matchs) use ($baseurl) {
-                $url = $baseurl . $matchs[2];
-                return "${matchs[1]}$url${matchs[3]}";
-            },
-            $content
-        );
-        return $content;
-    }
-
-    /**
-     * Init i18n files
-     */
-    public function l10n() {
-        load_plugin_textdomain( self::$text_domain );
-    }
-
-    /**
-     * Sets and kicks off the export cronjob
-     */
-    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' );
-    }
-
-    /**
-     * Enables the admin notice on initial activation
-     */
-    public function activate() {
-        if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) {
-            set_transient( '_wogh_activated', 'yes' );
-        }
-    }
-
-    /**
-     * Displays the activation admin notice
-     */
-    public function activation_notice() {
-        if ( ! get_transient( '_wogh_activated' ) ) {
-            return;
-        }
-
-        delete_transient( '_wogh_activated' );
-
-        ?><div class="updated">
+	/**
+	 * Object instance
+	 * @var self
+	 */
+	public static $instance;
+
+	/**
+	 * Language text domain
+	 * @var string
+	 */
+	public static $text_domain = 'writing-on-github';
+
+	/**
+	 * Controller object
+	 * @var Writing_On_GitHub_Controller
+	 */
+	public $controller;
+
+	/**
+	 * Controller object
+	 * @var Writing_On_GitHub_Admin
+	 */
+	public $admin;
+
+	/**
+	 * CLI object.
+	 *
+	 * @var Writing_On_GitHub_CLI
+	 */
+	protected $cli;
+
+	/**
+	 * Request object.
+	 *
+	 * @var Writing_On_GitHub_Request
+	 */
+	protected $request;
+
+	/**
+	 * Response object.
+	 *
+	 * @var Writing_On_GitHub_Response
+	 */
+	protected $response;
+
+	/**
+	 * Api object.
+	 *
+	 * @var Writing_On_GitHub_Api
+	 */
+	protected $api;
+
+	/**
+	 * Import object.
+	 *
+	 * @var Writing_On_GitHub_Import
+	 */
+	protected $import;
+
+	/**
+	 * Export object.
+	 *
+	 * @var Writing_On_GitHub_Export
+	 */
+	protected $export;
+
+	/**
+	 * Semaphore object.
+	 *
+	 * @var Writing_On_GitHub_Semaphore
+	 */
+	protected $semaphore;
+
+	/**
+	 * Database object.
+	 *
+	 * @var Writing_On_GitHub_Database
+	 */
+	protected $database;
+
+	/**
+	 * Called at load time, hooks into WP core
+	 */
+	public function __construct() {
+		self::$instance = $this;
+
+		if ( is_admin() ) {
+			$this->admin = new Writing_On_GitHub_Admin;
+		}
+
+		$this->controller = new Writing_On_GitHub_Controller( $this );
+
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+			WP_CLI::add_command( 'wogh', $this->cli() );
+		}
+	}
+
+	/**
+	 * 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' ) );
+
+		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_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' ) );
+
+		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() ) {
+				return $post->github_edit_url();
+			}
+		}
+
+		return $link;
+	}
+
+	public function ignore_post_meta($meta) {
+		$ignore_meta_keys = get_option('wogh_ignore_metas');
+		if (empty($ignore_meta_keys)) {
+			return $meta;
+		}
+
+		$keys = preg_split("/\\r\\n|\\r|\\n/", $ignore_meta_keys);
+		if (empty($keys)) {
+			return $meta;
+		}
+		foreach ($keys as $key => $value) {
+			$keys[$key] = trim($value);
+		}
+
+		foreach ($meta as $key => $value) {
+			if (in_array($key, $keys)) {
+				unset($meta[$key]);
+			}
+		}
+
+		return $meta;
+	}
+
+	public function the_content($content) {
+		$arr = wp_upload_dir();
+		$baseurl = $arr['baseurl'] . '/writing-on-github';
+
+		$content = preg_replace_callback(
+			'/(<img [^>]*?src=[\'"])\s*(\/images\/[^\s#]\S+)\s*([\'"][^>]*?>)/',
+			function($matchs) use ($baseurl) {
+				$url = $baseurl . $matchs[2];
+				return "${matchs[1]}$url${matchs[3]}";
+			},
+			$content
+		);
+
+		$content = preg_replace_callback(
+			'/(<a [^>]*?href=[\'"])\s*(\/images\/[^\s#]\S+)\s*([\'"][^>]*?>)/',
+			function($matchs) use ($baseurl) {
+				$url = $baseurl . $matchs[2];
+				return "${matchs[1]}$url${matchs[3]}";
+			},
+			$content
+		);
+		return $content;
+	}
+
+	/**
+	 * Init i18n files
+	 */
+	public function l10n() {
+		load_plugin_textdomain( self::$text_domain );
+	}
+
+	/**
+	 * Sets and kicks off the export cronjob
+	 */
+	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' );
+	}
+
+	/**
+	 * Enables the admin notice on initial activation
+	 */
+	public function activate() {
+		if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) {
+			set_transient( '_wogh_activated', 'yes' );
+		}
+	}
+
+	/**
+	 * Displays the activation admin notice
+	 */
+	public function activation_notice() {
+		if ( ! get_transient( '_wogh_activated' ) ) {
+			return;
+		}
+
+		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)
-                    );
-                ?>
+					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)
+					);
+				?>
             </p>
         </div><?php
-    }
-
-    /**
-     * Get the Controller object.
-     *
-     * @return Writing_On_GitHub_Controller
-     */
-    public function controller() {
-        return $this->controller;
-    }
-
-    /**
-     * Lazy-load the CLI object.
-     *
-     * @return Writing_On_GitHub_CLI
-     */
-    public function cli() {
-        if ( ! $this->cli ) {
-            $this->cli = new Writing_On_GitHub_CLI;
-        }
-
-        return $this->cli;
-    }
-
-    /**
-     * Lazy-load the Request object.
-     *
-     * @return Writing_On_GitHub_Request
-     */
-    public function request() {
-        if ( ! $this->request ) {
-            $this->request = new Writing_On_GitHub_Request( $this );
-        }
-
-        return $this->request;
-    }
-
-    /**
-     * Lazy-load the Response object.
-     *
-     * @return Writing_On_GitHub_Response
-     */
-    public function response() {
-        if ( ! $this->response ) {
-            $this->response = new Writing_On_GitHub_Response( $this );
-        }
-
-        return $this->response;
-    }
-
-    /**
-     * Lazy-load the Api object.
-     *
-     * @return Writing_On_GitHub_Api
-     */
-    public function api() {
-        if ( ! $this->api ) {
-            $this->api = new Writing_On_GitHub_Api( $this );
-        }
-
-        return $this->api;
-    }
-
-    /**
-     * Lazy-load the Import object.
-     *
-     * @return Writing_On_GitHub_Import
-     */
-    public function import() {
-        if ( ! $this->import ) {
-            $this->import = new Writing_On_GitHub_Import( $this );
-        }
-
-        return $this->import;
-    }
-
-    /**
-     * Lazy-load the Export object.
-     *
-     * @return Writing_On_GitHub_Export
-     */
-    public function export() {
-        if ( ! $this->export ) {
-            $this->export = new Writing_On_GitHub_Export( $this );
-        }
-
-        return $this->export;
-    }
-
-    /**
-     * Lazy-load the Semaphore object.
-     *
-     * @return Writing_On_GitHub_Semaphore
-     */
-    public function semaphore() {
-        if ( ! $this->semaphore ) {
-            $this->semaphore = new Writing_On_GitHub_Semaphore;
-        }
-
-        return $this->semaphore;
-    }
-
-    /**
-     * Lazy-load the Database object.
-     *
-     * @return Writing_On_GitHub_Database
-     */
-    public function database() {
-        if ( ! $this->database ) {
-            $this->database = new Writing_On_GitHub_Database( $this );
-        }
-
-        return $this->database;
-    }
-
-    /**
-     * Print to WP_CLI if in CLI environment or
-     * write to debug.log if WP_DEBUG is enabled
-     * @source http://www.stumiller.me/sending-output-to-the-wordpress-debug-log/
-     *
-     * @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 );
-            } else {
-                WP_CLI::$write( $msg );
-            }
-        } elseif ( true === WP_DEBUG ) {
-            if ( is_array( $msg ) || is_object( $msg ) ) {
-                error_log( print_r( $msg, true ) );
-            } else {
-                error_log( $msg );
-            }
-        }
-    }
-
-    /**
-     * Kicks of an import or export cronjob.
-     *
-     * @param bool   $force
-     * @param string $type
-     */
-    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 ) );
-        spawn_cron();
-    }
+	}
+
+	/**
+	 * Get the Controller object.
+	 *
+	 * @return Writing_On_GitHub_Controller
+	 */
+	public function controller() {
+		return $this->controller;
+	}
+
+	/**
+	 * Lazy-load the CLI object.
+	 *
+	 * @return Writing_On_GitHub_CLI
+	 */
+	public function cli() {
+		if ( ! $this->cli ) {
+			$this->cli = new Writing_On_GitHub_CLI;
+		}
+
+		return $this->cli;
+	}
+
+	/**
+	 * Lazy-load the Request object.
+	 *
+	 * @return Writing_On_GitHub_Request
+	 */
+	public function request() {
+		if ( ! $this->request ) {
+			$this->request = new Writing_On_GitHub_Request( $this );
+		}
+
+		return $this->request;
+	}
+
+	/**
+	 * Lazy-load the Response object.
+	 *
+	 * @return Writing_On_GitHub_Response
+	 */
+	public function response() {
+		if ( ! $this->response ) {
+			$this->response = new Writing_On_GitHub_Response( $this );
+		}
+
+		return $this->response;
+	}
+
+	/**
+	 * Lazy-load the Api object.
+	 *
+	 * @return Writing_On_GitHub_Api
+	 */
+	public function api() {
+		if ( ! $this->api ) {
+			$this->api = new Writing_On_GitHub_Api( $this );
+		}
+
+		return $this->api;
+	}
+
+	/**
+	 * Lazy-load the Import object.
+	 *
+	 * @return Writing_On_GitHub_Import
+	 */
+	public function import() {
+		if ( ! $this->import ) {
+			$this->import = new Writing_On_GitHub_Import( $this );
+		}
+
+		return $this->import;
+	}
+
+	/**
+	 * Lazy-load the Export object.
+	 *
+	 * @return Writing_On_GitHub_Export
+	 */
+	public function export() {
+		if ( ! $this->export ) {
+			$this->export = new Writing_On_GitHub_Export( $this );
+		}
+
+		return $this->export;
+	}
+
+	/**
+	 * Lazy-load the Semaphore object.
+	 *
+	 * @return Writing_On_GitHub_Semaphore
+	 */
+	public function semaphore() {
+		if ( ! $this->semaphore ) {
+			$this->semaphore = new Writing_On_GitHub_Semaphore;
+		}
+
+		return $this->semaphore;
+	}
+
+	/**
+	 * Lazy-load the Database object.
+	 *
+	 * @return Writing_On_GitHub_Database
+	 */
+	public function database() {
+		if ( ! $this->database ) {
+			$this->database = new Writing_On_GitHub_Database( $this );
+		}
+
+		return $this->database;
+	}
+
+	/**
+	 * Print to WP_CLI if in CLI environment or
+	 * write to debug.log if WP_DEBUG is enabled
+	 * @source http://www.stumiller.me/sending-output-to-the-wordpress-debug-log/
+	 *
+	 * @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 );
+			} else {
+				WP_CLI::$write( $msg );
+			}
+		} elseif ( true === WP_DEBUG ) {
+			if ( is_array( $msg ) || is_object( $msg ) ) {
+				error_log( print_r( $msg, true ) );
+			} else {
+				error_log( $msg );
+			}
+		}
+	}
+
+	/**
+	 * Kicks of an import or export cronjob.
+	 *
+	 * @param bool   $force
+	 * @param string $type
+	 */
+	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 ) );
+		spawn_cron();
+	}
 }

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/admin.php

Indentation +200 added lines, -200 removed lines

@@ -9,227 +9,227 @@
  */
 class Writing_On_GitHub_Admin {
 
-    /**
-     * 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' ) );
-    }
-
-    /**
-     * Callback to render the settings page view
-     */
-    public function settings_page() {
-        include dirname( dirname( __FILE__ ) ) . '/views/options.php';
-    }
-
-    /**
-     * Callback to register the plugin's options
-     */
-    public function register_settings() {
-        add_settings_section(
-            'general',
-            'General Settings',
-            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(
-                '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' ),
-            )
-        );
-
-        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' ),
-            )
-        );
-
-        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' ),
-            )
-        );
-
-        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' ),
-            )
-        );
-
-        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' ),
-            )
-        );
-
-        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' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
-            )
-        );
-
-        // register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
-        // add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-        //      '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' ),
-        //  )
-        // );
-    }
-
-    /**
-     * Callback to render an individual options field
-     *
-     * @param array $args Field arguments.
-     */
-    public function field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
-    }
-
-    /**
-     * Callback to render the default import user field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function user_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
-    }
-
-    /**
-     * Callback to render the textarea field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function textarea_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
-    }
-
-    /**
-     * Callback to render the checkbox field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
-    }
-
-    /**
-     * Displays settings messages from background processes
-     */
-    public function section_callback() {
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
-            return;
-        }
-
-        if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+	/**
+	 * 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' ) );
+	}
+
+	/**
+	 * Callback to render the settings page view
+	 */
+	public function settings_page() {
+		include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+	}
+
+	/**
+	 * Callback to register the plugin's options
+	 */
+	public function register_settings() {
+		add_settings_section(
+			'general',
+			'General Settings',
+			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(
+				'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' ),
+			)
+		);
+
+		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' ),
+			)
+		);
+
+		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' ),
+			)
+		);
+
+		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' ),
+			)
+		);
+
+		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' ),
+			)
+		);
+
+		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' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
+		add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_ignore_author',
+				'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+			)
+		);
+
+		// register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
+		// add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		//      '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' ),
+		//  )
+		// );
+	}
+
+	/**
+	 * Callback to render an individual options field
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+	}
+
+	/**
+	 * Callback to render the default import user field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function user_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+	}
+
+	/**
+	 * Callback to render the textarea field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function textarea_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+	}
+
+	/**
+	 * Callback to render the checkbox field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function checkbox_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+	}
+
+	/**
+	 * Displays settings messages from background processes
+	 */
+	public function section_callback() {
+		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+			return;
+		}
+
+		if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
             <div class="updated">
                 <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>
             </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>
             </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>
             </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>
             </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>
             </div><?php
-            delete_option( '_wogh_import_complete' );
-        }
-    }
-
-    /**
-     * Add options menu to admin navbar
-     */
-    public function add_admin_menu() {
-        add_options_page(
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            'manage_options',
-            Writing_On_GitHub::$text_domain,
-            array( $this, 'settings_page' )
-        );
-    }
-
-    /**
-     * Admin callback to trigger import/export because WordPress admin routing lol
-     */
-    public function trigger_cron() {
-        if ( ! current_user_can( 'manage_options' ) ) {
-            return;
-        }
-
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
-            return;
-        }
-
-        if ( ! isset( $_GET['action'] ) ) {
-            return;
-        }
-
-        if ( 'export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export();
-        }
-
-        if ( 'force_export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export(true);
-        }
-
-        if ( 'import' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_import();
-        }
-
-        wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
-        die;
-    }
+			delete_option( '_wogh_import_complete' );
+		}
+	}
+
+	/**
+	 * Add options menu to admin navbar
+	 */
+	public function add_admin_menu() {
+		add_options_page(
+			__( 'Writing On GitHub', 'writing-on-github' ),
+			__( 'Writing On GitHub', 'writing-on-github' ),
+			'manage_options',
+			Writing_On_GitHub::$text_domain,
+			array( $this, 'settings_page' )
+		);
+	}
+
+	/**
+	 * Admin callback to trigger import/export because WordPress admin routing lol
+	 */
+	public function trigger_cron() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			return;
+		}
+
+		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+			return;
+		}
+
+		if ( ! isset( $_GET['action'] ) ) {
+			return;
+		}
+
+		if ( 'export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export();
+		}
+
+		if ( 'force_export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export(true);
+		}
+
+		if ( 'import' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_import();
+		}
+
+		wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+		die;
+	}
 }

Spacing +63 added lines, -63 removed lines

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

lib/client/base.php

Indentation +200 added lines, -200 removed lines

@@ -9,204 +9,204 @@
  */
 class Writing_On_GitHub_Base_Client {
 
-    const HOST_OPTION_KEY   = 'wogh_host';
-    const TOKEN_OPTION_KEY  = 'wogh_oauth_token';
-    const REPO_OPTION_KEY   = 'wogh_repository';
-    const BRANCH_OPTION_KEY = 'wogh_branch';
-
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Instantiates a new Api object.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Generic GitHub API interface and response handler
-     *
-     * @param string $method HTTP method.
-     * @param string $endpoint API endpoint.
-     * @param array  $body Request body.
-     *
-     * @return stdClass|WP_Error
-     */
-    protected function call( $method, $endpoint, $body = array() ) {
-        if ( is_wp_error( $error = $this->can_call() ) ) {
-            /*　@var WP_Error $error */
-            return $error;
-        }
-
-        $args = array(
-            'method'  => $method,
-            'headers' => array(
-                'Authorization' => 'token ' . $this->oauth_token(),
-            ),
-        );
-
-        if ( 'GET' !== $method ) {
-            $args['body'] = json_encode( $body );
-        }
-
-        // $tmpbody = isset( $args['body'] ) ? $args['body'] : '';
-        // error_log( "writing-on-github-call $method $endpoint $tmpbody" );
-
-        $response = wp_remote_request( $endpoint, $args );
-        $status   = wp_remote_retrieve_header( $response, 'status' );
-        $body     = json_decode( wp_remote_retrieve_body( $response ) );
-
-        if ( '2' !== substr( $status, 0, 1 ) && '3' !== substr( $status, 0, 1 ) ) {
-            return new WP_Error(
-                strtolower( str_replace( ' ', '_', $status ) ),
-                sprintf(
-                    __( 'Method %s to endpoint %s failed with error: %s', 'writing-on-github' ),
-                    $method,
-                    $endpoint,
-                    ( $body && $body->message ) ? $body->message : 'Unknown error'
-                )
-            );
-        }
-
-        return $body;
-    }
-
-    /**
-     * Validates whether the Api object can make a call.
-     *
-     * @return true|WP_Error
-     */
-    protected function can_call() {
-        if ( ! $this->oauth_token() ) {
-            return new WP_Error(
-                'missing_token',
-                __( 'Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github' )
-            );
-        }
-
-        $repo = $this->repository();
-
-        if ( ! $repo ) {
-            return new WP_Error(
-                'missing_repository',
-                __( 'Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github' )
-            );
-        }
-
-        $parts = explode( '/', $repo );
-
-        if ( 2 !== count( $parts ) ) {
-            return new WP_Error(
-                'malformed_repository',
-                __( 'Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github' )
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the repository to sync with
-     *
-     * @return string
-     */
-    public function repository() {
-        return (string) get_option( self::REPO_OPTION_KEY );
-    }
-
-    /**
-     * Returns the user's oauth token
-     *
-     * @return string
-     */
-    public function oauth_token() {
-        return (string) get_option( self::TOKEN_OPTION_KEY );
-    }
-
-    /**
-     * Returns the GitHub host to sync with (for GitHub Enterprise support)
-     */
-    public function api_base() {
-        return get_option( self::HOST_OPTION_KEY );
-    }
-
-    public function branch() {
-        $branch = get_option( self::BRANCH_OPTION_KEY );
-        return $branch ? $branch : 'master';
-    }
-
-    /**
-     * API endpoint for the master branch reference
-     */
-    public function reference_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/git/refs/heads/' . $this->branch();
-
-        return $url;
-    }
-
-    /**
-     * Api to get and create commits
-     */
-    public function commit_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/git/commits';
-
-        return $url;
-    }
-
-    /**
-     * Api to compare commits
-     */
-    public function compare_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/compare';
-
-        return $url;
-    }
-
-    /**
-     * Api to get and create trees
-     */
-    public function tree_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/git/trees';
-
-        return $url;
-    }
-
-    /**
-     * Builds the proper blob API endpoint for a given post
-     *
-     * Returns String the relative API call path
-     */
-    public function blob_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/git/blobs';
-
-        return $url;
-    }
-
-    /**
-     * Builds the proper content API endpoint for a given post
-     *
-     * Returns String the relative API call path
-     */
-    public function content_endpoint( $path = false ) {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/contents';
-
-        if ( ! empty($path) ) {
-            $url .= '/' . $path;
-        }
-
-        return $url;
-    }
+	const HOST_OPTION_KEY   = 'wogh_host';
+	const TOKEN_OPTION_KEY  = 'wogh_oauth_token';
+	const REPO_OPTION_KEY   = 'wogh_repository';
+	const BRANCH_OPTION_KEY = 'wogh_branch';
+
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Instantiates a new Api object.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Generic GitHub API interface and response handler
+	 *
+	 * @param string $method HTTP method.
+	 * @param string $endpoint API endpoint.
+	 * @param array  $body Request body.
+	 *
+	 * @return stdClass|WP_Error
+	 */
+	protected function call( $method, $endpoint, $body = array() ) {
+		if ( is_wp_error( $error = $this->can_call() ) ) {
+			/*　@var WP_Error $error */
+			return $error;
+		}
+
+		$args = array(
+			'method'  => $method,
+			'headers' => array(
+				'Authorization' => 'token ' . $this->oauth_token(),
+			),
+		);
+
+		if ( 'GET' !== $method ) {
+			$args['body'] = json_encode( $body );
+		}
+
+		// $tmpbody = isset( $args['body'] ) ? $args['body'] : '';
+		// error_log( "writing-on-github-call $method $endpoint $tmpbody" );
+
+		$response = wp_remote_request( $endpoint, $args );
+		$status   = wp_remote_retrieve_header( $response, 'status' );
+		$body     = json_decode( wp_remote_retrieve_body( $response ) );
+
+		if ( '2' !== substr( $status, 0, 1 ) && '3' !== substr( $status, 0, 1 ) ) {
+			return new WP_Error(
+				strtolower( str_replace( ' ', '_', $status ) ),
+				sprintf(
+					__( 'Method %s to endpoint %s failed with error: %s', 'writing-on-github' ),
+					$method,
+					$endpoint,
+					( $body && $body->message ) ? $body->message : 'Unknown error'
+				)
+			);
+		}
+
+		return $body;
+	}
+
+	/**
+	 * Validates whether the Api object can make a call.
+	 *
+	 * @return true|WP_Error
+	 */
+	protected function can_call() {
+		if ( ! $this->oauth_token() ) {
+			return new WP_Error(
+				'missing_token',
+				__( 'Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github' )
+			);
+		}
+
+		$repo = $this->repository();
+
+		if ( ! $repo ) {
+			return new WP_Error(
+				'missing_repository',
+				__( 'Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github' )
+			);
+		}
+
+		$parts = explode( '/', $repo );
+
+		if ( 2 !== count( $parts ) ) {
+			return new WP_Error(
+				'malformed_repository',
+				__( 'Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github' )
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the repository to sync with
+	 *
+	 * @return string
+	 */
+	public function repository() {
+		return (string) get_option( self::REPO_OPTION_KEY );
+	}
+
+	/**
+	 * Returns the user's oauth token
+	 *
+	 * @return string
+	 */
+	public function oauth_token() {
+		return (string) get_option( self::TOKEN_OPTION_KEY );
+	}
+
+	/**
+	 * Returns the GitHub host to sync with (for GitHub Enterprise support)
+	 */
+	public function api_base() {
+		return get_option( self::HOST_OPTION_KEY );
+	}
+
+	public function branch() {
+		$branch = get_option( self::BRANCH_OPTION_KEY );
+		return $branch ? $branch : 'master';
+	}
+
+	/**
+	 * API endpoint for the master branch reference
+	 */
+	public function reference_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/git/refs/heads/' . $this->branch();
+
+		return $url;
+	}
+
+	/**
+	 * Api to get and create commits
+	 */
+	public function commit_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/git/commits';
+
+		return $url;
+	}
+
+	/**
+	 * Api to compare commits
+	 */
+	public function compare_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/compare';
+
+		return $url;
+	}
+
+	/**
+	 * Api to get and create trees
+	 */
+	public function tree_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/git/trees';
+
+		return $url;
+	}
+
+	/**
+	 * Builds the proper blob API endpoint for a given post
+	 *
+	 * Returns String the relative API call path
+	 */
+	public function blob_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/git/blobs';
+
+		return $url;
+	}
+
+	/**
+	 * Builds the proper content API endpoint for a given post
+	 *
+	 * Returns String the relative API call path
+	 */
+	public function content_endpoint( $path = false ) {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/contents';
+
+		if ( ! empty($path) ) {
+			$url .= '/' . $path;
+		}
+
+		return $url;
+	}
 }

Spacing +25 added lines, -25 removed lines

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

lib/client/fetch.php

Indentation +98 added lines, -98 removed lines

@@ -9,102 +9,102 @@
  */
 class Writing_On_GitHub_Fetch_Client extends Writing_On_GitHub_Base_Client {
 
-    /**
-     * Compare a commit by sha with master from the GitHub API
-     *
-     * @param string $sha Sha for commit to retrieve.
-     *
-     * @return Writing_On_GitHub_File_Info[]|WP_Error
-     */
-    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" );
-
-        if ( is_wp_error( $data ) ) {
-            return $data;
-        }
-
-        $files = array();
-        foreach ($data->files as $file) {
-            $file->path = $file->filename;
-            $files[] = new Writing_On_GitHub_File_Info($file);
-        }
-
-        return $files;
-    }
-
-    /**
-     * Calls the content API to get the post's contents and metadata
-     *
-     * Returns Object the response from the API
-     *
-     * @param Writing_On_GitHub_Post $post Post to retrieve remote contents for.
-     *
-     * @return mixed
-     */
-    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 ) ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Retrieves a tree by sha recursively from the GitHub API
-     *
-     * @param string $sha Commit sha to retrieve tree from.
-     *
-     * @return Writing_On_GitHub_File_Info[]|WP_Error
-     */
-    public function tree_recursive( $sha = '_default' ) {
-
-        if ( '_default' === $sha ) {
-            $sha = $this->branch();
-        }
-
-        $data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' );
-
-        if ( is_wp_error( $data ) ) {
-            return $data;
-        }
-
-        $files = array();
-
-        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 ) {
-                $thing->status = '';
-                $files[] = new Writing_On_GitHub_File_Info( $thing );
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Retrieves the blob data for a given sha
-     *
-     * @param Writing_On_GitHub_File_Info $fileinfo
-     *
-     * @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 );
-
-        if ( is_wp_error( $data ) ) {
-            return $data;
-        }
-
-        $data->path = $fileinfo->path;
-        return new Writing_On_GitHub_Blob( $data );
-    }
+	/**
+	 * Compare a commit by sha with master from the GitHub API
+	 *
+	 * @param string $sha Sha for commit to retrieve.
+	 *
+	 * @return Writing_On_GitHub_File_Info[]|WP_Error
+	 */
+	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" );
+
+		if ( is_wp_error( $data ) ) {
+			return $data;
+		}
+
+		$files = array();
+		foreach ($data->files as $file) {
+			$file->path = $file->filename;
+			$files[] = new Writing_On_GitHub_File_Info($file);
+		}
+
+		return $files;
+	}
+
+	/**
+	 * Calls the content API to get the post's contents and metadata
+	 *
+	 * Returns Object the response from the API
+	 *
+	 * @param Writing_On_GitHub_Post $post Post to retrieve remote contents for.
+	 *
+	 * @return mixed
+	 */
+	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 ) ) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Retrieves a tree by sha recursively from the GitHub API
+	 *
+	 * @param string $sha Commit sha to retrieve tree from.
+	 *
+	 * @return Writing_On_GitHub_File_Info[]|WP_Error
+	 */
+	public function tree_recursive( $sha = '_default' ) {
+
+		if ( '_default' === $sha ) {
+			$sha = $this->branch();
+		}
+
+		$data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' );
+
+		if ( is_wp_error( $data ) ) {
+			return $data;
+		}
+
+		$files = array();
+
+		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 ) {
+				$thing->status = '';
+				$files[] = new Writing_On_GitHub_File_Info( $thing );
+			}
+		}
+
+		return $files;
+	}
+
+	/**
+	 * Retrieves the blob data for a given sha
+	 *
+	 * @param Writing_On_GitHub_File_Info $fileinfo
+	 *
+	 * @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 );
+
+		if ( is_wp_error( $data ) ) {
+			return $data;
+		}
+
+		$data->path = $fileinfo->path;
+		return new Writing_On_GitHub_Blob( $data );
+	}
 }

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/client/persist.php

Indentation +60 added lines, -60 removed lines

@@ -9,75 +9,75 @@
  */
 class Writing_On_GitHub_Persist_Client extends Writing_On_GitHub_Base_Client {
 
-    /**
-     * Get the data for the current user.
-     *
-     * @return array
-     */
-    protected function export_user() {
-        $user_id = get_current_user_id();
-        $user = get_userdata( $user_id );
+	/**
+	 * Get the data for the current user.
+	 *
+	 * @return array
+	 */
+	protected function export_user() {
+		$user_id = get_current_user_id();
+		$user = get_userdata( $user_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,
+			);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete the file.
-     *
-     * @return array
-     */
-    public function delete_file( $path, $sha, $message ) {
-        $body = new stdClass();
-        $body->message = $message;
-        $body->sha = $sha;
-        $body->branch = $this->branch();
+	/**
+	 * Delete the file.
+	 *
+	 * @return array
+	 */
+	public function delete_file( $path, $sha, $message ) {
+		$body = new stdClass();
+		$body->message = $message;
+		$body->sha = $sha;
+		$body->branch = $this->branch();
 
-        if ( $author = $this->export_user() ) {
-            $body->author = $author;
-        }
+		if ( $author = $this->export_user() ) {
+			$body->author = $author;
+		}
 
-        return $this->call( 'DELETE', $this->content_endpoint( $path ), $body );
-    }
+		return $this->call( 'DELETE', $this->content_endpoint( $path ), $body );
+	}
 
-    /**
-     * Create the file.
-     *
-     * @return array
-     */
-    public function create_file( $blob, $message ) {
-        $body = $blob->to_body();
-        $body->message = $message;
-        $body->branch = $this->branch();
-        unset($body->sha);
+	/**
+	 * Create the file.
+	 *
+	 * @return array
+	 */
+	public function create_file( $blob, $message ) {
+		$body = $blob->to_body();
+		$body->message = $message;
+		$body->branch = $this->branch();
+		unset($body->sha);
 
-        if ( $author = $this->export_user() ) {
-            $body->author = $author;
-        }
+		if ( $author = $this->export_user() ) {
+			$body->author = $author;
+		}
 
-        return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
-    }
+		return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
+	}
 
-    /**
-     * Update the file.
-     *
-     * @return array
-     */
-    public function update_file( $blob, $message ) {
-        $body = $blob->to_body();
-        $body->message = $message;
-        $body->branch = $this->branch();
+	/**
+	 * Update the file.
+	 *
+	 * @return array
+	 */
+	public function update_file( $blob, $message ) {
+		$body = $blob->to_body();
+		$body->message = $message;
+		$body->branch = $this->branch();
 
-        if ( $author = $this->export_user() ) {
-            $body->author = $author;
-        }
+		if ( $author = $this->export_user() ) {
+			$body->author = $author;
+		}
 
-        return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
-    }
+		return $this->call( 'PUT', $this->content_endpoint( $blob->path() ), $body );
+	}
 }

Spacing +11 added lines, -11 removed lines

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

lib/response.php

Indentation +70 added lines, -70 removed lines

@@ -9,87 +9,87 @@
  */
 class Writing_On_GitHub_Response {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
 
-    /**
-     * Writing_On_GitHub_Response constructor.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
+	/**
+	 * Writing_On_GitHub_Response constructor.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
 
-    /**
-     * Writes to the log and returns the error response.
-     *
-     * @param WP_Error $error Error to respond with.
-     *
-     * @return false
-     */
-    public function error( WP_Error $error ) {
-        global $wp_version;
+	/**
+	 * Writes to the log and returns the error response.
+	 *
+	 * @param WP_Error $error Error to respond with.
+	 *
+	 * @return false
+	 */
+	public function error( WP_Error $error ) {
+		global $wp_version;
 
-        $this->log( $error );
+		$this->log( $error );
 
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
-            /**
-             * WordPress 4.1.0 introduced allowing WP_Error objects to be
-             * passed directly into `wp_send_json_error`. This shims in
-             * compatibility for older versions. We're currently supporting 3.9+.
-             */
-            if ( version_compare( $wp_version, '4.1.0', '<' ) ) {
-                $result = array();
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
+			/**
+			 * WordPress 4.1.0 introduced allowing WP_Error objects to be
+			 * passed directly into `wp_send_json_error`. This shims in
+			 * compatibility for older versions. We're currently supporting 3.9+.
+			 */
+			if ( version_compare( $wp_version, '4.1.0', '<' ) ) {
+				$result = array();
 
-                foreach ( $error->errors as $code => $messages ) {
-                    foreach ( $messages as $message ) {
-                        $result[] = array( 'code' => $code, 'message' => $message );
-                    }
-                }
+				foreach ( $error->errors as $code => $messages ) {
+					foreach ( $messages as $message ) {
+						$result[] = array( 'code' => $code, 'message' => $message );
+					}
+				}
 
-                $error = $result;
-            }
+				$error = $result;
+			}
 
-            wp_send_json_error( $error );
-        }
+			wp_send_json_error( $error );
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Writes to the log and returns the success response.
-     *
-     * @param string $success Success message to respond with.
-     *
-     * @return true
-     */
-    public function success( $success ) {
-        $this->log( $success );
+	/**
+	 * Writes to the log and returns the success response.
+	 *
+	 * @param string $success Success message to respond with.
+	 *
+	 * @return true
+	 */
+	public function success( $success ) {
+		$this->log( $success );
 
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
-            wp_send_json_success( $success );
-        }
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
+			wp_send_json_success( $success );
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Writes a log message.
-     *
-     * Can extract a message from WP_Error object.
-     *
-     * @param string|WP_Error $msg Message to log.
-     */
-    protected function log( $msg ) {
-        if ( is_wp_error( $msg ) ) {
-            $msg = $msg->get_error_message();
-        }
+	/**
+	 * Writes a log message.
+	 *
+	 * Can extract a message from WP_Error object.
+	 *
+	 * @param string|WP_Error $msg Message to log.
+	 */
+	protected function log( $msg ) {
+		if ( is_wp_error( $msg ) ) {
+			$msg = $msg->get_error_message();
+		}
 
-        Writing_On_GitHub::write_log( $msg );
-    }
+		Writing_On_GitHub::write_log( $msg );
+	}
 }

Spacing +16 added lines, -16 removed lines

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

lib/controller.php

Indentation +230 added lines, -230 removed lines

@@ -9,234 +9,234 @@
  */
 class Writing_On_GitHub_Controller {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    public $app;
-
-    /**
-     * Instantiates a new Controller object
-     *
-     * @param Writing_On_GitHub $app Applicatio container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Webhook callback as triggered from GitHub push.
-     *
-     * Reads the Webhook payload and syncs posts as necessary.
-     *
-     * @return boolean
-     */
-    public function pull_posts() {
-        $this->set_ajax();
-        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()' )
-            ) );
-        }
-
-        if ( ! $this->app->request()->is_secret_valid() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_headers',
-                __( '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' ) );
-        }
-
-        // push
-        if ( ! $this->app->request()->is_push() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_headers',
-                __( '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(
-                'invalid_payload',
-                sprintf(
-                    __( "%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' ) );
-
-        $result = $this->app->import()->payload( $payload );
-
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Imports posts from the current master branch.
-     *
-     * @return boolean
-     */
-    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()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        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 );
-        }
-
-        $result = $this->app->import()->master();
-
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_import_error', $result->get_error_message() );
-
-            return $this->app->response()->error( $result );
-        }
-
-        update_option( '_wogh_import_complete', 'yes' );
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Export all the posts in the database to GitHub.
-     *
-     * @param  int        $user_id
-     * @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(
-                'semaphore_locked',
-                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 );
-        }
-
-        $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 ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_export_error', $result->get_error_message() );
-
-            return $this->app->response()->error( $result );
-        } else {
-            update_option( '_wogh_export_complete', 'yes' );
-            update_option( '_wogh_fully_exported', 'yes' );
-
-            return $this->app->response()->success( $result );
-        }
-    }
-
-    /**
-     * Exports a single post to GitHub by ID.
-     *
-     * Called on the save_post hook.
-     *
-     * @param int $post_id Post ID.
-     *
-     * @return boolean
-     */
-    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(
-                'semaphore_locked',
-                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 );
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Removes the post from the tree.
-     *
-     * Called the delete_post hook.
-     *
-     * @param int $post_id Post ID.
-     *
-     * @return boolean
-     */
-    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(
-                'semaphore_locked',
-                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 );
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Indicates we're running our own AJAX hook
-     * and thus should respond with JSON, rather
-     * than just returning data.
-     */
-    protected function set_ajax() {
-        if ( ! defined( 'WOGH_AJAX' ) ) {
-            define( 'WOGH_AJAX', true );
-        }
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	public $app;
+
+	/**
+	 * Instantiates a new Controller object
+	 *
+	 * @param Writing_On_GitHub $app Applicatio container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Webhook callback as triggered from GitHub push.
+	 *
+	 * Reads the Webhook payload and syncs posts as necessary.
+	 *
+	 * @return boolean
+	 */
+	public function pull_posts() {
+		$this->set_ajax();
+		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()' )
+			) );
+		}
+
+		if ( ! $this->app->request()->is_secret_valid() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_headers',
+				__( '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' ) );
+		}
+
+		// push
+		if ( ! $this->app->request()->is_push() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_headers',
+				__( '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(
+				'invalid_payload',
+				sprintf(
+					__( "%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' ) );
+
+		$result = $this->app->import()->payload( $payload );
+
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Imports posts from the current master branch.
+	 *
+	 * @return boolean
+	 */
+	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()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		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 );
+		}
+
+		$result = $this->app->import()->master();
+
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			update_option( '_wogh_import_error', $result->get_error_message() );
+
+			return $this->app->response()->error( $result );
+		}
+
+		update_option( '_wogh_import_complete', 'yes' );
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Export all the posts in the database to GitHub.
+	 *
+	 * @param  int        $user_id
+	 * @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(
+				'semaphore_locked',
+				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 );
+		}
+
+		$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 ) ) {
+			/*　@var WP_Error $result */
+			update_option( '_wogh_export_error', $result->get_error_message() );
+
+			return $this->app->response()->error( $result );
+		} else {
+			update_option( '_wogh_export_complete', 'yes' );
+			update_option( '_wogh_fully_exported', 'yes' );
+
+			return $this->app->response()->success( $result );
+		}
+	}
+
+	/**
+	 * Exports a single post to GitHub by ID.
+	 *
+	 * Called on the save_post hook.
+	 *
+	 * @param int $post_id Post ID.
+	 *
+	 * @return boolean
+	 */
+	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(
+				'semaphore_locked',
+				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 );
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Removes the post from the tree.
+	 *
+	 * Called the delete_post hook.
+	 *
+	 * @param int $post_id Post ID.
+	 *
+	 * @return boolean
+	 */
+	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(
+				'semaphore_locked',
+				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 );
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Indicates we're running our own AJAX hook
+	 * and thus should respond with JSON, rather
+	 * than just returning data.
+	 */
+	protected function set_ajax() {
+		if ( ! defined( 'WOGH_AJAX' ) ) {
+			define( 'WOGH_AJAX', true );
+		}
+	}
 }

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/cli.php

Indentation +146 added lines, -146 removed lines

@@ -9,150 +9,150 @@
  */
 class Writing_On_GitHub_CLI extends WP_CLI_Command {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Grab the Application container on instantiation.
-     */
-    public function __construct() {
-        $this->app = Writing_On_GitHub::$instance;
-    }
-
-    /**
-     * Exports an individual post
-     * all your posts to GitHub
-     *
-     * ## OPTIONS
-     *
-     * <post_id|all>
-     * : The post ID to export or 'all' for full site
-     *
-     * <user_id>
-     * : The user ID you'd like to save the commit as
-     *
-     * ## EXAMPLES
-     *
-     *     wp wogh export all 1
-     *     wp wogh export 1 1
-     *
-     * @synopsis <post_id|all> <user_id>
-     *
-     * @param array $args Command arguments.
-     */
-    public function export( $args ) {
-        list( $post_id, $user_id ) = $args;
-
-        if ( ! is_numeric( $user_id ) ) {
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
-        }
-
-        $this->app->export()->set_user( $user_id );
-
-        if ( 'all' === $post_id ) {
-            WP_CLI::line( __( 'Starting full export to GitHub.', 'writing-on-github' ) );
-            $this->app->controller()->export_all();
-        } elseif ( is_numeric( $post_id ) ) {
-            WP_CLI::line(
-                sprintf(
-                    __( 'Exporting post ID to GitHub: %d', 'writing-on-github' ),
-                    $post_id
-                )
-            );
-            $this->app->controller()->export_post( (int) $post_id );
-        } else {
-            WP_CLI::error( __( 'Invalid post ID', 'writing-on-github' ) );
-        }
-    }
-
-    /**
-     * Imports the post in your GitHub repo
-     * into your WordPress blog
-     *
-     * ## OPTIONS
-     *
-     * <user_id>
-     * : The user ID you'd like to save the commit as
-     *
-     * ## EXAMPLES
-     *
-     *     wp wogh import 1
-     *
-     * @synopsis <user_id>
-     *
-     * @param array $args Command arguments.
-     */
-    public function import( $args ) {
-        list( $user_id ) = $args;
-
-        if ( ! is_numeric( $user_id ) ) {
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
-        }
-
-        update_option( '_wogh_export_user_id', (int) $user_id );
-
-        WP_CLI::line( __( 'Starting import from GitHub.', 'writing-on-github' ) );
-
-        $this->app->controller()->import_master();
-    }
-
-    /**
-     * Fetches the provided sha or the repository's
-     * master branch and caches it.
-     *
-     * ## OPTIONS
-     *
-     * <user_id>
-     * : The user ID you'd like to save the commit as
-     *
-     * ## EXAMPLES
-     *
-     *     wp wogh prime --branch=master
-     *     wp wogh prime --sha=<commit_sha>
-     *
-     * @synopsis [--sha=<commit_sha>] [--branch]
-     *
-     * @param array $args Command arguments.
-     * @param array $assoc_args Command associated arguments.
-     */
-    public function prime( $args, $assoc_args ) {
-        if ( isset( $assoc_args['branch'] ) ) {
-            WP_CLI::line( __( 'Starting branch import.', 'writing-on-github' ) );
-
-            $commit = $this->app->api()->fetch()->master();
-
-            if ( is_wp_error( $commit ) ) {
-                WP_CLI::error(
-                    sprintf(
-                        __( 'Failed to import and cache branch with error: %s', 'writing-on-github' ),
-                        $commit->get_error_message()
-                    )
-                );
-            } else {
-                WP_CLI::success(
-                    sprintf(
-                        __( 'Successfully imported and cached commit %s from branch.', 'writing-on-github' ),
-                        $commit->sha()
-                    )
-                );
-            }
-        } else if ( isset( $assoc_args['sha'] ) ) {
-            WP_CLI::line( 'Starting sha import.' );
-
-            $commit = $this->app->api()->fetch()->commit( $assoc_args['sha'] );
-
-            WP_CLI::success(
-                sprintf(
-                    __( 'Successfully imported and cached commit %s.', 'writing-on-github' ),
-                    $commit->sha()
-                )
-            );
-        } else {
-            WP_CLI::error( 'Invalid fetch.' );
-        }
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Grab the Application container on instantiation.
+	 */
+	public function __construct() {
+		$this->app = Writing_On_GitHub::$instance;
+	}
+
+	/**
+	 * Exports an individual post
+	 * all your posts to GitHub
+	 *
+	 * ## OPTIONS
+	 *
+	 * <post_id|all>
+	 * : The post ID to export or 'all' for full site
+	 *
+	 * <user_id>
+	 * : The user ID you'd like to save the commit as
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     wp wogh export all 1
+	 *     wp wogh export 1 1
+	 *
+	 * @synopsis <post_id|all> <user_id>
+	 *
+	 * @param array $args Command arguments.
+	 */
+	public function export( $args ) {
+		list( $post_id, $user_id ) = $args;
+
+		if ( ! is_numeric( $user_id ) ) {
+			WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+		}
+
+		$this->app->export()->set_user( $user_id );
+
+		if ( 'all' === $post_id ) {
+			WP_CLI::line( __( 'Starting full export to GitHub.', 'writing-on-github' ) );
+			$this->app->controller()->export_all();
+		} elseif ( is_numeric( $post_id ) ) {
+			WP_CLI::line(
+				sprintf(
+					__( 'Exporting post ID to GitHub: %d', 'writing-on-github' ),
+					$post_id
+				)
+			);
+			$this->app->controller()->export_post( (int) $post_id );
+		} else {
+			WP_CLI::error( __( 'Invalid post ID', 'writing-on-github' ) );
+		}
+	}
+
+	/**
+	 * Imports the post in your GitHub repo
+	 * into your WordPress blog
+	 *
+	 * ## OPTIONS
+	 *
+	 * <user_id>
+	 * : The user ID you'd like to save the commit as
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     wp wogh import 1
+	 *
+	 * @synopsis <user_id>
+	 *
+	 * @param array $args Command arguments.
+	 */
+	public function import( $args ) {
+		list( $user_id ) = $args;
+
+		if ( ! is_numeric( $user_id ) ) {
+			WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+		}
+
+		update_option( '_wogh_export_user_id', (int) $user_id );
+
+		WP_CLI::line( __( 'Starting import from GitHub.', 'writing-on-github' ) );
+
+		$this->app->controller()->import_master();
+	}
+
+	/**
+	 * Fetches the provided sha or the repository's
+	 * master branch and caches it.
+	 *
+	 * ## OPTIONS
+	 *
+	 * <user_id>
+	 * : The user ID you'd like to save the commit as
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     wp wogh prime --branch=master
+	 *     wp wogh prime --sha=<commit_sha>
+	 *
+	 * @synopsis [--sha=<commit_sha>] [--branch]
+	 *
+	 * @param array $args Command arguments.
+	 * @param array $assoc_args Command associated arguments.
+	 */
+	public function prime( $args, $assoc_args ) {
+		if ( isset( $assoc_args['branch'] ) ) {
+			WP_CLI::line( __( 'Starting branch import.', 'writing-on-github' ) );
+
+			$commit = $this->app->api()->fetch()->master();
+
+			if ( is_wp_error( $commit ) ) {
+				WP_CLI::error(
+					sprintf(
+						__( 'Failed to import and cache branch with error: %s', 'writing-on-github' ),
+						$commit->get_error_message()
+					)
+				);
+			} else {
+				WP_CLI::success(
+					sprintf(
+						__( 'Successfully imported and cached commit %s from branch.', 'writing-on-github' ),
+						$commit->sha()
+					)
+				);
+			}
+		} else if ( isset( $assoc_args['sha'] ) ) {
+			WP_CLI::line( 'Starting sha import.' );
+
+			$commit = $this->app->api()->fetch()->commit( $assoc_args['sha'] );
+
+			WP_CLI::success(
+				sprintf(
+					__( 'Successfully imported and cached commit %s.', 'writing-on-github' ),
+					$commit->sha()
+				)
+			);
+		} else {
+			WP_CLI::error( 'Invalid fetch.' );
+		}
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -44,28 +44,28 @@ 
      *
      * @param array $args Command arguments.
      */
-    public function export( $args ) {
-        list( $post_id, $user_id ) = $args;
+    public function export($args) {
+        list($post_id, $user_id) = $args;
 
-        if ( ! is_numeric( $user_id ) ) {
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+        if ( ! is_numeric($user_id)) {
+            WP_CLI::error(__('Invalid user ID', 'writing-on-github'));
         }
 
-        $this->app->export()->set_user( $user_id );
+        $this->app->export()->set_user($user_id);
 
-        if ( 'all' === $post_id ) {
-            WP_CLI::line( __( 'Starting full export to GitHub.', 'writing-on-github' ) );
+        if ('all' === $post_id) {
+            WP_CLI::line(__('Starting full export to GitHub.', 'writing-on-github'));
             $this->app->controller()->export_all();
-        } elseif ( is_numeric( $post_id ) ) {
+        } elseif (is_numeric($post_id)) {
             WP_CLI::line(
                 sprintf(
-                    __( 'Exporting post ID to GitHub: %d', 'writing-on-github' ),
+                    __('Exporting post ID to GitHub: %d', 'writing-on-github'),
                     $post_id
                 )
             );
-            $this->app->controller()->export_post( (int) $post_id );
+            $this->app->controller()->export_post((int) $post_id);
         } else {
-            WP_CLI::error( __( 'Invalid post ID', 'writing-on-github' ) );
+            WP_CLI::error(__('Invalid post ID', 'writing-on-github'));
         }
     }
 
@@ -86,16 +86,16 @@ 
      *
      * @param array $args Command arguments.
      */
-    public function import( $args ) {
-        list( $user_id ) = $args;
+    public function import($args) {
+        list($user_id) = $args;
 
-        if ( ! is_numeric( $user_id ) ) {
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+        if ( ! is_numeric($user_id)) {
+            WP_CLI::error(__('Invalid user ID', 'writing-on-github'));
         }
 
-        update_option( '_wogh_export_user_id', (int) $user_id );
+        update_option('_wogh_export_user_id', (int) $user_id);
 
-        WP_CLI::line( __( 'Starting import from GitHub.', 'writing-on-github' ) );
+        WP_CLI::line(__('Starting import from GitHub.', 'writing-on-github'));
 
         $this->app->controller()->import_master();
     }
@@ -119,40 +119,40 @@ 
      * @param array $args Command arguments.
      * @param array $assoc_args Command associated arguments.
      */
-    public function prime( $args, $assoc_args ) {
-        if ( isset( $assoc_args['branch'] ) ) {
-            WP_CLI::line( __( 'Starting branch import.', 'writing-on-github' ) );
+    public function prime($args, $assoc_args) {
+        if (isset($assoc_args['branch'])) {
+            WP_CLI::line(__('Starting branch import.', 'writing-on-github'));
 
             $commit = $this->app->api()->fetch()->master();
 
-            if ( is_wp_error( $commit ) ) {
+            if (is_wp_error($commit)) {
                 WP_CLI::error(
                     sprintf(
-                        __( 'Failed to import and cache branch with error: %s', 'writing-on-github' ),
+                        __('Failed to import and cache branch with error: %s', 'writing-on-github'),
                         $commit->get_error_message()
                     )
                 );
             } else {
                 WP_CLI::success(
                     sprintf(
-                        __( 'Successfully imported and cached commit %s from branch.', 'writing-on-github' ),
+                        __('Successfully imported and cached commit %s from branch.', 'writing-on-github'),
                         $commit->sha()
                     )
                 );
             }
-        } else if ( isset( $assoc_args['sha'] ) ) {
-            WP_CLI::line( 'Starting sha import.' );
+        } else if (isset($assoc_args['sha'])) {
+            WP_CLI::line('Starting sha import.');
 
-            $commit = $this->app->api()->fetch()->commit( $assoc_args['sha'] );
+            $commit = $this->app->api()->fetch()->commit($assoc_args['sha']);
 
             WP_CLI::success(
                 sprintf(
-                    __( 'Successfully imported and cached commit %s.', 'writing-on-github' ),
+                    __('Successfully imported and cached commit %s.', 'writing-on-github'),
                     $commit->sha()
                 )
             );
         } else {
-            WP_CLI::error( 'Invalid fetch.' );
+            WP_CLI::error('Invalid fetch.');
         }
     }
 }

lib/api.php

Indentation +48 added lines, -48 removed lines

@@ -9,59 +9,59 @@
  */
 class Writing_On_GitHub_Api {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
 
-    /**
-     * GitHub fetch client.
-     *
-     * @var Writing_On_GitHub_Fetch_Client
-     */
-    protected $fetch;
+	/**
+	 * GitHub fetch client.
+	 *
+	 * @var Writing_On_GitHub_Fetch_Client
+	 */
+	protected $fetch;
 
-    /**
-     * Github persist client.
-     *
-     * @var Writing_On_GitHub_Persist_Client
-     */
-    protected $persist;
+	/**
+	 * Github persist client.
+	 *
+	 * @var Writing_On_GitHub_Persist_Client
+	 */
+	protected $persist;
 
-    /**
-     * Instantiates a new Api object.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
+	/**
+	 * Instantiates a new Api object.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
 
-    /**
-     * Lazy-load fetch client.
-     *
-     * @return Writing_On_GitHub_Fetch_Client
-     */
-    public function fetch() {
-        if ( ! $this->fetch ) {
-            $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
-        }
+	/**
+	 * Lazy-load fetch client.
+	 *
+	 * @return Writing_On_GitHub_Fetch_Client
+	 */
+	public function fetch() {
+		if ( ! $this->fetch ) {
+			$this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+		}
 
-        return $this->fetch;
-    }
+		return $this->fetch;
+	}
 
-    /**
-     * Lazy-load persist client.
-     *
-     * @return Writing_On_GitHub_Persist_Client
-     */
-    public function persist() {
-        if ( ! $this->persist ) {
-            $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
-        }
+	/**
+	 * Lazy-load persist client.
+	 *
+	 * @return Writing_On_GitHub_Persist_Client
+	 */
+	public function persist() {
+		if ( ! $this->persist ) {
+			$this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+		}
 
-        return $this->persist;
-    }
+		return $this->persist;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,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;
     }
 
@@ -45,8 +45,8 @@ 
      * @return Writing_On_GitHub_Fetch_Client
      */
     public function fetch() {
-        if ( ! $this->fetch ) {
-            $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+        if ( ! $this->fetch) {
+            $this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
         }
 
         return $this->fetch;
@@ -58,8 +58,8 @@ 
      * @return Writing_On_GitHub_Persist_Client
      */
     public function persist() {
-        if ( ! $this->persist ) {
-            $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+        if ( ! $this->persist) {
+            $this->persist = new Writing_On_GitHub_Persist_Client($this->app);
         }
 
         return $this->persist;