litefeel / writing-on-github

tests/include/bootstrap.php

Spacing +9 added lines, -9 removed lines

@@ -1,23 +1,23 @@
 <?php
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
+$_tests_dir = getenv('WP_TESTS_DIR');
+if ( ! $_tests_dir) {
 	$_tests_dir = '/tmp/wordpress-tests-lib';
 }
 
-define( 'WRITING_ON_GITHUB_TEST', true );
+define('WRITING_ON_GITHUB_TEST', true);
 
 require_once $_tests_dir . '/includes/functions.php';
 
 function _manually_load_plugin() {
-	require dirname( __FILE__ ) . '/../../writing-on-github.php';
-	remove_action( 'plugins_loaded', array( Writing_On_GitHub::$instance, 'boot' ) );
+	require dirname(__FILE__) . '/../../writing-on-github.php';
+	remove_action('plugins_loaded', array(Writing_On_GitHub::$instance, 'boot'));
 }
 
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
 require $_tests_dir . '/includes/bootstrap.php';
 
-require dirname( __FILE__ ) . '/../../vendor/jdgrimes/wp-http-testcase/wp-http-testcase.php';
-require dirname( __FILE__ ) . '/../../tests/include/testcase.php';
+require dirname(__FILE__) . '/../../vendor/jdgrimes/wp-http-testcase/wp-http-testcase.php';
+require dirname(__FILE__) . '/../../tests/include/testcase.php';
 
-error_reporting( E_ALL ^ E_DEPRECATED );
+error_reporting(E_ALL ^ E_DEPRECATED);

tests/include/testcase.php

Spacing +39 added lines, -39 removed lines

@@ -85,69 +85,69 @@
 	public function setUp() {
 		parent::setUp();
 
-		$this->data_dir = dirname( __DIR__ ) . '/data/';
-
-		$this->app        = Mockery::mock( 'Writing_On_GitHub' );
-		$this->controller = Mockery::mock( 'Writing_On_GitHub_Controller' );
-		$this->request    = Mockery::mock( 'Writing_On_GitHub_Request' );
-		$this->import     = Mockery::mock( 'Writing_On_GitHub_Import' );
-		$this->export     = Mockery::mock( 'Writing_On_GitHub_Export' );
-		$this->response   = Mockery::mock( 'Writing_On_GitHub_Response' );
-		$this->payload    = Mockery::mock( 'Writing_On_GitHub_Payload' );
-		$this->api        = Mockery::mock( 'Writing_On_GitHub_Api' );
-		$this->semaphore  = Mockery::mock( 'Writing_On_GitHub_Semaphore' );
-		$this->database   = Mockery::mock( 'Writing_On_GitHub_Database' );
-		$this->post       = Mockery::mock( 'Writing_On_GitHub_Post' );
-		$this->blob       = Mockery::mock( 'Writing_On_GitHub_Blob' );
-		$this->api_cache  = Mockery::mock( 'Writing_On_GitHub_Cache' );
-		$this->fetch      = Mockery::mock( 'Writing_On_GitHub_Fetch_Client' );
-		$this->persist    = Mockery::mock( 'Writing_On_GitHub_Persist_Client' );
+		$this->data_dir = dirname(__DIR__) . '/data/';
+
+		$this->app        = Mockery::mock('Writing_On_GitHub');
+		$this->controller = Mockery::mock('Writing_On_GitHub_Controller');
+		$this->request    = Mockery::mock('Writing_On_GitHub_Request');
+		$this->import     = Mockery::mock('Writing_On_GitHub_Import');
+		$this->export     = Mockery::mock('Writing_On_GitHub_Export');
+		$this->response   = Mockery::mock('Writing_On_GitHub_Response');
+		$this->payload    = Mockery::mock('Writing_On_GitHub_Payload');
+		$this->api        = Mockery::mock('Writing_On_GitHub_Api');
+		$this->semaphore  = Mockery::mock('Writing_On_GitHub_Semaphore');
+		$this->database   = Mockery::mock('Writing_On_GitHub_Database');
+		$this->post       = Mockery::mock('Writing_On_GitHub_Post');
+		$this->blob       = Mockery::mock('Writing_On_GitHub_Blob');
+		$this->api_cache  = Mockery::mock('Writing_On_GitHub_Cache');
+		$this->fetch      = Mockery::mock('Writing_On_GitHub_Fetch_Client');
+		$this->persist    = Mockery::mock('Writing_On_GitHub_Persist_Client');
 
 		Writing_On_GitHub::$instance = $this->app;
 
 		$this->app
-			->shouldReceive( 'request' )
-			->andReturn( $this->request )
+			->shouldReceive('request')
+			->andReturn($this->request)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'import' )
-			->andReturn( $this->import )
+			->shouldReceive('import')
+			->andReturn($this->import)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'export' )
-			->andReturn( $this->export )
+			->shouldReceive('export')
+			->andReturn($this->export)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'response' )
-			->andReturn( $this->response )
+			->shouldReceive('response')
+			->andReturn($this->response)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'api' )
-			->andReturn( $this->api )
+			->shouldReceive('api')
+			->andReturn($this->api)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'semaphore' )
-			->andReturn( $this->semaphore )
+			->shouldReceive('semaphore')
+			->andReturn($this->semaphore)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'database' )
-			->andReturn( $this->database )
+			->shouldReceive('database')
+			->andReturn($this->database)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'blob' )
-			->andReturn( $this->blob )
+			->shouldReceive('blob')
+			->andReturn($this->blob)
 			->byDefault();
 		$this->app
-			->shouldReceive( 'cache' )
-			->andReturn( $this->api_cache )
+			->shouldReceive('cache')
+			->andReturn($this->api_cache)
 			->byDefault();
 		$this->api
-			->shouldReceive( 'fetch' )
-			->andReturn( $this->fetch )
+			->shouldReceive('fetch')
+			->andReturn($this->fetch)
 			->byDefault();
 		$this->api
-			->shouldReceive( 'persist' )
-			->andReturn( $this->persist )
+			->shouldReceive('persist')
+			->andReturn($this->persist)
 			->byDefault();
 	}
 

tests/unit/client/test-base.php

Spacing +63 added lines, -63 removed lines

@@ -31,10 +31,10 @@ 
 		parent::setUp();
 
 		WP_HTTP_TestCase::init();
-		update_option( 'wogh_repository', self::REPO_OPTION_VALUE );
-		update_option( 'wogh_oauth_token', self::TOKEN_OPTION_VALUE );
-		update_option( 'wogh_host', self::HOST_OPTION_VALUE );
-		$this->http_responder = array( $this, 'mock_github_api' );
+		update_option('wogh_repository', self::REPO_OPTION_VALUE);
+		update_option('wogh_oauth_token', self::TOKEN_OPTION_VALUE);
+		update_option('wogh_host', self::HOST_OPTION_VALUE);
+		$this->http_responder = array($this, 'mock_github_api');
 	}
 
 	/**
@@ -43,45 +43,45 @@ 
 	 *
 	 * @return void|string
 	 */
-	public function mock_github_api( $request, $url ) {
-		$host_length = strlen( self::HOST_OPTION_VALUE );
+	public function mock_github_api($request, $url) {
+		$host_length = strlen(self::HOST_OPTION_VALUE);
 
-		if ( self::HOST_OPTION_VALUE !== substr( $url, 0, $host_length ) ) {
-			$this->assertTrue( false, 'Called wrong host.' );
+		if (self::HOST_OPTION_VALUE !== substr($url, 0, $host_length)) {
+			$this->assertTrue(false, 'Called wrong host.');
 		}
 
 		if (
-			! isset( $request['headers']['Authorization'] ) ||
+			! isset($request['headers']['Authorization']) ||
 			'token ' . self::TOKEN_OPTION_VALUE !== $request['headers']['Authorization']
 		) {
-			$this->assertTrue( false, 'Missing authorization key.' );
+			$this->assertTrue(false, 'Missing authorization key.');
 		}
 
-		$url = explode( '/', substr( $url, $host_length + 1 ) );
+		$url = explode('/', substr($url, $host_length + 1));
 
-		if ( 'repos' !== $url[0] ) {
-			$this->assertTrue( false, 'Called wrong endpoint.' );
+		if ('repos' !== $url[0]) {
+			$this->assertTrue(false, 'Called wrong endpoint.');
 		}
 
 		$repo = $url[1] . '/' . $url[2];
 
-		if ( self::REPO_OPTION_VALUE !== $repo ) {
-			$this->assertTrue( false, 'Called wrong repo.' );
+		if (self::REPO_OPTION_VALUE !== $repo) {
+			$this->assertTrue(false, 'Called wrong repo.');
 		}
 
-		$parts = array_slice( $url, 4 );
-		array_unshift( $parts, strtolower( $request['method'] ) );
-		$endpoint = implode( '_', $parts );
-		$endpoint = str_replace( '?recursive=1', '', $endpoint );
-		$this->assertTrue( call_user_func( static::$validations[ $endpoint ], $request ), 'Request did not validate.' );
+		$parts = array_slice($url, 4);
+		array_unshift($parts, strtolower($request['method']));
+		$endpoint = implode('_', $parts);
+		$endpoint = str_replace('?recursive=1', '', $endpoint);
+		$this->assertTrue(call_user_func(static::$validations[$endpoint], $request), 'Request did not validate.');
 
-		return static::$responses[ $endpoint ];
+		return static::$responses[$endpoint];
 	}
 
-	protected function set_get_refs_heads_master( $succeed ) {
+	protected function set_get_refs_heads_master($succeed) {
 		$this->set_endpoint(
-			function ( $request ) {
-				if ( '[]' === $request['body'] ) {
+			function($request) {
+				if ('[]' === $request['body']) {
 					return false;
 				}
 
@@ -90,10 +90,10 @@ 
 		);
 	}
 
-	protected function set_get_commits( $succeed ) {
+	protected function set_get_commits($succeed) {
 		$this->set_endpoint(
-			function ( $request ) {
-				if ( '[]' === $request['body'] ) {
+			function($request) {
+				if ('[]' === $request['body']) {
 					return false;
 				}
 
@@ -102,10 +102,10 @@ 
 		);
 	}
 
-	protected function set_get_trees( $succeed, $sha = '' ) {
+	protected function set_get_trees($succeed, $sha = '') {
 		$this->set_endpoint(
-			function ( $request ) {
-				if ( '[]' === $request['body'] ) {
+			function($request) {
+				if ('[]' === $request['body']) {
 					return false;
 				}
 
@@ -115,17 +115,17 @@ 
 		);
 	}
 
-	protected function set_get_blobs( $succeed ) {
+	protected function set_get_blobs($succeed) {
 		$shas = array(
 			'9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
 			'8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
 			'2d73165945b0ccbe4932f1363457986b0ed49f19',
 		);
 
-		foreach ( $shas as $sha ) {
+		foreach ($shas as $sha) {
 			$this->set_endpoint(
-				function ( $request ) {
-					if ( '[]' === $request['body'] ) {
+				function($request) {
+					if ('[]' === $request['body']) {
 						return false;
 					}
 
@@ -135,26 +135,26 @@ 
 		}
 	}
 
-	protected function set_post_trees( $succeed ) {
+	protected function set_post_trees($succeed) {
 		$this->set_endpoint(
-			function ( $request ) {
-				$body = json_decode( $request['body'], true );
+			function($request) {
+				$body = json_decode($request['body'], true);
 
-				if ( ! isset( $body['tree'] ) ) {
+				if ( ! isset($body['tree'])) {
 					return false;
 				}
 
-				if ( 1 !== count( $body['tree'] ) ) {
+				if (1 !== count($body['tree'])) {
 					return false;
 				}
 
-				$blob = reset( $body['tree'] );
+				$blob = reset($body['tree']);
 
 				if (
-					! isset( $blob['path'] ) ||
-					! isset( $blob['type'] ) ||
-					! isset( $blob['content'] ) ||
-					! isset( $blob['mode'] )
+					! isset($blob['path']) ||
+					! isset($blob['type']) ||
+					! isset($blob['content']) ||
+					! isset($blob['mode'])
 				) {
 					return false;
 				}
@@ -166,25 +166,25 @@ 
 		);
 	}
 
-	protected function set_post_commits( $succeed, $anonymous = true ) {
+	protected function set_post_commits($succeed, $anonymous = true) {
 		$this->set_endpoint(
-			function ( $request ) use ( $anonymous ) {
-				$body = json_decode( $request['body'], true );
+			function($request) use ($anonymous) {
+				$body = json_decode($request['body'], true);
 
 				if (
-					! isset( $body['tree'] ) ||
-					! isset( $body['message'] ) ||
-					! isset( $body['parents'] ) ||
-					! isset( $body['author'] )
+					! isset($body['tree']) ||
+					! isset($body['message']) ||
+					! isset($body['parents']) ||
+					! isset($body['author'])
 				) {
 					return false;
 				}
 
-				if ( 1 !== count( $body['parents'] ) ) {
+				if (1 !== count($body['parents'])) {
 					return false;
 				}
 
-				if ( ! $anonymous ) {
+				if ( ! $anonymous) {
 					if (
 						'James DiGioia' !== $body['author']['name'] ||
 						'jamesorodig@gmail.com' !== $body['author']['email']
@@ -207,12 +207,12 @@ 
 		);
 	}
 
-	protected function set_patch_refs_heads_master( $succeed ) {
+	protected function set_patch_refs_heads_master($succeed) {
 		$this->set_endpoint(
-			function ( $request ) {
-				$body = json_decode( $request['body'], true );
+			function($request) {
+				$body = json_decode($request['body'], true);
 
-				if ( ! isset( $body['sha'] ) ) {
+				if ( ! isset($body['sha'])) {
 					return false;
 				}
 
@@ -223,18 +223,18 @@ 
 		);
 	}
 
-	private function set_endpoint( $validation, $status, $succeed, $sha = '' ) {
-		list( , $caller ) = debug_backtrace( false );
-		$endpoint = substr( $caller['function'], 4 ) . ( $sha ? "_$sha" : '' );
+	private function set_endpoint($validation, $status, $succeed, $sha = '') {
+		list(, $caller) = debug_backtrace(false);
+		$endpoint = substr($caller['function'], 4) . ($sha ? "_$sha" : '');
 
-		static::$validations[ $endpoint ] = $validation;
+		static::$validations[$endpoint] = $validation;
 
-		static::$responses[ $endpoint ] = array(
+		static::$responses[$endpoint] = array(
 			'headers' => array(
 				'status' => $status,
 			),
 			'body'    => file_get_contents(
-				$this->data_dir . $endpoint . '_' . ( $succeed ? 'succeed' : 'fail' ) . '.json'
+				$this->data_dir . $endpoint . '_' . ($succeed ? 'succeed' : 'fail') . '.json'
 			),
 		);
 	}

views/options.php

Spacing +10 added lines, -10 removed lines

@@ -6,24 +6,24 @@
 
 ?>
 <div class="wrap">
-	<h2><?php esc_html_e( 'Writing On GitHub', 'writing-on-github' ); ?></h2>
+	<h2><?php esc_html_e('Writing On GitHub', 'writing-on-github'); ?></h2>
 
 	<form method="post" action="options.php">
-		<?php settings_fields( Writing_On_GitHub::$text_domain ); ?>
-		<?php do_settings_sections( Writing_On_GitHub::$text_domain ); ?>
+		<?php settings_fields(Writing_On_GitHub::$text_domain); ?>
+		<?php do_settings_sections(Writing_On_GitHub::$text_domain); ?>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Webhook callback', 'writing-on-github' ); ?></th>
-				<td><code><?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>?action=wogh_push_request</code></td>
+				<th scope="row"><?php esc_html_e('Webhook callback', 'writing-on-github'); ?></th>
+				<td><code><?php echo esc_url(admin_url('admin-ajax.php')); ?>?action=wogh_push_request</code></td>
 			</tr>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Bulk actions', 'writing-on-github' ); ?></th>
+				<th scope="row"><?php esc_html_e('Bulk actions', 'writing-on-github'); ?></th>
 				<td>
-					<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'export' ) ) ); ?>">
-						<?php esc_html_e( 'Export to GitHub', 'writing-on-github' ); ?>
+					<a href="<?php echo esc_url(add_query_arg(array('action' => 'export'))); ?>">
+						<?php esc_html_e('Export to GitHub', 'writing-on-github'); ?>
 					</a> |
-					<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'import' ) ) ); ?>">
-						<?php esc_html_e( 'Import from GitHub', 'writing-on-github' ); ?>
+					<a href="<?php echo esc_url(add_query_arg(array('action' => 'import'))); ?>">
+						<?php esc_html_e('Import from GitHub', 'writing-on-github'); ?>
 					</a>
 				</td>
 		</table>

lib/blob.php

Spacing +24 added lines, -24 removed lines

@@ -49,8 +49,8 @@ 
 	 *
 	 * @param stdClass $data Raw blob data.
 	 */
-	public function __construct( stdClass $data ) {
-		$this->interpret_data( $data );
+	public function __construct(stdClass $data) {
+		$this->interpret_data($data);
 	}
 
 	public function id() {
@@ -78,12 +78,12 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set_content( $content, $base64 = false ) {
-		if ( $base64 ) {
-			$content = base64_decode( $content );
+	public function set_content($content, $base64 = false) {
+		if ($base64) {
+			$content = base64_decode($content);
 		}
 
-		$this->frontmatter = '---' === substr( $this->content = $content, 0, 3 ) ? true : false;
+		$this->frontmatter = '---' === substr($this->content = $content, 0, 3) ? true : false;
 
 		return $this;
 	}
@@ -122,20 +122,20 @@ 
 	public function content_import() {
 		$content = $this->content();
 
-		if ( $this->has_frontmatter() ) {
+		if ($this->has_frontmatter()) {
 			// Break out content.
-			preg_match( '/(^---(.*?)---$)?(.*)/ms', $content, $matches );
-			$content = array_pop( $matches );
+			preg_match('/(^---(.*?)---$)?(.*)/ms', $content, $matches);
+			$content = array_pop($matches);
 		}
 
-		if ( function_exists( 'wpmarkdown_markdown_to_html' ) ) {
-			$content = wpmarkdown_markdown_to_html( $content );
+		if (function_exists('wpmarkdown_markdown_to_html')) {
+			$content = wpmarkdown_markdown_to_html($content);
 		}
 
 		/**
 		 * Filters the content for import.
 		 */
-		return apply_filters( 'wogh_content_import', trim( $content ) );
+		return apply_filters('wogh_content_import', trim($content));
 	}
 
 	/**
@@ -146,14 +146,14 @@ 
 	public function meta() {
 		$meta = array();
 
-		if ( $this->has_frontmatter() ) {
+		if ($this->has_frontmatter()) {
 			// Break out meta, if present.
-			preg_match( '/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches );
-			array_pop( $matches );
+			preg_match('/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches);
+			array_pop($matches);
 
-			$meta = spyc_load( $matches[2] );
-			if ( isset( $meta['permalink'] ) ) {
-				$meta['permalink'] = str_replace( home_url(), '', $meta['permalink'] );
+			$meta = spyc_load($matches[2]);
+			if (isset($meta['permalink'])) {
+				$meta['permalink'] = str_replace(home_url(), '', $meta['permalink']);
 			}
 		}
 
@@ -195,7 +195,7 @@ 
 		// $data->type = 'blob';
 
 		$data->path = $this->path();
-		$data->content = base64_encode( $this->content() );
+		$data->content = base64_encode($this->content());
 		$data->sha = $this->sha;
 
 		return $data;
@@ -204,13 +204,13 @@ 
 	/**
 	 * Interprets the blob's data into properties.
 	 */
-	protected function interpret_data( $data ) {
-		$this->sha  = isset( $data->sha  ) ? $data->sha  : '';
-		$this->path = isset( $data->path ) ? $data->path : '';
+	protected function interpret_data($data) {
+		$this->sha  = isset($data->sha) ? $data->sha : '';
+		$this->path = isset($data->path) ? $data->path : '';
 
 		$this->set_content(
-			isset( $data->content ) ? trim( $data->content ) : '',
-			isset( $data->encoding ) && 'base64' === $data->encoding ? true : false
+			isset($data->content) ? trim($data->content) : '',
+			isset($data->encoding) && 'base64' === $data->encoding ? true : false
 		);
 	}
 }

lib/admin.php

Spacing +60 added lines, -60 removed lines

@@ -13,16 +13,16 @@ 
 	 * Hook into GitHub API
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-		add_action( 'admin_init', array( $this, 'register_settings' ) );
-		add_action( 'current_screen', array( $this, 'trigger_cron' ) );
+		add_action('admin_menu', array($this, 'add_admin_menu'));
+		add_action('admin_init', array($this, 'register_settings'));
+		add_action('current_screen', array($this, 'trigger_cron'));
 	}
 
 	/**
 	 * Callback to render the settings page view
 	 */
 	public function settings_page() {
-		include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+		include dirname(dirname(__FILE__)) . '/views/options.php';
 	}
 
 	/**
@@ -32,63 +32,63 @@ 
 		add_settings_section(
 			'general',
 			'General Settings',
-			array( $this, 'section_callback' ),
+			array($this, 'section_callback'),
 			Writing_On_GitHub::$text_domain
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
-		add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_host');
+		add_settings_field('wogh_host', __('GitHub hostname', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => 'https://api.github.com',
 				'name'      => 'wogh_host',
-				'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
+				'help_text' => __('The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
-		add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_repository');
+		add_settings_field('wogh_repository', __('Repository', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_repository',
-				'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
+				'help_text' => __('The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
-		add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_branch');
+		add_settings_field('wogh_branch', __('Branch', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => 'master',
 				'name'      => 'wogh_branch',
-				'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
+				'help_text' => __('The GitHub branch to commit to, default is master.', 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
-		add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_oauth_token');
+		add_settings_field('wogh_oauth_token', __('Oauth Token', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_oauth_token',
-				'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
+				'help_text' => __("A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
-		add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_secret');
+		add_settings_field('wogh_secret', __('Webhook Secret', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_secret',
-				'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
+				'help_text' => __("The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
-		add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_default_user');
+		add_settings_field('wogh_default_user', __('Default Import User', 'writing-on-github'), array(&$this, 'user_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_default_user',
-				'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
+				'help_text' => __('The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github'),
 			)
 		);
 
-		register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
-		add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		register_setting(Writing_On_GitHub::$text_domain, 'wogh_ignore_metas');
+		add_settings_field('wogh_ignore_metas', __('Ignore post metas', 'writing-on-github'), array(&$this, 'textarea_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
 				'default'   => '',
 				'name'      => 'wogh_ignore_metas',
-				'help_text' => __( 'These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github' ),
+				'help_text' => __('These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github'),
 			)
 		);
 	}
@@ -98,8 +98,8 @@ 
 	 *
 	 * @param array $args Field arguments.
 	 */
-	public function field_callback( $args ) {
-		include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+	public function field_callback($args) {
+		include dirname(dirname(__FILE__)) . '/views/setting-field.php';
 	}
 
 	/**
@@ -107,8 +107,8 @@ 
 	 *
 	 * @param array $args Field arguments.
 	 */
-	public function user_field_callback( $args ) {
-		include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+	public function user_field_callback($args) {
+		include dirname(dirname(__FILE__)) . '/views/user-setting-field.php';
 	}
 
 	/**
@@ -116,58 +116,58 @@ 
 	 *
 	 * @param array $args Field arguments.
 	 */
-	public function textarea_field_callback( $args ) {
-		include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+	public function textarea_field_callback($args) {
+		include dirname(dirname(__FILE__)) . '/views/textarea-setting-field.php';
 	}
 
 	/**
 	 * Displays settings messages from background processes
 	 */
 	public function section_callback() {
-		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+		if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
 			return;
 		}
 
-		if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+		if ('yes' === get_option('_wogh_export_started')) { ?>
 			<div class="updated">
-				<p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
+				<p><?php esc_html_e('Export to GitHub started.', 'writing-on-github'); ?></p>
 			</div><?php
-			delete_option( '_wogh_export_started' );
+			delete_option('_wogh_export_started');
 		}
 
-		if ( $message = get_option( '_wogh_export_error' ) ) { ?>
+		if ($message = get_option('_wogh_export_error')) { ?>
 			<div class="error">
-				<p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+				<p><?php esc_html_e('Export to GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
 			</div><?php
-			delete_option( '_wogh_export_error' );
+			delete_option('_wogh_export_error');
 		}
 
-		if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
+		if ('yes' === get_option('_wogh_export_complete')) { ?>
 			<div class="updated">
-				<p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
+				<p><?php esc_html_e('Export to GitHub completed successfully.', 'writing-on-github'); ?></p>
 			</div><?php
-			delete_option( '_wogh_export_complete' );
+			delete_option('_wogh_export_complete');
 		}
 
-		if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
+		if ('yes' === get_option('_wogh_import_started')) { ?>
 			<div class="updated">
-			<p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
+			<p><?php esc_html_e('Import from GitHub started.', 'writing-on-github'); ?></p>
 			</div><?php
-			delete_option( '_wogh_import_started' );
+			delete_option('_wogh_import_started');
 		}
 
-		if ( $message = get_option( '_wogh_import_error' ) ) { ?>
+		if ($message = get_option('_wogh_import_error')) { ?>
 			<div class="error">
-			<p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+			<p><?php esc_html_e('Import from GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
 			</div><?php
-			delete_option( '_wogh_import_error' );
+			delete_option('_wogh_import_error');
 		}
 
-		if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
+		if ('yes' === get_option('_wogh_import_complete')) { ?>
 			<div class="updated">
-			<p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
+			<p><?php esc_html_e('Import from GitHub completed successfully.', 'writing-on-github'); ?></p>
 			</div><?php
-			delete_option( '_wogh_import_complete' );
+			delete_option('_wogh_import_complete');
 		}
 	}
 
@@ -176,11 +176,11 @@ 
 	 */
 	public function add_admin_menu() {
 		add_options_page(
-			__( 'Writing On GitHub', 'writing-on-github' ),
-			__( 'Writing On GitHub', 'writing-on-github' ),
+			__('Writing On GitHub', 'writing-on-github'),
+			__('Writing On GitHub', 'writing-on-github'),
 			'manage_options',
 			Writing_On_GitHub::$text_domain,
-			array( $this, 'settings_page' )
+			array($this, 'settings_page')
 		);
 	}
 
@@ -188,27 +188,27 @@ 
 	 * Admin callback to trigger import/export because WordPress admin routing lol
 	 */
 	public function trigger_cron() {
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			return;
 		}
 
-		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+		if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
 			return;
 		}
 
-		if ( ! isset( $_GET['action'] ) ) {
+		if ( ! isset($_GET['action'])) {
 			return;
 		}
 
-		if ( 'export' === $_GET['action'] ) {
+		if ('export' === $_GET['action']) {
 			Writing_On_GitHub::$instance->start_export();
 		}
 
-		if ( 'import' === $_GET['action'] ) {
+		if ('import' === $_GET['action']) {
 			Writing_On_GitHub::$instance->start_import();
 		}
 
-		wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+		wp_redirect(admin_url('options-general.php?page=writing-on-github'));
 		die;
 	}
 }

lib/post.php

Spacing +63 added lines, -63 removed lines

@@ -60,26 +60,26 @@ 
 	 *
 	 * @todo remove database operations from this method
 	 */
-	public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
+	public function __construct($id_or_args, Writing_On_GitHub_Api $api) {
 		$this->api = $api;
 
-		if ( is_numeric( $id_or_args ) ) {
+		if (is_numeric($id_or_args)) {
 			$this->id   = (int) $id_or_args;
-			$this->post = get_post( $this->id );
+			$this->post = get_post($this->id);
 			$this->new  = false;
 		}
 
-		if ( is_array( $id_or_args ) ) {
+		if (is_array($id_or_args)) {
 			$this->args = $id_or_args;
 
-			if ( isset( $this->args['ID'] ) ) {
-				$this->post = get_post( $this->args['ID'] );
+			if (isset($this->args['ID'])) {
+				$this->post = get_post($this->args['ID']);
 
-				if ( $this->post ) {
+				if ($this->post) {
 					$this->id  = $this->post->ID;
 					$this->new = false;
 				} else {
-					unset( $this->args['ID'] );
+					unset($this->args['ID']);
 				}
 			}
 		}
@@ -115,7 +115,7 @@ 
 	 * @return bool
 	 */
 	public function has_password() {
-		return ! empty( $this->post->post_password );
+		return ! empty($this->post->post_password);
 	}
 
 	/**
@@ -123,9 +123,9 @@ 
 	 */
 	public function github_content() {
 		$content = $this->front_matter() . $this->post_content();
-		$ending  = apply_filters( 'wogh_line_endings', "\n" );
+		$ending  = apply_filters('wogh_line_endings', "\n");
 
-		return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
+		return preg_replace('~(*BSR_ANYCRLF)\R~', $ending, $content);
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 * Returns String the YAML frontmatter, ready to be written to the file
 	 */
 	public function front_matter() {
-		return "---\n" . spyc_dump( $this->meta() ) . "---\n";
+		return "---\n" . spyc_dump($this->meta()) . "---\n";
 	}
 
 	/**
@@ -145,24 +145,24 @@ 
 	public function post_content() {
 		$content = $this->post->post_content;
 
-		if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
-			$content = wpmarkdown_html_to_markdown( $content );
-		} else if ( class_exists( 'WPCom_Markdown' ) ) {
-			if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
+		if (function_exists('wpmarkdown_html_to_markdown')) {
+			$content = wpmarkdown_html_to_markdown($content);
+		} else if (class_exists('WPCom_Markdown')) {
+			if (WPCom_Markdown::get_instance()->is_markdown($this->post->ID)) {
 				$content = $this->post->post_content_filtered;
 			}
 		}
 
-		return apply_filters( 'wogh_content_export', $content, $this );
+		return apply_filters('wogh_content_export', $content, $this);
 	}
 
 	public function old_github_path() {
 		return $this->old_github_path;
 	}
 
-	public function set_old_github_path( $path ) {
+	public function set_old_github_path($path) {
 		$this->old_github_path = $path;
-		update_post_meta( $this->id, '_wogh_github_path', $path);
+		update_post_meta($this->id, '_wogh_github_path', $path);
 	}
 
 
@@ -184,13 +184,13 @@ 
 	 * @return string
 	 */
 	public function github_directory() {
-		if ( 'publish' !== $this->status() ) {
-			return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
+		if ('publish' !== $this->status()) {
+			return apply_filters('wogh_directory_unpublished', '_drafts/', $this);
 		}
 
 		$name = '';
 
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			case 'post':
 				$name = 'posts';
 				break;
@@ -198,35 +198,35 @@ 
 				$name = 'pages';
 				break;
 			default:
-				$obj = get_post_type_object( $this->type() );
+				$obj = get_post_type_object($this->type());
 
-				if ( $obj ) {
-					$name = strtolower( $obj->labels->name );
+				if ($obj) {
+					$name = strtolower($obj->labels->name);
 				}
 
-				if ( ! $name ) {
+				if ( ! $name) {
 					$name = '';
 				}
 		}
 
-		if ( $name ) {
+		if ($name) {
 			$name = '_' . $name . '/';
 		}
 
-		return apply_filters( 'wogh_directory_published', $name, $this );
+		return apply_filters('wogh_directory_published', $name, $this);
 	}
 
 	/**
 	 * Build GitHub filename based on post
 	 */
 	public function github_filename() {
-		if ( 'post' === $this->type() ) {
-			$filename = get_the_time( 'Y-m-d-', $this->id ) . $this->get_name() . '.md';
+		if ('post' === $this->type()) {
+			$filename = get_the_time('Y-m-d-', $this->id) . $this->get_name() . '.md';
 		} else {
 			$filename = $this->get_name() . '.md';
 		}
 
-		return apply_filters( 'wogh_filename', $filename, $this );
+		return apply_filters('wogh_filename', $filename, $this);
 	}
 
 	/**
@@ -235,11 +235,11 @@ 
 	 * @return string
 	 */
 	protected function get_name() {
-		if ( '' !== $this->name() ) {
+		if ('' !== $this->name()) {
 			return $this->name();
 		}
 
-		return sanitize_title( get_the_title( $this->post ) );
+		return sanitize_title(get_the_title($this->post));
 	}
 
 	/**
@@ -247,9 +247,9 @@ 
 	 * @return boolean
 	 */
 	public function is_on_github() {
-		$sha = get_post_meta( $this->id, '_wogh_sha', true );
-		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-		if ( $sha && $github_path ) {
+		$sha = get_post_meta($this->id, '_wogh_sha', true);
+		$github_path = get_post_meta($this->id, '_wogh_github_path', true);
+		if ($sha && $github_path) {
 			return true;
 		}
 		return false;
@@ -261,7 +261,7 @@ 
 	 * @return string
 	 */
 	public function github_view_url() {
-		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		$github_path = get_post_meta($this->id, '_wogh_github_path', true);
 		$repository = $this->api->fetch()->repository();
 		$branch = $this->api->fetch()->branch();
 
@@ -274,7 +274,7 @@ 
 	 * @return string
 	 */
 	public function github_edit_url() {
-		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		$github_path = get_post_meta($this->id, '_wogh_github_path', true);
 		$repository = $this->api->fetch()->repository();
 		$branch = $this->api->fetch()->branch();
 
@@ -288,9 +288,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_directory_from_path( $path ) {
-		$directory = explode( '/', $path );
-		$directory = count( $directory ) > 0 ? $directory[0] : '';
+	public function get_directory_from_path($path) {
+		$directory = explode('/', $path);
+		$directory = count($directory) > 0 ? $directory[0] : '';
 
 		return $directory;
 	}
@@ -301,11 +301,11 @@ 
 	 * Returns Array an array containing the author name and email
 	 */
 	public function last_modified_author() {
-		if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
-			$user = get_userdata( $last_id );
+		if ($last_id = get_post_meta($this->id, '_edit_last', true)) {
+			$user = get_userdata($last_id);
 
-			if ( $user ) {
-				return array( 'name' => $user->display_name, 'email' => $user->user_email );
+			if ($user) {
+				return array('name' => $user->display_name, 'email' => $user->user_email);
 			}
 		}
 
@@ -319,7 +319,7 @@ 
 	 * Returns String the sha1 hash
 	 */
 	public function sha() {
-		$sha = get_post_meta( $this->id, '_wogh_sha', true );
+		$sha = get_post_meta($this->id, '_wogh_sha', true);
 
 		// If we've done a full export and we have no sha
 		// then we should try a live check to see if it exists.
@@ -335,7 +335,7 @@ 
 		// }
 
 		// if the sha still doesn't exist, then it's empty
-		if ( ! $sha || is_wp_error( $sha ) ) {
+		if ( ! $sha || is_wp_error($sha)) {
 			$sha = '';
 		}
 
@@ -347,8 +347,8 @@ 
 	 *
 	 * @param string $sha
 	 */
-	public function set_sha( $sha ) {
-		update_post_meta( $this->id, '_wogh_sha', $sha );
+	public function set_sha($sha) {
+		update_post_meta($this->id, '_wogh_sha', $sha);
 	}
 
 	/**
@@ -359,32 +359,32 @@ 
 	public function meta() {
 		$meta = array(
 			'ID'           => $this->id,
-			'post_title'   => get_the_title( $this->post ),
-			'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+			'post_title'   => get_the_title($this->post),
+			'author'       => ($author = get_userdata($this->post->post_author)) ? $author->display_name : '',
 			'post_date'    => $this->post->post_date,
 			'post_excerpt' => $this->post->post_excerpt,
-			'layout'       => get_post_type( $this->post ),
-			'permalink'    => get_permalink( $this->post ),
+			'layout'       => get_post_type($this->post),
+			'permalink'    => get_permalink($this->post),
 			'published'    => 'publish' === $this->status() ? true : false,
-			'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
-			'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
+			'tags'         => wp_get_post_tags($this->id, array('fields' => 'names')),
+			'categories'   => wp_get_post_categories($this->id, array('fields' => 'names'))
 		);
-		if ( !empty($this->post->post_name) ) {
+		if ( ! empty($this->post->post_name)) {
 			$meta['post_name'] = $this->post->post_name;
 		}
 
 		//convert traditional post_meta values, hide hidden values, skip already populated values
-		foreach ( get_post_custom( $this->id ) as $key => $value ) {
+		foreach (get_post_custom($this->id) as $key => $value) {
 
-			if ( '_' === substr( $key, 0, 1 ) || isset( $meta[ $key ] ) ) {
+			if ('_' === substr($key, 0, 1) || isset($meta[$key])) {
 				continue;
 			}
 
-			$meta[ $key ] = $value;
+			$meta[$key] = $value;
 
 		}
 
-		return apply_filters( 'wogh_post_meta', $meta, $this );
+		return apply_filters('wogh_post_meta', $meta, $this);
 	}
 
 	/**
@@ -401,7 +401,7 @@ 
 	 *
 	 * @param array $meta
 	 */
-	public function set_meta( $meta ) {
+	public function set_meta($meta) {
 		$this->meta = $meta;
 	}
 
@@ -430,7 +430,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function set_post( WP_Post $post ) {
+	public function set_post(WP_Post $post) {
 		$this->post = $post;
 		$this->id   = $post->ID;
 
@@ -449,6 +449,6 @@ 
 		$data->content = $this->github_content();
 		$data->sha     = $this->sha();
 
-		return new Writing_On_GitHub_Blob( $data );
+		return new Writing_On_GitHub_Blob($data);
 	}
 }

lib/client/fetch.php

Spacing +21 added lines, -21 removed lines

@@ -16,13 +16,13 @@ 
 	 *
 	 * @return array[Writing_On_GitHub_File_Info]|WP_Error
 	 */
-	public function compare( $sha ) {
+	public function compare($sha) {
 		// https://api.github.com/repos/litefeel/testwpsync/compare/861f87e8851b8debb78db548269d29f8da4d94ac...master
 		$endpoint = $this->compare_endpoint();
 		$branch = $this->branch();
-		$data = $this->call( 'GET', "$endpoint/$sha...$branch" );
+		$data = $this->call('GET', "$endpoint/$sha...$branch");
 
-		if ( is_wp_error( $data ) ) {
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
@@ -44,13 +44,13 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function remote_contents( $post ) {
-		return $this->call( 'GET', $this->content_endpoint( $post->github_path() ) );
+	public function remote_contents($post) {
+		return $this->call('GET', $this->content_endpoint($post->github_path()));
 	}
 
-	public function exists( $path ) {
-		$result = $this->call( 'GET', $this->content_endpoint( $path ) );
-		if ( is_wp_error( $result ) ) {
+	public function exists($path) {
+		$result = $this->call('GET', $this->content_endpoint($path));
+		if (is_wp_error($result)) {
 			return false;
 		}
 		return true;
@@ -63,27 +63,27 @@ 
 	 *
 	 * @return Writing_On_GitHub_Tree|WP_Error
 	 */
-	public function tree_recursive( $sha = '_default' ) {
+	public function tree_recursive($sha = '_default') {
 
-		if ( '_default' === $sha ) {
+		if ('_default' === $sha) {
 			$sha = $this->branch();
 		}
 
-		$data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' );
+		$data = $this->call('GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1');
 
-		if ( is_wp_error( $data ) ) {
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
 		$files = array();
 
-		foreach ( $data->tree as $index => $thing ) {
+		foreach ($data->tree as $index => $thing) {
 			// We need to remove the trees because
 			// the recursive tree includes both
 			// the subtrees as well the subtrees' blobs.
-			if ( 'blob' === $thing->type ) {
+			if ('blob' === $thing->type) {
 				$thing->status = '';
-				$files[] = new Writing_On_GitHub_File_Info( $thing );
+				$files[] = new Writing_On_GitHub_File_Info($thing);
 			}
 		}
 
@@ -97,20 +97,20 @@ 
 	 *
 	 * @return Writing_On_GitHub_Blob|WP_Error
 	 */
-	public function blob( $blob ) {
-		if ( $cache = $this->app->cache()->fetch_blob( $blob->sha ) ) {
+	public function blob($blob) {
+		if ($cache = $this->app->cache()->fetch_blob($blob->sha)) {
 			return $cache;
 		}
 
-		$data = $this->call( 'GET', $this->blob_endpoint() . '/' . $blob->sha );
+		$data = $this->call('GET', $this->blob_endpoint() . '/' . $blob->sha);
 
-		if ( is_wp_error( $data ) ) {
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
 		$data->path = $blob->path;
-		$obj = new Writing_On_GitHub_Blob( $data );
+		$obj = new Writing_On_GitHub_Blob($data);
 
-		return $this->app->cache()->set_blob( $obj->sha(), $obj );
+		return $this->app->cache()->set_blob($obj->sha(), $obj);
 	}
 }