litefeel / writing-on-github

lib/response.php

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

Indentation +18 added lines, -18 removed lines

@@ -84,13 +84,13 @@ 
 			)
 		);
 
-        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_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(
@@ -128,14 +128,14 @@ 
 		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';
-    }
+	/**
+	 * 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
@@ -221,9 +221,9 @@ 
 			Writing_On_GitHub::$instance->start_export();
 		}
 
-        if ( 'force_export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export(true);
-        }
+		if ( 'force_export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export(true);
+		}
 
 		if ( 'import' === $_GET['action'] ) {
 			Writing_On_GitHub::$instance->start_import();

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

Indentation +3 added lines, -3 removed lines

@@ -152,9 +152,9 @@
 			array_pop( $matches );
 
 			$meta = spyc_load( $matches[2] );
-            if ( 'yes' == get_option('wogh_ignore_author') ) {
-                unset($meta['author']);
-            }
+			if ( 'yes' == get_option('wogh_ignore_author') ) {
+				unset($meta['author']);
+			}
 			// if ( isset( $meta['link'] ) ) {
 			// 	$meta['link'] = str_replace( home_url(), '', $meta['link'] );
 			// }

Spacing +23 added lines, -23 removed lines

@@ -49,8 +49,8 @@ 
 	 *
 	 * @param stdClass $data Raw blob data.
 	 */
-	public function __construct( stdClass $data ) {
-		$this->interpret_data( $data );
+	public function __construct(stdClass $data) {
+		$this->interpret_data($data);
 	}
 
 	public function id() {
@@ -78,12 +78,12 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set_content( $content, $base64 = false ) {
-		if ( $base64 ) {
-			$content = base64_decode( $content );
+	public function set_content($content, $base64 = false) {
+		if ($base64) {
+			$content = base64_decode($content);
 		}
 
-		$this->frontmatter = '---' === substr( $this->content = $content, 0, 3 ) ? true : false;
+		$this->frontmatter = '---' === substr($this->content = $content, 0, 3) ? true : false;
 
 		return $this;
 	}
@@ -122,20 +122,20 @@ 
 	public function content_import() {
 		$content = $this->content();
 
-		if ( $this->has_frontmatter() ) {
+		if ($this->has_frontmatter()) {
 			// Break out content.
-			preg_match( '/(^---(.*?)---$)?(.*)/ms', $content, $matches );
-			$content = array_pop( $matches );
+			preg_match('/(^---(.*?)---$)?(.*)/ms', $content, $matches);
+			$content = array_pop($matches);
 		}
 
-		if ( function_exists( 'wpmarkdown_markdown_to_html' ) ) {
-			$content = wpmarkdown_markdown_to_html( $content );
+		if (function_exists('wpmarkdown_markdown_to_html')) {
+			$content = wpmarkdown_markdown_to_html($content);
 		}
 
 		/**
 		 * Filters the content for import.
 		 */
-		return apply_filters( 'wogh_content_import', trim( $content ) );
+		return apply_filters('wogh_content_import', trim($content));
 	}
 
 	/**
@@ -146,13 +146,13 @@ 
 	public function meta() {
 		$meta = array();
 
-		if ( $this->has_frontmatter() ) {
+		if ($this->has_frontmatter()) {
 			// Break out meta, if present.
-			preg_match( '/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches );
-			array_pop( $matches );
+			preg_match('/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches);
+			array_pop($matches);
 
-			$meta = spyc_load( $matches[2] );
-            if ( 'yes' == get_option('wogh_ignore_author') ) {
+			$meta = spyc_load($matches[2]);
+            if ('yes' == get_option('wogh_ignore_author')) {
                 unset($meta['author']);
             }
 			// if ( isset( $meta['link'] ) ) {
@@ -198,7 +198,7 @@ 
 		// $data->type = 'blob';
 
 		$data->path = $this->path();
-		$data->content = base64_encode( $this->content() );
+		$data->content = base64_encode($this->content());
 		$data->sha = $this->sha;
 
 		return $data;
@@ -207,13 +207,13 @@ 
 	/**
 	 * Interprets the blob's data into properties.
 	 */
-	protected function interpret_data( $data ) {
-		$this->sha  = isset( $data->sha  ) ? $data->sha  : '';
-		$this->path = isset( $data->path ) ? $data->path : '';
+	protected function interpret_data($data) {
+		$this->sha  = isset($data->sha) ? $data->sha : '';
+		$this->path = isset($data->path) ? $data->path : '';
 
 		$this->set_content(
-			isset( $data->content ) ? trim( $data->content ) : '',
-			isset( $data->encoding ) && 'base64' === $data->encoding ? true : false
+			isset($data->content) ? trim($data->content) : '',
+			isset($data->encoding) && 'base64' === $data->encoding ? true : false
 		);
 	}
 }

lib/payload.php

Spacing +11 added lines, -11 removed lines

@@ -29,9 +29,9 @@ 
 	 * @param Writing_On_GitHub $app      Application container.
 	 * @param string                $raw_data Raw request data.
 	 */
-	public function __construct( Writing_On_GitHub $app, $raw_data ) {
+	public function __construct(Writing_On_GitHub $app, $raw_data) {
 		$this->app  = $app;
-		$this->data = json_decode( $raw_data );
+		$this->data = json_decode($raw_data);
 	}
 
 	/**
@@ -41,32 +41,32 @@ 
 	 */
 	public function should_import() {
 		// @todo how do we get this without importing the whole api object just for this?
-		if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
+		if (strtolower($this->data->repository->full_name) !== strtolower($this->app->api()->fetch()->repository())) {
 			return false;
 		}
 
 		// The last term in the ref is the payload_branch name.
-		$refs   = explode( '/', $this->data->ref );
-		$payload_branch = array_pop( $refs );
+		$refs   = explode('/', $this->data->ref);
+		$payload_branch = array_pop($refs);
 
 		$branch = $this->app->api()->fetch()->branch();
 
-		if ( $branch !== $payload_branch ) {
+		if ($branch !== $payload_branch) {
 			return false;
 		}
 
 		// We add a tag to commits we push out, so we shouldn't pull them in again.
-		$tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+		$tag = apply_filters('wogh_commit_msg_tag', 'wogh');
 
-		if ( ! $tag ) {
-			throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+		if ( ! $tag) {
+			throw new Exception(__('Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github'));
 		}
 
-		if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
+		if ($tag === substr($this->message(), -1 * strlen($tag))) {
 			return false;
 		}
 
-		if ( ! $this->get_commit_id() ) {
+		if ( ! $this->get_commit_id()) {
 			return false;
 		}
 

lib/api.php

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;

lib/fileinfo.php

Spacing +3 added lines, -3 removed lines

@@ -6,13 +6,13 @@
  */
 class Writing_On_GitHub_File_Info {
 
-	public function __construct( stdClass $data ) {
+	public function __construct(stdClass $data) {
 		$this->sha 			= $data->sha;
 		$this->path 		= $data->path;
-		$this->status 		= $data->status;
+		$this->status = $data->status;
 	}
 
 	public $sha;
 	public $path;
-	public $status;  // added removed modified
+	public $status; // added removed modified
 }

lib/semaphore.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 	 * Clean up the old values on instantiation.
 	 */
 	public function __construct() {
-		delete_option( self::KEY );
+		delete_option(self::KEY);
 	}
 
 	/**
@@ -40,7 +40,7 @@ 
 	 * @return bool
 	 */
 	public function is_open() {
-		if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
+		if (self::VALUE_LOCKED === get_transient(self::KEY)) {
 			return false;
 		}
 
@@ -51,13 +51,13 @@ 
 	 * Enables the push lock.
 	 */
 	public function lock() {
-		set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
+		set_transient(self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS);
 	}
 
 	/**
 	 * Disables the push lock.
 	 */
 	public function unlock() {
-		set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
+		set_transient(self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS);
 	}
 }

lib/cli.php

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

Indentation +3 added lines, -3 removed lines

@@ -376,9 +376,9 @@
 		if ( empty($this->post->post_excerpt) ) {
 			unset($meta['post_excerpt']);
 		}
-        if ( 'yes' == get_option('wogh_ignore_author') ) {
-            unset($meta['author']);
-        }
+		if ( 'yes' == get_option('wogh_ignore_author') ) {
+			unset($meta['author']);
+		}
 
 		//convert traditional post_meta values, hide hidden values, skip already populated values
 		// foreach ( get_post_custom( $this->id ) as $key => $value ) {

Spacing +62 added lines, -62 removed lines

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