litefeel / writing-on-github

lib/blob.php

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

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);
 	}
 }

lib/import.php

Spacing +74 added lines, -74 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;
 	}
 
@@ -70,21 +70,21 @@ 
 	// 	return __( 'Payload processed', 'writing-on-github' );
 	// }
 
-	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)) {
 			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');
 	}
 
 	/**
@@ -92,23 +92,23 @@ 
 	 * @param  array $files [Writing_On_GitHub_File_Info]
 	 * @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;
 					}
@@ -127,21 +127,21 @@ 
 	public function master() {
 		$result = $this->app->api()->fetch()->tree_recursive();
 
-		if ( is_wp_error( $result ) ) {
+		if (is_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');
 	}
 
-	protected function compare( $files, &$delete_ids ) {
-		if ( is_wp_error( $files ) ) {
+	protected function compare($files, &$delete_ids) {
+		if (is_wp_error($files)) {
 			return $files;
 		}
 
@@ -150,44 +150,44 @@ 
 
 		$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);
 			// network error ?
-			if ( is_wp_error($blob) ) {
+			if (is_wp_error($blob)) {
 				continue;
 			}
 
 
-			if ( $this->importable_raw_file($blob) ) {
+			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()] );
+			if ($post->id() && isset($idsmap[$post->id()])) {
+				unset($idsmap[$post->id()]);
 			}
 		}
 		$delete_ids = array();
@@ -197,16 +197,16 @@ 
 
 		// $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 ( $new ) {
-			$result = $this->app->export()->new_posts( $new );
+		if ($new) {
+			$result = $this->app->export()->new_posts($new);
 
-			if ( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				return $result;
 			}
 		}
@@ -221,12 +221,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;
 		}
 
@@ -245,7 +245,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.
@@ -258,20 +258,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;
 		}
 
@@ -283,16 +283,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);
 			}
 
@@ -307,57 +307,57 @@ 
 	 *
 	 * @return Writing_On_GitHub_Post
 	 */
-	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 ( $meta ) {
-			if ( array_key_exists( 'layout', $meta ) ) {
+		if ($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;
 	}

views/textarea-setting-field.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<textarea name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" rows="10" cols="40">
-<?php echo esc_attr( $value ); ?>
+<?php $value = get_option($args['name'], $args['default']); ?>
+<textarea name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" rows="10" cols="40">
+<?php echo esc_attr($value); ?>
 </textarea>
 <p class="description"><?php echo $args['help_text']; ?></p>