litefeel / writing-on-github

lib/controller.php

Indentation +6 added lines, -6 removed lines

@@ -113,8 +113,8 @@ 
 		$this->app->semaphore()->unlock();
 
 		if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_import_error', $result->get_error_message() );
+			/*　@var WP_Error $result */
+			update_option( '_wogh_import_error', $result->get_error_message() );
 
 			return $this->app->response()->error( $result );
 		}
@@ -127,10 +127,10 @@ 
 	/**
 	 * Export all the posts in the database to GitHub.
 	 *
-     * @param  int        $user_id
-     * @param  boolean    $force
-     * @return boolean
-     */
+	 * @param  int        $user_id
+	 * @param  boolean    $force
+	 * @return boolean
+	 */
 	public function export_all( $user_id, $force = false ) {
 		if ( ! $this->app->semaphore()->is_open() ) {
 			return $this->app->response()->error( new WP_Error(

Spacing +75 added lines, -75 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @param Writing_On_GitHub $app Applicatio container.
 	 */
-	public function __construct( Writing_On_GitHub $app ) {
+	public function __construct(Writing_On_GitHub $app) {
 		$this->app = $app;
 	}
 
@@ -34,57 +34,57 @@ 
 	 */
 	public function pull_posts() {
 		$this->set_ajax();
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::pull_posts()')
+			));
 		}
 
-		if ( ! $this->app->request()->is_secret_valid() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->request()->is_secret_valid()) {
+			return $this->app->response()->error(new WP_Error(
 				'invalid_headers',
-				__( 'Failed to validate secret.', 'writing-on-github' )
-			) );
+				__('Failed to validate secret.', 'writing-on-github')
+			));
 		}
 
 		// ping
-		if ( $this->app->request()->is_ping() ) {
-			return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
+		if ($this->app->request()->is_ping()) {
+			return $this->app->response()->success(__('Wordpress is ready.', 'writing-on-github'));
 		}
 
 		// push
-		if ( ! $this->app->request()->is_push() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->request()->is_push()) {
+			return $this->app->response()->error(new WP_Error(
 				'invalid_headers',
-				__( 'Failed to validate webhook event.', 'writing-on-github' )
-			) );
+				__('Failed to validate webhook event.', 'writing-on-github')
+			));
 		}
 		$payload = $this->app->request()->payload();
 
-		if ( ! $payload->should_import() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $payload->should_import()) {
+			return $this->app->response()->error(new WP_Error(
 				'invalid_payload',
 				sprintf(
-					__( "%s won't be imported.", 'writing-on-github' ),
-					strtolower( $payload->get_commit_id() ) ? : '[Missing Commit ID]'
+					__("%s won't be imported.", 'writing-on-github'),
+					strtolower($payload->get_commit_id()) ?: '[Missing Commit ID]'
 				)
-			) );
+			));
 		}
 
 		$this->app->semaphore()->lock();
-		remove_action( 'save_post', array( $this, 'export_post' ) );
-		remove_action( 'delete_post', array( $this, 'delete_post' ) );
+		remove_action('save_post', array($this, 'export_post'));
+		remove_action('delete_post', array($this, 'delete_post'));
 
-		$result = $this->app->import()->payload( $payload );
+		$result = $this->app->import()->payload($payload);
 
 		$this->app->semaphore()->unlock();
 
-		if ( is_wp_error( $result ) ) {
-			return $this->app->response()->error( $result );
+		if (is_wp_error($result)) {
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -92,36 +92,36 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function import_master( $user_id ) {
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+	public function import_master($user_id) {
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::import_master()')
+			));
 		}
 
 		$this->app->semaphore()->lock();
-		remove_action( 'save_post', array( $this, 'export_post' ) );
-		remove_action( 'save_post', array( $this, 'delete_post' ) );
+		remove_action('save_post', array($this, 'export_post'));
+		remove_action('save_post', array($this, 'delete_post'));
 
-		if ( $user_id ) {
-			wp_set_current_user( $user_id );
+		if ($user_id) {
+			wp_set_current_user($user_id);
 		}
 
 		$result = $this->app->import()->master();
 
 		$this->app->semaphore()->unlock();
 
-		if ( is_wp_error( $result ) ) {
+		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);
 	}
 
 	/**
@@ -131,33 +131,33 @@ 
      * @param  boolean    $force
      * @return boolean
      */
-	public function export_all( $user_id, $force = false ) {
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+	public function export_all($user_id, $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 ) ) {
-			update_option( '_wogh_export_error', $result->get_error_message() );
+		if (is_wp_error($result)) {
+			update_option('_wogh_export_error', $result->get_error_message());
 
-			return $this->app->response()->error( $result );
+			return $this->app->response()->error($result);
 		} else {
-			update_option( '_wogh_export_complete', 'yes' );
-			update_option( '_wogh_fully_exported', 'yes' );
+			update_option('_wogh_export_complete', 'yes');
+			update_option('_wogh_fully_exported', 'yes');
 
-			return $this->app->response()->success( $result );
+			return $this->app->response()->success($result);
 		}
 	}
 
@@ -170,27 +170,27 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function export_post( $post_id ) {
-		if ( wp_is_post_revision( $post_id ) ) {
+	public function export_post($post_id) {
+		if (wp_is_post_revision($post_id)) {
 			return;
 		}
 
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::export_post()')
+			));
 		}
 
 		$this->app->semaphore()->lock();
-		$result = $this->app->export()->update( $post_id );
+		$result = $this->app->export()->update($post_id);
 		$this->app->semaphore()->unlock();
 
-		if ( is_wp_error( $result ) ) {
-			return $this->app->response()->error( $result );
+		if (is_wp_error($result)) {
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -202,27 +202,27 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function delete_post( $post_id ) {
-		if ( wp_is_post_revision( $post_id ) ) {
+	public function delete_post($post_id) {
+		if (wp_is_post_revision($post_id)) {
 			return;
 		}
 
-		if ( ! $this->app->semaphore()->is_open() ) {
-			return $this->app->response()->error( new WP_Error(
+		if ( ! $this->app->semaphore()->is_open()) {
+			return $this->app->response()->error(new WP_Error(
 				'semaphore_locked',
-				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
-			) );
+				sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::delete_post()')
+			));
 		}
 
 		$this->app->semaphore()->lock();
-		$result = $this->app->export()->delete( $post_id );
+		$result = $this->app->export()->delete($post_id);
 		$this->app->semaphore()->unlock();
 
-		if ( is_wp_error( $result ) ) {
-			return $this->app->response()->error( $result );
+		if (is_wp_error($result)) {
+			return $this->app->response()->error($result);
 		}
 
-		return $this->app->response()->success( $result );
+		return $this->app->response()->success($result);
 	}
 
 	/**
@@ -231,8 +231,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);
 		}
 	}
 }