litefeel / writing-on-github

lib/database.php

Spacing +105 added lines, -106 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;
     }
 
@@ -46,33 +46,33 @@ 
      *
      * @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')
             );
         }
 
         /* @var Writing_On_GitHub_Post[] $results */
         $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());
             }
         }
 
@@ -86,10 +86,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,36 +112,35 @@ 
      * @param  Writing_On_GitHub_Post $post [description]
      * @return WP_Error|true
      */
-    public function save_post( Writing_On_GitHub_Post $post ) {
-        $args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
+    public function save_post(Writing_On_GitHub_Post $post) {
+        $args = apply_filters('wogh_pre_import_args', $this->post_args($post), $post);
 
-        remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
+        remove_filter('content_save_pre', 'wp_filter_post_kses');
         $post_id = $post->is_new() ?
-            wp_insert_post( $args, true ) :
-            wp_update_post( $args, true );
-        add_filter( 'content_save_pre', 'wp_filter_post_kses' );
+            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 (is_wp_error($post_id)) {
             /* @var WP_Error $post_id */
             return $post_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 ) ? 0 : $user->ID;
-            $this->set_post_author( $post_id, $user_id );
+            $user    = $this->fetch_commit_user($author);
+            $user_id = is_wp_error($user) ? 0 : $user->ID;
+            $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);
 
-        update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
+        update_post_meta($post_id, '_wogh_sha', $meta['_wogh_sha']);
 
         // unset( $meta['tags'] );
         // unset( $meta['categories'] );
@@ -157,25 +156,25 @@ 
         return true;
     }
 
-    protected function post_args( $post ) {
+    protected function post_args($post) {
         $args = $post->get_args();
         $meta = $post->get_meta();
 
         // prevent backslash loss
-        $args['post_content'] = addslashes( $args['post_content'] );
+        $args['post_content'] = addslashes($args['post_content']);
 
         // update tags
-        if ( ! empty( $meta['tags'] ) ) {
+        if ( ! empty($meta['tags'])) {
             $args['tags_input'] = $meta['tags'];
         }
 
         // update categories
-        if ( ! empty( $meta['categories'] ) ) {
+        if ( ! empty($meta['categories'])) {
             $categories = $meta['categories'];
-            if ( ! is_array( $categories ) ) {
-                $categories = array( $categories );
+            if ( ! is_array($categories)) {
+                $categories = array($categories);
             }
-            $terms = get_terms( array(
+            $terms = get_terms(array(
                 'taxonomy' => 'category',
                 'fields' => 'id=>name',
                 'hide_empty' => 0,
@@ -183,22 +182,22 @@ 
                 )
             );
             $map = array();
-            foreach ( $categories as $name ) {
+            foreach ($categories as $name) {
                 $map[$name] = 1;
             }
 
             $ids = array();
-            if ( ! empty( $terms ) ) {
-                foreach ( $terms as $id => $name ) {
+            if ( ! empty($terms)) {
+                foreach ($terms as $id => $name) {
                     $ids[] = $id;
-                    unset( $map[$name] );
+                    unset($map[$name]);
                 }
             }
 
             // create new terms
-            if ( ! empty( $map ) ) {
-                foreach ( $map as $name => $value ) {
-                    $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
+            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'];
                 }
@@ -210,19 +209,19 @@ 
         return $args;
     }
 
-    private function get_post_id_by_filename( $filename, $pattern  ) {
-        preg_match( $pattern , $filename, $matches );
+    private function get_post_id_by_filename($filename, $pattern) {
+        preg_match($pattern, $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);
         return $post_id;
     }
 
@@ -233,55 +232,55 @@ 
      *
      * @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' ) ) {
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
+            if (false !== strpos($directory, 'post')) {
+                $post_id = get_post_id_by_filename($filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/');
             }
 
-            if ( ! $post_id ) {
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
+            if ( ! $post_id) {
+                $post_id = get_post_id_by_filename($filename, '/(.*)\.md/');
             }
         }
 
-        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
                     )
                 );
@@ -289,25 +288,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
                     )
                 );
@@ -315,7 +314,7 @@ 
         }
 
         return sprintf(
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
+            __('Successfully deleted post ID %d.', 'writing-on-github'),
             $post_id
         );
     }
@@ -326,7 +325,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);
     }
 
     /**
@@ -335,7 +334,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);
     }
 
     /**
@@ -345,12 +344,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);
     }
 
     /**
@@ -361,25 +360,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);
     }
 
     /**
@@ -392,35 +391,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
                 )
             );
@@ -472,7 +471,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(
@@ -483,25 +482,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
         );
     }

lib/import.php

Spacing +71 added lines, -71 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,24 +32,24 @@ 
      *
      * @return string|WP_Error
      */
-    public function payload( Writing_On_GitHub_Payload $payload ) {
+    public function payload(Writing_On_GitHub_Payload $payload) {
 
-        $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
+        $result = $this->app->api()->fetch()->compare($payload->get_before_commit_id());
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($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');
     }
 
     /**
@@ -58,33 +58,33 @@ 
      *
      * @return true|WP_Error
      */
-    protected function import_files( $files ) {
+    protected function import_files($files) {
 
         $error = true;
 
-        foreach ( $files as $file ) {
-            if ( ! $this->importable_file( $file ) ) {
+        foreach ($files as $file) {
+            if ( ! $this->importable_file($file)) {
                 continue;
             }
 
-            $blob = $this->app->api()->fetch()->blob( $file );
+            $blob = $this->app->api()->fetch()->blob($file);
             // network error ?
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+            if ( ! $blob instanceof Writing_On_GitHub_Blob) {
                 continue;
             }
 
             $is_remove = 'removed' == $file->status;
 
             $result = false;
-            if ( $this->importable_raw_file( $blob ) ) {
-                $result = $this->import_raw_file( $blob, $is_remove );
-            } elseif ( $this->importable_post( $blob ) ) {
-                $result = $this->import_post( $blob, $is_remove );
+            if ($this->importable_raw_file($blob)) {
+                $result = $this->import_raw_file($blob, $is_remove);
+            } elseif ($this->importable_post($blob)) {
+                $result = $this->import_post($blob, $is_remove);
             }
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+                $error = wogh_append_error($error, $result);
             }
         }
 
@@ -99,21 +99,21 @@ 
     public function master() {
         $result = $this->app->api()->fetch()->tree_recursive();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($result)) {
+            $result = $this->import_files($result);
         }
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        return __( 'Payload processed', 'writing-on-github' );
+        return __('Payload processed', 'writing-on-github');
     }
 
     /**
@@ -123,14 +123,14 @@ 
      *
      * @return bool
      */
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+    protected function importable_file(Writing_On_GitHub_File_Info $file) {
 
         $path = $file->path;
 
         // only _pages, _posts and images
-        $prefixs = array( '_pages/', '_posts/', 'images/');
+        $prefixs = array('_pages/', '_posts/', 'images/');
         foreach ($prefixs as $prefix) {
-            if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
+            if ( ! strncasecmp($path, $prefix, strlen($prefix))) {
                 return true;
             }
         }
@@ -144,7 +144,7 @@ 
      *
      * @return bool
      */
-    protected function importable_post( Writing_On_GitHub_Blob $blob ) {
+    protected function importable_post(Writing_On_GitHub_Blob $blob) {
         // global $wpdb;
 
         // // Skip the repo's readme.
@@ -157,7 +157,7 @@ 
         //  return false;
         // }
 
-        if ( ! $blob->has_frontmatter() ) {
+        if ( ! $blob->has_frontmatter()) {
             return false;
         }
 
@@ -170,39 +170,39 @@ 
      * @param  bool                   $is_remove
      * @return WP_Error|bool
      */
-    protected function import_post( Writing_On_GitHub_Blob $blob, $is_remove ) {
+    protected function import_post(Writing_On_GitHub_Blob $blob, $is_remove) {
 
-        if ( $is_remove ) {
+        if ($is_remove) {
             $id = $blob->id();
-            if ( empty( $id ) ) {
+            if (empty($id)) {
                 return false;
             }
-            $result = $this->app->database()->delete_post( $id );
-            if ( is_wp_error( $result ) ) {
+            $result = $this->app->database()->delete_post($id);
+            if (is_wp_error($result)) {
                 /* @var WP_Error $result */
                 return $result;
             }
             return true;
         }
 
-        $post = $this->blob_to_post( $blob );
+        $post = $this->blob_to_post($blob);
 
-        if ( ! $post instanceof Writing_On_GitHub_Post ) {
+        if ( ! $post instanceof Writing_On_GitHub_Post) {
             return false;
         }
 
-        $result = $this->app->database()->save_post( $post );
-        if ( is_wp_error( $result ) ) {
+        $result = $this->app->database()->save_post($post);
+        if (is_wp_error($result)) {
             /** @var WP_Error $result */
             return $result;
         }
 
-        if ( $post->is_new() ||
-                ! wogh_equal_front_matter( $post, $blob ) ) {
+        if ($post->is_new() ||
+                ! wogh_equal_front_matter($post, $blob)) {
 
-            $result = $this->app->export()->new_posts( array( $post ) );
+            $result = $this->app->export()->new_posts(array($post));
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 /** @var WP_Error $result */
                 return $result;
             }
@@ -216,13 +216,13 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return bool
      */
-    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;
         }
 
@@ -234,16 +234,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);
             }
 
@@ -259,57 +259,57 @@ 
      *
      * @return Writing_On_GitHub_Post|false
      */
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
-        $args = array( 'post_content' => $blob->content_import() );
+    protected function blob_to_post(Writing_On_GitHub_Blob $blob) {
+        $args = array('post_content' => $blob->content_import());
         $meta = $blob->meta();
 
         $id = false;
 
-        if ( ! empty( $meta ) ) {
-            if ( array_key_exists( 'layout', $meta ) ) {
+        if ( ! empty($meta)) {
+            if (array_key_exists('layout', $meta)) {
                 $args['post_type'] = $meta['layout'];
-                unset( $meta['layout'] );
+                unset($meta['layout']);
             }
 
-            if ( array_key_exists( 'published', $meta ) ) {
+            if (array_key_exists('published', $meta)) {
                 $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
-                unset( $meta['published'] );
+                unset($meta['published']);
             }
 
-            if ( array_key_exists( 'post_title', $meta ) ) {
+            if (array_key_exists('post_title', $meta)) {
                 $args['post_title'] = $meta['post_title'];
-                unset( $meta['post_title'] );
+                unset($meta['post_title']);
             }
 
-            if ( array_key_exists( 'post_name', $meta ) ) {
+            if (array_key_exists('post_name', $meta)) {
                 $args['post_name'] = $meta['post_name'];
-                unset( $meta['post_name'] );
+                unset($meta['post_name']);
             }
 
-            if ( array_key_exists( 'ID', $meta ) ) {
+            if (array_key_exists('ID', $meta)) {
                 $id = $args['ID'] = $meta['ID'];
                 $blob->set_id($id);
-                unset( $meta['ID'] );
+                unset($meta['ID']);
             }
         }
 
         $meta['_wogh_sha'] = $blob->sha();
 
-        if ( $id ) {
-            $old_sha = get_post_meta( $id, '_wogh_sha', true );
-            $old_github_path = get_post_meta( $id, '_wogh_github_path', true );
+        if ($id) {
+            $old_sha = get_post_meta($id, '_wogh_sha', true);
+            $old_github_path = get_post_meta($id, '_wogh_github_path', true);
 
             // dont save post when has same sha
-            if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
-                 $old_github_path && $old_github_path == $blob->path() ) {
+            if ($old_sha && $old_sha == $meta['_wogh_sha'] &&
+                 $old_github_path && $old_github_path == $blob->path()) {
                 return false;
             }
         }
 
-        $post = new Writing_On_GitHub_Post( $args, $this->app->api() );
-        $post->set_old_github_path( $blob->path() );
-        $post->set_meta( $meta );
-        $blob->set_id( $post->id() );
+        $post = new Writing_On_GitHub_Post($args, $this->app->api());
+        $post->set_old_github_path($blob->path());
+        $post->set_meta($meta);
+        $blob->set_id($post->id());
 
         return $post;
     }

lib/blob.php

Spacing +23 added lines, -23 removed lines

@@ -55,8 +55,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() {
@@ -84,12 +84,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 );
+        $this->frontmatter = '---' === substr($this->content = $content, 0, 3);
 
         return $this;
     }
@@ -136,21 +136,21 @@ 
     public function content_import() {
         $content = $this->content();
 
-        if ( $this->has_frontmatter() ) {
+        if ($this->has_frontmatter()) {
             // Break out content.
-            preg_match( '/(^---(.*?)---$)?(.*)/ms', $content, $matches );
+            preg_match('/(^---(.*?)---$)?(.*)/ms', $content, $matches);
             $this->front_matter = $matches[1];
-            $content = array_pop( $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));
     }
 
     /**
@@ -161,13 +161,13 @@ 
     public function meta() {
         $meta = array();
 
-        if ( $this->has_frontmatter() ) {
+        if ($this->has_frontmatter()) {
             // Break out meta, if present.
-            preg_match( '/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches );
-            array_pop( $matches );
+            preg_match('/(^---(.*?)---$)?(.*)/ms', $this->content(), $matches);
+            array_pop($matches);
 
-            $meta = spyc_load( $matches[2] );
-            if ( 'yes' == get_option('wogh_ignore_author') ) {
+            $meta = spyc_load($matches[2]);
+            if ('yes' == get_option('wogh_ignore_author')) {
                 unset($meta['author']);
             }
             // if ( isset( $meta['link'] ) ) {
@@ -213,7 +213,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;
@@ -222,13 +222,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/function.php

Spacing +4 added lines, -4 removed lines

@@ -7,9 +7,9 @@ 
  * @param  WP_Error   $error2
  * @return WP_Error
  */
-function wogh_append_error( $error, $error2 ) {
-    if ( is_wp_error( $error ) ) {
-        $error->add( $error2->get_error_code(), $error2->get_error_message() );
+function wogh_append_error($error, $error2) {
+    if (is_wp_error($error)) {
+        $error->add($error2->get_error_code(), $error2->get_error_message());
     }
     return $error2;
 }
@@ -20,7 +20,7 @@ 
  * @param  Writing_On_GitHub_Blob $blob
  * @return bool
  */
-function wogh_equal_front_matter( $post, $blob ) {
+function wogh_equal_front_matter($post, $blob) {
     $str1 = $post->front_matter();
     $str2 = $blob->front_matter();
     return trim($str1) === trim($str2);