litefeel / writing-on-github

lib/client/base.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	 */
 	protected function call( $method, $endpoint, $body = array() ) {
 		if ( is_wp_error( $error = $this->can_call() ) ) {
-            /*　@var WP_Error $error */
+			/*　@var WP_Error $error */
 			return $error;
 		}
 

Spacing +25 added lines, -26 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,24 +52,23 @@ 
 			),
 		);
 
-		if ( 'GET' !== $method ) {
-			$args['body'] = function_exists( 'wp_json_encode' ) ?
-				wp_json_encode( $body ) :
-				json_encode( $body );
+		if ('GET' !== $method) {
+			$args['body'] = function_exists('wp_json_encode') ?
+				wp_json_encode($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'
@@ -86,28 +85,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')
 			);
 		}
 
@@ -120,7 +119,7 @@ 
 	 * @return string
 	 */
 	public function repository() {
-		return (string) get_option( self::REPO_OPTION_KEY );
+		return (string) get_option(self::REPO_OPTION_KEY);
 	}
 
 	/**
@@ -129,18 +128,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';
 	}
 
@@ -201,11 +200,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/import.php

Indentation +17 added lines, -17 removed lines

@@ -26,18 +26,18 @@ 
 		$this->app = $app;
 	}
 
-    /**
-     * Imports a payload.
-     * @param  Writing_On_GitHub_Payload $payload
-     *
-     * @return string|WP_Error
-     */
+	/**
+	 * Imports a payload.
+	 * @param  Writing_On_GitHub_Payload $payload
+	 *
+	 * @return string|WP_Error
+	 */
 	public function payload( Writing_On_GitHub_Payload $payload ) {
 
 		$result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
 
 		if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
+			/* @var WP_Error $result */
 			return $result;
 		}
 
@@ -53,7 +53,7 @@ 
 	/**
 	 * import blob by files
 	 * @param  Writing_On_GitHub_File_Info[] $files
-     *
+	 *
 	 * @return string|WP_Error
 	 */
 	protected function import_files( $files ) {
@@ -92,7 +92,7 @@ 
 		$result = $this->app->api()->fetch()->tree_recursive();
 
 		if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
+			/* @var WP_Error $result */
 			return $result;
 		}
 
@@ -105,16 +105,16 @@ 
 		return __( 'Payload processed', 'writing-on-github' );
 	}
 
-    /**
-     * Do compare
-     * @param  Writing_On_GitHub_File_Info[]|WP_Error $files
-     * @param  int[] &$delete_ids
-     *
-     * @return string|WP_Error
-     */
+	/**
+	 * Do compare
+	 * @param  Writing_On_GitHub_File_Info[]|WP_Error $files
+	 * @param  int[] &$delete_ids
+	 *
+	 * @return string|WP_Error
+	 */
 	protected function compare( $files, &$delete_ids ) {
 		if ( is_wp_error( $files ) ) {
-            /* @var WP_Error $files */
+			/* @var WP_Error $files */
 			return $files;
 		}
 

Spacing +78 added lines, -78 removed lines

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

lib/request.php

Spacing +11 added lines, -11 removed lines

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