litefeel / writing-on-github

lib/client/base.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 * @param string $endpoint API endpoint.
 	 * @param array  $body Request body.
 	 *
-	 * @return stdClass|WP_Error
+	 * @return stdClass
 	 */
 	protected function call( $method, $endpoint, $body = array() ) {
 		if ( is_wp_error( $error = $this->can_call() ) ) {

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())) {
 			return $error;
 		}
 
@@ -51,24 +51,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'
@@ -85,28 +84,28 @@ 
 	 * @return true|WP_Error
 	 */
 	protected function can_call() {
-		if ( ! $this->oauth_token() ) {
+		if ( ! $this->oauth_token()) {
 			return new WP_Error(
 				'missing_token',
-				__( 'Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github' )
+				__('Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github')
 			);
 		}
 
 		$repo = $this->repository();
 
-		if ( ! $repo ) {
+		if ( ! $repo) {
 			return new WP_Error(
 				'missing_repository',
-				__( 'Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github' )
+				__('Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github')
 			);
 		}
 
-		$parts = explode( '/', $repo );
+		$parts = explode('/', $repo);
 
-		if ( 2 !== count( $parts ) ) {
+		if (2 !== count($parts)) {
 			return new WP_Error(
 				'malformed_repository',
-				__( 'Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github' )
+				__('Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github')
 			);
 		}
 
@@ -119,7 +118,7 @@ 
 	 * @return string
 	 */
 	public function repository() {
-		return (string) get_option( self::REPO_OPTION_KEY );
+		return (string) get_option(self::REPO_OPTION_KEY);
 	}
 
 	/**
@@ -128,18 +127,18 @@ 
 	 * @return string
 	 */
 	public function oauth_token() {
-		return (string) get_option( self::TOKEN_OPTION_KEY );
+		return (string) get_option(self::TOKEN_OPTION_KEY);
 	}
 
 	/**
 	 * Returns the GitHub host to sync with (for GitHub Enterprise support)
 	 */
 	public function api_base() {
-		return get_option( self::HOST_OPTION_KEY );
+		return get_option(self::HOST_OPTION_KEY);
 	}
 
 	public function branch() {
-		$branch = get_option( self::BRANCH_OPTION_KEY );
+		$branch = get_option(self::BRANCH_OPTION_KEY);
 		return $branch ? $branch : 'master';
 	}
 
@@ -200,11 +199,11 @@ 
 	 *
 	 * Returns String the relative API call path
 	 */
-	public function content_endpoint( $path = false ) {
+	public function content_endpoint($path = false) {
 		$url = $this->api_base() . '/repos/';
 		$url = $url . $this->repository() . '/contents';
 
-		if ( ! empty($path) ) {
+		if ( ! empty($path)) {
 			$url .= '/' . $path;
 		}
 

lib/client/persist.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 	/**
 	 * Delete the file.
 	 *
+	 * @param string $message
 	 * @return array
 	 */
 	public function delete_file( $path, $sha, $message ) {

Spacing +11 added lines, -11 removed lines

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

lib/controller.php

Doc Comments +2 added lines, -2 removed lines

@@ -167,7 +167,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 *
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function export_post( $post_id ) {
 		if ( wp_is_post_revision( $post_id ) ) {
@@ -199,7 +199,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 *
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function delete_post( $post_id ) {
 		if ( wp_is_post_revision( $post_id ) ) {

Indentation +4 added lines, -4 removed lines

@@ -126,10 +126,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,35 +92,35 @@ 
 	 *
 	 * @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 ) ) {
-			update_option( '_wogh_import_error', $result->get_error_message() );
+		if (is_wp_error($result)) {
+			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);
 	}
 
 	/**
@@ -130,33 +130,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);
 		}
 	}
 
@@ -169,27 +169,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);
 	}
 
 	/**
@@ -201,27 +201,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);
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * than just returning data.
 	 */
 	protected function set_ajax() {
-		if ( ! defined( 'WOGH_AJAX' ) ) {
-			define( 'WOGH_AJAX', true );
+		if ( ! defined('WOGH_AJAX')) {
+			define('WOGH_AJAX', true);
 		}
 	}
 }

lib/database.php

Doc Comments +3 added lines, -1 removed lines

@@ -108,7 +108,6 @@ 
 	 * and associates their author as well as their latest
 	 *
 	 * @param Writing_On_GitHub_Post[] $posts Array of Posts to save.
-	 * @param string                       $email Author email.
 	 *
 	 * @return string|WP_Error
 	 */
@@ -178,6 +177,9 @@ 
 		return __( 'Successfully saved posts.', 'writing-on-github' );
 	}
 
+	/**
+	 * @param Writing_On_GitHub_Post $post
+	 */
 	protected function post_args( $post ) {
 		$args = $post->get_args();
 		$meta = $post->get_meta();

Indentation +44 added lines, -44 removed lines

@@ -42,9 +42,9 @@ 
 	/**
 	 * Queries the database for all of the supported posts.
 	 *
-     * @param  bool $force
-     * @return Writing_On_GitHub_Post[]|WP_Error
-     */
+	 * @param  bool $force
+	 * @return Writing_On_GitHub_Post[]|WP_Error
+	 */
 	public function fetch_all_supported( $force = false ) {
 		$args  = array(
 			'post_type'   => $this->get_whitelisted_post_types(),
@@ -187,45 +187,45 @@ 
 
 		// update tags
 		if ( isset( $meta['tags'] ) && $meta['tags'] ) {
-		    $args['tags_input'] = $meta['tags'];
+			$args['tags_input'] = $meta['tags'];
 		}
 
 		// update categories
 		if ( isset( $meta['categories'] ) && $meta['categories'] ) {
-		    $categories = $meta['categories'];
-		    if (!is_array($categories)) {
-		        $categories = array($categories);
-		    }
-		    $terms = get_terms(array(
-		        'taxonomy' => 'category',
-		        'fields' => 'id=>name',
-		        'hide_empty' => 0,
-		        'name' => $categories
-		        )
-		    );
-		    $map = array();
-		    foreach ($categories as $name) {
-		        $map[$name] = 1;
-		    }
-
-		    $ids = array();
-		    if (!empty($terms)) {
-		        foreach ($terms as $id => $name) {
-		            $ids[] = $id;
-		            unset($map[$name]);
-		        }
-		    }
-
-		    // create new terms
-		    if (!empty($map)) {
-		        foreach ($map as $name => $value) {
-		            $term = wp_insert_term($name, 'category', array('parent' => 0));
-		            // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
-		            $ids[] = $term['term_id'];
-		        }
-		    }
-
-		    $args['post_category'] = $ids;
+			$categories = $meta['categories'];
+			if (!is_array($categories)) {
+				$categories = array($categories);
+			}
+			$terms = get_terms(array(
+				'taxonomy' => 'category',
+				'fields' => 'id=>name',
+				'hide_empty' => 0,
+				'name' => $categories
+				)
+			);
+			$map = array();
+			foreach ($categories as $name) {
+				$map[$name] = 1;
+			}
+
+			$ids = array();
+			if (!empty($terms)) {
+				foreach ($terms as $id => $name) {
+					$ids[] = $id;
+					unset($map[$name]);
+				}
+			}
+
+			// create new terms
+			if (!empty($map)) {
+				foreach ($map as $name => $value) {
+					$term = wp_insert_term($name, 'category', array('parent' => 0));
+					// array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
+					$ids[] = $term['term_id'];
+				}
+			}
+
+			$args['post_category'] = $ids;
 		}
 
 		return $args;
@@ -427,12 +427,12 @@ 
 		if ( ! empty( $display_name ) ) {
 			$search_string = esc_attr( $display_name );
 			$query = new WP_User_Query( array(
-			    'search'         => "{$search_string}",
-			    'search_columns' => array(
-			        'display_name',
-			        'user_nicename',
-			        'user_login',
-			    )
+				'search'         => "{$search_string}",
+				'search_columns' => array(
+					'display_name',
+					'user_nicename',
+					'user_login',
+				)
 			) );
 			$users = $query->get_results();
 			$user = empty($users) ? false : $users[0];

Spacing +122 added lines, -123 removed lines

@@ -21,21 +21,21 @@ 
 	 *
 	 * @var array
 	 */
-	protected $whitelisted_post_types = array( 'post', 'page' );
+	protected $whitelisted_post_types = array('post', 'page');
 
 	/**
 	 * Currently whitelisted post statuses.
 	 *
 	 * @var array
 	 */
-	protected $whitelisted_post_statuses = array( 'publish' );
+	protected $whitelisted_post_statuses = array('publish');
 
 	/**
 	 * Instantiates a new Database object.
 	 *
 	 * @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,32 +45,32 @@ 
      * @param  bool $force
      * @return Writing_On_GitHub_Post[]|WP_Error
      */
-	public function fetch_all_supported( $force = false ) {
-		$args  = array(
+	public function fetch_all_supported($force = false) {
+		$args = array(
 			'post_type'   => $this->get_whitelisted_post_types(),
 			'post_status' => $this->get_whitelisted_post_statuses(),
 			'nopaging'    => true,
 			'fields'      => 'ids',
 		);
 
-		$query = new WP_Query( apply_filters( 'wogh_pre_fetch_all_supported', $args ) );
+		$query = new WP_Query(apply_filters('wogh_pre_fetch_all_supported', $args));
 
 		$post_ids = $query->get_posts();
 
-		if ( ! $post_ids ) {
+		if ( ! $post_ids) {
 			return new WP_Error(
 				'no_results',
-				__( 'Querying for supported posts returned no results.', 'writing-on-github' )
+				__('Querying for supported posts returned no results.', 'writing-on-github')
 			);
 		}
 
 		$results = array();
-		foreach ( $post_ids as $post_id ) {
+		foreach ($post_ids as $post_id) {
 			// Do not export posts that have already been exported
-			if ( $force || ! get_post_meta( $post_id, '_wogh_sha', true ) ||
-				 ! get_post_meta( $post_id, '_wogh_github_path', true) ) {
+			if ($force || ! get_post_meta($post_id, '_wogh_sha', true) ||
+				 ! get_post_meta($post_id, '_wogh_github_path', true)) {
 
-				$results[] = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+				$results[] = new Writing_On_GitHub_Post($post_id, $this->app->api());
 			}
 		}
 
@@ -84,10 +84,10 @@ 
 	 *
 	 * @return WP_Error|Writing_On_GitHub_Post
 	 */
-	public function fetch_by_id( $post_id ) {
-		$post = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
+	public function fetch_by_id($post_id) {
+		$post = new Writing_On_GitHub_Post($post_id, $this->app->api());
 
-		if ( ! $this->is_post_supported( $post ) ) {
+		if ( ! $this->is_post_supported($post)) {
 			return new WP_Error(
 				'unsupported_post',
 				sprintf(
@@ -112,7 +112,7 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function save_posts( array $posts ) {
+	public function save_posts(array $posts) {
 
 		/**
 		 * Whether an error has occurred.
@@ -121,20 +121,19 @@ 
 		 */
 		$error = false;
 
-		foreach ( $posts as $post ) {
-			$args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
+		foreach ($posts as $post) {
+			$args = apply_filters('wogh_pre_import_args', $this->post_args($post), $post);
 
 			remove_filter('content_save_pre', 'wp_filter_post_kses');
 			$post_id = $post->is_new() ?
-				wp_insert_post( $args, true ) :
-				wp_update_post( $args, true );
+				wp_insert_post($args, true) : wp_update_post($args, true);
 			add_filter('content_save_pre', 'wp_filter_post_kses');
 
-			if ( is_wp_error( $post_id ) ) {
-				if ( ! $error ) {
+			if (is_wp_error($post_id)) {
+				if ( ! $error) {
 					$error = $post_id;
 				} else {
-					$error->add( $post_id->get_error_code(), $post_id->get_error_message() );
+					$error->add($post_id->get_error_code(), $post_id->get_error_message());
 				}
 
 				// Abort saving if updating the post fails.
@@ -143,42 +142,42 @@ 
 
 			// $this->set_revision_author( $post_id, $user_id );
 
-			if ( $post->is_new() ) {
+			if ($post->is_new()) {
 				$author = false;
 				$meta = $post->get_meta();
-				if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
+				if ( ! empty($meta) && ! empty($meta['author'])) {
 					$author = $meta['author'];
 				}
-				$user    = $this->fetch_commit_user( $author );
-				$user_id = ! is_wp_error( $user ) ? $user->ID : 0;
-				$this->set_post_author( $post_id, $user_id );
+				$user    = $this->fetch_commit_user($author);
+				$user_id = ! is_wp_error($user) ? $user->ID : 0;
+				$this->set_post_author($post_id, $user_id);
 			}
 
-			$post->set_post( get_post( $post_id ) );
+			$post->set_post(get_post($post_id));
 
-			$meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
+			$meta = apply_filters('wogh_pre_import_meta', $post->get_meta(), $post);
 
-			unset( $meta['tags'] );
-			unset( $meta['categories'] );
-			unset( $meta['author'] );
-			unset( $meta['post_date'] );
-			unset( $meta['post_excerpt'] );
-			unset( $meta['permalink'] );
-			unset( $meta['link'] );
+			unset($meta['tags']);
+			unset($meta['categories']);
+			unset($meta['author']);
+			unset($meta['post_date']);
+			unset($meta['post_excerpt']);
+			unset($meta['permalink']);
+			unset($meta['link']);
 
-			foreach ( $meta as $key => $value ) {
-				update_post_meta( $post_id, $key, $value );
+			foreach ($meta as $key => $value) {
+				update_post_meta($post_id, $key, $value);
 			}
 		}
 
-		if ( $error ) {
+		if ($error) {
 			return $error;
 		}
 
-		return __( 'Successfully saved posts.', 'writing-on-github' );
+		return __('Successfully saved posts.', 'writing-on-github');
 	}
 
-	protected function post_args( $post ) {
+	protected function post_args($post) {
 		$args = $post->get_args();
 		$meta = $post->get_meta();
 
@@ -186,14 +185,14 @@ 
 		$args['post_content'] = addslashes($args['post_content']);
 
 		// update tags
-		if ( isset( $meta['tags'] ) && $meta['tags'] ) {
+		if (isset($meta['tags']) && $meta['tags']) {
 		    $args['tags_input'] = $meta['tags'];
 		}
 
 		// update categories
-		if ( isset( $meta['categories'] ) && $meta['categories'] ) {
+		if (isset($meta['categories']) && $meta['categories']) {
 		    $categories = $meta['categories'];
-		    if (!is_array($categories)) {
+		    if ( ! is_array($categories)) {
 		        $categories = array($categories);
 		    }
 		    $terms = get_terms(array(
@@ -209,7 +208,7 @@ 
 		    }
 
 		    $ids = array();
-		    if (!empty($terms)) {
+		    if ( ! empty($terms)) {
 		        foreach ($terms as $id => $name) {
 		            $ids[] = $id;
 		            unset($map[$name]);
@@ -217,7 +216,7 @@ 
 		    }
 
 		    // create new terms
-		    if (!empty($map)) {
+		    if ( ! empty($map)) {
 		        foreach ($map as $name => $value) {
 		            $term = wp_insert_term($name, 'category', array('parent' => 0));
 		            // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
@@ -238,77 +237,77 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function delete_post_by_path( $path ) {
-		$query = new WP_Query( array(
+	public function delete_post_by_path($path) {
+		$query = new WP_Query(array(
 			'meta_key'       => '_wogh_github_path',
 			'meta_value'     => $path,
 			'meta_compare'   => '=',
 			'posts_per_page' => 1,
 			'fields'         => 'ids',
-		) );
+		));
 
 		$post_id = $query->get_posts();
-		$post_id = array_pop( $post_id );
+		$post_id = array_pop($post_id);
 
-		if ( ! $post_id ) {
-			$parts     = explode( '/', $path );
-			$filename  = array_pop( $parts );
-			$directory = $parts ? array_shift( $parts ) : '';
+		if ( ! $post_id) {
+			$parts     = explode('/', $path);
+			$filename  = array_pop($parts);
+			$directory = $parts ? array_shift($parts) : '';
 
-			if ( false !== strpos( $directory, 'post' ) ) {
-				preg_match( '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/', $filename, $matches );
+			if (false !== strpos($directory, 'post')) {
+				preg_match('/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/', $filename, $matches);
 				$title = $matches[4];
 
-				$query = new WP_Query( array(
+				$query = new WP_Query(array(
 					'name'     => $title,
 					'posts_per_page' => 1,
 					'post_type' => $this->get_whitelisted_post_types(),
 					'fields'         => 'ids',
-				) );
+				));
 
 				$post_id = $query->get_posts();
-				$post_id = array_pop( $post_id );
+				$post_id = array_pop($post_id);
 			}
 
-			if ( ! $post_id ) {
-				preg_match( '/(.*)\.md/', $filename, $matches );
+			if ( ! $post_id) {
+				preg_match('/(.*)\.md/', $filename, $matches);
 				$title = $matches[1];
 
-				$query = new WP_Query( array(
+				$query = new WP_Query(array(
 					'name'     => $title,
 					'posts_per_page' => 1,
 					'post_type' => $this->get_whitelisted_post_types(),
 					'fields'         => 'ids',
-				) );
+				));
 
 				$post_id = $query->get_posts();
-				$post_id = array_pop( $post_id );
+				$post_id = array_pop($post_id);
 			}
 		}
 
-		if ( ! $post_id ) {
+		if ( ! $post_id) {
 			return new WP_Error(
 				'path_not_found',
 				sprintf(
-					__( 'Post not found for path %s.', 'writing-on-github' ),
+					__('Post not found for path %s.', 'writing-on-github'),
 					$path
 				)
 			);
 		}
 
-		$result = wp_delete_post( $post_id );
+		$result = wp_delete_post($post_id);
 
 		// If deleting fails...
-		if ( false === $result ) {
-			$post = get_post( $post_id );
+		if (false === $result) {
+			$post = get_post($post_id);
 
 			// ...and the post both exists and isn't in the trash...
-			if ( $post && 'trash' !== $post->post_status ) {
+			if ($post && 'trash' !== $post->post_status) {
 				// ... then something went wrong.
 				return new WP_Error(
 					'db_error',
 					sprintf(
-						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
+						__('Failed to delete post ID %d.', 'writing-on-github'),
 						$post_id
 					)
 				);
@@ -316,25 +315,25 @@ 
 		}
 
 		return sprintf(
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}
 
-	public function delete_post( $post_id ) {
-		$result = wp_delete_post( $post_id );
+	public function delete_post($post_id) {
+		$result = wp_delete_post($post_id);
 
 		// If deleting fails...
-		if ( false === $result ) {
-			$post = get_post( $post_id );
+		if (false === $result) {
+			$post = get_post($post_id);
 
 			// ...and the post both exists and isn't in the trash...
-			if ( $post && 'trash' !== $post->post_status ) {
+			if ($post && 'trash' !== $post->post_status) {
 				// ... then something went wrong.
 				return new WP_Error(
 					'db_error',
 					sprintf(
-						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
+						__('Failed to delete post ID %d.', 'writing-on-github'),
 						$post_id
 					)
 				);
@@ -342,7 +341,7 @@ 
 		}
 
 		return sprintf(
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}
@@ -353,7 +352,7 @@ 
 	 * @return array
 	 */
 	protected function get_whitelisted_post_types() {
-		return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
+		return apply_filters('wogh_whitelisted_post_types', $this->whitelisted_post_types);
 	}
 
 	/**
@@ -362,7 +361,7 @@ 
 	 * @return array
 	 */
 	protected function get_whitelisted_post_statuses() {
-		return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
+		return apply_filters('wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses);
 	}
 
 	/**
@@ -372,12 +371,12 @@ 
 	 *
 	 * @return string Whitelist formatted for query
 	 */
-	protected function format_for_query( $whitelist ) {
-		foreach ( $whitelist as $key => $value ) {
-			$whitelist[ $key ] = "'$value'";
+	protected function format_for_query($whitelist) {
+		foreach ($whitelist as $key => $value) {
+			$whitelist[$key] = "'$value'";
 		}
 
-		return implode( ', ', $whitelist );
+		return implode(', ', $whitelist);
 	}
 
 	/**
@@ -388,25 +387,25 @@ 
 	 *
 	 * @return boolean                          True if supported, false if not.
 	 */
-	protected function is_post_supported( Writing_On_GitHub_Post $post ) {
-		if ( wp_is_post_revision( $post->id ) ) {
+	protected function is_post_supported(Writing_On_GitHub_Post $post) {
+		if (wp_is_post_revision($post->id)) {
 			return false;
 		}
 
 		// We need to allow trashed posts to be queried, but they are not whitelisted for export.
-		if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
+		if ( ! in_array($post->status(), $this->get_whitelisted_post_statuses()) && 'trash' !== $post->status()) {
 			return false;
 		}
 
-		if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
+		if ( ! in_array($post->type(), $this->get_whitelisted_post_types())) {
 			return false;
 		}
 
-		if ( $post->has_password() ) {
+		if ($post->has_password()) {
 			return false;
 		}
 
-		return apply_filters( 'wogh_is_post_supported', true, $post );
+		return apply_filters('wogh_is_post_supported', true, $post);
 	}
 
 	/**
@@ -419,35 +418,35 @@ 
 	 *
 	 * @return WP_Error|WP_User
 	 */
-	protected function fetch_commit_user( $display_name ) {
+	protected function fetch_commit_user($display_name) {
 		// If we can't find a user and a default hasn't been set,
 		// we're just going to set the revision author to 0.
 		$user = false;
 
-		if ( ! empty( $display_name ) ) {
-			$search_string = esc_attr( $display_name );
-			$query = new WP_User_Query( array(
+		if ( ! empty($display_name)) {
+			$search_string = esc_attr($display_name);
+			$query = new WP_User_Query(array(
 			    'search'         => "{$search_string}",
 			    'search_columns' => array(
 			        'display_name',
 			        'user_nicename',
 			        'user_login',
 			    )
-			) );
+			));
 			$users = $query->get_results();
 			$user = empty($users) ? false : $users[0];
 		}
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			// Use the default user.
-			$user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
+			$user = get_user_by('id', (int) get_option('wogh_default_user'));
 		}
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			return new WP_Error(
 				'user_not_found',
 				sprintf(
-					__( 'Commit user not found for email %s', 'writing-on-github' ),
+					__('Commit user not found for email %s', 'writing-on-github'),
 					$email
 				)
 			);
@@ -465,28 +464,28 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	protected function set_revision_author( $post_id, $user_id ) {
-		$revision = wp_get_post_revisions( $post_id );
+	protected function set_revision_author($post_id, $user_id) {
+		$revision = wp_get_post_revisions($post_id);
 
-		if ( ! $revision ) {
-			$new_revision = wp_save_post_revision( $post_id );
+		if ( ! $revision) {
+			$new_revision = wp_save_post_revision($post_id);
 
-			if ( ! $new_revision || is_wp_error( $new_revision ) ) {
-				return new WP_Error( 'db_error', 'There was a problem saving a new revision.' );
+			if ( ! $new_revision || is_wp_error($new_revision)) {
+				return new WP_Error('db_error', 'There was a problem saving a new revision.');
 			}
 
 			// `wp_save_post_revision` returns the ID, whereas `get_post_revision` returns the whole object
 			// in order to be consistent, let's make sure we have the whole object before continuing.
-			$revision = get_post( $new_revision );
+			$revision = get_post($new_revision);
 
-			if ( ! $revision ) {
-				return new WP_Error( 'db_error', 'There was a problem retrieving the newly recreated revision.' );
+			if ( ! $revision) {
+				return new WP_Error('db_error', 'There was a problem retrieving the newly recreated revision.');
 			}
 		} else {
-			$revision = array_shift( $revision );
+			$revision = array_shift($revision);
 		}
 
-		return $this->set_post_author( $revision->ID, $user_id );
+		return $this->set_post_author($revision->ID, $user_id);
 	}
 
 	/**
@@ -499,7 +498,7 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	protected function set_post_author( $post_id, $user_id ) {
+	protected function set_post_author($post_id, $user_id) {
 		global $wpdb;
 
 		$result = $wpdb->update(
@@ -510,25 +509,25 @@ 
 			array(
 				'ID' => (int) $post_id,
 			),
-			array( '%d' ),
-			array( '%d' )
+			array('%d'),
+			array('%d')
 		);
 
-		if ( false === $result ) {
-			return new WP_Error( 'db_error', $wpdb->last_error );
+		if (false === $result) {
+			return new WP_Error('db_error', $wpdb->last_error);
 		}
 
-		if ( 0 === $result ) {
+		if (0 === $result) {
 			return sprintf(
-				__( 'No change for post ID %d.', 'writing-on-github' ),
+				__('No change for post ID %d.', 'writing-on-github'),
 				$post_id
 			);
 		}
 
-		clean_post_cache( $post_id );
+		clean_post_cache($post_id);
 
 		return sprintf(
-			__( 'Successfully updated post ID %d.', 'writing-on-github' ),
+			__('Successfully updated post ID %d.', 'writing-on-github'),
 			$post_id
 		);
 	}
@@ -541,7 +540,7 @@ 
 	 *
 	 * @return bool|int
 	 */
-	public function set_post_sha( $post, $sha ) {
-		return update_post_meta( $post->id, '_wogh_sha', $sha );
+	public function set_post_sha($post, $sha) {
+		return update_post_meta($post->id, '_wogh_sha', $sha);
 	}
 }

lib/export.php

Doc Comments +4 added lines

@@ -142,6 +142,10 @@
 		return true;
 	}
 
+	/**
+	 * @param Writing_On_GitHub_Post $post
+	 * @param Writing_On_GitHub_Persist_Client $persist
+	 */
 	protected function new_post( $post, $persist ) {
 		$github_path = $post->github_path();
 		$old_github_path = $post->old_github_path();

Indentation +18 added lines, -18 removed lines

@@ -29,9 +29,9 @@ 
 	/**
 	 * Updates all of the current posts in the database on master.
 	 *
-     * @param  bool    $force_all
-     * @return string|WP_Error
-     */
+	 * @param  bool    $force_all
+	 * @return string|WP_Error
+	 */
 	public function full( $force_all = false ) {
 		$posts = $this->app->database()->fetch_all_supported($force_all);
 
@@ -39,24 +39,24 @@ 
 			return $posts;
 		}
 
-        $error = false;
+		$error = false;
 
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
-                if ( $error ) {
-                    $error->add( $result->get_error_code(), $result->get_error_message() );
-                } else {
-                    $error = $result;
-                }
-            }
-        }
+		foreach ( $posts as $post ) {
+			$result = $this->update( $post->id() );
+			if ( is_wp_error( $result ) ) {
+				if ( $error ) {
+					$error->add( $result->get_error_code(), $result->get_error_message() );
+				} else {
+					$error = $result;
+				}
+			}
+		}
 
-        if ( is_wp_error( $error ) ) {
-            return $error;
-        }
+		if ( is_wp_error( $error ) ) {
+			return $error;
+		}
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
 	}
 
 

Spacing +57 added lines, -57 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,31 +32,31 @@ 
      * @param  bool    $force_all
      * @return string|WP_Error
      */
-	public function full( $force_all = false ) {
+	public function full($force_all = false) {
 		$posts = $this->app->database()->fetch_all_supported($force_all);
 
-		if ( is_wp_error( $posts ) ) {
+		if (is_wp_error($posts)) {
 			return $posts;
 		}
 
         $error = false;
 
-        foreach ( $posts as $post ) {
-            $result = $this->update( $post->id() );
-            if ( is_wp_error( $result ) ) {
-                if ( $error ) {
-                    $error->add( $result->get_error_code(), $result->get_error_message() );
+        foreach ($posts as $post) {
+            $result = $this->update($post->id());
+            if (is_wp_error($result)) {
+                if ($error) {
+                    $error->add($result->get_error_code(), $result->get_error_message());
                 } else {
                     $error = $result;
                 }
             }
         }
 
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             return $error;
         }
 
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
 
@@ -65,10 +65,10 @@ 
 	 * @param  int  $post_id
 	 * @return boolean
 	 */
-	protected function github_path( $post_id ) {
-		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+	protected function github_path($post_id) {
+		$github_path = get_post_meta($post_id, '_wogh_github_path', true);
 
-		if ( $github_path && $this->app->api()->fetch()->exists( $github_path ) ) {
+		if ($github_path && $this->app->api()->fetch()->exists($github_path)) {
 			return $github_path;
 		}
 
@@ -82,29 +82,29 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function update( $post_id ) {
-		$post = $this->app->database()->fetch_by_id( $post_id );
+	public function update($post_id) {
+		$post = $this->app->database()->fetch_by_id($post_id);
 
-		if ( is_wp_error( $post ) ) {
+		if (is_wp_error($post)) {
 			return $post;
 		}
 
-		if ( 'trash' === $post->status() ) {
-			return $this->delete( $post_id );
+		if ('trash' === $post->status()) {
+			return $this->delete($post_id);
 		}
 
-		if ( $old_github_path = $this->github_path( $post->id() ) ) {
+		if ($old_github_path = $this->github_path($post->id())) {
 			error_log("old_github_path: $old_github_path");
 			$post->set_old_github_path($old_github_path);
 		}
 
-		$result = $this->new_posts( array( $post ) );
+		$result = $this->new_posts(array($post));
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			return $result;
 		}
 
-		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
 	/**
@@ -114,16 +114,16 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function new_posts( array $posts ) {
+	public function new_posts(array $posts) {
 		$error = false;
 
 		$persist = $this->app->api()->persist();
 
-		foreach ( $posts as $post ) {
-			$result = $this->new_post( $post, $persist );
-			if ( is_wp_error( $result ) ) {
-				if ( $error ) {
-					$error->add( $result->get_error_code(), $result->get_error_message() );
+		foreach ($posts as $post) {
+			$result = $this->new_post($post, $persist);
+			if (is_wp_error($result)) {
+				if ($error) {
+					$error->add($result->get_error_code(), $result->get_error_message());
 				} else {
 					$error = $result;
 				}
@@ -134,7 +134,7 @@ 
 
 		// $result = $this->app->api()->persist()->commit( $master );
 
-		if ( is_wp_error( $error ) ) {
+		if (is_wp_error($error)) {
 			return $error;
 		}
 
@@ -142,13 +142,13 @@ 
 		return true;
 	}
 
-	protected function new_post( $post, $persist ) {
+	protected function new_post($post, $persist) {
 		$github_path = $post->github_path();
 		$old_github_path = $post->old_github_path();
 		$blob = $post->to_blob();
 		$result = false;
 
-		if ( $old_github_path && $old_github_path != $github_path ) {
+		if ($old_github_path && $old_github_path != $github_path) {
 			// rename
 			$message = apply_filters(
 				'wogh_commit_msg_move_post',
@@ -156,20 +156,20 @@ 
 					'Move %s to %s via WordPress at %s (%s)',
 					$old_github_path, $github_path,
 					site_url(),
-					get_bloginfo( 'name' )
+					get_bloginfo('name')
 				)
 			) . $this->get_commit_msg_tag();
 
-			$result = $persist->delete_file( $post->old_github_path(), $blob->sha(), $message );
-			if ( is_wp_error( $result ) ) {
+			$result = $persist->delete_file($post->old_github_path(), $blob->sha(), $message);
+			if (is_wp_error($result)) {
 				return $result;
 			}
 
-			$result = $persist->create_file( $blob, $message );
-			if ( is_wp_error( $result ) ) {
+			$result = $persist->create_file($blob, $message);
+			if (is_wp_error($result)) {
 				return $result;
 			}
-		} elseif ( ! $old_github_path ) {
+		} elseif ( ! $old_github_path) {
 			// create new
 			$message = apply_filters(
 				'wogh_commit_msg_new_post',
@@ -177,14 +177,14 @@ 
 					'Create new post %s from WordPress at %s (%s)',
 					$github_path,
 					site_url(),
-					get_bloginfo( 'name' )
+					get_bloginfo('name')
 				)
 			) . $this->get_commit_msg_tag();
-			$result = $persist->create_file( $blob, $message );
-			if ( is_wp_error( $result ) ) {
+			$result = $persist->create_file($blob, $message);
+			if (is_wp_error($result)) {
 				return $result;
 			}
-		} elseif ( $old_github_path && $old_github_path == $github_path ) {
+		} elseif ($old_github_path && $old_github_path == $github_path) {
 			// update
 			$message = apply_filters(
 				'wogh_commit_msg_update_post',
@@ -192,11 +192,11 @@ 
 					'Update post %s from WordPress at %s (%s)',
 					$github_path,
 					site_url(),
-					get_bloginfo( 'name' )
+					get_bloginfo('name')
 				)
 			) . $this->get_commit_msg_tag();
-			$result = $persist->update_file( $blob, $message );
-			if ( is_wp_error( $result ) ) {
+			$result = $persist->update_file($blob, $message);
+			if (is_wp_error($result)) {
 				return $result;
 			}
 		}
@@ -215,14 +215,14 @@ 
 	 *
 	 * @return string|WP_Error
 	 */
-	public function delete( $post_id ) {
-		$post = $this->app->database()->fetch_by_id( $post_id );
+	public function delete($post_id) {
+		$post = $this->app->database()->fetch_by_id($post_id);
 
-		if ( is_wp_error( $post ) ) {
+		if (is_wp_error($post)) {
 			return $post;
 		}
 
-		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
+		$github_path = get_post_meta($post_id, '_wogh_github_path', true);
 
 		$message = apply_filters(
 			'wogh_commit_msg_delete',
@@ -230,18 +230,18 @@ 
 				'Deleting %s via WordPress at %s (%s)',
 				$github_path,
 				site_url(),
-				get_bloginfo( 'name' )
+				get_bloginfo('name')
 			),
 			$post
 		) . $this->get_commit_msg_tag();
 
-		$result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
+		$result = $this->app->api()->persist()->delete_file($github_path, $post->sha(), $message);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			return $result;
 		}
 
-		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
+		return __('Export to GitHub completed successfully.', 'writing-on-github');
 	}
 
 
@@ -252,8 +252,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function set_user( $user_id ) {
-		return update_option( self::EXPORT_USER_OPTION, (int) $user_id );
+	public function set_user($user_id) {
+		return update_option(self::EXPORT_USER_OPTION, (int) $user_id);
 	}
 
 	/**
@@ -262,10 +262,10 @@ 
 	 * @return string
 	 */
 	protected function get_commit_msg_tag() {
-		$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'));
 		}
 
 		return ' - ' . $tag;

lib/import.php

Doc Comments +3 added lines, -1 removed lines

@@ -140,6 +140,9 @@ 
 		return __( 'Payload processed', 'writing-on-github' );
 	}
 
+	/**
+	 * @param boolean $delete_ids
+	 */
 	protected function compare( $files, &$delete_ids ) {
 		if ( is_wp_error( $files ) ) {
 			return $files;
@@ -217,7 +220,6 @@ 
 	/**
 	 * Checks whether the provided blob should be imported.
 	 *
-	 * @param Writing_On_GitHub_Blob $blob Blob to validate.
 	 *
 	 * @return bool
 	 */

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

lib/request.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	/**
 	 * Validates the header's secret.
 	 *
-	 * @return true|WP_Error
+	 * @return boolean
 	 */
 	public function is_secret_valid() {
 		$headers = $this->headers();

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 ( $this->headers ) {
+		if ($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');
 	}
 }

Spyc.php

Doc Comments +77 added lines, -1 removed lines

@@ -361,7 +361,7 @@ 
      * Creates a literal block for dumping
      * @access private
      * @return string
-     * @param $value
+     * @param string $value
      * @param $indent int The value of the indent
      */
   private function _doLiteralBlock($value,$indent) {
@@ -430,6 +430,9 @@ 
     return in_array($value, $words, true);
   }
 
+  /**
+   * @param string $value
+   */
   private function isTranslationWord($value) {
     return (
       self::isTrueWord($value)  ||
@@ -471,11 +474,17 @@ 
 
 // LOADING FUNCTIONS
 
+  /**
+   * @param string $input
+   */
   private function __load($input) {
     $Source = $this->loadFromSource($input);
     return $this->loadWithSource($Source);
   }
 
+  /**
+   * @param string $input
+   */
   private function __loadString($input) {
     $Source = $this->loadFromString($input);
     return $this->loadWithSource($Source);
@@ -692,6 +701,7 @@ 
   /**
      * Used in inlines to check for more inlines or quoted strings
      * @access private
+     * @param string $inline
      * @return array
      */
   private function _inlineEscape($inline) {
@@ -822,12 +832,18 @@ 
     return $explode;
   }
 
+  /**
+   * @param integer $lineIndent
+   */
   private function literalBlockContinues ($line, $lineIndent) {
     if (!trim($line)) return true;
     if (strlen($line) - strlen(ltrim($line)) > $lineIndent) return true;
     return false;
   }
 
+  /**
+   * @param boolean $alias
+   */
   private function referenceContentsByAlias ($alias) {
     do {
       if (!isset($this->SavedGroups[$alias])) { echo "Bad group name: $alias."; break; }
@@ -926,6 +942,9 @@ 
 
   }
 
+  /**
+   * @param string $line
+   */
   private static function startsLiteralBlock ($line) {
     $lastChar = substr (trim($line), -1);
     if ($lastChar != '>' && $lastChar != '|') return false;
@@ -935,6 +954,9 @@ 
     return $lastChar;
   }
 
+  /**
+   * @param string $line
+   */
   private static function greedilyNeedNextLine($line) {
     $line = trim ($line);
     if (!strlen($line)) return false;
@@ -944,6 +966,10 @@ 
     return false;
   }
 
+  /**
+   * @param string $literalBlock
+   * @param string $literalBlockStyle
+   */
   private function addLiteralLine ($literalBlock, $line, $literalBlockStyle, $indent = -1) {
     $line = self::stripIndent($line, $indent);
     if ($literalBlockStyle !== '|') {
@@ -963,6 +989,9 @@ 
     return $literalBlock . $line;
   }
 
+   /**
+    * @param string $literalBlock
+    */
    function revertLiteralPlaceHolder ($lineArray, $literalBlock) {
      foreach ($lineArray as $k => $_) {
       if (is_array($_))
@@ -978,6 +1007,9 @@ 
     return substr ($line, $indent);
   }
 
+  /**
+   * @param integer $indent
+   */
   private function getParentPathByIndent ($indent) {
     if ($indent == 0) return array();
     $linePath = $this->path;
@@ -1003,6 +1035,9 @@ 
   }
 
 
+  /**
+   * @param string $line
+   */
   private static function isComment ($line) {
     if (!$line) return false;
     if ($line[0] == '#') return true;
@@ -1010,6 +1045,9 @@ 
     return false;
   }
 
+  /**
+   * @param string $line
+   */
   private static function isEmpty ($line) {
     return (trim ($line) === '');
   }
@@ -1035,6 +1073,9 @@ 
   }
 
 
+  /**
+   * @param string $value
+   */
   private static function unquote ($value) {
     if (!$value) return $value;
     if (!is_string($value)) return $value;
@@ -1043,10 +1084,16 @@ 
     return $value;
   }
 
+  /**
+   * @param string $line
+   */
   private function startsMappedSequence ($line) {
     return (substr($line, 0, 2) == '- ' && substr ($line, -1, 1) == ':');
   }
 
+  /**
+   * @param string $line
+   */
   private function returnMappedSequence ($line) {
     $array = array();
     $key         = self::unquote(trim(substr($line,1,-1)));
@@ -1063,6 +1110,9 @@ 
     }
   }
 
+  /**
+   * @param string $line
+   */
   private function returnMappedValue ($line) {
     $this->checkKeysInValue($line);
     $array = array();
@@ -1071,18 +1121,30 @@ 
     return $array;
   }
 
+  /**
+   * @param string $line
+   */
   private function startsMappedValue ($line) {
     return (substr ($line, -1, 1) == ':');
   }
 
+  /**
+   * @param string $line
+   */
   private function isPlainArray ($line) {
     return ($line[0] == '[' && substr ($line, -1, 1) == ']');
   }
 
+  /**
+   * @param string $line
+   */
   private function returnPlainArray ($line) {
     return $this->_toType($line);
   }
 
+  /**
+   * @param string $line
+   */
   private function returnKeyValuePair ($line) {
     $array = array();
     $key = '';
@@ -1111,6 +1173,9 @@ 
   }
 
 
+  /**
+   * @param string $line
+   */
   private function returnArrayElement ($line) {
      if (strlen($line) <= 1) return array(array()); // Weird %)
      $array = array();
@@ -1124,6 +1189,9 @@ 
   }
 
 
+  /**
+   * @param string $line
+   */
   private function nodeContainsGroup ($line) {
     $symbolsForReference = 'A-z0-9_\-';
     if (strpos($line, '&') === false && strpos($line, '*') === false) return false; // Please die fast ;-)
@@ -1136,12 +1204,20 @@ 
 
   }
 
+  /**
+   * @param string $line
+   * @param string $group
+   */
   private function addGroup ($line, $group) {
     if ($group[0] == '&') $this->_containsGroupAnchor = substr ($group, 1);
     if ($group[0] == '*') $this->_containsGroupAlias = substr ($group, 1);
     //print_r ($this->path);
   }
 
+  /**
+   * @param string $line
+   * @param string $group
+   */
   private function stripGroup ($line, $group) {
     $line = trim(str_replace($group, '', $line));
     return $line;

Indentation +853 added lines, -853 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
-   * Spyc -- A Simple PHP YAML Class
-   * @version 0.5.1
-   * @author Vlad Andersen <vlad.andersen@gmail.com>
-   * @author Chris Wanstrath <chris@ozmm.org>
-   * @link https://github.com/mustangostang/spyc/
-   * @copyright Copyright 2005-2006 Chris Wanstrath, 2006-2011 Vlad Andersen
-   * @license http://www.opensource.org/licenses/mit-license.php MIT License
-   * @package Spyc
-   */
+ * Spyc -- A Simple PHP YAML Class
+ * @version 0.5.1
+ * @author Vlad Andersen <vlad.andersen@gmail.com>
+ * @author Chris Wanstrath <chris@ozmm.org>
+ * @link https://github.com/mustangostang/spyc/
+ * @copyright Copyright 2005-2006 Chris Wanstrath, 2006-2011 Vlad Andersen
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @package Spyc
+ */
 
 if (!function_exists('spyc_load')) {
   /**
@@ -17,7 +17,7 @@ 
    * @return array
    */
   function spyc_load ($string) {
-    return Spyc::YAMLLoadString($string);
+	return Spyc::YAMLLoadString($string);
   }
 }
 
@@ -28,7 +28,7 @@ 
    * @return array
    */
   function spyc_load_file ($file) {
-    return Spyc::YAMLLoad($file);
+	return Spyc::YAMLLoad($file);
   }
 }
 
@@ -39,34 +39,34 @@ 
    * @return string
    */
   function spyc_dump ($data) {
-    return Spyc::YAMLDump($data, false, false, true);
+	return Spyc::YAMLDump($data, false, false, true);
   }
 }
 
 if (!class_exists('Spyc')) {
 
 /**
-   * The Simple PHP YAML Class.
-   *
-   * This class can be used to read a YAML file and convert its contents
-   * into a PHP array.  It currently supports a very limited subsection of
-   * the YAML spec.
-   *
-   * Usage:
-   * <code>
-   *   $Spyc  = new Spyc;
-   *   $array = $Spyc->load($file);
-   * </code>
-   * or:
-   * <code>
-   *   $array = Spyc::YAMLLoad($file);
-   * </code>
-   * or:
-   * <code>
-   *   $array = spyc_load_file($file);
-   * </code>
-   * @package Spyc
-   */
+ * The Simple PHP YAML Class.
+ *
+ * This class can be used to read a YAML file and convert its contents
+ * into a PHP array.  It currently supports a very limited subsection of
+ * the YAML spec.
+ *
+ * Usage:
+ * <code>
+ *   $Spyc  = new Spyc;
+ *   $array = $Spyc->load($file);
+ * </code>
+ * or:
+ * <code>
+ *   $array = Spyc::YAMLLoad($file);
+ * </code>
+ * or:
+ * <code>
+ *   $array = spyc_load_file($file);
+ * </code>
+ * @package Spyc
+ */
 class Spyc {
 
   // SETTINGS
@@ -121,1030 +121,1030 @@ 
  * @return array
  */
   public function load ($input) {
-    return $this->__loadString($input);
+	return $this->__loadString($input);
   }
 
  /**
- * Load a valid YAML file to Spyc.
- * @param string $file
- * @return array
- */
+  * Load a valid YAML file to Spyc.
+  * @param string $file
+  * @return array
+  */
   public function loadFile ($file) {
-    return $this->__load($file);
+	return $this->__load($file);
   }
 
   /**
-     * Load YAML into a PHP array statically
-     *
-     * The load method, when supplied with a YAML stream (string or file),
-     * will do its best to convert YAML in a file into a PHP array.  Pretty
-     * simple.
-     *  Usage:
-     *  <code>
-     *   $array = Spyc::YAMLLoad('lucky.yaml');
-     *   print_r($array);
-     *  </code>
-     * @access public
-     * @return array
-     * @param string $input Path of YAML file or string containing YAML
-     */
+   * Load YAML into a PHP array statically
+   *
+   * The load method, when supplied with a YAML stream (string or file),
+   * will do its best to convert YAML in a file into a PHP array.  Pretty
+   * simple.
+   *  Usage:
+   *  <code>
+   *   $array = Spyc::YAMLLoad('lucky.yaml');
+   *   print_r($array);
+   *  </code>
+   * @access public
+   * @return array
+   * @param string $input Path of YAML file or string containing YAML
+   */
   public static function YAMLLoad($input) {
-    $Spyc = new Spyc;
-    return $Spyc->__load($input);
+	$Spyc = new Spyc;
+	return $Spyc->__load($input);
   }
 
   /**
-     * Load a string of YAML into a PHP array statically
-     *
-     * The load method, when supplied with a YAML string, will do its best
-     * to convert YAML in a string into a PHP array.  Pretty simple.
-     *
-     * Note: use this function if you don't want files from the file system
-     * loaded and processed as YAML.  This is of interest to people concerned
-     * about security whose input is from a string.
-     *
-     *  Usage:
-     *  <code>
-     *   $array = Spyc::YAMLLoadString("---\n0: hello world\n");
-     *   print_r($array);
-     *  </code>
-     * @access public
-     * @return array
-     * @param string $input String containing YAML
-     */
+   * Load a string of YAML into a PHP array statically
+   *
+   * The load method, when supplied with a YAML string, will do its best
+   * to convert YAML in a string into a PHP array.  Pretty simple.
+   *
+   * Note: use this function if you don't want files from the file system
+   * loaded and processed as YAML.  This is of interest to people concerned
+   * about security whose input is from a string.
+   *
+   *  Usage:
+   *  <code>
+   *   $array = Spyc::YAMLLoadString("---\n0: hello world\n");
+   *   print_r($array);
+   *  </code>
+   * @access public
+   * @return array
+   * @param string $input String containing YAML
+   */
   public static function YAMLLoadString($input) {
-    $Spyc = new Spyc;
-    return $Spyc->__loadString($input);
+	$Spyc = new Spyc;
+	return $Spyc->__loadString($input);
   }
 
   /**
-     * Dump YAML from PHP array statically
-     *
-     * The dump method, when supplied with an array, will do its best
-     * to convert the array into friendly YAML.  Pretty simple.  Feel free to
-     * save the returned string as nothing.yaml and pass it around.
-     *
-     * Oh, and you can decide how big the indent is and what the wordwrap
-     * for folding is.  Pretty cool -- just pass in 'false' for either if
-     * you want to use the default.
-     *
-     * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
-     * you can turn off wordwrap by passing in 0.
-     *
-     * @access public
-     * @return string
-     * @param array $array PHP array
-     * @param int $indent Pass in false to use the default, which is 2
-     * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
-     * @param int $no_opening_dashes Do not start YAML file with "---\n"
-     */
+   * Dump YAML from PHP array statically
+   *
+   * The dump method, when supplied with an array, will do its best
+   * to convert the array into friendly YAML.  Pretty simple.  Feel free to
+   * save the returned string as nothing.yaml and pass it around.
+   *
+   * Oh, and you can decide how big the indent is and what the wordwrap
+   * for folding is.  Pretty cool -- just pass in 'false' for either if
+   * you want to use the default.
+   *
+   * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
+   * you can turn off wordwrap by passing in 0.
+   *
+   * @access public
+   * @return string
+   * @param array $array PHP array
+   * @param int $indent Pass in false to use the default, which is 2
+   * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
+   * @param int $no_opening_dashes Do not start YAML file with "---\n"
+   */
   public static function YAMLDump($array, $indent = false, $wordwrap = false, $no_opening_dashes = false) {
-    $spyc = new Spyc;
-    return $spyc->dump($array, $indent, $wordwrap, $no_opening_dashes);
+	$spyc = new Spyc;
+	return $spyc->dump($array, $indent, $wordwrap, $no_opening_dashes);
   }
 
 
   /**
-     * Dump PHP array to YAML
-     *
-     * The dump method, when supplied with an array, will do its best
-     * to convert the array into friendly YAML.  Pretty simple.  Feel free to
-     * save the returned string as tasteful.yaml and pass it around.
-     *
-     * Oh, and you can decide how big the indent is and what the wordwrap
-     * for folding is.  Pretty cool -- just pass in 'false' for either if
-     * you want to use the default.
-     *
-     * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
-     * you can turn off wordwrap by passing in 0.
-     *
-     * @access public
-     * @return string
-     * @param array $array PHP array
-     * @param int $indent Pass in false to use the default, which is 2
-     * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
-     */
+   * Dump PHP array to YAML
+   *
+   * The dump method, when supplied with an array, will do its best
+   * to convert the array into friendly YAML.  Pretty simple.  Feel free to
+   * save the returned string as tasteful.yaml and pass it around.
+   *
+   * Oh, and you can decide how big the indent is and what the wordwrap
+   * for folding is.  Pretty cool -- just pass in 'false' for either if
+   * you want to use the default.
+   *
+   * Indent's default is 2 spaces, wordwrap's default is 40 characters.  And
+   * you can turn off wordwrap by passing in 0.
+   *
+   * @access public
+   * @return string
+   * @param array $array PHP array
+   * @param int $indent Pass in false to use the default, which is 2
+   * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
+   */
   public function dump($array,$indent = false,$wordwrap = false, $no_opening_dashes = false) {
-    // Dumps to some very clean YAML.  We'll have to add some more features
-    // and options soon.  And better support for folding.
-
-    // New features and options.
-    if ($indent === false or !is_numeric($indent)) {
-      $this->_dumpIndent = 2;
-    } else {
-      $this->_dumpIndent = $indent;
-    }
-
-    if ($wordwrap === false or !is_numeric($wordwrap)) {
-      $this->_dumpWordWrap = 40;
-    } else {
-      $this->_dumpWordWrap = $wordwrap;
-    }
-
-    // New YAML document
-    $string = "";
-    if (!$no_opening_dashes) $string = "---\n";
-
-    // Start at the base of the array and move through it.
-    if ($array) {
-      $array = (array)$array;
-      $previous_key = -1;
-      foreach ($array as $key => $value) {
-        if (!isset($first_key)) $first_key = $key;
-        $string .= $this->_yamlize($key,$value,0,$previous_key, $first_key, $array);
-        $previous_key = $key;
-      }
-    }
-    return $string;
+	// Dumps to some very clean YAML.  We'll have to add some more features
+	// and options soon.  And better support for folding.
+
+	// New features and options.
+	if ($indent === false or !is_numeric($indent)) {
+	  $this->_dumpIndent = 2;
+	} else {
+	  $this->_dumpIndent = $indent;
+	}
+
+	if ($wordwrap === false or !is_numeric($wordwrap)) {
+	  $this->_dumpWordWrap = 40;
+	} else {
+	  $this->_dumpWordWrap = $wordwrap;
+	}
+
+	// New YAML document
+	$string = "";
+	if (!$no_opening_dashes) $string = "---\n";
+
+	// Start at the base of the array and move through it.
+	if ($array) {
+	  $array = (array)$array;
+	  $previous_key = -1;
+	  foreach ($array as $key => $value) {
+		if (!isset($first_key)) $first_key = $key;
+		$string .= $this->_yamlize($key,$value,0,$previous_key, $first_key, $array);
+		$previous_key = $key;
+	  }
+	}
+	return $string;
   }
 
   /**
-     * Attempts to convert a key / value array item to YAML
-     * @access private
-     * @return string
-     * @param $key The name of the key
-     * @param $value The value of the item
-     * @param $indent The indent of the current node
-     */
+   * Attempts to convert a key / value array item to YAML
+   * @access private
+   * @return string
+   * @param $key The name of the key
+   * @param $value The value of the item
+   * @param $indent The indent of the current node
+   */
   private function _yamlize($key,$value,$indent, $previous_key = -1, $first_key = 0, $source_array = null) {
-    if(is_object($value)) $value = (array)$value;
-    if (is_array($value)) {
-      if (empty ($value))
-        return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array);
-      // It has children.  What to do?
-      // Make it the right kind of item
-      $string = $this->_dumpNode($key, self::REMPTY, $indent, $previous_key, $first_key, $source_array);
-      // Add the indent
-      $indent += $this->_dumpIndent;
-      // Yamlize the array
-      $string .= $this->_yamlizeArray($value,$indent);
-    } elseif (!is_array($value)) {
-      // It doesn't have children.  Yip.
-      $string = $this->_dumpNode($key, $value, $indent, $previous_key, $first_key, $source_array);
-    }
-    return $string;
+	if(is_object($value)) $value = (array)$value;
+	if (is_array($value)) {
+	  if (empty ($value))
+		return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array);
+	  // It has children.  What to do?
+	  // Make it the right kind of item
+	  $string = $this->_dumpNode($key, self::REMPTY, $indent, $previous_key, $first_key, $source_array);
+	  // Add the indent
+	  $indent += $this->_dumpIndent;
+	  // Yamlize the array
+	  $string .= $this->_yamlizeArray($value,$indent);
+	} elseif (!is_array($value)) {
+	  // It doesn't have children.  Yip.
+	  $string = $this->_dumpNode($key, $value, $indent, $previous_key, $first_key, $source_array);
+	}
+	return $string;
   }
 
   /**
-     * Attempts to convert an array to YAML
-     * @access private
-     * @return string
-     * @param $array The array you want to convert
-     * @param $indent The indent of the current level
-     */
+   * Attempts to convert an array to YAML
+   * @access private
+   * @return string
+   * @param $array The array you want to convert
+   * @param $indent The indent of the current level
+   */
   private function _yamlizeArray($array,$indent) {
-    if (is_array($array)) {
-      $string = '';
-      $previous_key = -1;
-      foreach ($array as $key => $value) {
-        if (!isset($first_key)) $first_key = $key;
-        $string .= $this->_yamlize($key, $value, $indent, $previous_key, $first_key, $array);
-        $previous_key = $key;
-      }
-      return $string;
-    } else {
-      return false;
-    }
+	if (is_array($array)) {
+	  $string = '';
+	  $previous_key = -1;
+	  foreach ($array as $key => $value) {
+		if (!isset($first_key)) $first_key = $key;
+		$string .= $this->_yamlize($key, $value, $indent, $previous_key, $first_key, $array);
+		$previous_key = $key;
+	  }
+	  return $string;
+	} else {
+	  return false;
+	}
   }
 
   /**
-     * Returns YAML from a key and a value
-     * @access private
-     * @return string
-     * @param $key The name of the key
-     * @param $value The value of the item
-     * @param $indent The indent of the current node
-     */
+   * Returns YAML from a key and a value
+   * @access private
+   * @return string
+   * @param $key The name of the key
+   * @param $value The value of the item
+   * @param $indent The indent of the current node
+   */
   private function _dumpNode($key, $value, $indent, $previous_key = -1, $first_key = 0, $source_array = null) {
-    // do some folding here, for blocks
-    if (is_string ($value) && ((strpos($value,"\n") !== false || strpos($value,": ") !== false || strpos($value,"- ") !== false ||
-      strpos($value,"*") !== false || strpos($value,"#") !== false || strpos($value,"<") !== false || strpos($value,">") !== false || strpos ($value, '%') !== false || strpos ($value, '  ') !== false ||
-      strpos($value,"[") !== false || strpos($value,"]") !== false || strpos($value,"{") !== false || strpos($value,"}") !== false) || strpos($value,"&") !== false || strpos($value, "'") !== false || strpos($value, "!") === 0 ||
-      substr ($value, -1, 1) == ':')
-    ) {
-      $value = $this->_doLiteralBlock($value,$indent);
-    } else {
-      $value  = $this->_doFolding($value,$indent);
-    }
-
-    if ($value === array()) $value = '[ ]';
-    if ($value === "") $value = '""';
-    if (self::isTranslationWord($value)) {
-      $value = $this->_doLiteralBlock($value, $indent);
-    }
-    if (trim ($value) != $value)
-       $value = $this->_doLiteralBlock($value,$indent);
-
-    if (is_bool($value)) {
-       $value = $value ? "true" : "false";
-    }
-
-    if ($value === null) $value = 'null';
-    if ($value === "'" . self::REMPTY . "'") $value = null;
-
-    $spaces = str_repeat(' ',$indent);
-
-    //if (is_int($key) && $key - 1 == $previous_key && $first_key===0) {
-    if (is_array ($source_array) && array_keys($source_array) === range(0, count($source_array) - 1)) {
-      // It's a sequence
-      $string = $spaces.'- '.$value."\n";
-    } else {
-      // if ($first_key===0)  throw new Exception('Keys are all screwy.  The first one was zero, now it\'s "'. $key .'"');
-      // It's mapped
-      if (strpos($key, ":") !== false || strpos($key, "#") !== false) { $key = '"' . $key . '"'; }
-      $string = rtrim ($spaces.$key.': '.$value)."\n";
-    }
-    return $string;
+	// do some folding here, for blocks
+	if (is_string ($value) && ((strpos($value,"\n") !== false || strpos($value,": ") !== false || strpos($value,"- ") !== false ||
+	  strpos($value,"*") !== false || strpos($value,"#") !== false || strpos($value,"<") !== false || strpos($value,">") !== false || strpos ($value, '%') !== false || strpos ($value, '  ') !== false ||
+	  strpos($value,"[") !== false || strpos($value,"]") !== false || strpos($value,"{") !== false || strpos($value,"}") !== false) || strpos($value,"&") !== false || strpos($value, "'") !== false || strpos($value, "!") === 0 ||
+	  substr ($value, -1, 1) == ':')
+	) {
+	  $value = $this->_doLiteralBlock($value,$indent);
+	} else {
+	  $value  = $this->_doFolding($value,$indent);
+	}
+
+	if ($value === array()) $value = '[ ]';
+	if ($value === "") $value = '""';
+	if (self::isTranslationWord($value)) {
+	  $value = $this->_doLiteralBlock($value, $indent);
+	}
+	if (trim ($value) != $value)
+	   $value = $this->_doLiteralBlock($value,$indent);
+
+	if (is_bool($value)) {
+	   $value = $value ? "true" : "false";
+	}
+
+	if ($value === null) $value = 'null';
+	if ($value === "'" . self::REMPTY . "'") $value = null;
+
+	$spaces = str_repeat(' ',$indent);
+
+	//if (is_int($key) && $key - 1 == $previous_key && $first_key===0) {
+	if (is_array ($source_array) && array_keys($source_array) === range(0, count($source_array) - 1)) {
+	  // It's a sequence
+	  $string = $spaces.'- '.$value."\n";
+	} else {
+	  // if ($first_key===0)  throw new Exception('Keys are all screwy.  The first one was zero, now it\'s "'. $key .'"');
+	  // It's mapped
+	  if (strpos($key, ":") !== false || strpos($key, "#") !== false) { $key = '"' . $key . '"'; }
+	  $string = rtrim ($spaces.$key.': '.$value)."\n";
+	}
+	return $string;
   }
 
   /**
-     * Creates a literal block for dumping
-     * @access private
-     * @return string
-     * @param $value
-     * @param $indent int The value of the indent
-     */
+   * Creates a literal block for dumping
+   * @access private
+   * @return string
+   * @param $value
+   * @param $indent int The value of the indent
+   */
   private function _doLiteralBlock($value,$indent) {
-    if ($value === "\n") return '\n';
-    if (strpos($value, "\n") === false && strpos($value, "'") === false) {
-      return sprintf ("'%s'", $value);
-    }
-    if (strpos($value, "\n") === false && strpos($value, '"') === false) {
-      return sprintf ('"%s"', $value);
-    }
-    $exploded = explode("\n",$value);
-    $newValue = '|';
-    if (isset($exploded[0]) && ($exploded[0] == "|" || $exploded[0] == "|-" || $exploded[0] == ">")) {
-        $newValue = $exploded[0];
-        unset($exploded[0]);
-    }
-    $indent += $this->_dumpIndent;
-    $spaces   = str_repeat(' ',$indent);
-    foreach ($exploded as $line) {
-      $line = trim($line);
-      if (strpos($line, '"') === 0 && strrpos($line, '"') == (strlen($line)-1) || strpos($line, "'") === 0 && strrpos($line, "'") == (strlen($line)-1)) {
-        $line = substr($line, 1, -1);
-      }
-      $newValue .= "\n" . $spaces . ($line);
-    }
-    return $newValue;
+	if ($value === "\n") return '\n';
+	if (strpos($value, "\n") === false && strpos($value, "'") === false) {
+	  return sprintf ("'%s'", $value);
+	}
+	if (strpos($value, "\n") === false && strpos($value, '"') === false) {
+	  return sprintf ('"%s"', $value);
+	}
+	$exploded = explode("\n",$value);
+	$newValue = '|';
+	if (isset($exploded[0]) && ($exploded[0] == "|" || $exploded[0] == "|-" || $exploded[0] == ">")) {
+		$newValue = $exploded[0];
+		unset($exploded[0]);
+	}
+	$indent += $this->_dumpIndent;
+	$spaces   = str_repeat(' ',$indent);
+	foreach ($exploded as $line) {
+	  $line = trim($line);
+	  if (strpos($line, '"') === 0 && strrpos($line, '"') == (strlen($line)-1) || strpos($line, "'") === 0 && strrpos($line, "'") == (strlen($line)-1)) {
+		$line = substr($line, 1, -1);
+	  }
+	  $newValue .= "\n" . $spaces . ($line);
+	}
+	return $newValue;
   }
 
   /**
-     * Folds a string of text, if necessary
-     * @access private
-     * @return string
-     * @param $value The string you wish to fold
-     */
+   * Folds a string of text, if necessary
+   * @access private
+   * @return string
+   * @param $value The string you wish to fold
+   */
   private function _doFolding($value,$indent) {
-    // Don't do anything if wordwrap is set to 0
-
-    if ($this->_dumpWordWrap !== 0 && is_string ($value) && strlen($value) > $this->_dumpWordWrap) {
-      $indent += $this->_dumpIndent;
-      $indent = str_repeat(' ',$indent);
-      $wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent");
-      $value   = ">\n".$indent.$wrapped;
-    } else {
-      if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY)
-        $value = '"' . $value . '"';
-      if (is_numeric($value) && is_string($value))
-        $value = '"' . $value . '"';
-    }
-
-
-    return $value;
+	// Don't do anything if wordwrap is set to 0
+
+	if ($this->_dumpWordWrap !== 0 && is_string ($value) && strlen($value) > $this->_dumpWordWrap) {
+	  $indent += $this->_dumpIndent;
+	  $indent = str_repeat(' ',$indent);
+	  $wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent");
+	  $value   = ">\n".$indent.$wrapped;
+	} else {
+	  if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY)
+		$value = '"' . $value . '"';
+	  if (is_numeric($value) && is_string($value))
+		$value = '"' . $value . '"';
+	}
+
+
+	return $value;
   }
 
   private function isTrueWord($value) {
-    $words = self::getTranslations(array('true', 'on', 'yes', 'y'));
-    return in_array($value, $words, true);
+	$words = self::getTranslations(array('true', 'on', 'yes', 'y'));
+	return in_array($value, $words, true);
   }
 
   private function isFalseWord($value) {
-    $words = self::getTranslations(array('false', 'off', 'no', 'n'));
-    return in_array($value, $words, true);
+	$words = self::getTranslations(array('false', 'off', 'no', 'n'));
+	return in_array($value, $words, true);
   }
 
   private function isNullWord($value) {
-    $words = self::getTranslations(array('null', '~'));
-    return in_array($value, $words, true);
+	$words = self::getTranslations(array('null', '~'));
+	return in_array($value, $words, true);
   }
 
   private function isTranslationWord($value) {
-    return (
-      self::isTrueWord($value)  ||
-      self::isFalseWord($value) ||
-      self::isNullWord($value)
-    );
+	return (
+	  self::isTrueWord($value)  ||
+	  self::isFalseWord($value) ||
+	  self::isNullWord($value)
+	);
   }
 
   /**
-     * Coerce a string into a native type
-     * Reference: http://yaml.org/type/bool.html
-     * TODO: Use only words from the YAML spec.
-     * @access private
-     * @param $value The value to coerce
-     */
+   * Coerce a string into a native type
+   * Reference: http://yaml.org/type/bool.html
+   * TODO: Use only words from the YAML spec.
+   * @access private
+   * @param $value The value to coerce
+   */
   private function coerceValue(&$value) {
-    if (self::isTrueWord($value)) {
-      $value = true;
-    } else if (self::isFalseWord($value)) {
-      $value = false;
-    } else if (self::isNullWord($value)) {
-      $value = null;
-    }
+	if (self::isTrueWord($value)) {
+	  $value = true;
+	} else if (self::isFalseWord($value)) {
+	  $value = false;
+	} else if (self::isNullWord($value)) {
+	  $value = null;
+	}
   }
 
   /**
-     * Given a set of words, perform the appropriate translations on them to
-     * match the YAML 1.1 specification for type coercing.
-     * @param $words The words to translate
-     * @access private
-     */
+   * Given a set of words, perform the appropriate translations on them to
+   * match the YAML 1.1 specification for type coercing.
+   * @param $words The words to translate
+   * @access private
+   */
   private static function getTranslations(array $words) {
-    $result = array();
-    foreach ($words as $i) {
-      $result = array_merge($result, array(ucfirst($i), strtoupper($i), strtolower($i)));
-    }
-    return $result;
+	$result = array();
+	foreach ($words as $i) {
+	  $result = array_merge($result, array(ucfirst($i), strtoupper($i), strtolower($i)));
+	}
+	return $result;
   }
 
 // LOADING FUNCTIONS
 
   private function __load($input) {
-    $Source = $this->loadFromSource($input);
-    return $this->loadWithSource($Source);
+	$Source = $this->loadFromSource($input);
+	return $this->loadWithSource($Source);
   }
 
   private function __loadString($input) {
-    $Source = $this->loadFromString($input);
-    return $this->loadWithSource($Source);
+	$Source = $this->loadFromString($input);
+	return $this->loadWithSource($Source);
   }
 
   private function loadWithSource($Source) {
-    if (empty ($Source)) return array();
-    if ($this->setting_use_syck_is_possible && function_exists ('syck_load')) {
-      $array = syck_load (implode ("\n", $Source));
-      return is_array($array) ? $array : array();
-    }
-
-    $this->path = array();
-    $this->result = array();
-
-    $cnt = count($Source);
-    for ($i = 0; $i < $cnt; $i++) {
-      $line = $Source[$i];
-
-      $this->indent = strlen($line) - strlen(ltrim($line));
-      $tempPath = $this->getParentPathByIndent($this->indent);
-      $line = self::stripIndent($line, $this->indent);
-      if (self::isComment($line)) continue;
-      if (self::isEmpty($line)) continue;
-      $this->path = $tempPath;
-
-      $literalBlockStyle = self::startsLiteralBlock($line);
-      if ($literalBlockStyle) {
-        $line = rtrim ($line, $literalBlockStyle . " \n");
-        $literalBlock = '';
-        $line .= ' '.$this->LiteralPlaceHolder;
-        $literal_block_indent = strlen($Source[$i+1]) - strlen(ltrim($Source[$i+1]));
-        while (++$i < $cnt && $this->literalBlockContinues($Source[$i], $this->indent)) {
-          $literalBlock = $this->addLiteralLine($literalBlock, $Source[$i], $literalBlockStyle, $literal_block_indent);
-        }
-        $i--;
-      }
-
-      // Strip out comments
-      if (strpos ($line, '#')) {
-          $line = preg_replace('/\s*#([^"\']+)$/','',$line);
-      }
-
-      while (++$i < $cnt && self::greedilyNeedNextLine($line)) {
-        $line = rtrim ($line, " \n\t\r") . ' ' . ltrim ($Source[$i], " \t");
-      }
-      $i--;
-
-      $lineArray = $this->_parseLine($line);
-
-      if ($literalBlockStyle)
-        $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock);
-
-      $this->addArray($lineArray, $this->indent);
-
-      foreach ($this->delayedPath as $indent => $delayedPath)
-        $this->path[$indent] = $delayedPath;
-
-      $this->delayedPath = array();
-
-    }
-    return $this->result;
+	if (empty ($Source)) return array();
+	if ($this->setting_use_syck_is_possible && function_exists ('syck_load')) {
+	  $array = syck_load (implode ("\n", $Source));
+	  return is_array($array) ? $array : array();
+	}
+
+	$this->path = array();
+	$this->result = array();
+
+	$cnt = count($Source);
+	for ($i = 0; $i < $cnt; $i++) {
+	  $line = $Source[$i];
+
+	  $this->indent = strlen($line) - strlen(ltrim($line));
+	  $tempPath = $this->getParentPathByIndent($this->indent);
+	  $line = self::stripIndent($line, $this->indent);
+	  if (self::isComment($line)) continue;
+	  if (self::isEmpty($line)) continue;
+	  $this->path = $tempPath;
+
+	  $literalBlockStyle = self::startsLiteralBlock($line);
+	  if ($literalBlockStyle) {
+		$line = rtrim ($line, $literalBlockStyle . " \n");
+		$literalBlock = '';
+		$line .= ' '.$this->LiteralPlaceHolder;
+		$literal_block_indent = strlen($Source[$i+1]) - strlen(ltrim($Source[$i+1]));
+		while (++$i < $cnt && $this->literalBlockContinues($Source[$i], $this->indent)) {
+		  $literalBlock = $this->addLiteralLine($literalBlock, $Source[$i], $literalBlockStyle, $literal_block_indent);
+		}
+		$i--;
+	  }
+
+	  // Strip out comments
+	  if (strpos ($line, '#')) {
+		  $line = preg_replace('/\s*#([^"\']+)$/','',$line);
+	  }
+
+	  while (++$i < $cnt && self::greedilyNeedNextLine($line)) {
+		$line = rtrim ($line, " \n\t\r") . ' ' . ltrim ($Source[$i], " \t");
+	  }
+	  $i--;
+
+	  $lineArray = $this->_parseLine($line);
+
+	  if ($literalBlockStyle)
+		$lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock);
+
+	  $this->addArray($lineArray, $this->indent);
+
+	  foreach ($this->delayedPath as $indent => $delayedPath)
+		$this->path[$indent] = $delayedPath;
+
+	  $this->delayedPath = array();
+
+	}
+	return $this->result;
   }
 
   private function loadFromSource ($input) {
-    if (!empty($input) && strpos($input, "\n") === false && file_exists($input))
-      $input = file_get_contents($input);
+	if (!empty($input) && strpos($input, "\n") === false && file_exists($input))
+	  $input = file_get_contents($input);
 
-    return $this->loadFromString($input);
+	return $this->loadFromString($input);
   }
 
   private function loadFromString ($input) {
-    $lines = explode("\n",$input);
-    foreach ($lines as $k => $_) {
-      $lines[$k] = rtrim ($_, "\r");
-    }
-    return $lines;
+	$lines = explode("\n",$input);
+	foreach ($lines as $k => $_) {
+	  $lines[$k] = rtrim ($_, "\r");
+	}
+	return $lines;
   }
 
   /**
-     * Parses YAML code and returns an array for a node
-     * @access private
-     * @return array
-     * @param string $line A line from the YAML file
-     */
+   * Parses YAML code and returns an array for a node
+   * @access private
+   * @return array
+   * @param string $line A line from the YAML file
+   */
   private function _parseLine($line) {
-    if (!$line) return array();
-    $line = trim($line);
-    if (!$line) return array();
+	if (!$line) return array();
+	$line = trim($line);
+	if (!$line) return array();
 
-    $array = array();
+	$array = array();
 
-    $group = $this->nodeContainsGroup($line);
-    if ($group) {
-      $this->addGroup($line, $group);
-      $line = $this->stripGroup ($line, $group);
-    }
+	$group = $this->nodeContainsGroup($line);
+	if ($group) {
+	  $this->addGroup($line, $group);
+	  $line = $this->stripGroup ($line, $group);
+	}
 
-    if ($this->startsMappedSequence($line))
-      return $this->returnMappedSequence($line);
+	if ($this->startsMappedSequence($line))
+	  return $this->returnMappedSequence($line);
 
-    if ($this->startsMappedValue($line))
-      return $this->returnMappedValue($line);
+	if ($this->startsMappedValue($line))
+	  return $this->returnMappedValue($line);
 
-    if ($this->isArrayElement($line))
-     return $this->returnArrayElement($line);
+	if ($this->isArrayElement($line))
+	 return $this->returnArrayElement($line);
 
-    if ($this->isPlainArray($line))
-     return $this->returnPlainArray($line);
+	if ($this->isPlainArray($line))
+	 return $this->returnPlainArray($line);
 
 
-    return $this->returnKeyValuePair($line);
+	return $this->returnKeyValuePair($line);
 
   }
 
   /**
-     * Finds the type of the passed value, returns the value as the new type.
-     * @access private
-     * @param string $value
-     * @return mixed
-     */
+   * Finds the type of the passed value, returns the value as the new type.
+   * @access private
+   * @param string $value
+   * @return mixed
+   */
   private function _toType($value) {
-    if ($value === '') return "";
-    $first_character = $value[0];
-    $last_character = substr($value, -1, 1);
-
-    $is_quoted = false;
-    do {
-      if (!$value) break;
-      if ($first_character != '"' && $first_character != "'") break;
-      if ($last_character != '"' && $last_character != "'") break;
-      $is_quoted = true;
-    } while (0);
-
-    if ($is_quoted) {
-      $value = str_replace('\n', "\n", $value);
-      if ($first_character == "'")
-        return strtr(substr ($value, 1, -1), array ('\'\'' => '\'', '\\\''=> '\''));
-      return strtr(substr ($value, 1, -1), array ('\\"' => '"', '\\\''=> '\''));
-    }
-
-    if (strpos($value, ' #') !== false && !$is_quoted)
-      $value = preg_replace('/\s+#(.+)$/','',$value);
-
-    if ($first_character == '[' && $last_character == ']') {
-      // Take out strings sequences and mappings
-      $innerValue = trim(substr ($value, 1, -1));
-      if ($innerValue === '') return array();
-      $explode = $this->_inlineEscape($innerValue);
-      // Propagate value array
-      $value  = array();
-      foreach ($explode as $v) {
-        $value[] = $this->_toType($v);
-      }
-      return $value;
-    }
-
-    if (strpos($value,': ')!==false && $first_character != '{') {
-      $array = explode(': ',$value);
-      $key   = trim($array[0]);
-      array_shift($array);
-      $value = trim(implode(': ',$array));
-      $value = $this->_toType($value);
-      return array($key => $value);
-    }
-
-    if ($first_character == '{' && $last_character == '}') {
-      $innerValue = trim(substr ($value, 1, -1));
-      if ($innerValue === '') return array();
-      // Inline Mapping
-      // Take out strings sequences and mappings
-      $explode = $this->_inlineEscape($innerValue);
-      // Propagate value array
-      $array = array();
-      foreach ($explode as $v) {
-        $SubArr = $this->_toType($v);
-        if (empty($SubArr)) continue;
-        if (is_array ($SubArr)) {
-          $array[key($SubArr)] = $SubArr[key($SubArr)]; continue;
-        }
-        $array[] = $SubArr;
-      }
-      return $array;
-    }
-
-    if ($value == 'null' || $value == 'NULL' || $value == 'Null' || $value == '' || $value == '~') {
-      return null;
-    }
-
-    if ( is_numeric($value) && preg_match ('/^(-|)[1-9]+[0-9]*$/', $value) ){
-      $intvalue = (int)$value;
-      if ($intvalue != PHP_INT_MAX && $intvalue != ~PHP_INT_MAX)
-        $value = $intvalue;
-      return $value;
-    }
-
-    if (is_numeric($value) && preg_match('/^0[xX][0-9a-fA-F]+$/', $value)) {
-      // Hexadecimal value.
-      return hexdec($value);
-    }
-
-    $this->coerceValue($value);
-
-    if (is_numeric($value)) {
-      if ($value === '0') return 0;
-      if (rtrim ($value, 0) === $value)
-        $value = (float)$value;
-      return $value;
-    }
-
-    return $value;
+	if ($value === '') return "";
+	$first_character = $value[0];
+	$last_character = substr($value, -1, 1);
+
+	$is_quoted = false;
+	do {
+	  if (!$value) break;
+	  if ($first_character != '"' && $first_character != "'") break;
+	  if ($last_character != '"' && $last_character != "'") break;
+	  $is_quoted = true;
+	} while (0);
+
+	if ($is_quoted) {
+	  $value = str_replace('\n', "\n", $value);
+	  if ($first_character == "'")
+		return strtr(substr ($value, 1, -1), array ('\'\'' => '\'', '\\\''=> '\''));
+	  return strtr(substr ($value, 1, -1), array ('\\"' => '"', '\\\''=> '\''));
+	}
+
+	if (strpos($value, ' #') !== false && !$is_quoted)
+	  $value = preg_replace('/\s+#(.+)$/','',$value);
+
+	if ($first_character == '[' && $last_character == ']') {
+	  // Take out strings sequences and mappings
+	  $innerValue = trim(substr ($value, 1, -1));
+	  if ($innerValue === '') return array();
+	  $explode = $this->_inlineEscape($innerValue);
+	  // Propagate value array
+	  $value  = array();
+	  foreach ($explode as $v) {
+		$value[] = $this->_toType($v);
+	  }
+	  return $value;
+	}
+
+	if (strpos($value,': ')!==false && $first_character != '{') {
+	  $array = explode(': ',$value);
+	  $key   = trim($array[0]);
+	  array_shift($array);
+	  $value = trim(implode(': ',$array));
+	  $value = $this->_toType($value);
+	  return array($key => $value);
+	}
+
+	if ($first_character == '{' && $last_character == '}') {
+	  $innerValue = trim(substr ($value, 1, -1));
+	  if ($innerValue === '') return array();
+	  // Inline Mapping
+	  // Take out strings sequences and mappings
+	  $explode = $this->_inlineEscape($innerValue);
+	  // Propagate value array
+	  $array = array();
+	  foreach ($explode as $v) {
+		$SubArr = $this->_toType($v);
+		if (empty($SubArr)) continue;
+		if (is_array ($SubArr)) {
+		  $array[key($SubArr)] = $SubArr[key($SubArr)]; continue;
+		}
+		$array[] = $SubArr;
+	  }
+	  return $array;
+	}
+
+	if ($value == 'null' || $value == 'NULL' || $value == 'Null' || $value == '' || $value == '~') {
+	  return null;
+	}
+
+	if ( is_numeric($value) && preg_match ('/^(-|)[1-9]+[0-9]*$/', $value) ){
+	  $intvalue = (int)$value;
+	  if ($intvalue != PHP_INT_MAX && $intvalue != ~PHP_INT_MAX)
+		$value = $intvalue;
+	  return $value;
+	}
+
+	if (is_numeric($value) && preg_match('/^0[xX][0-9a-fA-F]+$/', $value)) {
+	  // Hexadecimal value.
+	  return hexdec($value);
+	}
+
+	$this->coerceValue($value);
+
+	if (is_numeric($value)) {
+	  if ($value === '0') return 0;
+	  if (rtrim ($value, 0) === $value)
+		$value = (float)$value;
+	  return $value;
+	}
+
+	return $value;
   }
 
   /**
-     * Used in inlines to check for more inlines or quoted strings
-     * @access private
-     * @return array
-     */
+   * Used in inlines to check for more inlines or quoted strings
+   * @access private
+   * @return array
+   */
   private function _inlineEscape($inline) {
-    // There's gotta be a cleaner way to do this...
-    // While pure sequences seem to be nesting just fine,
-    // pure mappings and mappings with sequences inside can't go very
-    // deep.  This needs to be fixed.
-
-    $seqs = array();
-    $maps = array();
-    $saved_strings = array();
-    $saved_empties = array();
-
-    // Check for empty strings
-    $regex = '/("")|(\'\')/';
-    if (preg_match_all($regex,$inline,$strings)) {
-      $saved_empties = $strings[0];
-      $inline  = preg_replace($regex,'YAMLEmpty',$inline);
-    }
-    unset($regex);
-
-    // Check for strings
-    $regex = '/(?:(")|(?:\'))((?(1)[^"]+|[^\']+))(?(1)"|\')/';
-    if (preg_match_all($regex,$inline,$strings)) {
-      $saved_strings = $strings[0];
-      $inline  = preg_replace($regex,'YAMLString',$inline);
-    }
-    unset($regex);
-
-    // echo $inline;
-
-    $i = 0;
-    do {
-
-    // Check for sequences
-    while (preg_match('/\[([^{}\[\]]+)\]/U',$inline,$matchseqs)) {
-      $seqs[] = $matchseqs[0];
-      $inline = preg_replace('/\[([^{}\[\]]+)\]/U', ('YAMLSeq' . (count($seqs) - 1) . 's'), $inline, 1);
-    }
-
-    // Check for mappings
-    while (preg_match('/{([^\[\]{}]+)}/U',$inline,$matchmaps)) {
-      $maps[] = $matchmaps[0];
-      $inline = preg_replace('/{([^\[\]{}]+)}/U', ('YAMLMap' . (count($maps) - 1) . 's'), $inline, 1);
-    }
-
-    if ($i++ >= 10) break;
-
-    } while (strpos ($inline, '[') !== false || strpos ($inline, '{') !== false);
-
-    $explode = explode(',',$inline);
-    $explode = array_map('trim', $explode);
-    $stringi = 0; $i = 0;
-
-    while (1) {
-
-    // Re-add the sequences
-    if (!empty($seqs)) {
-      foreach ($explode as $key => $value) {
-        if (strpos($value,'YAMLSeq') !== false) {
-          foreach ($seqs as $seqk => $seq) {
-            $explode[$key] = str_replace(('YAMLSeq'.$seqk.'s'),$seq,$value);
-            $value = $explode[$key];
-          }
-        }
-      }
-    }
-
-    // Re-add the mappings
-    if (!empty($maps)) {
-      foreach ($explode as $key => $value) {
-        if (strpos($value,'YAMLMap') !== false) {
-          foreach ($maps as $mapk => $map) {
-            $explode[$key] = str_replace(('YAMLMap'.$mapk.'s'), $map, $value);
-            $value = $explode[$key];
-          }
-        }
-      }
-    }
-
-
-    // Re-add the strings
-    if (!empty($saved_strings)) {
-      foreach ($explode as $key => $value) {
-        while (strpos($value,'YAMLString') !== false) {
-          $explode[$key] = preg_replace('/YAMLString/',$saved_strings[$stringi],$value, 1);
-          unset($saved_strings[$stringi]);
-          ++$stringi;
-          $value = $explode[$key];
-        }
-      }
-    }
-
-
-    // Re-add the empties
-    if (!empty($saved_empties)) {
-      foreach ($explode as $key => $value) {
-        while (strpos($value,'YAMLEmpty') !== false) {
-          $explode[$key] = preg_replace('/YAMLEmpty/', '', $value, 1);
-          $value = $explode[$key];
-        }
-      }
-    }
-
-    $finished = true;
-    foreach ($explode as $key => $value) {
-      if (strpos($value,'YAMLSeq') !== false) {
-        $finished = false; break;
-      }
-      if (strpos($value,'YAMLMap') !== false) {
-        $finished = false; break;
-      }
-      if (strpos($value,'YAMLString') !== false) {
-        $finished = false; break;
-      }
-      if (strpos($value,'YAMLEmpty') !== false) {
-        $finished = false; break;
-      }
-    }
-    if ($finished) break;
-
-    $i++;
-    if ($i > 10)
-      break; // Prevent infinite loops.
-    }
-
-
-    return $explode;
+	// There's gotta be a cleaner way to do this...
+	// While pure sequences seem to be nesting just fine,
+	// pure mappings and mappings with sequences inside can't go very
+	// deep.  This needs to be fixed.
+
+	$seqs = array();
+	$maps = array();
+	$saved_strings = array();
+	$saved_empties = array();
+
+	// Check for empty strings
+	$regex = '/("")|(\'\')/';
+	if (preg_match_all($regex,$inline,$strings)) {
+	  $saved_empties = $strings[0];
+	  $inline  = preg_replace($regex,'YAMLEmpty',$inline);
+	}
+	unset($regex);
+
+	// Check for strings
+	$regex = '/(?:(")|(?:\'))((?(1)[^"]+|[^\']+))(?(1)"|\')/';
+	if (preg_match_all($regex,$inline,$strings)) {
+	  $saved_strings = $strings[0];
+	  $inline  = preg_replace($regex,'YAMLString',$inline);
+	}
+	unset($regex);
+
+	// echo $inline;
+
+	$i = 0;
+	do {
+
+	// Check for sequences
+	while (preg_match('/\[([^{}\[\]]+)\]/U',$inline,$matchseqs)) {
+	  $seqs[] = $matchseqs[0];
+	  $inline = preg_replace('/\[([^{}\[\]]+)\]/U', ('YAMLSeq' . (count($seqs) - 1) . 's'), $inline, 1);
+	}
+
+	// Check for mappings
+	while (preg_match('/{([^\[\]{}]+)}/U',$inline,$matchmaps)) {
+	  $maps[] = $matchmaps[0];
+	  $inline = preg_replace('/{([^\[\]{}]+)}/U', ('YAMLMap' . (count($maps) - 1) . 's'), $inline, 1);
+	}
+
+	if ($i++ >= 10) break;
+
+	} while (strpos ($inline, '[') !== false || strpos ($inline, '{') !== false);
+
+	$explode = explode(',',$inline);
+	$explode = array_map('trim', $explode);
+	$stringi = 0; $i = 0;
+
+	while (1) {
+
+	// Re-add the sequences
+	if (!empty($seqs)) {
+	  foreach ($explode as $key => $value) {
+		if (strpos($value,'YAMLSeq') !== false) {
+		  foreach ($seqs as $seqk => $seq) {
+			$explode[$key] = str_replace(('YAMLSeq'.$seqk.'s'),$seq,$value);
+			$value = $explode[$key];
+		  }
+		}
+	  }
+	}
+
+	// Re-add the mappings
+	if (!empty($maps)) {
+	  foreach ($explode as $key => $value) {
+		if (strpos($value,'YAMLMap') !== false) {
+		  foreach ($maps as $mapk => $map) {
+			$explode[$key] = str_replace(('YAMLMap'.$mapk.'s'), $map, $value);
+			$value = $explode[$key];
+		  }
+		}
+	  }
+	}
+
+
+	// Re-add the strings
+	if (!empty($saved_strings)) {
+	  foreach ($explode as $key => $value) {
+		while (strpos($value,'YAMLString') !== false) {
+		  $explode[$key] = preg_replace('/YAMLString/',$saved_strings[$stringi],$value, 1);
+		  unset($saved_strings[$stringi]);
+		  ++$stringi;
+		  $value = $explode[$key];
+		}
+	  }
+	}
+
+
+	// Re-add the empties
+	if (!empty($saved_empties)) {
+	  foreach ($explode as $key => $value) {
+		while (strpos($value,'YAMLEmpty') !== false) {
+		  $explode[$key] = preg_replace('/YAMLEmpty/', '', $value, 1);
+		  $value = $explode[$key];
+		}
+	  }
+	}
+
+	$finished = true;
+	foreach ($explode as $key => $value) {
+	  if (strpos($value,'YAMLSeq') !== false) {
+		$finished = false; break;
+	  }
+	  if (strpos($value,'YAMLMap') !== false) {
+		$finished = false; break;
+	  }
+	  if (strpos($value,'YAMLString') !== false) {
+		$finished = false; break;
+	  }
+	  if (strpos($value,'YAMLEmpty') !== false) {
+		$finished = false; break;
+	  }
+	}
+	if ($finished) break;
+
+	$i++;
+	if ($i > 10)
+	  break; // Prevent infinite loops.
+	}
+
+
+	return $explode;
   }
 
   private function literalBlockContinues ($line, $lineIndent) {
-    if (!trim($line)) return true;
-    if (strlen($line) - strlen(ltrim($line)) > $lineIndent) return true;
-    return false;
+	if (!trim($line)) return true;
+	if (strlen($line) - strlen(ltrim($line)) > $lineIndent) return true;
+	return false;
   }
 
   private function referenceContentsByAlias ($alias) {
-    do {
-      if (!isset($this->SavedGroups[$alias])) { echo "Bad group name: $alias."; break; }
-      $groupPath = $this->SavedGroups[$alias];
-      $value = $this->result;
-      foreach ($groupPath as $k) {
-        $value = $value[$k];
-      }
-    } while (false);
-    return $value;
+	do {
+	  if (!isset($this->SavedGroups[$alias])) { echo "Bad group name: $alias."; break; }
+	  $groupPath = $this->SavedGroups[$alias];
+	  $value = $this->result;
+	  foreach ($groupPath as $k) {
+		$value = $value[$k];
+	  }
+	} while (false);
+	return $value;
   }
 
   private function addArrayInline ($array, $indent) {
-      $CommonGroupPath = $this->path;
-      if (empty ($array)) return false;
-
-      foreach ($array as $k => $_) {
-        $this->addArray(array($k => $_), $indent);
-        $this->path = $CommonGroupPath;
-      }
-      return true;
+	  $CommonGroupPath = $this->path;
+	  if (empty ($array)) return false;
+
+	  foreach ($array as $k => $_) {
+		$this->addArray(array($k => $_), $indent);
+		$this->path = $CommonGroupPath;
+	  }
+	  return true;
   }
 
   private function addArray ($incoming_data, $incoming_indent) {
 
    // print_r ($incoming_data);
 
-    if (count ($incoming_data) > 1)
-      return $this->addArrayInline ($incoming_data, $incoming_indent);
-
-    $key = key ($incoming_data);
-    $value = isset($incoming_data[$key]) ? $incoming_data[$key] : null;
-    if ($key === '__!YAMLZero') $key = '0';
-
-    if ($incoming_indent == 0 && !$this->_containsGroupAlias && !$this->_containsGroupAnchor) { // Shortcut for root-level values.
-      if ($key || $key === '' || $key === '0') {
-        $this->result[$key] = $value;
-      } else {
-        $this->result[] = $value; end ($this->result); $key = key ($this->result);
-      }
-      $this->path[$incoming_indent] = $key;
-      return;
-    }
-
-
-
-    $history = array();
-    // Unfolding inner array tree.
-    $history[] = $_arr = $this->result;
-    foreach ($this->path as $k) {
-      $history[] = $_arr = $_arr[$k];
-    }
-
-    if ($this->_containsGroupAlias) {
-      $value = $this->referenceContentsByAlias($this->_containsGroupAlias);
-      $this->_containsGroupAlias = false;
-    }
-
-
-    // Adding string or numeric key to the innermost level or $this->arr.
-    if (is_string($key) && $key == '<<') {
-      if (!is_array ($_arr)) { $_arr = array (); }
-
-      $_arr = array_merge ($_arr, $value);
-    } else if ($key || $key === '' || $key === '0') {
-      if (!is_array ($_arr))
-        $_arr = array ($key=>$value);
-      else
-        $_arr[$key] = $value;
-    } else {
-      if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; }
-      else { $_arr[] = $value; end ($_arr); $key = key ($_arr); }
-    }
-
-    $reverse_path = array_reverse($this->path);
-    $reverse_history = array_reverse ($history);
-    $reverse_history[0] = $_arr;
-    $cnt = count($reverse_history) - 1;
-    for ($i = 0; $i < $cnt; $i++) {
-      $reverse_history[$i+1][$reverse_path[$i]] = $reverse_history[$i];
-    }
-    $this->result = $reverse_history[$cnt];
-
-    $this->path[$incoming_indent] = $key;
-
-    if ($this->_containsGroupAnchor) {
-      $this->SavedGroups[$this->_containsGroupAnchor] = $this->path;
-      if (is_array ($value)) {
-        $k = key ($value);
-        if (!is_int ($k)) {
-          $this->SavedGroups[$this->_containsGroupAnchor][$incoming_indent + 2] = $k;
-        }
-      }
-      $this->_containsGroupAnchor = false;
-    }
+	if (count ($incoming_data) > 1)
+	  return $this->addArrayInline ($incoming_data, $incoming_indent);
+
+	$key = key ($incoming_data);
+	$value = isset($incoming_data[$key]) ? $incoming_data[$key] : null;
+	if ($key === '__!YAMLZero') $key = '0';
+
+	if ($incoming_indent == 0 && !$this->_containsGroupAlias && !$this->_containsGroupAnchor) { // Shortcut for root-level values.
+	  if ($key || $key === '' || $key === '0') {
+		$this->result[$key] = $value;
+	  } else {
+		$this->result[] = $value; end ($this->result); $key = key ($this->result);
+	  }
+	  $this->path[$incoming_indent] = $key;
+	  return;
+	}
+
+
+
+	$history = array();
+	// Unfolding inner array tree.
+	$history[] = $_arr = $this->result;
+	foreach ($this->path as $k) {
+	  $history[] = $_arr = $_arr[$k];
+	}
+
+	if ($this->_containsGroupAlias) {
+	  $value = $this->referenceContentsByAlias($this->_containsGroupAlias);
+	  $this->_containsGroupAlias = false;
+	}
+
+
+	// Adding string or numeric key to the innermost level or $this->arr.
+	if (is_string($key) && $key == '<<') {
+	  if (!is_array ($_arr)) { $_arr = array (); }
+
+	  $_arr = array_merge ($_arr, $value);
+	} else if ($key || $key === '' || $key === '0') {
+	  if (!is_array ($_arr))
+		$_arr = array ($key=>$value);
+	  else
+		$_arr[$key] = $value;
+	} else {
+	  if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; }
+	  else { $_arr[] = $value; end ($_arr); $key = key ($_arr); }
+	}
+
+	$reverse_path = array_reverse($this->path);
+	$reverse_history = array_reverse ($history);
+	$reverse_history[0] = $_arr;
+	$cnt = count($reverse_history) - 1;
+	for ($i = 0; $i < $cnt; $i++) {
+	  $reverse_history[$i+1][$reverse_path[$i]] = $reverse_history[$i];
+	}
+	$this->result = $reverse_history[$cnt];
+
+	$this->path[$incoming_indent] = $key;
+
+	if ($this->_containsGroupAnchor) {
+	  $this->SavedGroups[$this->_containsGroupAnchor] = $this->path;
+	  if (is_array ($value)) {
+		$k = key ($value);
+		if (!is_int ($k)) {
+		  $this->SavedGroups[$this->_containsGroupAnchor][$incoming_indent + 2] = $k;
+		}
+	  }
+	  $this->_containsGroupAnchor = false;
+	}
 
   }
 
   private static function startsLiteralBlock ($line) {
-    $lastChar = substr (trim($line), -1);
-    if ($lastChar != '>' && $lastChar != '|') return false;
-    if ($lastChar == '|') return $lastChar;
-    // HTML tags should not be counted as literal blocks.
-    if (preg_match ('#<.*?>$#', $line)) return false;
-    return $lastChar;
+	$lastChar = substr (trim($line), -1);
+	if ($lastChar != '>' && $lastChar != '|') return false;
+	if ($lastChar == '|') return $lastChar;
+	// HTML tags should not be counted as literal blocks.
+	if (preg_match ('#<.*?>$#', $line)) return false;
+	return $lastChar;
   }
 
   private static function greedilyNeedNextLine($line) {
-    $line = trim ($line);
-    if (!strlen($line)) return false;
-    if (substr ($line, -1, 1) == ']') return false;
-    if ($line[0] == '[') return true;
-    if (preg_match ('#^[^:]+?:\s*\[#', $line)) return true;
-    return false;
+	$line = trim ($line);
+	if (!strlen($line)) return false;
+	if (substr ($line, -1, 1) == ']') return false;
+	if ($line[0] == '[') return true;
+	if (preg_match ('#^[^:]+?:\s*\[#', $line)) return true;
+	return false;
   }
 
   private function addLiteralLine ($literalBlock, $line, $literalBlockStyle, $indent = -1) {
-    $line = self::stripIndent($line, $indent);
-    if ($literalBlockStyle !== '|') {
-        $line = self::stripIndent($line);
-    }
-    $line = rtrim ($line, "\r\n\t ") . "\n";
-    if ($literalBlockStyle == '|') {
-      return $literalBlock . $line;
-    }
-    if (strlen($line) == 0)
-      return rtrim($literalBlock, ' ') . "\n";
-    if ($line == "\n" && $literalBlockStyle == '>') {
-      return rtrim ($literalBlock, " \t") . "\n";
-    }
-    if ($line != "\n")
-      $line = trim ($line, "\r\n ") . " ";
-    return $literalBlock . $line;
+	$line = self::stripIndent($line, $indent);
+	if ($literalBlockStyle !== '|') {
+		$line = self::stripIndent($line);
+	}
+	$line = rtrim ($line, "\r\n\t ") . "\n";
+	if ($literalBlockStyle == '|') {
+	  return $literalBlock . $line;
+	}
+	if (strlen($line) == 0)
+	  return rtrim($literalBlock, ' ') . "\n";
+	if ($line == "\n" && $literalBlockStyle == '>') {
+	  return rtrim ($literalBlock, " \t") . "\n";
+	}
+	if ($line != "\n")
+	  $line = trim ($line, "\r\n ") . " ";
+	return $literalBlock . $line;
   }
 
    function revertLiteralPlaceHolder ($lineArray, $literalBlock) {
-     foreach ($lineArray as $k => $_) {
-      if (is_array($_))
-        $lineArray[$k] = $this->revertLiteralPlaceHolder ($_, $literalBlock);
-      else if (substr($_, -1 * strlen ($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder)
-	       $lineArray[$k] = rtrim ($literalBlock, " \r\n");
-     }
-     return $lineArray;
+	 foreach ($lineArray as $k => $_) {
+	  if (is_array($_))
+		$lineArray[$k] = $this->revertLiteralPlaceHolder ($_, $literalBlock);
+	  else if (substr($_, -1 * strlen ($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder)
+		   $lineArray[$k] = rtrim ($literalBlock, " \r\n");
+	 }
+	 return $lineArray;
    }
 
   private static function stripIndent ($line, $indent = -1) {
-    if ($indent == -1) $indent = strlen($line) - strlen(ltrim($line));
-    return substr ($line, $indent);
+	if ($indent == -1) $indent = strlen($line) - strlen(ltrim($line));
+	return substr ($line, $indent);
   }
 
   private function getParentPathByIndent ($indent) {
-    if ($indent == 0) return array();
-    $linePath = $this->path;
-    do {
-      end($linePath); $lastIndentInParentPath = key($linePath);
-      if ($indent <= $lastIndentInParentPath) array_pop ($linePath);
-    } while ($indent <= $lastIndentInParentPath);
-    return $linePath;
+	if ($indent == 0) return array();
+	$linePath = $this->path;
+	do {
+	  end($linePath); $lastIndentInParentPath = key($linePath);
+	  if ($indent <= $lastIndentInParentPath) array_pop ($linePath);
+	} while ($indent <= $lastIndentInParentPath);
+	return $linePath;
   }
 
 
   private function clearBiggerPathValues ($indent) {
 
 
-    if ($indent == 0) $this->path = array();
-    if (empty ($this->path)) return true;
+	if ($indent == 0) $this->path = array();
+	if (empty ($this->path)) return true;
 
-    foreach ($this->path as $k => $_) {
-      if ($k > $indent) unset ($this->path[$k]);
-    }
+	foreach ($this->path as $k => $_) {
+	  if ($k > $indent) unset ($this->path[$k]);
+	}
 
-    return true;
+	return true;
   }
 
 
   private static function isComment ($line) {
-    if (!$line) return false;
-    if ($line[0] == '#') return true;
-    if (trim($line, " \r\n\t") == '---') return true;
-    return false;
+	if (!$line) return false;
+	if ($line[0] == '#') return true;
+	if (trim($line, " \r\n\t") == '---') return true;
+	return false;
   }
 
   private static function isEmpty ($line) {
-    return (trim ($line) === '');
+	return (trim ($line) === '');
   }
 
 
   private function isArrayElement ($line) {
-    if (!$line || !is_scalar($line)) return false;
-    if (substr($line, 0, 2) != '- ') return false;
-    if (strlen ($line) > 3)
-      if (substr($line,0,3) == '---') return false;
+	if (!$line || !is_scalar($line)) return false;
+	if (substr($line, 0, 2) != '- ') return false;
+	if (strlen ($line) > 3)
+	  if (substr($line,0,3) == '---') return false;
 
-    return true;
+	return true;
   }
 
   private function isHashElement ($line) {
-    return strpos($line, ':');
+	return strpos($line, ':');
   }
 
   private function isLiteral ($line) {
-    if ($this->isArrayElement($line)) return false;
-    if ($this->isHashElement($line)) return false;
-    return true;
+	if ($this->isArrayElement($line)) return false;
+	if ($this->isHashElement($line)) return false;
+	return true;
   }
 
 
   private static function unquote ($value) {
-    if (!$value) return $value;
-    if (!is_string($value)) return $value;
-    if ($value[0] == '\'') return trim ($value, '\'');
-    if ($value[0] == '"') return trim ($value, '"');
-    return $value;
+	if (!$value) return $value;
+	if (!is_string($value)) return $value;
+	if ($value[0] == '\'') return trim ($value, '\'');
+	if ($value[0] == '"') return trim ($value, '"');
+	return $value;
   }
 
   private function startsMappedSequence ($line) {
-    return (substr($line, 0, 2) == '- ' && substr ($line, -1, 1) == ':');
+	return (substr($line, 0, 2) == '- ' && substr ($line, -1, 1) == ':');
   }
 
   private function returnMappedSequence ($line) {
-    $array = array();
-    $key         = self::unquote(trim(substr($line,1,-1)));
-    $array[$key] = array();
-    $this->delayedPath = array(strpos ($line, $key) + $this->indent => $key);
-    return array($array);
+	$array = array();
+	$key         = self::unquote(trim(substr($line,1,-1)));
+	$array[$key] = array();
+	$this->delayedPath = array(strpos ($line, $key) + $this->indent => $key);
+	return array($array);
   }
 
   private function checkKeysInValue($value) {
-    if (strchr('[{"\'', $value[0]) === false) {
-      if (strchr($value, ': ') !== false) {
-          throw new Exception('Too many keys: '.$value);
-      }
-    }
+	if (strchr('[{"\'', $value[0]) === false) {
+	  if (strchr($value, ': ') !== false) {
+		  throw new Exception('Too many keys: '.$value);
+	  }
+	}
   }
 
   private function returnMappedValue ($line) {
-    $this->checkKeysInValue($line);
-    $array = array();
-    $key         = self::unquote (trim(substr($line,0,-1)));
-    $array[$key] = '';
-    return $array;
+	$this->checkKeysInValue($line);
+	$array = array();
+	$key         = self::unquote (trim(substr($line,0,-1)));
+	$array[$key] = '';
+	return $array;
   }
 
   private function startsMappedValue ($line) {
-    return (substr ($line, -1, 1) == ':');
+	return (substr ($line, -1, 1) == ':');
   }
 
   private function isPlainArray ($line) {
-    return ($line[0] == '[' && substr ($line, -1, 1) == ']');
+	return ($line[0] == '[' && substr ($line, -1, 1) == ']');
   }
 
   private function returnPlainArray ($line) {
-    return $this->_toType($line);
+	return $this->_toType($line);
   }
 
   private function returnKeyValuePair ($line) {
-    $array = array();
-    $key = '';
-    if (strpos ($line, ': ')) {
-      // It's a key/value pair most likely
-      // If the key is in double quotes pull it out
-      if (($line[0] == '"' || $line[0] == "'") && preg_match('/^(["\'](.*)["\'](\s)*:)/',$line,$matches)) {
-        $value = trim(str_replace($matches[1],'',$line));
-        $key   = $matches[2];
-      } else {
-        // Do some guesswork as to the key and the value
-        $explode = explode(': ', $line);
-        $key     = trim(array_shift($explode));
-        $value   = trim(implode(': ', $explode));
-        $this->checkKeysInValue($value);
-      }
-      // Set the type of the value.  Int, string, etc
-      $value = $this->_toType($value);
-      if ($key === '0') $key = '__!YAMLZero';
-      $array[$key] = $value;
-    } else {
-      $array = array ($line);
-    }
-    return $array;
+	$array = array();
+	$key = '';
+	if (strpos ($line, ': ')) {
+	  // It's a key/value pair most likely
+	  // If the key is in double quotes pull it out
+	  if (($line[0] == '"' || $line[0] == "'") && preg_match('/^(["\'](.*)["\'](\s)*:)/',$line,$matches)) {
+		$value = trim(str_replace($matches[1],'',$line));
+		$key   = $matches[2];
+	  } else {
+		// Do some guesswork as to the key and the value
+		$explode = explode(': ', $line);
+		$key     = trim(array_shift($explode));
+		$value   = trim(implode(': ', $explode));
+		$this->checkKeysInValue($value);
+	  }
+	  // Set the type of the value.  Int, string, etc
+	  $value = $this->_toType($value);
+	  if ($key === '0') $key = '__!YAMLZero';
+	  $array[$key] = $value;
+	} else {
+	  $array = array ($line);
+	}
+	return $array;
 
   }
 
 
   private function returnArrayElement ($line) {
-     if (strlen($line) <= 1) return array(array()); // Weird %)
-     $array = array();
-     $value   = trim(substr($line,1));
-     $value   = $this->_toType($value);
-     if ($this->isArrayElement($value)) {
-       $value = $this->returnArrayElement($value);
-     }
-     $array[] = $value;
-     return $array;
+	 if (strlen($line) <= 1) return array(array()); // Weird %)
+	 $array = array();
+	 $value   = trim(substr($line,1));
+	 $value   = $this->_toType($value);
+	 if ($this->isArrayElement($value)) {
+	   $value = $this->returnArrayElement($value);
+	 }
+	 $array[] = $value;
+	 return $array;
   }
 
 
   private function nodeContainsGroup ($line) {
-    $symbolsForReference = 'A-z0-9_\-';
-    if (strpos($line, '&') === false && strpos($line, '*') === false) return false; // Please die fast ;-)
-    if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
-    if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
-    if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) return $matches[1];
-    if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) return $matches[1];
-    if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) return $matches[1];
-    return false;
+	$symbolsForReference = 'A-z0-9_\-';
+	if (strpos($line, '&') === false && strpos($line, '*') === false) return false; // Please die fast ;-)
+	if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
+	if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
+	if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) return $matches[1];
+	if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) return $matches[1];
+	if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) return $matches[1];
+	return false;
 
   }
 
   private function addGroup ($line, $group) {
-    if ($group[0] == '&') $this->_containsGroupAnchor = substr ($group, 1);
-    if ($group[0] == '*') $this->_containsGroupAlias = substr ($group, 1);
-    //print_r ($this->path);
+	if ($group[0] == '&') $this->_containsGroupAnchor = substr ($group, 1);
+	if ($group[0] == '*') $this->_containsGroupAlias = substr ($group, 1);
+	//print_r ($this->path);
   }
 
   private function stripGroup ($line, $group) {
-    $line = trim(str_replace($group, '', $line));
-    return $line;
+	$line = trim(str_replace($group, '', $line));
+	return $line;
   }
 }
 }

Spacing +192 added lines, -192 removed lines

@@ -10,40 +10,40 @@ 
    * @package Spyc
    */
 
-if (!function_exists('spyc_load')) {
+if ( ! function_exists('spyc_load')) {
   /**
    * Parses YAML to array.
    * @param string $string YAML string.
    * @return array
    */
-  function spyc_load ($string) {
+  function spyc_load($string) {
     return Spyc::YAMLLoadString($string);
   }
 }
 
-if (!function_exists('spyc_load_file')) {
+if ( ! function_exists('spyc_load_file')) {
   /**
    * Parses YAML to array.
    * @param string $file Path to YAML file.
    * @return array
    */
-  function spyc_load_file ($file) {
+  function spyc_load_file($file) {
     return Spyc::YAMLLoad($file);
   }
 }
 
-if (!function_exists('spyc_dump')) {
+if ( ! function_exists('spyc_dump')) {
   /**
    * Dumps array to YAML.
    * @param array $data Array.
    * @return string
    */
-  function spyc_dump ($data) {
+  function spyc_dump($data) {
     return Spyc::YAMLDump($data, false, false, true);
   }
 }
 
-if (!class_exists('Spyc')) {
+if ( ! class_exists('Spyc')) {
 
 /**
    * The Simple PHP YAML Class.
@@ -120,7 +120,7 @@ 
  * @param string $input
  * @return array
  */
-  public function load ($input) {
+  public function load($input) {
     return $this->__loadString($input);
   }
 
@@ -129,7 +129,7 @@ 
  * @param string $file
  * @return array
  */
-  public function loadFile ($file) {
+  public function loadFile($file) {
     return $this->__load($file);
   }
 
@@ -224,18 +224,18 @@ 
      * @param int $indent Pass in false to use the default, which is 2
      * @param int $wordwrap Pass in 0 for no wordwrap, false for default (40)
      */
-  public function dump($array,$indent = false,$wordwrap = false, $no_opening_dashes = false) {
+  public function dump($array, $indent = false, $wordwrap = false, $no_opening_dashes = false) {
     // Dumps to some very clean YAML.  We'll have to add some more features
     // and options soon.  And better support for folding.
 
     // New features and options.
-    if ($indent === false or !is_numeric($indent)) {
+    if ($indent === false or ! is_numeric($indent)) {
       $this->_dumpIndent = 2;
     } else {
       $this->_dumpIndent = $indent;
     }
 
-    if ($wordwrap === false or !is_numeric($wordwrap)) {
+    if ($wordwrap === false or ! is_numeric($wordwrap)) {
       $this->_dumpWordWrap = 40;
     } else {
       $this->_dumpWordWrap = $wordwrap;
@@ -243,15 +243,15 @@ 
 
     // New YAML document
     $string = "";
-    if (!$no_opening_dashes) $string = "---\n";
+    if ( ! $no_opening_dashes) $string = "---\n";
 
     // Start at the base of the array and move through it.
     if ($array) {
-      $array = (array)$array;
+      $array = (array) $array;
       $previous_key = -1;
       foreach ($array as $key => $value) {
-        if (!isset($first_key)) $first_key = $key;
-        $string .= $this->_yamlize($key,$value,0,$previous_key, $first_key, $array);
+        if ( ! isset($first_key)) $first_key = $key;
+        $string .= $this->_yamlize($key, $value, 0, $previous_key, $first_key, $array);
         $previous_key = $key;
       }
     }
@@ -266,8 +266,8 @@ 
      * @param $value The value of the item
      * @param $indent The indent of the current node
      */
-  private function _yamlize($key,$value,$indent, $previous_key = -1, $first_key = 0, $source_array = null) {
-    if(is_object($value)) $value = (array)$value;
+  private function _yamlize($key, $value, $indent, $previous_key = -1, $first_key = 0, $source_array = null) {
+    if (is_object($value)) $value = (array) $value;
     if (is_array($value)) {
       if (empty ($value))
         return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array);
@@ -277,8 +277,8 @@ 
       // Add the indent
       $indent += $this->_dumpIndent;
       // Yamlize the array
-      $string .= $this->_yamlizeArray($value,$indent);
-    } elseif (!is_array($value)) {
+      $string .= $this->_yamlizeArray($value, $indent);
+    } elseif ( ! is_array($value)) {
       // It doesn't have children.  Yip.
       $string = $this->_dumpNode($key, $value, $indent, $previous_key, $first_key, $source_array);
     }
@@ -292,12 +292,12 @@ 
      * @param $array The array you want to convert
      * @param $indent The indent of the current level
      */
-  private function _yamlizeArray($array,$indent) {
+  private function _yamlizeArray($array, $indent) {
     if (is_array($array)) {
       $string = '';
       $previous_key = -1;
       foreach ($array as $key => $value) {
-        if (!isset($first_key)) $first_key = $key;
+        if ( ! isset($first_key)) $first_key = $key;
         $string .= $this->_yamlize($key, $value, $indent, $previous_key, $first_key, $array);
         $previous_key = $key;
       }
@@ -317,14 +317,14 @@ 
      */
   private function _dumpNode($key, $value, $indent, $previous_key = -1, $first_key = 0, $source_array = null) {
     // do some folding here, for blocks
-    if (is_string ($value) && ((strpos($value,"\n") !== false || strpos($value,": ") !== false || strpos($value,"- ") !== false ||
-      strpos($value,"*") !== false || strpos($value,"#") !== false || strpos($value,"<") !== false || strpos($value,">") !== false || strpos ($value, '%') !== false || strpos ($value, '  ') !== false ||
-      strpos($value,"[") !== false || strpos($value,"]") !== false || strpos($value,"{") !== false || strpos($value,"}") !== false) || strpos($value,"&") !== false || strpos($value, "'") !== false || strpos($value, "!") === 0 ||
-      substr ($value, -1, 1) == ':')
+    if (is_string($value) && ((strpos($value, "\n") !== false || strpos($value, ": ") !== false || strpos($value, "- ") !== false ||
+      strpos($value, "*") !== false || strpos($value, "#") !== false || strpos($value, "<") !== false || strpos($value, ">") !== false || strpos($value, '%') !== false || strpos($value, '  ') !== false ||
+      strpos($value, "[") !== false || strpos($value, "]") !== false || strpos($value, "{") !== false || strpos($value, "}") !== false) || strpos($value, "&") !== false || strpos($value, "'") !== false || strpos($value, "!") === 0 ||
+      substr($value, -1, 1) == ':')
     ) {
-      $value = $this->_doLiteralBlock($value,$indent);
+      $value = $this->_doLiteralBlock($value, $indent);
     } else {
-      $value  = $this->_doFolding($value,$indent);
+      $value = $this->_doFolding($value, $indent);
     }
 
     if ($value === array()) $value = '[ ]';
@@ -332,8 +332,8 @@ 
     if (self::isTranslationWord($value)) {
       $value = $this->_doLiteralBlock($value, $indent);
     }
-    if (trim ($value) != $value)
-       $value = $this->_doLiteralBlock($value,$indent);
+    if (trim($value) != $value)
+       $value = $this->_doLiteralBlock($value, $indent);
 
     if (is_bool($value)) {
        $value = $value ? "true" : "false";
@@ -342,17 +342,17 @@ 
     if ($value === null) $value = 'null';
     if ($value === "'" . self::REMPTY . "'") $value = null;
 
-    $spaces = str_repeat(' ',$indent);
+    $spaces = str_repeat(' ', $indent);
 
     //if (is_int($key) && $key - 1 == $previous_key && $first_key===0) {
-    if (is_array ($source_array) && array_keys($source_array) === range(0, count($source_array) - 1)) {
+    if (is_array($source_array) && array_keys($source_array) === range(0, count($source_array) - 1)) {
       // It's a sequence
-      $string = $spaces.'- '.$value."\n";
+      $string = $spaces . '- ' . $value . "\n";
     } else {
       // if ($first_key===0)  throw new Exception('Keys are all screwy.  The first one was zero, now it\'s "'. $key .'"');
       // It's mapped
       if (strpos($key, ":") !== false || strpos($key, "#") !== false) { $key = '"' . $key . '"'; }
-      $string = rtrim ($spaces.$key.': '.$value)."\n";
+      $string = rtrim($spaces . $key . ': ' . $value) . "\n";
     }
     return $string;
   }
@@ -364,25 +364,25 @@ 
      * @param $value
      * @param $indent int The value of the indent
      */
-  private function _doLiteralBlock($value,$indent) {
+  private function _doLiteralBlock($value, $indent) {
     if ($value === "\n") return '\n';
     if (strpos($value, "\n") === false && strpos($value, "'") === false) {
-      return sprintf ("'%s'", $value);
+      return sprintf("'%s'", $value);
     }
     if (strpos($value, "\n") === false && strpos($value, '"') === false) {
-      return sprintf ('"%s"', $value);
+      return sprintf('"%s"', $value);
     }
-    $exploded = explode("\n",$value);
+    $exploded = explode("\n", $value);
     $newValue = '|';
     if (isset($exploded[0]) && ($exploded[0] == "|" || $exploded[0] == "|-" || $exploded[0] == ">")) {
         $newValue = $exploded[0];
         unset($exploded[0]);
     }
     $indent += $this->_dumpIndent;
-    $spaces   = str_repeat(' ',$indent);
+    $spaces = str_repeat(' ', $indent);
     foreach ($exploded as $line) {
       $line = trim($line);
-      if (strpos($line, '"') === 0 && strrpos($line, '"') == (strlen($line)-1) || strpos($line, "'") === 0 && strrpos($line, "'") == (strlen($line)-1)) {
+      if (strpos($line, '"') === 0 && strrpos($line, '"') == (strlen($line) - 1) || strpos($line, "'") === 0 && strrpos($line, "'") == (strlen($line) - 1)) {
         $line = substr($line, 1, -1);
       }
       $newValue .= "\n" . $spaces . ($line);
@@ -396,16 +396,16 @@ 
      * @return string
      * @param $value The string you wish to fold
      */
-  private function _doFolding($value,$indent) {
+  private function _doFolding($value, $indent) {
     // Don't do anything if wordwrap is set to 0
 
-    if ($this->_dumpWordWrap !== 0 && is_string ($value) && strlen($value) > $this->_dumpWordWrap) {
+    if ($this->_dumpWordWrap !== 0 && is_string($value) && strlen($value) > $this->_dumpWordWrap) {
       $indent += $this->_dumpIndent;
-      $indent = str_repeat(' ',$indent);
-      $wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent");
-      $value   = ">\n".$indent.$wrapped;
+      $indent = str_repeat(' ', $indent);
+      $wrapped = wordwrap($value, $this->_dumpWordWrap, "\n$indent");
+      $value   = ">\n" . $indent . $wrapped;
     } else {
-      if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY)
+      if ($this->setting_dump_force_quotes && is_string($value) && $value !== self::REMPTY)
         $value = '"' . $value . '"';
       if (is_numeric($value) && is_string($value))
         $value = '"' . $value . '"';
@@ -432,7 +432,7 @@ 
 
   private function isTranslationWord($value) {
     return (
-      self::isTrueWord($value)  ||
+      self::isTrueWord($value) ||
       self::isFalseWord($value) ||
       self::isNullWord($value)
     );
@@ -483,8 +483,8 @@ 
 
   private function loadWithSource($Source) {
     if (empty ($Source)) return array();
-    if ($this->setting_use_syck_is_possible && function_exists ('syck_load')) {
-      $array = syck_load (implode ("\n", $Source));
+    if ($this->setting_use_syck_is_possible && function_exists('syck_load')) {
+      $array = syck_load(implode("\n", $Source));
       return is_array($array) ? $array : array();
     }
 
@@ -504,10 +504,10 @@ 
 
       $literalBlockStyle = self::startsLiteralBlock($line);
       if ($literalBlockStyle) {
-        $line = rtrim ($line, $literalBlockStyle . " \n");
+        $line = rtrim($line, $literalBlockStyle . " \n");
         $literalBlock = '';
-        $line .= ' '.$this->LiteralPlaceHolder;
-        $literal_block_indent = strlen($Source[$i+1]) - strlen(ltrim($Source[$i+1]));
+        $line .= ' ' . $this->LiteralPlaceHolder;
+        $literal_block_indent = strlen($Source[$i + 1]) - strlen(ltrim($Source[$i + 1]));
         while (++$i < $cnt && $this->literalBlockContinues($Source[$i], $this->indent)) {
           $literalBlock = $this->addLiteralLine($literalBlock, $Source[$i], $literalBlockStyle, $literal_block_indent);
         }
@@ -515,19 +515,19 @@ 
       }
 
       // Strip out comments
-      if (strpos ($line, '#')) {
-          $line = preg_replace('/\s*#([^"\']+)$/','',$line);
+      if (strpos($line, '#')) {
+          $line = preg_replace('/\s*#([^"\']+)$/', '', $line);
       }
 
       while (++$i < $cnt && self::greedilyNeedNextLine($line)) {
-        $line = rtrim ($line, " \n\t\r") . ' ' . ltrim ($Source[$i], " \t");
+        $line = rtrim($line, " \n\t\r") . ' ' . ltrim($Source[$i], " \t");
       }
       $i--;
 
       $lineArray = $this->_parseLine($line);
 
       if ($literalBlockStyle)
-        $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock);
+        $lineArray = $this->revertLiteralPlaceHolder($lineArray, $literalBlock);
 
       $this->addArray($lineArray, $this->indent);
 
@@ -540,17 +540,17 @@ 
     return $this->result;
   }
 
-  private function loadFromSource ($input) {
-    if (!empty($input) && strpos($input, "\n") === false && file_exists($input))
+  private function loadFromSource($input) {
+    if ( ! empty($input) && strpos($input, "\n") === false && file_exists($input))
       $input = file_get_contents($input);
 
     return $this->loadFromString($input);
   }
 
-  private function loadFromString ($input) {
-    $lines = explode("\n",$input);
+  private function loadFromString($input) {
+    $lines = explode("\n", $input);
     foreach ($lines as $k => $_) {
-      $lines[$k] = rtrim ($_, "\r");
+      $lines[$k] = rtrim($_, "\r");
     }
     return $lines;
   }
@@ -562,16 +562,16 @@ 
      * @param string $line A line from the YAML file
      */
   private function _parseLine($line) {
-    if (!$line) return array();
+    if ( ! $line) return array();
     $line = trim($line);
-    if (!$line) return array();
+    if ( ! $line) return array();
 
     $array = array();
 
     $group = $this->nodeContainsGroup($line);
     if ($group) {
       $this->addGroup($line, $group);
-      $line = $this->stripGroup ($line, $group);
+      $line = $this->stripGroup($line, $group);
     }
 
     if ($this->startsMappedSequence($line))
@@ -604,7 +604,7 @@ 
 
     $is_quoted = false;
     do {
-      if (!$value) break;
+      if ( ! $value) break;
       if ($first_character != '"' && $first_character != "'") break;
       if ($last_character != '"' && $last_character != "'") break;
       $is_quoted = true;
@@ -613,37 +613,37 @@ 
     if ($is_quoted) {
       $value = str_replace('\n', "\n", $value);
       if ($first_character == "'")
-        return strtr(substr ($value, 1, -1), array ('\'\'' => '\'', '\\\''=> '\''));
-      return strtr(substr ($value, 1, -1), array ('\\"' => '"', '\\\''=> '\''));
+        return strtr(substr($value, 1, -1), array('\'\'' => '\'', '\\\''=> '\''));
+      return strtr(substr($value, 1, -1), array('\\"' => '"', '\\\''=> '\''));
     }
 
-    if (strpos($value, ' #') !== false && !$is_quoted)
-      $value = preg_replace('/\s+#(.+)$/','',$value);
+    if (strpos($value, ' #') !== false && ! $is_quoted)
+      $value = preg_replace('/\s+#(.+)$/', '', $value);
 
     if ($first_character == '[' && $last_character == ']') {
       // Take out strings sequences and mappings
-      $innerValue = trim(substr ($value, 1, -1));
+      $innerValue = trim(substr($value, 1, -1));
       if ($innerValue === '') return array();
       $explode = $this->_inlineEscape($innerValue);
       // Propagate value array
-      $value  = array();
+      $value = array();
       foreach ($explode as $v) {
         $value[] = $this->_toType($v);
       }
       return $value;
     }
 
-    if (strpos($value,': ')!==false && $first_character != '{') {
-      $array = explode(': ',$value);
+    if (strpos($value, ': ') !== false && $first_character != '{') {
+      $array = explode(': ', $value);
       $key   = trim($array[0]);
       array_shift($array);
-      $value = trim(implode(': ',$array));
+      $value = trim(implode(': ', $array));
       $value = $this->_toType($value);
       return array($key => $value);
     }
 
     if ($first_character == '{' && $last_character == '}') {
-      $innerValue = trim(substr ($value, 1, -1));
+      $innerValue = trim(substr($value, 1, -1));
       if ($innerValue === '') return array();
       // Inline Mapping
       // Take out strings sequences and mappings
@@ -653,7 +653,7 @@ 
       foreach ($explode as $v) {
         $SubArr = $this->_toType($v);
         if (empty($SubArr)) continue;
-        if (is_array ($SubArr)) {
+        if (is_array($SubArr)) {
           $array[key($SubArr)] = $SubArr[key($SubArr)]; continue;
         }
         $array[] = $SubArr;
@@ -665,8 +665,8 @@ 
       return null;
     }
 
-    if ( is_numeric($value) && preg_match ('/^(-|)[1-9]+[0-9]*$/', $value) ){
-      $intvalue = (int)$value;
+    if (is_numeric($value) && preg_match('/^(-|)[1-9]+[0-9]*$/', $value)) {
+      $intvalue = (int) $value;
       if ($intvalue != PHP_INT_MAX && $intvalue != ~PHP_INT_MAX)
         $value = $intvalue;
       return $value;
@@ -681,8 +681,8 @@ 
 
     if (is_numeric($value)) {
       if ($value === '0') return 0;
-      if (rtrim ($value, 0) === $value)
-        $value = (float)$value;
+      if (rtrim($value, 0) === $value)
+        $value = (float) $value;
       return $value;
     }
 
@@ -707,17 +707,17 @@ 
 
     // Check for empty strings
     $regex = '/("")|(\'\')/';
-    if (preg_match_all($regex,$inline,$strings)) {
+    if (preg_match_all($regex, $inline, $strings)) {
       $saved_empties = $strings[0];
-      $inline  = preg_replace($regex,'YAMLEmpty',$inline);
+      $inline = preg_replace($regex, 'YAMLEmpty', $inline);
     }
     unset($regex);
 
     // Check for strings
     $regex = '/(?:(")|(?:\'))((?(1)[^"]+|[^\']+))(?(1)"|\')/';
-    if (preg_match_all($regex,$inline,$strings)) {
+    if (preg_match_all($regex, $inline, $strings)) {
       $saved_strings = $strings[0];
-      $inline  = preg_replace($regex,'YAMLString',$inline);
+      $inline = preg_replace($regex, 'YAMLString', $inline);
     }
     unset($regex);
 
@@ -727,33 +727,33 @@ 
     do {
 
     // Check for sequences
-    while (preg_match('/\[([^{}\[\]]+)\]/U',$inline,$matchseqs)) {
+    while (preg_match('/\[([^{}\[\]]+)\]/U', $inline, $matchseqs)) {
       $seqs[] = $matchseqs[0];
       $inline = preg_replace('/\[([^{}\[\]]+)\]/U', ('YAMLSeq' . (count($seqs) - 1) . 's'), $inline, 1);
     }
 
     // Check for mappings
-    while (preg_match('/{([^\[\]{}]+)}/U',$inline,$matchmaps)) {
+    while (preg_match('/{([^\[\]{}]+)}/U', $inline, $matchmaps)) {
       $maps[] = $matchmaps[0];
       $inline = preg_replace('/{([^\[\]{}]+)}/U', ('YAMLMap' . (count($maps) - 1) . 's'), $inline, 1);
     }
 
     if ($i++ >= 10) break;
 
-    } while (strpos ($inline, '[') !== false || strpos ($inline, '{') !== false);
+    } while (strpos($inline, '[') !== false || strpos($inline, '{') !== false);
 
-    $explode = explode(',',$inline);
+    $explode = explode(',', $inline);
     $explode = array_map('trim', $explode);
     $stringi = 0; $i = 0;
 
     while (1) {
 
     // Re-add the sequences
-    if (!empty($seqs)) {
+    if ( ! empty($seqs)) {
       foreach ($explode as $key => $value) {
-        if (strpos($value,'YAMLSeq') !== false) {
+        if (strpos($value, 'YAMLSeq') !== false) {
           foreach ($seqs as $seqk => $seq) {
-            $explode[$key] = str_replace(('YAMLSeq'.$seqk.'s'),$seq,$value);
+            $explode[$key] = str_replace(('YAMLSeq' . $seqk . 's'), $seq, $value);
             $value = $explode[$key];
           }
         }
@@ -761,11 +761,11 @@ 
     }
 
     // Re-add the mappings
-    if (!empty($maps)) {
+    if ( ! empty($maps)) {
       foreach ($explode as $key => $value) {
-        if (strpos($value,'YAMLMap') !== false) {
+        if (strpos($value, 'YAMLMap') !== false) {
           foreach ($maps as $mapk => $map) {
-            $explode[$key] = str_replace(('YAMLMap'.$mapk.'s'), $map, $value);
+            $explode[$key] = str_replace(('YAMLMap' . $mapk . 's'), $map, $value);
             $value = $explode[$key];
           }
         }
@@ -774,10 +774,10 @@ 
 
 
     // Re-add the strings
-    if (!empty($saved_strings)) {
+    if ( ! empty($saved_strings)) {
       foreach ($explode as $key => $value) {
-        while (strpos($value,'YAMLString') !== false) {
-          $explode[$key] = preg_replace('/YAMLString/',$saved_strings[$stringi],$value, 1);
+        while (strpos($value, 'YAMLString') !== false) {
+          $explode[$key] = preg_replace('/YAMLString/', $saved_strings[$stringi], $value, 1);
           unset($saved_strings[$stringi]);
           ++$stringi;
           $value = $explode[$key];
@@ -787,9 +787,9 @@ 
 
 
     // Re-add the empties
-    if (!empty($saved_empties)) {
+    if ( ! empty($saved_empties)) {
       foreach ($explode as $key => $value) {
-        while (strpos($value,'YAMLEmpty') !== false) {
+        while (strpos($value, 'YAMLEmpty') !== false) {
           $explode[$key] = preg_replace('/YAMLEmpty/', '', $value, 1);
           $value = $explode[$key];
         }
@@ -798,16 +798,16 @@ 
 
     $finished = true;
     foreach ($explode as $key => $value) {
-      if (strpos($value,'YAMLSeq') !== false) {
+      if (strpos($value, 'YAMLSeq') !== false) {
         $finished = false; break;
       }
-      if (strpos($value,'YAMLMap') !== false) {
+      if (strpos($value, 'YAMLMap') !== false) {
         $finished = false; break;
       }
-      if (strpos($value,'YAMLString') !== false) {
+      if (strpos($value, 'YAMLString') !== false) {
         $finished = false; break;
       }
-      if (strpos($value,'YAMLEmpty') !== false) {
+      if (strpos($value, 'YAMLEmpty') !== false) {
         $finished = false; break;
       }
     }
@@ -822,15 +822,15 @@ 
     return $explode;
   }
 
-  private function literalBlockContinues ($line, $lineIndent) {
-    if (!trim($line)) return true;
+  private function literalBlockContinues($line, $lineIndent) {
+    if ( ! trim($line)) return true;
     if (strlen($line) - strlen(ltrim($line)) > $lineIndent) return true;
     return false;
   }
 
-  private function referenceContentsByAlias ($alias) {
+  private function referenceContentsByAlias($alias) {
     do {
-      if (!isset($this->SavedGroups[$alias])) { echo "Bad group name: $alias."; break; }
+      if ( ! isset($this->SavedGroups[$alias])) { echo "Bad group name: $alias."; break; }
       $groupPath = $this->SavedGroups[$alias];
       $value = $this->result;
       foreach ($groupPath as $k) {
@@ -840,7 +840,7 @@ 
     return $value;
   }
 
-  private function addArrayInline ($array, $indent) {
+  private function addArrayInline($array, $indent) {
       $CommonGroupPath = $this->path;
       if (empty ($array)) return false;
 
@@ -851,22 +851,22 @@ 
       return true;
   }
 
-  private function addArray ($incoming_data, $incoming_indent) {
+  private function addArray($incoming_data, $incoming_indent) {
 
    // print_r ($incoming_data);
 
-    if (count ($incoming_data) > 1)
-      return $this->addArrayInline ($incoming_data, $incoming_indent);
+    if (count($incoming_data) > 1)
+      return $this->addArrayInline($incoming_data, $incoming_indent);
 
-    $key = key ($incoming_data);
+    $key = key($incoming_data);
     $value = isset($incoming_data[$key]) ? $incoming_data[$key] : null;
     if ($key === '__!YAMLZero') $key = '0';
 
-    if ($incoming_indent == 0 && !$this->_containsGroupAlias && !$this->_containsGroupAnchor) { // Shortcut for root-level values.
+    if ($incoming_indent == 0 && ! $this->_containsGroupAlias && ! $this->_containsGroupAnchor) { // Shortcut for root-level values.
       if ($key || $key === '' || $key === '0') {
         $this->result[$key] = $value;
       } else {
-        $this->result[] = $value; end ($this->result); $key = key ($this->result);
+        $this->result[] = $value; end($this->result); $key = key($this->result);
       }
       $this->path[$incoming_indent] = $key;
       return;
@@ -889,25 +889,25 @@ 
 
     // Adding string or numeric key to the innermost level or $this->arr.
     if (is_string($key) && $key == '<<') {
-      if (!is_array ($_arr)) { $_arr = array (); }
+      if ( ! is_array($_arr)) { $_arr = array(); }
 
-      $_arr = array_merge ($_arr, $value);
+      $_arr = array_merge($_arr, $value);
     } else if ($key || $key === '' || $key === '0') {
-      if (!is_array ($_arr))
-        $_arr = array ($key=>$value);
+      if ( ! is_array($_arr))
+        $_arr = array($key=>$value);
       else
         $_arr[$key] = $value;
     } else {
-      if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; }
-      else { $_arr[] = $value; end ($_arr); $key = key ($_arr); }
+      if ( ! is_array($_arr)) { $_arr = array($value); $key = 0; }
+      else { $_arr[] = $value; end($_arr); $key = key($_arr); }
     }
 
     $reverse_path = array_reverse($this->path);
-    $reverse_history = array_reverse ($history);
+    $reverse_history = array_reverse($history);
     $reverse_history[0] = $_arr;
     $cnt = count($reverse_history) - 1;
     for ($i = 0; $i < $cnt; $i++) {
-      $reverse_history[$i+1][$reverse_path[$i]] = $reverse_history[$i];
+      $reverse_history[$i + 1][$reverse_path[$i]] = $reverse_history[$i];
     }
     $this->result = $reverse_history[$cnt];
 
@@ -915,9 +915,9 @@ 
 
     if ($this->_containsGroupAnchor) {
       $this->SavedGroups[$this->_containsGroupAnchor] = $this->path;
-      if (is_array ($value)) {
-        $k = key ($value);
-        if (!is_int ($k)) {
+      if (is_array($value)) {
+        $k = key($value);
+        if ( ! is_int($k)) {
           $this->SavedGroups[$this->_containsGroupAnchor][$incoming_indent + 2] = $k;
         }
       }
@@ -926,70 +926,70 @@ 
 
   }
 
-  private static function startsLiteralBlock ($line) {
-    $lastChar = substr (trim($line), -1);
+  private static function startsLiteralBlock($line) {
+    $lastChar = substr(trim($line), -1);
     if ($lastChar != '>' && $lastChar != '|') return false;
     if ($lastChar == '|') return $lastChar;
     // HTML tags should not be counted as literal blocks.
-    if (preg_match ('#<.*?>$#', $line)) return false;
+    if (preg_match('#<.*?>$#', $line)) return false;
     return $lastChar;
   }
 
   private static function greedilyNeedNextLine($line) {
-    $line = trim ($line);
-    if (!strlen($line)) return false;
-    if (substr ($line, -1, 1) == ']') return false;
+    $line = trim($line);
+    if ( ! strlen($line)) return false;
+    if (substr($line, -1, 1) == ']') return false;
     if ($line[0] == '[') return true;
-    if (preg_match ('#^[^:]+?:\s*\[#', $line)) return true;
+    if (preg_match('#^[^:]+?:\s*\[#', $line)) return true;
     return false;
   }
 
-  private function addLiteralLine ($literalBlock, $line, $literalBlockStyle, $indent = -1) {
+  private function addLiteralLine($literalBlock, $line, $literalBlockStyle, $indent = -1) {
     $line = self::stripIndent($line, $indent);
     if ($literalBlockStyle !== '|') {
         $line = self::stripIndent($line);
     }
-    $line = rtrim ($line, "\r\n\t ") . "\n";
+    $line = rtrim($line, "\r\n\t ") . "\n";
     if ($literalBlockStyle == '|') {
       return $literalBlock . $line;
     }
     if (strlen($line) == 0)
       return rtrim($literalBlock, ' ') . "\n";
     if ($line == "\n" && $literalBlockStyle == '>') {
-      return rtrim ($literalBlock, " \t") . "\n";
+      return rtrim($literalBlock, " \t") . "\n";
     }
     if ($line != "\n")
-      $line = trim ($line, "\r\n ") . " ";
+      $line = trim($line, "\r\n ") . " ";
     return $literalBlock . $line;
   }
 
-   function revertLiteralPlaceHolder ($lineArray, $literalBlock) {
+   function revertLiteralPlaceHolder($lineArray, $literalBlock) {
      foreach ($lineArray as $k => $_) {
       if (is_array($_))
-        $lineArray[$k] = $this->revertLiteralPlaceHolder ($_, $literalBlock);
-      else if (substr($_, -1 * strlen ($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder)
-	       $lineArray[$k] = rtrim ($literalBlock, " \r\n");
+        $lineArray[$k] = $this->revertLiteralPlaceHolder($_, $literalBlock);
+      else if (substr($_, -1 * strlen($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder)
+	       $lineArray[$k] = rtrim($literalBlock, " \r\n");
      }
      return $lineArray;
    }
 
-  private static function stripIndent ($line, $indent = -1) {
+  private static function stripIndent($line, $indent = -1) {
     if ($indent == -1) $indent = strlen($line) - strlen(ltrim($line));
-    return substr ($line, $indent);
+    return substr($line, $indent);
   }
 
-  private function getParentPathByIndent ($indent) {
+  private function getParentPathByIndent($indent) {
     if ($indent == 0) return array();
     $linePath = $this->path;
     do {
       end($linePath); $lastIndentInParentPath = key($linePath);
-      if ($indent <= $lastIndentInParentPath) array_pop ($linePath);
+      if ($indent <= $lastIndentInParentPath) array_pop($linePath);
     } while ($indent <= $lastIndentInParentPath);
     return $linePath;
   }
 
 
-  private function clearBiggerPathValues ($indent) {
+  private function clearBiggerPathValues($indent) {
 
 
     if ($indent == 0) $this->path = array();
@@ -1003,94 +1003,94 @@ 
   }
 
 
-  private static function isComment ($line) {
-    if (!$line) return false;
+  private static function isComment($line) {
+    if ( ! $line) return false;
     if ($line[0] == '#') return true;
     if (trim($line, " \r\n\t") == '---') return true;
     return false;
   }
 
-  private static function isEmpty ($line) {
-    return (trim ($line) === '');
+  private static function isEmpty($line) {
+    return (trim($line) === '');
   }
 
 
-  private function isArrayElement ($line) {
-    if (!$line || !is_scalar($line)) return false;
+  private function isArrayElement($line) {
+    if ( ! $line || ! is_scalar($line)) return false;
     if (substr($line, 0, 2) != '- ') return false;
-    if (strlen ($line) > 3)
-      if (substr($line,0,3) == '---') return false;
+    if (strlen($line) > 3)
+      if (substr($line, 0, 3) == '---') return false;
 
     return true;
   }
 
-  private function isHashElement ($line) {
+  private function isHashElement($line) {
     return strpos($line, ':');
   }
 
-  private function isLiteral ($line) {
+  private function isLiteral($line) {
     if ($this->isArrayElement($line)) return false;
     if ($this->isHashElement($line)) return false;
     return true;
   }
 
 
-  private static function unquote ($value) {
-    if (!$value) return $value;
-    if (!is_string($value)) return $value;
-    if ($value[0] == '\'') return trim ($value, '\'');
-    if ($value[0] == '"') return trim ($value, '"');
+  private static function unquote($value) {
+    if ( ! $value) return $value;
+    if ( ! is_string($value)) return $value;
+    if ($value[0] == '\'') return trim($value, '\'');
+    if ($value[0] == '"') return trim($value, '"');
     return $value;
   }
 
-  private function startsMappedSequence ($line) {
-    return (substr($line, 0, 2) == '- ' && substr ($line, -1, 1) == ':');
+  private function startsMappedSequence($line) {
+    return (substr($line, 0, 2) == '- ' && substr($line, -1, 1) == ':');
   }
 
-  private function returnMappedSequence ($line) {
+  private function returnMappedSequence($line) {
     $array = array();
-    $key         = self::unquote(trim(substr($line,1,-1)));
+    $key         = self::unquote(trim(substr($line, 1, -1)));
     $array[$key] = array();
-    $this->delayedPath = array(strpos ($line, $key) + $this->indent => $key);
+    $this->delayedPath = array(strpos($line, $key) + $this->indent => $key);
     return array($array);
   }
 
   private function checkKeysInValue($value) {
     if (strchr('[{"\'', $value[0]) === false) {
       if (strchr($value, ': ') !== false) {
-          throw new Exception('Too many keys: '.$value);
+          throw new Exception('Too many keys: ' . $value);
       }
     }
   }
 
-  private function returnMappedValue ($line) {
+  private function returnMappedValue($line) {
     $this->checkKeysInValue($line);
     $array = array();
-    $key         = self::unquote (trim(substr($line,0,-1)));
+    $key         = self::unquote(trim(substr($line, 0, -1)));
     $array[$key] = '';
     return $array;
   }
 
-  private function startsMappedValue ($line) {
-    return (substr ($line, -1, 1) == ':');
+  private function startsMappedValue($line) {
+    return (substr($line, -1, 1) == ':');
   }
 
-  private function isPlainArray ($line) {
-    return ($line[0] == '[' && substr ($line, -1, 1) == ']');
+  private function isPlainArray($line) {
+    return ($line[0] == '[' && substr($line, -1, 1) == ']');
   }
 
-  private function returnPlainArray ($line) {
+  private function returnPlainArray($line) {
     return $this->_toType($line);
   }
 
-  private function returnKeyValuePair ($line) {
+  private function returnKeyValuePair($line) {
     $array = array();
     $key = '';
-    if (strpos ($line, ': ')) {
+    if (strpos($line, ': ')) {
       // It's a key/value pair most likely
       // If the key is in double quotes pull it out
-      if (($line[0] == '"' || $line[0] == "'") && preg_match('/^(["\'](.*)["\'](\s)*:)/',$line,$matches)) {
-        $value = trim(str_replace($matches[1],'',$line));
+      if (($line[0] == '"' || $line[0] == "'") && preg_match('/^(["\'](.*)["\'](\s)*:)/', $line, $matches)) {
+        $value = trim(str_replace($matches[1], '', $line));
         $key   = $matches[2];
       } else {
         // Do some guesswork as to the key and the value
@@ -1104,17 +1104,17 @@ 
       if ($key === '0') $key = '__!YAMLZero';
       $array[$key] = $value;
     } else {
-      $array = array ($line);
+      $array = array($line);
     }
     return $array;
 
   }
 
 
-  private function returnArrayElement ($line) {
+  private function returnArrayElement($line) {
      if (strlen($line) <= 1) return array(array()); // Weird %)
      $array = array();
-     $value   = trim(substr($line,1));
+     $value   = trim(substr($line, 1));
      $value   = $this->_toType($value);
      if ($this->isArrayElement($value)) {
        $value = $this->returnArrayElement($value);
@@ -1124,25 +1124,25 @@ 
   }
 
 
-  private function nodeContainsGroup ($line) {
+  private function nodeContainsGroup($line) {
     $symbolsForReference = 'A-z0-9_\-';
     if (strpos($line, '&') === false && strpos($line, '*') === false) return false; // Please die fast ;-)
-    if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
-    if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
-    if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) return $matches[1];
-    if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) return $matches[1];
-    if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) return $matches[1];
+    if ($line[0] == '&' && preg_match('/^(&[' . $symbolsForReference . ']+)/', $line, $matches)) return $matches[1];
+    if ($line[0] == '*' && preg_match('/^(\*[' . $symbolsForReference . ']+)/', $line, $matches)) return $matches[1];
+    if (preg_match('/(&[' . $symbolsForReference . ']+)$/', $line, $matches)) return $matches[1];
+    if (preg_match('/(\*[' . $symbolsForReference . ']+$)/', $line, $matches)) return $matches[1];
+    if (preg_match('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) return $matches[1];
     return false;
 
   }
 
-  private function addGroup ($line, $group) {
-    if ($group[0] == '&') $this->_containsGroupAnchor = substr ($group, 1);
-    if ($group[0] == '*') $this->_containsGroupAlias = substr ($group, 1);
+  private function addGroup($line, $group) {
+    if ($group[0] == '&') $this->_containsGroupAnchor = substr($group, 1);
+    if ($group[0] == '*') $this->_containsGroupAlias = substr($group, 1);
     //print_r ($this->path);
   }
 
-  private function stripGroup ($line, $group) {
+  private function stripGroup($line, $group) {
     $line = trim(str_replace($group, '', $line));
     return $line;
   }
@@ -1155,7 +1155,7 @@ 
 do {
   if (PHP_SAPI != 'cli') break;
   if (empty ($_SERVER['argc']) || $_SERVER['argc'] < 2) break;
-  if (empty ($_SERVER['PHP_SELF']) || FALSE === strpos ($_SERVER['PHP_SELF'], 'Spyc.php') ) break;
+  if (empty ($_SERVER['PHP_SELF']) || FALSE === strpos($_SERVER['PHP_SELF'], 'Spyc.php')) break;
   $file = $argv[1];
-  echo json_encode (spyc_load_file ($file));
+  echo json_encode(spyc_load_file($file));
 } while (0);

Braces +269 added lines, -115 removed lines

@@ -243,14 +243,18 @@ 
 
     // New YAML document
     $string = "";
-    if (!$no_opening_dashes) $string = "---\n";
+    if (!$no_opening_dashes) {
+    	$string = "---\n";
+    }
 
     // Start at the base of the array and move through it.
     if ($array) {
       $array = (array)$array;
       $previous_key = -1;
       foreach ($array as $key => $value) {
-        if (!isset($first_key)) $first_key = $key;
+        if (!isset($first_key)) {
+        	$first_key = $key;
+        }
         $string .= $this->_yamlize($key,$value,0,$previous_key, $first_key, $array);
         $previous_key = $key;
       }
@@ -267,10 +271,13 @@ 
      * @param $indent The indent of the current node
      */
   private function _yamlize($key,$value,$indent, $previous_key = -1, $first_key = 0, $source_array = null) {
-    if(is_object($value)) $value = (array)$value;
+    if(is_object($value)) {
+    	$value = (array)$value;
+    }
     if (is_array($value)) {
-      if (empty ($value))
-        return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array);
+      if (empty ($value)) {
+              return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array);
+      }
       // It has children.  What to do?
       // Make it the right kind of item
       $string = $this->_dumpNode($key, self::REMPTY, $indent, $previous_key, $first_key, $source_array);
@@ -297,7 +304,9 @@ 
       $string = '';
       $previous_key = -1;
       foreach ($array as $key => $value) {
-        if (!isset($first_key)) $first_key = $key;
+        if (!isset($first_key)) {
+        	$first_key = $key;
+        }
         $string .= $this->_yamlize($key, $value, $indent, $previous_key, $first_key, $array);
         $previous_key = $key;
       }
@@ -327,20 +336,29 @@ 
       $value  = $this->_doFolding($value,$indent);
     }
 
-    if ($value === array()) $value = '[ ]';
-    if ($value === "") $value = '""';
+    if ($value === array()) {
+    	$value = '[ ]';
+    }
+    if ($value === "") {
+    	$value = '""';
+    }
     if (self::isTranslationWord($value)) {
       $value = $this->_doLiteralBlock($value, $indent);
     }
-    if (trim ($value) != $value)
-       $value = $this->_doLiteralBlock($value,$indent);
+    if (trim ($value) != $value) {
+           $value = $this->_doLiteralBlock($value,$indent);
+    }
 
     if (is_bool($value)) {
        $value = $value ? "true" : "false";
     }
 
-    if ($value === null) $value = 'null';
-    if ($value === "'" . self::REMPTY . "'") $value = null;
+    if ($value === null) {
+    	$value = 'null';
+    }
+    if ($value === "'" . self::REMPTY . "'") {
+    	$value = null;
+    }
 
     $spaces = str_repeat(' ',$indent);
 
@@ -365,7 +383,9 @@ 
      * @param $indent int The value of the indent
      */
   private function _doLiteralBlock($value,$indent) {
-    if ($value === "\n") return '\n';
+    if ($value === "\n") {
+    	return '\n';
+    }
     if (strpos($value, "\n") === false && strpos($value, "'") === false) {
       return sprintf ("'%s'", $value);
     }
@@ -405,10 +425,12 @@ 
       $wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent");
       $value   = ">\n".$indent.$wrapped;
     } else {
-      if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY)
-        $value = '"' . $value . '"';
-      if (is_numeric($value) && is_string($value))
-        $value = '"' . $value . '"';
+      if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY) {
+              $value = '"' . $value . '"';
+      }
+      if (is_numeric($value) && is_string($value)) {
+              $value = '"' . $value . '"';
+      }
     }
 
 
@@ -482,7 +504,9 @@ 
   }
 
   private function loadWithSource($Source) {
-    if (empty ($Source)) return array();
+    if (empty ($Source)) {
+    	return array();
+    }
     if ($this->setting_use_syck_is_possible && function_exists ('syck_load')) {
       $array = syck_load (implode ("\n", $Source));
       return is_array($array) ? $array : array();
@@ -498,8 +522,12 @@ 
       $this->indent = strlen($line) - strlen(ltrim($line));
       $tempPath = $this->getParentPathByIndent($this->indent);
       $line = self::stripIndent($line, $this->indent);
-      if (self::isComment($line)) continue;
-      if (self::isEmpty($line)) continue;
+      if (self::isComment($line)) {
+      	continue;
+      }
+      if (self::isEmpty($line)) {
+      	continue;
+      }
       $this->path = $tempPath;
 
       $literalBlockStyle = self::startsLiteralBlock($line);
@@ -526,13 +554,15 @@ 
 
       $lineArray = $this->_parseLine($line);
 
-      if ($literalBlockStyle)
-        $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock);
+      if ($literalBlockStyle) {
+              $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock);
+      }
 
       $this->addArray($lineArray, $this->indent);
 
-      foreach ($this->delayedPath as $indent => $delayedPath)
-        $this->path[$indent] = $delayedPath;
+      foreach ($this->delayedPath as $indent => $delayedPath) {
+              $this->path[$indent] = $delayedPath;
+      }
 
       $this->delayedPath = array();
 
@@ -541,8 +571,9 @@ 
   }
 
   private function loadFromSource ($input) {
-    if (!empty($input) && strpos($input, "\n") === false && file_exists($input))
-      $input = file_get_contents($input);
+    if (!empty($input) && strpos($input, "\n") === false && file_exists($input)) {
+          $input = file_get_contents($input);
+    }
 
     return $this->loadFromString($input);
   }
@@ -562,9 +593,13 @@ 
      * @param string $line A line from the YAML file
      */
   private function _parseLine($line) {
-    if (!$line) return array();
+    if (!$line) {
+    	return array();
+    }
     $line = trim($line);
-    if (!$line) return array();
+    if (!$line) {
+    	return array();
+    }
 
     $array = array();
 
@@ -574,17 +609,21 @@ 
       $line = $this->stripGroup ($line, $group);
     }
 
-    if ($this->startsMappedSequence($line))
-      return $this->returnMappedSequence($line);
+    if ($this->startsMappedSequence($line)) {
+          return $this->returnMappedSequence($line);
+    }
 
-    if ($this->startsMappedValue($line))
-      return $this->returnMappedValue($line);
+    if ($this->startsMappedValue($line)) {
+          return $this->returnMappedValue($line);
+    }
 
-    if ($this->isArrayElement($line))
-     return $this->returnArrayElement($line);
+    if ($this->isArrayElement($line)) {
+         return $this->returnArrayElement($line);
+    }
 
-    if ($this->isPlainArray($line))
-     return $this->returnPlainArray($line);
+    if ($this->isPlainArray($line)) {
+         return $this->returnPlainArray($line);
+    }
 
 
     return $this->returnKeyValuePair($line);
@@ -598,32 +637,44 @@ 
      * @return mixed
      */
   private function _toType($value) {
-    if ($value === '') return "";
+    if ($value === '') {
+    	return "";
+    }
     $first_character = $value[0];
     $last_character = substr($value, -1, 1);
 
     $is_quoted = false;
     do {
-      if (!$value) break;
-      if ($first_character != '"' && $first_character != "'") break;
-      if ($last_character != '"' && $last_character != "'") break;
+      if (!$value) {
+      	break;
+      }
+      if ($first_character != '"' && $first_character != "'") {
+      	break;
+      }
+      if ($last_character != '"' && $last_character != "'") {
+      	break;
+      }
       $is_quoted = true;
     } while (0);
 
     if ($is_quoted) {
       $value = str_replace('\n', "\n", $value);
-      if ($first_character == "'")
-        return strtr(substr ($value, 1, -1), array ('\'\'' => '\'', '\\\''=> '\''));
+      if ($first_character == "'") {
+              return strtr(substr ($value, 1, -1), array ('\'\'' => '\'', '\\\''=> '\''));
+      }
       return strtr(substr ($value, 1, -1), array ('\\"' => '"', '\\\''=> '\''));
     }
 
-    if (strpos($value, ' #') !== false && !$is_quoted)
-      $value = preg_replace('/\s+#(.+)$/','',$value);
+    if (strpos($value, ' #') !== false && !$is_quoted) {
+          $value = preg_replace('/\s+#(.+)$/','',$value);
+    }
 
     if ($first_character == '[' && $last_character == ']') {
       // Take out strings sequences and mappings
       $innerValue = trim(substr ($value, 1, -1));
-      if ($innerValue === '') return array();
+      if ($innerValue === '') {
+      	return array();
+      }
       $explode = $this->_inlineEscape($innerValue);
       // Propagate value array
       $value  = array();
@@ -644,7 +695,9 @@ 
 
     if ($first_character == '{' && $last_character == '}') {
       $innerValue = trim(substr ($value, 1, -1));
-      if ($innerValue === '') return array();
+      if ($innerValue === '') {
+      	return array();
+      }
       // Inline Mapping
       // Take out strings sequences and mappings
       $explode = $this->_inlineEscape($innerValue);
@@ -652,7 +705,9 @@ 
       $array = array();
       foreach ($explode as $v) {
         $SubArr = $this->_toType($v);
-        if (empty($SubArr)) continue;
+        if (empty($SubArr)) {
+        	continue;
+        }
         if (is_array ($SubArr)) {
           $array[key($SubArr)] = $SubArr[key($SubArr)]; continue;
         }
@@ -667,8 +722,9 @@ 
 
     if ( is_numeric($value) && preg_match ('/^(-|)[1-9]+[0-9]*$/', $value) ){
       $intvalue = (int)$value;
-      if ($intvalue != PHP_INT_MAX && $intvalue != ~PHP_INT_MAX)
-        $value = $intvalue;
+      if ($intvalue != PHP_INT_MAX && $intvalue != ~PHP_INT_MAX) {
+              $value = $intvalue;
+      }
       return $value;
     }
 
@@ -680,9 +736,12 @@ 
     $this->coerceValue($value);
 
     if (is_numeric($value)) {
-      if ($value === '0') return 0;
-      if (rtrim ($value, 0) === $value)
-        $value = (float)$value;
+      if ($value === '0') {
+      	return 0;
+      }
+      if (rtrim ($value, 0) === $value) {
+              $value = (float)$value;
+      }
       return $value;
     }
 
@@ -738,7 +797,9 @@ 
       $inline = preg_replace('/{([^\[\]{}]+)}/U', ('YAMLMap' . (count($maps) - 1) . 's'), $inline, 1);
     }
 
-    if ($i++ >= 10) break;
+    if ($i++ >= 10) {
+    	break;
+    }
 
     } while (strpos ($inline, '[') !== false || strpos ($inline, '{') !== false);
 
@@ -811,11 +872,15 @@ 
         $finished = false; break;
       }
     }
-    if ($finished) break;
+    if ($finished) {
+    	break;
+    }
 
     $i++;
-    if ($i > 10)
-      break; // Prevent infinite loops.
+    if ($i > 10) {
+          break;
+    }
+    // Prevent infinite loops.
     }
 
 
@@ -823,8 +888,12 @@ 
   }
 
   private function literalBlockContinues ($line, $lineIndent) {
-    if (!trim($line)) return true;
-    if (strlen($line) - strlen(ltrim($line)) > $lineIndent) return true;
+    if (!trim($line)) {
+    	return true;
+    }
+    if (strlen($line) - strlen(ltrim($line)) > $lineIndent) {
+    	return true;
+    }
     return false;
   }
 
@@ -842,7 +911,9 @@ 
 
   private function addArrayInline ($array, $indent) {
       $CommonGroupPath = $this->path;
-      if (empty ($array)) return false;
+      if (empty ($array)) {
+      	return false;
+      }
 
       foreach ($array as $k => $_) {
         $this->addArray(array($k => $_), $indent);
@@ -855,12 +926,15 @@ 
 
    // print_r ($incoming_data);
 
-    if (count ($incoming_data) > 1)
-      return $this->addArrayInline ($incoming_data, $incoming_indent);
+    if (count ($incoming_data) > 1) {
+          return $this->addArrayInline ($incoming_data, $incoming_indent);
+    }
 
     $key = key ($incoming_data);
     $value = isset($incoming_data[$key]) ? $incoming_data[$key] : null;
-    if ($key === '__!YAMLZero') $key = '0';
+    if ($key === '__!YAMLZero') {
+    	$key = '0';
+    }
 
     if ($incoming_indent == 0 && !$this->_containsGroupAlias && !$this->_containsGroupAnchor) { // Shortcut for root-level values.
       if ($key || $key === '' || $key === '0') {
@@ -893,13 +967,13 @@ 
 
       $_arr = array_merge ($_arr, $value);
     } else if ($key || $key === '' || $key === '0') {
-      if (!is_array ($_arr))
-        $_arr = array ($key=>$value);
-      else
-        $_arr[$key] = $value;
+      if (!is_array ($_arr)) {
+              $_arr = array ($key=>$value);
+      } else {
+              $_arr[$key] = $value;
+      }
     } else {
-      if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; }
-      else { $_arr[] = $value; end ($_arr); $key = key ($_arr); }
+      if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; } else { $_arr[] = $value; end ($_arr); $key = key ($_arr); }
     }
 
     $reverse_path = array_reverse($this->path);
@@ -928,19 +1002,33 @@ 
 
   private static function startsLiteralBlock ($line) {
     $lastChar = substr (trim($line), -1);
-    if ($lastChar != '>' && $lastChar != '|') return false;
-    if ($lastChar == '|') return $lastChar;
+    if ($lastChar != '>' && $lastChar != '|') {
+    	return false;
+    }
+    if ($lastChar == '|') {
+    	return $lastChar;
+    }
     // HTML tags should not be counted as literal blocks.
-    if (preg_match ('#<.*?>$#', $line)) return false;
+    if (preg_match ('#<.*?>$#', $line)) {
+    	return false;
+    }
     return $lastChar;
   }
 
   private static function greedilyNeedNextLine($line) {
     $line = trim ($line);
-    if (!strlen($line)) return false;
-    if (substr ($line, -1, 1) == ']') return false;
-    if ($line[0] == '[') return true;
-    if (preg_match ('#^[^:]+?:\s*\[#', $line)) return true;
+    if (!strlen($line)) {
+    	return false;
+    }
+    if (substr ($line, -1, 1) == ']') {
+    	return false;
+    }
+    if ($line[0] == '[') {
+    	return true;
+    }
+    if (preg_match ('#^[^:]+?:\s*\[#', $line)) {
+    	return true;
+    }
     return false;
   }
 
@@ -953,37 +1041,46 @@ 
     if ($literalBlockStyle == '|') {
       return $literalBlock . $line;
     }
-    if (strlen($line) == 0)
-      return rtrim($literalBlock, ' ') . "\n";
+    if (strlen($line) == 0) {
+          return rtrim($literalBlock, ' ') . "\n";
+    }
     if ($line == "\n" && $literalBlockStyle == '>') {
       return rtrim ($literalBlock, " \t") . "\n";
     }
-    if ($line != "\n")
-      $line = trim ($line, "\r\n ") . " ";
+    if ($line != "\n") {
+          $line = trim ($line, "\r\n ") . " ";
+    }
     return $literalBlock . $line;
   }
 
    function revertLiteralPlaceHolder ($lineArray, $literalBlock) {
      foreach ($lineArray as $k => $_) {
-      if (is_array($_))
-        $lineArray[$k] = $this->revertLiteralPlaceHolder ($_, $literalBlock);
-      else if (substr($_, -1 * strlen ($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder)
-	       $lineArray[$k] = rtrim ($literalBlock, " \r\n");
+      if (is_array($_)) {
+              $lineArray[$k] = $this->revertLiteralPlaceHolder ($_, $literalBlock);
+      } else if (substr($_, -1 * strlen ($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder) {
+      	       $lineArray[$k] = rtrim ($literalBlock, " \r\n");
+      }
      }
      return $lineArray;
    }
 
   private static function stripIndent ($line, $indent = -1) {
-    if ($indent == -1) $indent = strlen($line) - strlen(ltrim($line));
+    if ($indent == -1) {
+    	$indent = strlen($line) - strlen(ltrim($line));
+    }
     return substr ($line, $indent);
   }
 
   private function getParentPathByIndent ($indent) {
-    if ($indent == 0) return array();
+    if ($indent == 0) {
+    	return array();
+    }
     $linePath = $this->path;
     do {
       end($linePath); $lastIndentInParentPath = key($linePath);
-      if ($indent <= $lastIndentInParentPath) array_pop ($linePath);
+      if ($indent <= $lastIndentInParentPath) {
+      	array_pop ($linePath);
+      }
     } while ($indent <= $lastIndentInParentPath);
     return $linePath;
   }
@@ -992,11 +1089,17 @@ 
   private function clearBiggerPathValues ($indent) {
 
 
-    if ($indent == 0) $this->path = array();
-    if (empty ($this->path)) return true;
+    if ($indent == 0) {
+    	$this->path = array();
+    }
+    if (empty ($this->path)) {
+    	return true;
+    }
 
     foreach ($this->path as $k => $_) {
-      if ($k > $indent) unset ($this->path[$k]);
+      if ($k > $indent) {
+      	unset ($this->path[$k]);
+      }
     }
 
     return true;
@@ -1004,9 +1107,15 @@ 
 
 
   private static function isComment ($line) {
-    if (!$line) return false;
-    if ($line[0] == '#') return true;
-    if (trim($line, " \r\n\t") == '---') return true;
+    if (!$line) {
+    	return false;
+    }
+    if ($line[0] == '#') {
+    	return true;
+    }
+    if (trim($line, " \r\n\t") == '---') {
+    	return true;
+    }
     return false;
   }
 
@@ -1016,10 +1125,15 @@ 
 
 
   private function isArrayElement ($line) {
-    if (!$line || !is_scalar($line)) return false;
-    if (substr($line, 0, 2) != '- ') return false;
-    if (strlen ($line) > 3)
-      if (substr($line,0,3) == '---') return false;
+    if (!$line || !is_scalar($line)) {
+    	return false;
+    }
+    if (substr($line, 0, 2) != '- ') {
+    	return false;
+    }
+    if (strlen ($line) > 3) {
+          if (substr($line,0,3) == '---') return false;
+    }
 
     return true;
   }
@@ -1029,17 +1143,29 @@ 
   }
 
   private function isLiteral ($line) {
-    if ($this->isArrayElement($line)) return false;
-    if ($this->isHashElement($line)) return false;
+    if ($this->isArrayElement($line)) {
+    	return false;
+    }
+    if ($this->isHashElement($line)) {
+    	return false;
+    }
     return true;
   }
 
 
   private static function unquote ($value) {
-    if (!$value) return $value;
-    if (!is_string($value)) return $value;
-    if ($value[0] == '\'') return trim ($value, '\'');
-    if ($value[0] == '"') return trim ($value, '"');
+    if (!$value) {
+    	return $value;
+    }
+    if (!is_string($value)) {
+    	return $value;
+    }
+    if ($value[0] == '\'') {
+    	return trim ($value, '\'');
+    }
+    if ($value[0] == '"') {
+    	return trim ($value, '"');
+    }
     return $value;
   }
 
@@ -1101,7 +1227,9 @@ 
       }
       // Set the type of the value.  Int, string, etc
       $value = $this->_toType($value);
-      if ($key === '0') $key = '__!YAMLZero';
+      if ($key === '0') {
+      	$key = '__!YAMLZero';
+      }
       $array[$key] = $value;
     } else {
       $array = array ($line);
@@ -1112,7 +1240,10 @@ 
 
 
   private function returnArrayElement ($line) {
-     if (strlen($line) <= 1) return array(array()); // Weird %)
+     if (strlen($line) <= 1) {
+     	return array(array());
+     }
+     // Weird %)
      $array = array();
      $value   = trim(substr($line,1));
      $value   = $this->_toType($value);
@@ -1126,19 +1257,36 @@ 
 
   private function nodeContainsGroup ($line) {
     $symbolsForReference = 'A-z0-9_\-';
-    if (strpos($line, '&') === false && strpos($line, '*') === false) return false; // Please die fast ;-)
-    if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
-    if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
-    if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) return $matches[1];
-    if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) return $matches[1];
-    if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) return $matches[1];
+    if (strpos($line, '&') === false && strpos($line, '*') === false) {
+    	return false;
+    }
+    // Please die fast ;-)
+    if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) {
+    	return $matches[1];
+    }
+    if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) {
+    	return $matches[1];
+    }
+    if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) {
+    	return $matches[1];
+    }
+    if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) {
+    	return $matches[1];
+    }
+    if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) {
+    	return $matches[1];
+    }
     return false;
 
   }
 
   private function addGroup ($line, $group) {
-    if ($group[0] == '&') $this->_containsGroupAnchor = substr ($group, 1);
-    if ($group[0] == '*') $this->_containsGroupAlias = substr ($group, 1);
+    if ($group[0] == '&') {
+    	$this->_containsGroupAnchor = substr ($group, 1);
+    }
+    if ($group[0] == '*') {
+    	$this->_containsGroupAlias = substr ($group, 1);
+    }
     //print_r ($this->path);
   }
 
@@ -1153,9 +1301,15 @@ 
 // The syntax is the following: php Spyc.php spyc.yaml
 
 do {
-  if (PHP_SAPI != 'cli') break;
-  if (empty ($_SERVER['argc']) || $_SERVER['argc'] < 2) break;
-  if (empty ($_SERVER['PHP_SELF']) || FALSE === strpos ($_SERVER['PHP_SELF'], 'Spyc.php') ) break;
+  if (PHP_SAPI != 'cli') {
+  	break;
+  }
+  if (empty ($_SERVER['argc']) || $_SERVER['argc'] < 2) {
+  	break;
+  }
+  if (empty ($_SERVER['PHP_SELF']) || FALSE === strpos ($_SERVER['PHP_SELF'], 'Spyc.php') ) {
+  	break;
+  }
   $file = $argv[1];
   echo json_encode (spyc_load_file ($file));
 } while (0);

writing-on-github.php

Indentation +5 added lines, -5 removed lines

@@ -162,7 +162,7 @@ 
 		add_action( 'save_post', array( $this->controller, 'export_post' ) );
 		add_action( 'delete_post', array( $this->controller, 'delete_post' ) );
 		add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) );
-        add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 );
+		add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 );
 		add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 );
 		add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 );
 
@@ -181,7 +181,7 @@ 
 			}
 		}
 
-	    return $link;
+		return $link;
 	}
 
 	public function ignore_post_meta($meta) {
@@ -436,9 +436,9 @@ 
 	/**
 	 * Kicks of an import or export cronjob.
 	 *
-     * @param bool   $force
-     * @param string $type
-     */
+	 * @param bool   $force
+	 * @param string $type
+	 */
 	protected function start_cron( $type, $force = false ) {
 		update_option( '_wogh_' . $type . '_started', 'yes' );
 		$user_id = get_current_user_id();

Spacing +58 added lines, -58 removed lines

@@ -12,8 +12,8 @@ 
 
 // If the functions have already been autoloaded, don't reload.
 // This fixes function duplication during unit testing.
-if ( defined( 'WRITING_ON_GITHUB_TEST' ) && WRITING_ON_GITHUB_TEST ) {
-	$path = dirname( __FILE__ ) . '/vendor/autoload_52.php';
+if (defined('WRITING_ON_GITHUB_TEST') && WRITING_ON_GITHUB_TEST) {
+	$path = dirname(__FILE__) . '/vendor/autoload_52.php';
 	include_once $path;
 }
 
@@ -41,7 +41,7 @@ 
 // require_once(dirname(__FILE__) . '/views/options.php');
 // require_once(dirname(__FILE__) . '/views/user-setting-field.php');
 
-add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) );
+add_action('plugins_loaded', array(new Writing_On_GitHub, 'boot'));
 
 class Writing_On_GitHub {
 
@@ -138,14 +138,14 @@ 
 	public function __construct() {
 		self::$instance = $this;
 
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->admin = new Writing_On_GitHub_Admin;
 		}
 
-		$this->controller = new Writing_On_GitHub_Controller( $this );
+		$this->controller = new Writing_On_GitHub_Controller($this);
 
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			WP_CLI::add_command( 'wogh', $this->cli() );
+		if (defined('WP_CLI') && WP_CLI) {
+			WP_CLI::add_command('wogh', $this->cli());
 		}
 	}
 
@@ -153,30 +153,30 @@ 
 	 * Attaches the plugin's hooks into WordPress.
 	 */
 	public function boot() {
-		register_activation_hook( __FILE__, array( $this, 'activate' ) );
-		add_action( 'admin_notices', array( $this, 'activation_notice' ) );
+		register_activation_hook(__FILE__, array($this, 'activate'));
+		add_action('admin_notices', array($this, 'activation_notice'));
 
-		add_action( 'init', array( $this, 'l10n' ) );
+		add_action('init', array($this, 'l10n'));
 
 		// Controller actions.
-		add_action( 'save_post', array( $this->controller, 'export_post' ) );
-		add_action( 'delete_post', array( $this->controller, 'delete_post' ) );
-		add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) );
-        add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 );
-		add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 );
-		add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 );
+		add_action('save_post', array($this->controller, 'export_post'));
+		add_action('delete_post', array($this->controller, 'delete_post'));
+		add_action('wp_ajax_nopriv_wogh_push_request', array($this->controller, 'pull_posts'));
+        add_action('wogh_export', array($this->controller, 'export_all'), 10, 2);
+		add_action('wogh_import', array($this->controller, 'import_master'), 10, 1);
+		add_filter('get_edit_post_link', array($this, 'edit_post_link'), 10, 3);
 
 		// add_filter( 'wogh_post_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
 		// add_filter( 'wogh_pre_import_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
-		add_filter( 'the_content', array( $this, 'the_content' ) );
+		add_filter('the_content', array($this, 'the_content'));
 
-		do_action( 'wogh_boot', $this );
+		do_action('wogh_boot', $this);
 	}
 
 	public function edit_post_link($link, $postID, $context) {
-		if ( ! wp_is_post_revision( $postID ) ) {
-			$post = new Writing_On_GitHub_Post( $postID, Writing_On_GitHub::$instance->api() );
-			if ( $post->is_on_github() ) {
+		if ( ! wp_is_post_revision($postID)) {
+			$post = new Writing_On_GitHub_Post($postID, Writing_On_GitHub::$instance->api());
+			if ($post->is_on_github()) {
 				return $post->github_edit_url();
 			}
 		}
@@ -235,29 +235,29 @@ 
 	 * Init i18n files
 	 */
 	public function l10n() {
-		load_plugin_textdomain( self::$text_domain );
+		load_plugin_textdomain(self::$text_domain);
 	}
 
 	/**
 	 * Sets and kicks off the export cronjob
 	 */
-	public function start_export( $force = false ) {
-		$this->start_cron( 'export', $force );
+	public function start_export($force = false) {
+		$this->start_cron('export', $force);
 	}
 
 	/**
 	 * Sets and kicks off the import cronjob
 	 */
 	public function start_import() {
-		$this->start_cron( 'import' );
+		$this->start_cron('import');
 	}
 
 	/**
 	 * Enables the admin notice on initial activation
 	 */
 	public function activate() {
-		if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) {
-			set_transient( '_wogh_activated', 'yes' );
+		if ('yes' !== get_option('_wogh_fully_exported')) {
+			set_transient('_wogh_activated', 'yes');
 		}
 	}
 
@@ -265,18 +265,18 @@ 
 	 * Displays the activation admin notice
 	 */
 	public function activation_notice() {
-		if ( ! get_transient( '_wogh_activated' ) ) {
+		if ( ! get_transient('_wogh_activated')) {
 			return;
 		}
 
-		delete_transient( '_wogh_activated' );
+		delete_transient('_wogh_activated');
 
 		?><div class="updated">
 			<p>
 				<?php
 					printf(
-						__( 'To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github' ),
-						admin_url( 'options-general.php?page=' . static::$text_domain)
+						__('To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github'),
+						admin_url('options-general.php?page=' . static::$text_domain)
 					);
 				?>
 			</p>
@@ -298,7 +298,7 @@ 
 	 * @return Writing_On_GitHub_CLI
 	 */
 	public function cli() {
-		if ( ! $this->cli ) {
+		if ( ! $this->cli) {
 			$this->cli = new Writing_On_GitHub_CLI;
 		}
 
@@ -311,8 +311,8 @@ 
 	 * @return Writing_On_GitHub_Request
 	 */
 	public function request() {
-		if ( ! $this->request ) {
-			$this->request = new Writing_On_GitHub_Request( $this );
+		if ( ! $this->request) {
+			$this->request = new Writing_On_GitHub_Request($this);
 		}
 
 		return $this->request;
@@ -324,8 +324,8 @@ 
 	 * @return Writing_On_GitHub_Response
 	 */
 	public function response() {
-		if ( ! $this->response ) {
-			$this->response = new Writing_On_GitHub_Response( $this );
+		if ( ! $this->response) {
+			$this->response = new Writing_On_GitHub_Response($this);
 		}
 
 		return $this->response;
@@ -337,8 +337,8 @@ 
 	 * @return Writing_On_GitHub_Api
 	 */
 	public function api() {
-		if ( ! $this->api ) {
-			$this->api = new Writing_On_GitHub_Api( $this );
+		if ( ! $this->api) {
+			$this->api = new Writing_On_GitHub_Api($this);
 		}
 
 		return $this->api;
@@ -350,8 +350,8 @@ 
 	 * @return Writing_On_GitHub_Import
 	 */
 	public function import() {
-		if ( ! $this->import ) {
-			$this->import = new Writing_On_GitHub_Import( $this );
+		if ( ! $this->import) {
+			$this->import = new Writing_On_GitHub_Import($this);
 		}
 
 		return $this->import;
@@ -363,8 +363,8 @@ 
 	 * @return Writing_On_GitHub_Export
 	 */
 	public function export() {
-		if ( ! $this->export ) {
-			$this->export = new Writing_On_GitHub_Export( $this );
+		if ( ! $this->export) {
+			$this->export = new Writing_On_GitHub_Export($this);
 		}
 
 		return $this->export;
@@ -376,7 +376,7 @@ 
 	 * @return Writing_On_GitHub_Semaphore
 	 */
 	public function semaphore() {
-		if ( ! $this->semaphore ) {
+		if ( ! $this->semaphore) {
 			$this->semaphore = new Writing_On_GitHub_Semaphore;
 		}
 
@@ -389,8 +389,8 @@ 
 	 * @return Writing_On_GitHub_Database
 	 */
 	public function database() {
-		if ( ! $this->database ) {
-			$this->database = new Writing_On_GitHub_Database( $this );
+		if ( ! $this->database) {
+			$this->database = new Writing_On_GitHub_Database($this);
 		}
 
 		return $this->database;
@@ -402,7 +402,7 @@ 
 	 * @return Writing_On_GitHub_Cache
 	 */
 	public function cache() {
-		if ( ! $this->cache ) {
+		if ( ! $this->cache) {
 			$this->cache = new Writing_On_GitHub_Cache;
 		}
 
@@ -417,18 +417,18 @@ 
 	 * @param mixed $msg
 	 * @param string $write
 	 */
-	public static function write_log( $msg, $write = 'line' ) {
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			if ( is_array( $msg ) || is_object( $msg ) ) {
-				WP_CLI::print_value( $msg );
+	public static function write_log($msg, $write = 'line') {
+		if (defined('WP_CLI') && WP_CLI) {
+			if (is_array($msg) || is_object($msg)) {
+				WP_CLI::print_value($msg);
 			} else {
-				WP_CLI::$write( $msg );
+				WP_CLI::$write($msg);
 			}
-		} elseif ( true === WP_DEBUG ) {
-			if ( is_array( $msg ) || is_object( $msg ) ) {
-				error_log( print_r( $msg, true ) );
+		} elseif (true === WP_DEBUG) {
+			if (is_array($msg) || is_object($msg)) {
+				error_log(print_r($msg, true));
 			} else {
-				error_log( $msg );
+				error_log($msg);
 			}
 		}
 	}
@@ -439,10 +439,10 @@ 
      * @param bool   $force
      * @param string $type
      */
-	protected function start_cron( $type, $force = false ) {
-		update_option( '_wogh_' . $type . '_started', 'yes' );
+	protected function start_cron($type, $force = false) {
+		update_option('_wogh_' . $type . '_started', 'yes');
 		$user_id = get_current_user_id();
-		wp_schedule_single_event( time(), 'wogh_' . $type . '', array( $user_id, $force ) );
+		wp_schedule_single_event(time(), 'wogh_' . $type . '', array($user_id, $force));
 		spawn_cron();
 	}
 }