litefeel / writing-on-github

lib/post.php

Spacing +62 added lines, -62 removed lines

@@ -60,26 +60,26 @@ 
      *
      * @todo remove database operations from this method
      */
-    public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
+    public function __construct($id_or_args, Writing_On_GitHub_Api $api) {
         $this->api = $api;
 
-        if ( is_numeric( $id_or_args ) ) {
+        if (is_numeric($id_or_args)) {
             $this->id   = (int) $id_or_args;
-            $this->post = get_post( $this->id );
+            $this->post = get_post($this->id);
             $this->new  = false;
         }
 
-        if ( is_array( $id_or_args ) ) {
+        if (is_array($id_or_args)) {
             $this->args = $id_or_args;
 
-            if ( isset( $this->args['ID'] ) ) {
-                $this->post = get_post( $this->args['ID'] );
+            if (isset($this->args['ID'])) {
+                $this->post = get_post($this->args['ID']);
 
-                if ( $this->post ) {
+                if ($this->post) {
                     $this->id  = $this->post->ID;
                     $this->new = false;
                 } else {
-                    unset( $this->args['ID'] );
+                    unset($this->args['ID']);
                 }
             }
         }
@@ -115,7 +115,7 @@ 
      * @return bool
      */
     public function has_password() {
-        return ! empty( $this->post->post_password );
+        return ! empty($this->post->post_password);
     }
 
     /**
@@ -123,9 +123,9 @@ 
      */
     public function github_content() {
         $content = $this->front_matter() . $this->post_content();
-        $ending  = apply_filters( 'wogh_line_endings', "\n" );
+        $ending  = apply_filters('wogh_line_endings', "\n");
 
-        return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
+        return preg_replace('~(*BSR_ANYCRLF)\R~', $ending, $content);
     }
 
     /**
@@ -134,7 +134,7 @@ 
      * Returns String the YAML frontmatter, ready to be written to the file
      */
     public function front_matter() {
-        return "---\n" . spyc_dump( $this->meta() ) . "---\n";
+        return "---\n" . spyc_dump($this->meta()) . "---\n";
     }
 
     /**
@@ -145,24 +145,24 @@ 
     public function post_content() {
         $content = $this->post->post_content;
 
-        if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
-            $content = wpmarkdown_html_to_markdown( $content );
-        } else if ( class_exists( 'WPCom_Markdown' ) ) {
-            if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
+        if (function_exists('wpmarkdown_html_to_markdown')) {
+            $content = wpmarkdown_html_to_markdown($content);
+        } else if (class_exists('WPCom_Markdown')) {
+            if (WPCom_Markdown::get_instance()->is_markdown($this->post->ID)) {
                 $content = $this->post->post_content_filtered;
             }
         }
 
-        return apply_filters( 'wogh_content_export', $content, $this );
+        return apply_filters('wogh_content_export', $content, $this);
     }
 
     public function old_github_path() {
         return $this->old_github_path;
     }
 
-    public function set_old_github_path( $path ) {
+    public function set_old_github_path($path) {
         $this->old_github_path = $path;
-        update_post_meta( $this->id, '_wogh_github_path', $path );
+        update_post_meta($this->id, '_wogh_github_path', $path);
     }
 
 
@@ -183,13 +183,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;
@@ -197,35 +197,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);
     }
 
     /**
@@ -234,11 +234,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));
     }
 
     /**
@@ -246,9 +246,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;
@@ -260,7 +260,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();
 
@@ -273,7 +273,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();
 
@@ -287,9 +287,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;
     }
@@ -300,11 +300,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);
             }
         }
 
@@ -318,7 +318,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.
@@ -334,7 +334,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 = '';
         }
 
@@ -346,8 +346,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);
     }
 
     /**
@@ -358,24 +358,24 @@ 
     public function meta() {
         $meta = array(
             'ID'           => $this->id,
-            'post_title'   => get_the_title( $this->post ),
+            'post_title'   => get_the_title($this->post),
             'post_name'    => $this->post->post_name,
-            'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+            'author'       => ($author = get_userdata($this->post->post_author)) ? $author->display_name : '',
             'post_date'    => $this->post->post_date,
             'post_excerpt' => $this->post->post_excerpt,
-            'layout'       => get_post_type( $this->post ),
-            'link'         => get_permalink( $this->post ),
+            'layout'       => get_post_type($this->post),
+            'link'         => get_permalink($this->post),
             'published'    => 'publish' === $this->status() ? true : false,
-            'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
-            'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
+            'tags'         => wp_get_post_tags($this->id, array('fields' => 'names')),
+            'categories'   => wp_get_post_categories($this->id, array('fields' => 'names'))
         );
-        if ( empty($this->post->post_name) ) {
+        if (empty($this->post->post_name)) {
             unset($meta['post_name']);
         }
-        if ( empty($this->post->post_excerpt) ) {
+        if (empty($this->post->post_excerpt)) {
             unset($meta['post_excerpt']);
         }
-        if ( 'yes' == get_option('wogh_ignore_author') ) {
+        if ('yes' == get_option('wogh_ignore_author')) {
             unset($meta['author']);
         }
 
@@ -390,7 +390,7 @@ 
 
         // }
 
-        return apply_filters( 'wogh_post_meta', $meta, $this );
+        return apply_filters('wogh_post_meta', $meta, $this);
     }
 
     /**
@@ -407,7 +407,7 @@ 
      *
      * @param array $meta
      */
-    public function set_meta( $meta ) {
+    public function set_meta($meta) {
         $this->meta = $meta;
     }
 
@@ -436,7 +436,7 @@ 
      *
      * @return $this
      */
-    public function set_post( WP_Post $post ) {
+    public function set_post(WP_Post $post) {
         $this->post = $post;
         $this->id   = $post->ID;
 
@@ -455,6 +455,6 @@ 
         $data->content = $this->github_content();
         $data->sha     = $this->sha();
 
-        return new Writing_On_GitHub_Blob( $data );
+        return new Writing_On_GitHub_Blob($data);
     }
 }

lib/import.php

Spacing +78 added lines, -78 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,23 +58,23 @@ 
      *
      * @return string|WP_Error
      */
-    protected function import_files( $files ) {
+    protected function import_files($files) {
 
         $error      = false;
         $delete_ids = false;
 
-        $result = $this->compare( $files, $delete_ids );
+        $result = $this->compare($files, $delete_ids);
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             return $result;
         }
 
-        if ( $delete_ids ) {
+        if ($delete_ids) {
             foreach ($delete_ids as $id) {
-                $result = $this->app->database()->delete_post( $id );
-                if ( is_wp_error( $result ) ) {
+                $result = $this->app->database()->delete_post($id);
+                if (is_wp_error($result)) {
                     /* @var WP_Error $result */
-                    $error = wogh_append_error( $error, $result );
+                    $error = wogh_append_error($error, $result);
                 }
             }
         }
@@ -90,21 +90,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');
     }
 
     /**
@@ -114,8 +114,8 @@ 
      *
      * @return string|WP_Error
      */
-    protected function compare( $files, &$delete_ids ) {
-        if ( is_wp_error( $files ) ) {
+    protected function compare($files, &$delete_ids) {
+        if (is_wp_error($files)) {
             /* @var WP_Error $files */
             return $files;
         }
@@ -125,62 +125,62 @@ 
 
         $idsmap = array();
 
-        foreach ( $files as $file ) {
-            if ( ! $this->importable_file( $file ) ) {
+        foreach ($files as $file) {
+            if ( ! $this->importable_file($file)) {
                 continue;
             }
 
-            $blob = $this->app->api()->fetch()->blob( $file );
+            $blob = $this->app->api()->fetch()->blob($file);
             // network error ?
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+            if ( ! $blob instanceof Writing_On_GitHub_Blob) {
                 continue;
             }
 
-            if ( $this->importable_raw_file( $blob ) ) {
-                $this->import_raw_file( $blob, $file->status == 'removed' );
+            if ($this->importable_raw_file($blob)) {
+                $this->import_raw_file($blob, $file->status == 'removed');
                 continue;
             }
 
-            if ( ! $this->importable_blob( $blob ) ) {
+            if ( ! $this->importable_blob($blob)) {
                 continue;
             }
 
-            $post = $this->blob_to_post( $blob );
+            $post = $this->blob_to_post($blob);
 
-            if ( $file->status == 'removed' ) {
-                if ( $blob->id() ) {
+            if ($file->status == 'removed') {
+                if ($blob->id()) {
                     $idsmap[$blob->id()] = true;
                 }
-            } elseif ( $post != false ) {
+            } elseif ($post != false) {
                 $posts[] = $post;
-                if ( $post->is_new() ) {
+                if ($post->is_new()) {
                     $new[] = $post;
                 }
             }
         }
 
-        foreach ( $posts as $post ) {
-            if ( $post->id() && isset( $idsmap[ $post->id() ] ) ) {
-                unset( $idsmap[ $post->id() ] );
+        foreach ($posts as $post) {
+            if ($post->id() && isset($idsmap[$post->id()])) {
+                unset($idsmap[$post->id()]);
             }
         }
         $delete_ids = array();
-        foreach ( $idsmap as $id => $value ) {
+        foreach ($idsmap as $id => $value) {
             $delete_ids[] = $id;
         }
 
         // $this->app->database()->save_posts( $posts, $commit->author_email() );
 
-        $result = $this->app->database()->save_posts( $posts );
+        $result = $this->app->database()->save_posts($posts);
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             return $result;
         }
 
-        if ( ! empty( $new ) ) {
-            $result = $this->app->export()->new_posts( $new );
+        if ( ! empty($new)) {
+            $result = $this->app->export()->new_posts($new);
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 return $result;
             }
         }
@@ -195,12 +195,12 @@ 
      *
      * @return bool
      */
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+    protected function importable_file(Writing_On_GitHub_File_Info $file) {
 
         // only _pages and _posts
-        if ( strncasecmp($file->path, '_pages/', strlen('_pages/') ) != 0 &&
-             strncasecmp($file->path, '_posts/', strlen('_posts/') ) != 0 &&
-             strncasecmp($file->path, 'images/', strlen('images/') ) != 0 ) {
+        if (strncasecmp($file->path, '_pages/', strlen('_pages/')) != 0 &&
+             strncasecmp($file->path, '_posts/', strlen('_posts/')) != 0 &&
+             strncasecmp($file->path, 'images/', strlen('images/')) != 0) {
             return false;
         }
 
@@ -219,7 +219,7 @@ 
      *
      * @return bool
      */
-    protected function importable_blob( Writing_On_GitHub_Blob $blob ) {
+    protected function importable_blob(Writing_On_GitHub_Blob $blob) {
         // global $wpdb;
 
         // // Skip the repo's readme.
@@ -232,20 +232,20 @@ 
         //  return false;
         // }
 
-        if ( ! $blob->has_frontmatter() ) {
+        if ( ! $blob->has_frontmatter()) {
             return false;
         }
 
         return true;
     }
 
-    protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
-        if ( $blob->has_frontmatter() ) {
+    protected function importable_raw_file(Writing_On_GitHub_Blob $blob) {
+        if ($blob->has_frontmatter()) {
             return false;
         }
 
         // only images
-        if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
+        if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) {
             return false;
         }
 
@@ -257,16 +257,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);
             }
 
@@ -281,57 +281,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;
     }

writing-on-github.php

Spacing +58 added lines, -58 removed lines

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

lib/admin.php

Spacing +63 added lines, -63 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_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_ignore_author');
+        add_settings_field('wogh_ignore_author', __('Ignore author', 'writing-on-github'), array(&$this, 'checkbox_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+                'help_text' => __('Do not export author and do not use author info from GitHub.', 'writing-on-github'),
             )
         );
 
@@ -106,8 +106,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';
     }
 
     /**
@@ -115,8 +115,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';
     }
 
     /**
@@ -124,8 +124,8 @@ 
      *
      * @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';
     }
 
     /**
@@ -133,58 +133,58 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+    public function checkbox_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/checkbox-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');
         }
     }
 
@@ -193,11 +193,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')
         );
     }
 
@@ -205,31 +205,31 @@ 
      * 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 ( 'force_export' === $_GET['action'] ) {
+        if ('force_export' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_export(true);
         }
 
-        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/client/base.php

Spacing +25 added lines, -25 removed lines

@@ -26,7 +26,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -39,8 +39,8 @@ 
      *
      * @return stdClass|WP_Error
      */
-    protected function call( $method, $endpoint, $body = array() ) {
-        if ( is_wp_error( $error = $this->can_call() ) ) {
+    protected function call($method, $endpoint, $body = array()) {
+        if (is_wp_error($error = $this->can_call())) {
             /*　@var WP_Error $error */
             return $error;
         }
@@ -52,25 +52,25 @@ 
             ),
         );
 
-        if ( 'GET' !== $method ) {
-            $args['body'] = json_encode( $body );
+        if ('GET' !== $method) {
+            $args['body'] = json_encode($body);
         }
 
         // $tmpbody = isset( $args['body'] ) ? $args['body'] : '';
         // error_log( "writing-on-github-call $method $endpoint $tmpbody" );
 
-        $response = wp_remote_request( $endpoint, $args );
-        $status   = wp_remote_retrieve_header( $response, 'status' );
-        $body     = json_decode( wp_remote_retrieve_body( $response ) );
+        $response = wp_remote_request($endpoint, $args);
+        $status   = wp_remote_retrieve_header($response, 'status');
+        $body     = json_decode(wp_remote_retrieve_body($response));
 
-        if ( '2' !== substr( $status, 0, 1 ) && '3' !== substr( $status, 0, 1 ) ) {
+        if ('2' !== substr($status, 0, 1) && '3' !== substr($status, 0, 1)) {
             return new WP_Error(
-                strtolower( str_replace( ' ', '_', $status ) ),
+                strtolower(str_replace(' ', '_', $status)),
                 sprintf(
-                    __( 'Method %s to endpoint %s failed with error: %s', 'writing-on-github' ),
+                    __('Method %s to endpoint %s failed with error: %s', 'writing-on-github'),
                     $method,
                     $endpoint,
-                    ( $body && $body->message ) ? $body->message : 'Unknown error'
+                    ($body && $body->message) ? $body->message : 'Unknown error'
                 )
             );
         }
@@ -84,28 +84,28 @@ 
      * @return true|WP_Error
      */
     protected function can_call() {
-        if ( ! $this->oauth_token() ) {
+        if ( ! $this->oauth_token()) {
             return new WP_Error(
                 'missing_token',
-                __( 'Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github' )
+                __('Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github')
             );
         }
 
         $repo = $this->repository();
 
-        if ( ! $repo ) {
+        if ( ! $repo) {
             return new WP_Error(
                 'missing_repository',
-                __( 'Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github' )
+                __('Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github')
             );
         }
 
-        $parts = explode( '/', $repo );
+        $parts = explode('/', $repo);
 
-        if ( 2 !== count( $parts ) ) {
+        if (2 !== count($parts)) {
             return new WP_Error(
                 'malformed_repository',
-                __( 'Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github' )
+                __('Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github')
             );
         }
 
@@ -118,7 +118,7 @@ 
      * @return string
      */
     public function repository() {
-        return (string) get_option( self::REPO_OPTION_KEY );
+        return (string) get_option(self::REPO_OPTION_KEY);
     }
 
     /**
@@ -127,18 +127,18 @@ 
      * @return string
      */
     public function oauth_token() {
-        return (string) get_option( self::TOKEN_OPTION_KEY );
+        return (string) get_option(self::TOKEN_OPTION_KEY);
     }
 
     /**
      * Returns the GitHub host to sync with (for GitHub Enterprise support)
      */
     public function api_base() {
-        return get_option( self::HOST_OPTION_KEY );
+        return get_option(self::HOST_OPTION_KEY);
     }
 
     public function branch() {
-        $branch = get_option( self::BRANCH_OPTION_KEY );
+        $branch = get_option(self::BRANCH_OPTION_KEY);
         return $branch ? $branch : 'master';
     }
 
@@ -199,11 +199,11 @@ 
      *
      * Returns String the relative API call path
      */
-    public function content_endpoint( $path = false ) {
+    public function content_endpoint($path = false) {
         $url = $this->api_base() . '/repos/';
         $url = $url . $this->repository() . '/contents';
 
-        if ( ! empty($path) ) {
+        if ( ! empty($path)) {
             $url .= '/' . $path;
         }
 

lib/client/fetch.php

Spacing +19 added lines, -19 removed lines

@@ -16,13 +16,13 @@ 
      *
      * @return 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_File_Info[]|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,14 +97,14 @@ 
      *
      * @return Writing_On_GitHub_Blob|WP_Error
      */
-    public function blob( Writing_On_GitHub_File_Info $fileinfo ) {
-        $data = $this->call( 'GET', $this->blob_endpoint() . '/' . $fileinfo->sha );
+    public function blob(Writing_On_GitHub_File_Info $fileinfo) {
+        $data = $this->call('GET', $this->blob_endpoint() . '/' . $fileinfo->sha);
 
-        if ( is_wp_error( $data ) ) {
+        if (is_wp_error($data)) {
             return $data;
         }
 
         $data->path = $fileinfo->path;
-        return new Writing_On_GitHub_Blob( $data );
+        return new Writing_On_GitHub_Blob($data);
     }
 }

lib/client/persist.php

Spacing +11 added lines, -11 removed lines

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

lib/response.php

Spacing +16 added lines, -16 removed lines

@@ -21,7 +21,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,30 +32,30 @@ 
      *
      * @return false
      */
-    public function error( WP_Error $error ) {
+    public function error(WP_Error $error) {
         global $wp_version;
 
-        $this->log( $error );
+        $this->log($error);
 
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
+        if (defined('DOING_AJAX') && DOING_AJAX && defined('WOGH_AJAX') && WOGH_AJAX) {
             /**
              * WordPress 4.1.0 introduced allowing WP_Error objects to be
              * passed directly into `wp_send_json_error`. This shims in
              * compatibility for older versions. We're currently supporting 3.9+.
              */
-            if ( version_compare( $wp_version, '4.1.0', '<' ) ) {
+            if (version_compare($wp_version, '4.1.0', '<')) {
                 $result = array();
 
-                foreach ( $error->errors as $code => $messages ) {
-                    foreach ( $messages as $message ) {
-                        $result[] = array( 'code' => $code, 'message' => $message );
+                foreach ($error->errors as $code => $messages) {
+                    foreach ($messages as $message) {
+                        $result[] = array('code' => $code, 'message' => $message);
                     }
                 }
 
                 $error = $result;
             }
 
-            wp_send_json_error( $error );
+            wp_send_json_error($error);
         }
 
         return false;
@@ -68,11 +68,11 @@ 
      *
      * @return true
      */
-    public function success( $success ) {
-        $this->log( $success );
+    public function success($success) {
+        $this->log($success);
 
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && defined( 'WOGH_AJAX' ) && WOGH_AJAX ) {
-            wp_send_json_success( $success );
+        if (defined('DOING_AJAX') && DOING_AJAX && defined('WOGH_AJAX') && WOGH_AJAX) {
+            wp_send_json_success($success);
         }
 
         return true;
@@ -85,11 +85,11 @@ 
      *
      * @param string|WP_Error $msg Message to log.
      */
-    protected function log( $msg ) {
-        if ( is_wp_error( $msg ) ) {
+    protected function log($msg) {
+        if (is_wp_error($msg)) {
             $msg = $msg->get_error_message();
         }
 
-        Writing_On_GitHub::write_log( $msg );
+        Writing_On_GitHub::write_log($msg);
     }
 }

lib/controller.php

Spacing +75 added lines, -75 removed lines

@@ -21,7 +21,7 @@ 
      *
      * @param Writing_On_GitHub $app Applicatio container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -34,58 +34,58 @@ 
      */
     public function pull_posts() {
         $this->set_ajax();
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::pull_posts()')
+            ));
         }
 
-        if ( ! $this->app->request()->is_secret_valid() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->request()->is_secret_valid()) {
+            return $this->app->response()->error(new WP_Error(
                 'invalid_headers',
-                __( 'Failed to validate secret.', 'writing-on-github' )
-            ) );
+                __('Failed to validate secret.', 'writing-on-github')
+            ));
         }
 
         // ping
-        if ( $this->app->request()->is_ping() ) {
-            return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
+        if ($this->app->request()->is_ping()) {
+            return $this->app->response()->success(__('Wordpress is ready.', 'writing-on-github'));
         }
 
         // push
-        if ( ! $this->app->request()->is_push() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->request()->is_push()) {
+            return $this->app->response()->error(new WP_Error(
                 'invalid_headers',
-                __( 'Failed to validate webhook event.', 'writing-on-github' )
-            ) );
+                __('Failed to validate webhook event.', 'writing-on-github')
+            ));
         }
         $payload = $this->app->request()->payload();
 
-        if ( ! $payload->should_import() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $payload->should_import()) {
+            return $this->app->response()->error(new WP_Error(
                 'invalid_payload',
                 sprintf(
-                    __( "%s won't be imported.", 'writing-on-github' ),
-                    strtolower( $payload->get_commit_id() ) ? : '[Missing Commit ID]'
+                    __("%s won't be imported.", 'writing-on-github'),
+                    strtolower($payload->get_commit_id()) ?: '[Missing Commit ID]'
                 )
-            ) );
+            ));
         }
 
         $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'delete_post', array( $this, 'delete_post' ) );
+        remove_action('save_post', array($this, 'export_post'));
+        remove_action('delete_post', array($this, 'delete_post'));
 
-        $result = $this->app->import()->payload( $payload );
+        $result = $this->app->import()->payload($payload);
 
         $this->app->semaphore()->unlock();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         }
 
-        return $this->app->response()->success( $result );
+        return $this->app->response()->success($result);
     }
 
     /**
@@ -93,36 +93,36 @@ 
      *
      * @return boolean
      */
-    public function import_master( $user_id = 0 ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+    public function import_master($user_id = 0) {
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::import_master()')
+            ));
         }
 
         $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'save_post', array( $this, 'delete_post' ) );
+        remove_action('save_post', array($this, 'export_post'));
+        remove_action('save_post', array($this, 'delete_post'));
 
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
+        if ($user_id) {
+            wp_set_current_user($user_id);
         }
 
         $result = $this->app->import()->master();
 
         $this->app->semaphore()->unlock();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            update_option( '_wogh_import_error', $result->get_error_message() );
+            update_option('_wogh_import_error', $result->get_error_message());
 
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         }
 
-        update_option( '_wogh_import_complete', 'yes' );
+        update_option('_wogh_import_complete', 'yes');
 
-        return $this->app->response()->success( $result );
+        return $this->app->response()->success($result);
     }
 
     /**
@@ -132,34 +132,34 @@ 
      * @param  boolean    $force
      * @return boolean
      */
-    public function export_all( $user_id = 0, $force = false ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+    public function export_all($user_id = 0, $force = false) {
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::export_all()')
+            ));
         }
 
         $this->app->semaphore()->lock();
 
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
+        if ($user_id) {
+            wp_set_current_user($user_id);
         }
 
         $result = $this->app->export()->full($force);
         $this->app->semaphore()->unlock();
 
         // Maybe move option updating out of this class/upgrade message display?
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            update_option( '_wogh_export_error', $result->get_error_message() );
+            update_option('_wogh_export_error', $result->get_error_message());
 
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         } else {
-            update_option( '_wogh_export_complete', 'yes' );
-            update_option( '_wogh_fully_exported', 'yes' );
+            update_option('_wogh_export_complete', 'yes');
+            update_option('_wogh_fully_exported', 'yes');
 
-            return $this->app->response()->success( $result );
+            return $this->app->response()->success($result);
         }
     }
 
@@ -172,28 +172,28 @@ 
      *
      * @return boolean
      */
-    public function export_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
+    public function export_post($post_id) {
+        if (wp_is_post_revision($post_id)) {
             return;
         }
 
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::export_post()')
+            ));
         }
 
         $this->app->semaphore()->lock();
-        $result = $this->app->export()->update( $post_id );
+        $result = $this->app->export()->update($post_id);
         $this->app->semaphore()->unlock();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         }
 
-        return $this->app->response()->success( $result );
+        return $this->app->response()->success($result);
     }
 
     /**
@@ -205,28 +205,28 @@ 
      *
      * @return boolean
      */
-    public function delete_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
+    public function delete_post($post_id) {
+        if (wp_is_post_revision($post_id)) {
             return;
         }
 
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
+        if ( ! $this->app->semaphore()->is_open()) {
+            return $this->app->response()->error(new WP_Error(
                 'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
-            ) );
+                sprintf(__('%s : Semaphore is locked, import/export already in progress.', 'writing-on-github'), 'Controller::delete_post()')
+            ));
         }
 
         $this->app->semaphore()->lock();
-        $result = $this->app->export()->delete( $post_id );
+        $result = $this->app->export()->delete($post_id);
         $this->app->semaphore()->unlock();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
+            return $this->app->response()->error($result);
         }
 
-        return $this->app->response()->success( $result );
+        return $this->app->response()->success($result);
     }
 
     /**
@@ -235,8 +235,8 @@ 
      * than just returning data.
      */
     protected function set_ajax() {
-        if ( ! defined( 'WOGH_AJAX' ) ) {
-            define( 'WOGH_AJAX', true );
+        if ( ! defined('WOGH_AJAX')) {
+            define('WOGH_AJAX', true);
         }
     }
 }