litefeel / writing-on-github

lib/payload.php

Spacing +11 added lines, -11 removed lines

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

lib/api.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 	 *
 	 * @param Writing_On_GitHub $app Application container.
 	 */
-	public function __construct( Writing_On_GitHub $app ) {
+	public function __construct(Writing_On_GitHub $app) {
 		$this->app = $app;
 	}
 
@@ -45,8 +45,8 @@ 
 	 * @return Writing_On_GitHub_Fetch_Client
 	 */
 	public function fetch() {
-		if ( ! $this->fetch ) {
-			$this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+		if ( ! $this->fetch) {
+			$this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
 		}
 
 		return $this->fetch;
@@ -58,8 +58,8 @@ 
 	 * @return Writing_On_GitHub_Persist_Client
 	 */
 	public function persist() {
-		if ( ! $this->persist ) {
-			$this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+		if ( ! $this->persist) {
+			$this->persist = new Writing_On_GitHub_Persist_Client($this->app);
 		}
 
 		return $this->persist;

lib/fileinfo.php

Spacing +3 added lines, -3 removed lines

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

lib/semaphore.php

Spacing +4 added lines, -4 removed lines

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

lib/cli.php

Spacing +28 added lines, -28 removed lines

@@ -44,28 +44,28 @@ 
 	 *
 	 * @param array $args Command arguments.
 	 */
-	public function export( $args ) {
-		list( $post_id, $user_id ) = $args;
+	public function export($args) {
+		list($post_id, $user_id) = $args;
 
-		if ( ! is_numeric( $user_id ) ) {
-			WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+		if ( ! is_numeric($user_id)) {
+			WP_CLI::error(__('Invalid user ID', 'writing-on-github'));
 		}
 
-		$this->app->export()->set_user( $user_id );
+		$this->app->export()->set_user($user_id);
 
-		if ( 'all' === $post_id ) {
-			WP_CLI::line( __( 'Starting full export to GitHub.', 'writing-on-github' ) );
+		if ('all' === $post_id) {
+			WP_CLI::line(__('Starting full export to GitHub.', 'writing-on-github'));
 			$this->app->controller()->export_all();
-		} elseif ( is_numeric( $post_id ) ) {
+		} elseif (is_numeric($post_id)) {
 			WP_CLI::line(
 				sprintf(
-					__( 'Exporting post ID to GitHub: %d', 'writing-on-github' ),
+					__('Exporting post ID to GitHub: %d', 'writing-on-github'),
 					$post_id
 				)
 			);
-			$this->app->controller()->export_post( (int) $post_id );
+			$this->app->controller()->export_post((int) $post_id);
 		} else {
-			WP_CLI::error( __( 'Invalid post ID', 'writing-on-github' ) );
+			WP_CLI::error(__('Invalid post ID', 'writing-on-github'));
 		}
 	}
 
@@ -86,16 +86,16 @@ 
 	 *
 	 * @param array $args Command arguments.
 	 */
-	public function import( $args ) {
-		list( $user_id ) = $args;
+	public function import($args) {
+		list($user_id) = $args;
 
-		if ( ! is_numeric( $user_id ) ) {
-			WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
+		if ( ! is_numeric($user_id)) {
+			WP_CLI::error(__('Invalid user ID', 'writing-on-github'));
 		}
 
-		update_option( '_wogh_export_user_id', (int) $user_id );
+		update_option('_wogh_export_user_id', (int) $user_id);
 
-		WP_CLI::line( __( 'Starting import from GitHub.', 'writing-on-github' ) );
+		WP_CLI::line(__('Starting import from GitHub.', 'writing-on-github'));
 
 		$this->app->controller()->import_master();
 	}
@@ -119,40 +119,40 @@ 
 	 * @param array $args Command arguments.
 	 * @param array $assoc_args Command associated arguments.
 	 */
-	public function prime( $args, $assoc_args ) {
-		if ( isset( $assoc_args['branch'] ) ) {
-			WP_CLI::line( __( 'Starting branch import.', 'writing-on-github' ) );
+	public function prime($args, $assoc_args) {
+		if (isset($assoc_args['branch'])) {
+			WP_CLI::line(__('Starting branch import.', 'writing-on-github'));
 
 			$commit = $this->app->api()->fetch()->master();
 
-			if ( is_wp_error( $commit ) ) {
+			if (is_wp_error($commit)) {
 				WP_CLI::error(
 					sprintf(
-						__( 'Failed to import and cache branch with error: %s', 'writing-on-github' ),
+						__('Failed to import and cache branch with error: %s', 'writing-on-github'),
 						$commit->get_error_message()
 					)
 				);
 			} else {
 				WP_CLI::success(
 					sprintf(
-						__( 'Successfully imported and cached commit %s from branch.', 'writing-on-github' ),
+						__('Successfully imported and cached commit %s from branch.', 'writing-on-github'),
 						$commit->sha()
 					)
 				);
 			}
-		} else if ( isset( $assoc_args['sha'] ) ) {
-			WP_CLI::line( 'Starting sha import.' );
+		} else if (isset($assoc_args['sha'])) {
+			WP_CLI::line('Starting sha import.');
 
-			$commit = $this->app->api()->fetch()->commit( $assoc_args['sha'] );
+			$commit = $this->app->api()->fetch()->commit($assoc_args['sha']);
 
 			WP_CLI::success(
 				sprintf(
-					__( 'Successfully imported and cached commit %s.', 'writing-on-github' ),
+					__('Successfully imported and cached commit %s.', 'writing-on-github'),
 					$commit->sha()
 				)
 			);
 		} else {
-			WP_CLI::error( 'Invalid fetch.' );
+			WP_CLI::error('Invalid fetch.');
 		}
 	}
 }

views/textarea-setting-field.php

Spacing +3 added lines, -3 removed lines

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

views/user-setting-field.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<select name="<?php echo esc_attr( $args['name'] ) ?>" id="<?php echo esc_attr( $args['name'] ) ?>">
-	<?php foreach ( get_users() as $user ) : ?>
-		<option value="<?php echo esc_attr( $user->ID ); ?>"<?php echo (int) $value === $user->ID ? ' selected' : '';?>>
-			<?php echo esc_html( $user->display_name ); ?>
+<?php $value = get_option($args['name'], $args['default']); ?>
+<select name="<?php echo esc_attr($args['name']) ?>" id="<?php echo esc_attr($args['name']) ?>">
+	<?php foreach (get_users() as $user) : ?>
+		<option value="<?php echo esc_attr($user->ID); ?>"<?php echo (int) $value === $user->ID ? ' selected' : ''; ?>>
+			<?php echo esc_html($user->display_name); ?>
 		</option>
 	<?php endforeach; ?>
 </select>

views/setting-field.php

Spacing +2 added lines, -2 removed lines

@@ -5,6 +5,6 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<input name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr( $value ); ?>" />
+<?php $value = get_option($args['name'], $args['default']); ?>
+<input name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr($value); ?>" />
 <p class="description"><?php echo $args['help_text']; ?></p>

tests/unit/client/test-fetch.php

Doc Comments +3 added lines

@@ -159,6 +159,9 @@
 	// 	}
 	// }
 
+	/**
+	 * @param string $repo
+	 */
 	protected function malformed_repo( $repo ) {
 		update_option( Base::REPO_OPTION_KEY, $repo );
 

Spacing +35 added lines, -35 removed lines

@@ -9,77 +9,77 @@ 
 	public function setUp() {
 		parent::setUp();
 
-		$this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+		$this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
 		$this->api_cache
-			->shouldReceive( 'fetch_blob' )
-			->andReturn( false )
+			->shouldReceive('fetch_blob')
+			->andReturn(false)
 			->byDefault();
 	}
 
 	public function test_should_fail_if_missing_token() {
-		delete_option( Base::TOKEN_OPTION_KEY );
+		delete_option(Base::TOKEN_OPTION_KEY);
 
-		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-		$this->assertSame( 'missing_token', $error->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+		$this->assertSame('missing_token', $error->get_error_code());
 	}
 
 	public function test_should_fail_if_missing_repo() {
-		delete_option( Base::REPO_OPTION_KEY );
+		delete_option(Base::REPO_OPTION_KEY);
 
-		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-		$this->assertSame( 'missing_repository', $error->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+		$this->assertSame('missing_repository', $error->get_error_code());
 	}
 
 	public function test_should_fail_if_malformed_repo() {
 		// If you find a particular name passing that shouldn't,
 		// add it to the list here and make it pass.
-		$this->malformed_repo( 'repositoryname' );
+		$this->malformed_repo('repositoryname');
 	}
 
 	public function test_should_return_files_with_tree() {
 		// $this->set_get_refs_heads_master( true );
 		// $this->set_get_commits( true );
-		$this->set_get_trees( true, 'master' );
+		$this->set_get_trees(true, 'master');
 
-		$this->assertCount( 3, $this->fetch->tree_recursive() );
+		$this->assertCount(3, $this->fetch->tree_recursive());
 	}
 
 	public function test_should_fail_if_cant_fetch_tree() {
-		$this->set_get_trees( false, 'master' );
+		$this->set_get_trees(false, 'master');
 
-		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-		$this->assertSame( '422_unprocessable_entity', $error->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+		$this->assertSame('422_unprocessable_entity', $error->get_error_code());
 	}
 
 	public function test_should_return_commit_with_blobs_from_cache() {
-		$this->set_get_trees( true, 'master' );
-		$this->set_get_blobs( true );
+		$this->set_get_trees(true, 'master');
+		$this->set_get_blobs(true);
 		$this->api_cache
-			->shouldReceive( 'fetch_blob' )
-			->times( 3 )
-			->with( Mockery::anyOf(
+			->shouldReceive('fetch_blob')
+			->times(3)
+			->with(Mockery::anyOf(
 				'9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
 				'8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
 				'2d73165945b0ccbe4932f1363457986b0ed49f19'
-			) )
-			->andReturn( $this->blob );
+			))
+			->andReturn($this->blob);
 
-		$this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+		$this->assertCount(3, $files = $this->fetch->tree_recursive());
 
-		foreach ( $files as $file ) {
-			$this->assertSame( $this->blob, $this->fetch->blob( $file ) );
+		foreach ($files as $file) {
+			$this->assertSame($this->blob, $this->fetch->blob($file));
 		}
 	}
 
 	public function test_should_return_commit_with_no_blobs_if_api_fails() {
-		$this->set_get_trees( true, 'master' );
-		$this->set_get_blobs( false );
+		$this->set_get_trees(true, 'master');
+		$this->set_get_blobs(false);
 
-		$this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+		$this->assertCount(3, $files = $this->fetch->tree_recursive());
 
-		foreach ( $files as $file ) {
-			$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->blob( $file ) );
-			$this->assertSame( '404_not_found', $error->get_error_code() );
+		foreach ($files as $file) {
+			$this->assertInstanceOf('WP_Error', $error = $this->fetch->blob($file));
+			$this->assertSame('404_not_found', $error->get_error_code());
 		}
 	}
 
@@ -159,10 +159,10 @@ 
 	// 	}
 	// }
 
-	protected function malformed_repo( $repo ) {
-		update_option( Base::REPO_OPTION_KEY, $repo );
+	protected function malformed_repo($repo) {
+		update_option(Base::REPO_OPTION_KEY, $repo);
 
-		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-		$this->assertSame( 'malformed_repository', $error->get_error_code() );
+		$this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+		$this->assertSame('malformed_repository', $error->get_error_code());
 	}
 }