Passed
Push — ci ( 3ea26a...990482 )
by litefeel
02:30
created
lib/cli.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -44,28 +44,28 @@  discard block
 block discarded – undo
44 44
      *
45 45
      * @param array $args Command arguments.
46 46
      */
47
-    public function export( $args ) {
48
-        list( $post_id, $user_id ) = $args;
47
+    public function export($args) {
48
+        list($post_id, $user_id) = $args;
49 49
 
50
-        if ( ! is_numeric( $user_id ) ) {
51
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
50
+        if ( ! is_numeric($user_id)) {
51
+            WP_CLI::error(__('Invalid user ID', 'writing-on-github'));
52 52
         }
53 53
 
54
-        $this->app->export()->set_user( $user_id );
54
+        $this->app->export()->set_user($user_id);
55 55
 
56
-        if ( 'all' === $post_id ) {
57
-            WP_CLI::line( __( 'Starting full export to GitHub.', 'writing-on-github' ) );
56
+        if ('all' === $post_id) {
57
+            WP_CLI::line(__('Starting full export to GitHub.', 'writing-on-github'));
58 58
             $this->app->controller()->export_all();
59
-        } elseif ( is_numeric( $post_id ) ) {
59
+        } elseif (is_numeric($post_id)) {
60 60
             WP_CLI::line(
61 61
                 sprintf(
62
-                    __( 'Exporting post ID to GitHub: %d', 'writing-on-github' ),
62
+                    __('Exporting post ID to GitHub: %d', 'writing-on-github'),
63 63
                     $post_id
64 64
                 )
65 65
             );
66
-            $this->app->controller()->export_post( (int) $post_id );
66
+            $this->app->controller()->export_post((int) $post_id);
67 67
         } else {
68
-            WP_CLI::error( __( 'Invalid post ID', 'writing-on-github' ) );
68
+            WP_CLI::error(__('Invalid post ID', 'writing-on-github'));
69 69
         }
70 70
     }
71 71
 
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
      *
87 87
      * @param array $args Command arguments.
88 88
      */
89
-    public function import( $args ) {
90
-        list( $user_id ) = $args;
89
+    public function import($args) {
90
+        list($user_id) = $args;
91 91
 
92
-        if ( ! is_numeric( $user_id ) ) {
93
-            WP_CLI::error( __( 'Invalid user ID', 'writing-on-github' ) );
92
+        if ( ! is_numeric($user_id)) {
93
+            WP_CLI::error(__('Invalid user ID', 'writing-on-github'));
94 94
         }
95 95
 
96
-        update_option( '_wogh_export_user_id', (int) $user_id );
96
+        update_option('_wogh_export_user_id', (int) $user_id);
97 97
 
98
-        WP_CLI::line( __( 'Starting import from GitHub.', 'writing-on-github' ) );
98
+        WP_CLI::line(__('Starting import from GitHub.', 'writing-on-github'));
99 99
 
100 100
         $this->app->controller()->import_master();
101 101
     }
@@ -119,40 +119,40 @@  discard block
 block discarded – undo
119 119
      * @param array $args Command arguments.
120 120
      * @param array $assoc_args Command associated arguments.
121 121
      */
122
-    public function prime( $args, $assoc_args ) {
123
-        if ( isset( $assoc_args['branch'] ) ) {
124
-            WP_CLI::line( __( 'Starting branch import.', 'writing-on-github' ) );
122
+    public function prime($args, $assoc_args) {
123
+        if (isset($assoc_args['branch'])) {
124
+            WP_CLI::line(__('Starting branch import.', 'writing-on-github'));
125 125
 
126 126
             $commit = $this->app->api()->fetch()->master();
127 127
 
128
-            if ( is_wp_error( $commit ) ) {
128
+            if (is_wp_error($commit)) {
129 129
                 WP_CLI::error(
130 130
                     sprintf(
131
-                        __( 'Failed to import and cache branch with error: %s', 'writing-on-github' ),
131
+                        __('Failed to import and cache branch with error: %s', 'writing-on-github'),
132 132
                         $commit->get_error_message()
133 133
                     )
134 134
                 );
135 135
             } else {
136 136
                 WP_CLI::success(
137 137
                     sprintf(
138
-                        __( 'Successfully imported and cached commit %s from branch.', 'writing-on-github' ),
138
+                        __('Successfully imported and cached commit %s from branch.', 'writing-on-github'),
139 139
                         $commit->sha()
140 140
                     )
141 141
                 );
142 142
             }
143
-        } else if ( isset( $assoc_args['sha'] ) ) {
144
-            WP_CLI::line( 'Starting sha import.' );
143
+        } else if (isset($assoc_args['sha'])) {
144
+            WP_CLI::line('Starting sha import.');
145 145
 
146
-            $commit = $this->app->api()->fetch()->commit( $assoc_args['sha'] );
146
+            $commit = $this->app->api()->fetch()->commit($assoc_args['sha']);
147 147
 
148 148
             WP_CLI::success(
149 149
                 sprintf(
150
-                    __( 'Successfully imported and cached commit %s.', 'writing-on-github' ),
150
+                    __('Successfully imported and cached commit %s.', 'writing-on-github'),
151 151
                     $commit->sha()
152 152
                 )
153 153
             );
154 154
         } else {
155
-            WP_CLI::error( 'Invalid fetch.' );
155
+            WP_CLI::error('Invalid fetch.');
156 156
         }
157 157
     }
158 158
 }
Please login to merge, or discard this patch.
lib/api.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
      *
36 36
      * @param Writing_On_GitHub $app Application container.
37 37
      */
38
-    public function __construct( Writing_On_GitHub $app ) {
38
+    public function __construct(Writing_On_GitHub $app) {
39 39
         $this->app = $app;
40 40
     }
41 41
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
      * @return Writing_On_GitHub_Fetch_Client
46 46
      */
47 47
     public function fetch() {
48
-        if ( ! $this->fetch ) {
49
-            $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
48
+        if ( ! $this->fetch) {
49
+            $this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
50 50
         }
51 51
 
52 52
         return $this->fetch;
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
      * @return Writing_On_GitHub_Persist_Client
59 59
      */
60 60
     public function persist() {
61
-        if ( ! $this->persist ) {
62
-            $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
61
+        if ( ! $this->persist) {
62
+            $this->persist = new Writing_On_GitHub_Persist_Client($this->app);
63 63
         }
64 64
 
65 65
         return $this->persist;
Please login to merge, or discard this patch.
lib/payload.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
      * @param Writing_On_GitHub $app      Application container.
30 30
      * @param string                $raw_data Raw request data.
31 31
      */
32
-    public function __construct( Writing_On_GitHub $app, $raw_data ) {
32
+    public function __construct(Writing_On_GitHub $app, $raw_data) {
33 33
         $this->app  = $app;
34
-        $this->data = json_decode( $raw_data );
34
+        $this->data = json_decode($raw_data);
35 35
     }
36 36
 
37 37
     /**
@@ -41,32 +41,32 @@  discard block
 block discarded – undo
41 41
      */
42 42
     public function should_import() {
43 43
         // @todo how do we get this without importing the whole api object just for this?
44
-        if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
44
+        if (strtolower($this->data->repository->full_name) !== strtolower($this->app->api()->fetch()->repository())) {
45 45
             return false;
46 46
         }
47 47
 
48 48
         // The last term in the ref is the payload_branch name.
49
-        $refs   = explode( '/', $this->data->ref );
50
-        $payload_branch = array_pop( $refs );
49
+        $refs   = explode('/', $this->data->ref);
50
+        $payload_branch = array_pop($refs);
51 51
 
52 52
         $branch = $this->app->api()->fetch()->branch();
53 53
 
54
-        if ( $branch !== $payload_branch ) {
54
+        if ($branch !== $payload_branch) {
55 55
             return false;
56 56
         }
57 57
 
58 58
         // We add a tag to commits we push out, so we shouldn't pull them in again.
59
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
59
+        $tag = apply_filters('wogh_commit_msg_tag', 'wogh');
60 60
 
61
-        if ( ! $tag ) {
62
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
61
+        if ( ! $tag) {
62
+            throw new Exception(__('Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github'));
63 63
         }
64 64
 
65
-        if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
65
+        if ($tag === substr($this->message(), -1 * strlen($tag))) {
66 66
             return false;
67 67
         }
68 68
 
69
-        if ( ! $this->get_commit_id() ) {
69
+        if ( ! $this->get_commit_id()) {
70 70
             return false;
71 71
         }
72 72
 
Please login to merge, or discard this patch.
lib/fileinfo.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  */
7 7
 class Writing_On_GitHub_File_Info {
8 8
 
9
-    public function __construct( stdClass $data ) {
9
+    public function __construct(stdClass $data) {
10 10
         $this->sha          = $data->sha;
11 11
         $this->path         = $data->path;
12 12
         $this->status       = $data->status;
@@ -14,5 +14,5 @@  discard block
 block discarded – undo
14 14
 
15 15
     public $sha;
16 16
     public $path;
17
-    public $status;  // added removed modified
17
+    public $status; // added removed modified
18 18
 }
Please login to merge, or discard this patch.
lib/semaphore.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
      * Clean up the old values on instantiation.
29 29
      */
30 30
     public function __construct() {
31
-        delete_option( self::KEY );
31
+        delete_option(self::KEY);
32 32
     }
33 33
 
34 34
     /**
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
      * @return bool
41 41
      */
42 42
     public function is_open() {
43
-        if ( self::VALUE_LOCKED === get_transient( self::KEY ) ) {
43
+        if (self::VALUE_LOCKED === get_transient(self::KEY)) {
44 44
             return false;
45 45
         }
46 46
 
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
      * Enables the push lock.
52 52
      */
53 53
     public function lock() {
54
-        set_transient( self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS );
54
+        set_transient(self::KEY, self::VALUE_LOCKED, MINUTE_IN_SECONDS);
55 55
     }
56 56
 
57 57
     /**
58 58
      * Disables the push lock.
59 59
      */
60 60
     public function unlock() {
61
-        set_transient( self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS );
61
+        set_transient(self::KEY, self::VALUE_UNLOCKED, MINUTE_IN_SECONDS);
62 62
     }
63 63
 }
Please login to merge, or discard this patch.
lib/request.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      *
35 35
      * @param Writing_On_GitHub $app Application container.
36 36
      */
37
-    public function __construct( Writing_On_GitHub $app ) {
37
+    public function __construct(Writing_On_GitHub $app) {
38 38
         $this->app = $app;
39 39
     }
40 40
 
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
         $this->raw_data = $this->read_raw_data();
50 50
 
51 51
         // Validate request secret.
52
-        $hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
53
-        if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
52
+        $hash = hash_hmac('sha1', $this->raw_data, $this->secret());
53
+        if ('sha1=' . $hash !== $headers['X-Hub-Signature']) {
54 54
             return false;
55 55
         }
56 56
 
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
      * @return Writing_On_GitHub_Payload
91 91
      */
92 92
     public function payload() {
93
-        return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
93
+        return new Writing_On_GitHub_Payload($this->app, $this->raw_data);
94 94
     }
95 95
 
96 96
     /**
@@ -101,11 +101,11 @@  discard block
 block discarded – undo
101 101
      * @return array
102 102
      */
103 103
     protected function headers() {
104
-        if ( ! empty( $this->headers ) ) {
104
+        if ( ! empty($this->headers)) {
105 105
             return $this->headers;
106 106
         }
107 107
 
108
-        if ( function_exists( 'getallheaders' ) ) {
108
+        if (function_exists('getallheaders')) {
109 109
 
110 110
             $this->headers = getallheaders();
111 111
             return $this->headers;
@@ -115,9 +115,9 @@  discard block
 block discarded – undo
115 115
          * @see http://www.php.net/manual/en/function.getallheaders.php
116 116
          */
117 117
         $this->headers = array();
118
-        foreach ( $_SERVER as $name => $value ) {
119
-            if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
120
-                $this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
118
+        foreach ($_SERVER as $name => $value) {
119
+            if ('HTTP_' === substr($name, 0, 5)) {
120
+                $this->headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
121 121
             }
122 122
         }
123 123
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
      * @return string
131 131
      */
132 132
     protected function read_raw_data() {
133
-        return file_get_contents( 'php://input' );
133
+        return file_get_contents('php://input');
134 134
     }
135 135
 
136 136
     /**
@@ -139,6 +139,6 @@  discard block
 block discarded – undo
139 139
      * @return string
140 140
      */
141 141
     protected function secret() {
142
-        return get_option( 'wogh_secret' );
142
+        return get_option('wogh_secret');
143 143
     }
144 144
 }
Please login to merge, or discard this patch.
lib/database.php 1 patch
Spacing   +105 added lines, -106 removed lines patch added patch discarded remove patch
@@ -21,21 +21,21 @@  discard block
 block discarded – undo
21 21
      *
22 22
      * @var array
23 23
      */
24
-    protected $whitelisted_post_types = array( 'post', 'page' );
24
+    protected $whitelisted_post_types = array('post', 'page');
25 25
 
26 26
     /**
27 27
      * Currently whitelisted post statuses.
28 28
      *
29 29
      * @var array
30 30
      */
31
-    protected $whitelisted_post_statuses = array( 'publish' );
31
+    protected $whitelisted_post_statuses = array('publish');
32 32
 
33 33
     /**
34 34
      * Instantiates a new Database object.
35 35
      *
36 36
      * @param Writing_On_GitHub $app Application container.
37 37
      */
38
-    public function __construct( Writing_On_GitHub $app ) {
38
+    public function __construct(Writing_On_GitHub $app) {
39 39
         $this->app = $app;
40 40
     }
41 41
 
@@ -46,33 +46,33 @@  discard block
 block discarded – undo
46 46
      *
47 47
      * @return Writing_On_GitHub_Post[]|WP_Error
48 48
      */
49
-    public function fetch_all_supported( $force = false ) {
50
-        $args  = array(
49
+    public function fetch_all_supported($force = false) {
50
+        $args = array(
51 51
             'post_type'   => $this->get_whitelisted_post_types(),
52 52
             'post_status' => $this->get_whitelisted_post_statuses(),
53 53
             'nopaging'    => true,
54 54
             'fields'      => 'ids',
55 55
         );
56 56
 
57
-        $query = new WP_Query( apply_filters( 'wogh_pre_fetch_all_supported', $args ) );
57
+        $query = new WP_Query(apply_filters('wogh_pre_fetch_all_supported', $args));
58 58
 
59 59
         $post_ids = $query->get_posts();
60 60
 
61
-        if ( ! $post_ids ) {
61
+        if ( ! $post_ids) {
62 62
             return new WP_Error(
63 63
                 'no_results',
64
-                __( 'Querying for supported posts returned no results.', 'writing-on-github' )
64
+                __('Querying for supported posts returned no results.', 'writing-on-github')
65 65
             );
66 66
         }
67 67
 
68 68
         /* @var Writing_On_GitHub_Post[] $results */
69 69
         $results = array();
70
-        foreach ( $post_ids as $post_id ) {
70
+        foreach ($post_ids as $post_id) {
71 71
             // Do not export posts that have already been exported
72
-            if ( $force || ! get_post_meta( $post_id, '_wogh_sha', true ) ||
73
-                 ! get_post_meta( $post_id, '_wogh_github_path', true ) ) {
72
+            if ($force || ! get_post_meta($post_id, '_wogh_sha', true) ||
73
+                 ! get_post_meta($post_id, '_wogh_github_path', true)) {
74 74
 
75
-                $results[] = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
75
+                $results[] = new Writing_On_GitHub_Post($post_id, $this->app->api());
76 76
             }
77 77
         }
78 78
 
@@ -86,10 +86,10 @@  discard block
 block discarded – undo
86 86
      *
87 87
      * @return WP_Error|Writing_On_GitHub_Post
88 88
      */
89
-    public function fetch_by_id( $post_id ) {
90
-        $post = new Writing_On_GitHub_Post( $post_id, $this->app->api() );
89
+    public function fetch_by_id($post_id) {
90
+        $post = new Writing_On_GitHub_Post($post_id, $this->app->api());
91 91
 
92
-        if ( ! $this->is_post_supported( $post ) ) {
92
+        if ( ! $this->is_post_supported($post)) {
93 93
             return new WP_Error(
94 94
                 'unsupported_post',
95 95
                 sprintf(
@@ -112,36 +112,35 @@  discard block
 block discarded – undo
112 112
      * @param  Writing_On_GitHub_Post $post [description]
113 113
      * @return WP_Error|true
114 114
      */
115
-    public function save_post( Writing_On_GitHub_Post $post ) {
116
-        $args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
115
+    public function save_post(Writing_On_GitHub_Post $post) {
116
+        $args = apply_filters('wogh_pre_import_args', $this->post_args($post), $post);
117 117
 
118
-        remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
118
+        remove_filter('content_save_pre', 'wp_filter_post_kses');
119 119
         $post_id = $post->is_new() ?
120
-            wp_insert_post( $args, true ) :
121
-            wp_update_post( $args, true );
122
-        add_filter( 'content_save_pre', 'wp_filter_post_kses' );
120
+            wp_insert_post($args, true) : wp_update_post($args, true);
121
+        add_filter('content_save_pre', 'wp_filter_post_kses');
123 122
 
124
-        if ( is_wp_error( $post_id ) ) {
123
+        if (is_wp_error($post_id)) {
125 124
             /* @var WP_Error $post_id */
126 125
             return $post_id;
127 126
         }
128 127
 
129
-        if ( $post->is_new() ) {
128
+        if ($post->is_new()) {
130 129
             $author = false;
131 130
             $meta = $post->get_meta();
132
-            if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
131
+            if ( ! empty($meta) && ! empty($meta['author'])) {
133 132
                 $author = $meta['author'];
134 133
             }
135
-            $user    = $this->fetch_commit_user( $author );
136
-            $user_id = is_wp_error( $user ) ? 0 : $user->ID;
137
-            $this->set_post_author( $post_id, $user_id );
134
+            $user    = $this->fetch_commit_user($author);
135
+            $user_id = is_wp_error($user) ? 0 : $user->ID;
136
+            $this->set_post_author($post_id, $user_id);
138 137
         }
139 138
 
140
-        $post->set_post( get_post( $post_id ) );
139
+        $post->set_post(get_post($post_id));
141 140
 
142
-        $meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
141
+        $meta = apply_filters('wogh_pre_import_meta', $post->get_meta(), $post);
143 142
 
144
-        update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
143
+        update_post_meta($post_id, '_wogh_sha', $meta['_wogh_sha']);
145 144
 
146 145
         // unset( $meta['tags'] );
147 146
         // unset( $meta['categories'] );
@@ -157,25 +156,25 @@  discard block
 block discarded – undo
157 156
         return true;
158 157
     }
159 158
 
160
-    protected function post_args( $post ) {
159
+    protected function post_args($post) {
161 160
         $args = $post->get_args();
162 161
         $meta = $post->get_meta();
163 162
 
164 163
         // prevent backslash loss
165
-        $args['post_content'] = addslashes( $args['post_content'] );
164
+        $args['post_content'] = addslashes($args['post_content']);
166 165
 
167 166
         // update tags
168
-        if ( ! empty( $meta['tags'] ) ) {
167
+        if ( ! empty($meta['tags'])) {
169 168
             $args['tags_input'] = $meta['tags'];
170 169
         }
171 170
 
172 171
         // update categories
173
-        if ( ! empty( $meta['categories'] ) ) {
172
+        if ( ! empty($meta['categories'])) {
174 173
             $categories = $meta['categories'];
175
-            if ( ! is_array( $categories ) ) {
176
-                $categories = array( $categories );
174
+            if ( ! is_array($categories)) {
175
+                $categories = array($categories);
177 176
             }
178
-            $terms = get_terms( array(
177
+            $terms = get_terms(array(
179 178
                 'taxonomy' => 'category',
180 179
                 'fields' => 'id=>name',
181 180
                 'hide_empty' => 0,
@@ -183,22 +182,22 @@  discard block
 block discarded – undo
183 182
                 )
184 183
             );
185 184
             $map = array();
186
-            foreach ( $categories as $name ) {
185
+            foreach ($categories as $name) {
187 186
                 $map[$name] = 1;
188 187
             }
189 188
 
190 189
             $ids = array();
191
-            if ( ! empty( $terms ) ) {
192
-                foreach ( $terms as $id => $name ) {
190
+            if ( ! empty($terms)) {
191
+                foreach ($terms as $id => $name) {
193 192
                     $ids[] = $id;
194
-                    unset( $map[$name] );
193
+                    unset($map[$name]);
195 194
                 }
196 195
             }
197 196
 
198 197
             // create new terms
199
-            if ( ! empty( $map ) ) {
200
-                foreach ( $map as $name => $value ) {
201
-                    $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
198
+            if ( ! empty($map)) {
199
+                foreach ($map as $name => $value) {
200
+                    $term = wp_insert_term($name, 'category', array('parent' => 0));
202 201
                     // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
203 202
                     $ids[] = $term['term_id'];
204 203
                 }
@@ -210,19 +209,19 @@  discard block
 block discarded – undo
210 209
         return $args;
211 210
     }
212 211
 
213
-    private function get_post_id_by_filename( $filename, $pattern  ) {
214
-        preg_match( $pattern , $filename, $matches );
212
+    private function get_post_id_by_filename($filename, $pattern) {
213
+        preg_match($pattern, $filename, $matches);
215 214
         $title = $matches[4];
216 215
 
217
-        $query = new WP_Query( array(
216
+        $query = new WP_Query(array(
218 217
             'name'     => $title,
219 218
             'posts_per_page' => 1,
220 219
             'post_type' => $this->get_whitelisted_post_types(),
221 220
             'fields'         => 'ids',
222
-        ) );
221
+        ));
223 222
 
224 223
         $post_id = $query->get_posts();
225
-        $post_id = array_pop( $post_id );
224
+        $post_id = array_pop($post_id);
226 225
         return $post_id;
227 226
     }
228 227
 
@@ -233,55 +232,55 @@  discard block
 block discarded – undo
233 232
      *
234 233
      * @return string|WP_Error
235 234
      */
236
-    public function delete_post_by_path( $path ) {
237
-        $query = new WP_Query( array(
235
+    public function delete_post_by_path($path) {
236
+        $query = new WP_Query(array(
238 237
             'meta_key'       => '_wogh_github_path',
239 238
             'meta_value'     => $path,
240 239
             'meta_compare'   => '=',
241 240
             'posts_per_page' => 1,
242 241
             'fields'         => 'ids',
243
-        ) );
242
+        ));
244 243
 
245 244
         $post_id = $query->get_posts();
246
-        $post_id = array_pop( $post_id );
245
+        $post_id = array_pop($post_id);
247 246
 
248
-        if ( ! $post_id ) {
249
-            $parts     = explode( '/', $path );
250
-            $filename  = array_pop( $parts );
251
-            $directory = $parts ? array_shift( $parts ) : '';
247
+        if ( ! $post_id) {
248
+            $parts     = explode('/', $path);
249
+            $filename  = array_pop($parts);
250
+            $directory = $parts ? array_shift($parts) : '';
252 251
 
253
-            if ( false !== strpos( $directory, 'post' ) ) {
254
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
252
+            if (false !== strpos($directory, 'post')) {
253
+                $post_id = get_post_id_by_filename($filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/');
255 254
             }
256 255
 
257
-            if ( ! $post_id ) {
258
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
256
+            if ( ! $post_id) {
257
+                $post_id = get_post_id_by_filename($filename, '/(.*)\.md/');
259 258
             }
260 259
         }
261 260
 
262
-        if ( ! $post_id ) {
261
+        if ( ! $post_id) {
263 262
             return new WP_Error(
264 263
                 'path_not_found',
265 264
                 sprintf(
266
-                    __( 'Post not found for path %s.', 'writing-on-github' ),
265
+                    __('Post not found for path %s.', 'writing-on-github'),
267 266
                     $path
268 267
                 )
269 268
             );
270 269
         }
271 270
 
272
-        $result = wp_delete_post( $post_id );
271
+        $result = wp_delete_post($post_id);
273 272
 
274 273
         // If deleting fails...
275
-        if ( false === $result ) {
276
-            $post = get_post( $post_id );
274
+        if (false === $result) {
275
+            $post = get_post($post_id);
277 276
 
278 277
             // ...and the post both exists and isn't in the trash...
279
-            if ( $post && 'trash' !== $post->post_status ) {
278
+            if ($post && 'trash' !== $post->post_status) {
280 279
                 // ... then something went wrong.
281 280
                 return new WP_Error(
282 281
                     'db_error',
283 282
                     sprintf(
284
-                        __( 'Failed to delete post ID %d.', 'writing-on-github' ),
283
+                        __('Failed to delete post ID %d.', 'writing-on-github'),
285 284
                         $post_id
286 285
                     )
287 286
                 );
@@ -289,25 +288,25 @@  discard block
 block discarded – undo
289 288
         }
290 289
 
291 290
         return sprintf(
292
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
291
+            __('Successfully deleted post ID %d.', 'writing-on-github'),
293 292
             $post_id
294 293
         );
295 294
     }
296 295
 
297
-    public function delete_post( $post_id ) {
298
-        $result = wp_delete_post( $post_id );
296
+    public function delete_post($post_id) {
297
+        $result = wp_delete_post($post_id);
299 298
 
300 299
         // If deleting fails...
301
-        if ( false === $result ) {
302
-            $post = get_post( $post_id );
300
+        if (false === $result) {
301
+            $post = get_post($post_id);
303 302
 
304 303
             // ...and the post both exists and isn't in the trash...
305
-            if ( $post && 'trash' !== $post->post_status ) {
304
+            if ($post && 'trash' !== $post->post_status) {
306 305
                 // ... then something went wrong.
307 306
                 return new WP_Error(
308 307
                     'db_error',
309 308
                     sprintf(
310
-                        __( 'Failed to delete post ID %d.', 'writing-on-github' ),
309
+                        __('Failed to delete post ID %d.', 'writing-on-github'),
311 310
                         $post_id
312 311
                     )
313 312
                 );
@@ -315,7 +314,7 @@  discard block
 block discarded – undo
315 314
         }
316 315
 
317 316
         return sprintf(
318
-            __( 'Successfully deleted post ID %d.', 'writing-on-github' ),
317
+            __('Successfully deleted post ID %d.', 'writing-on-github'),
319 318
             $post_id
320 319
         );
321 320
     }
@@ -326,7 +325,7 @@  discard block
 block discarded – undo
326 325
      * @return array
327 326
      */
328 327
     protected function get_whitelisted_post_types() {
329
-        return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
328
+        return apply_filters('wogh_whitelisted_post_types', $this->whitelisted_post_types);
330 329
     }
331 330
 
332 331
     /**
@@ -335,7 +334,7 @@  discard block
 block discarded – undo
335 334
      * @return array
336 335
      */
337 336
     protected function get_whitelisted_post_statuses() {
338
-        return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
337
+        return apply_filters('wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses);
339 338
     }
340 339
 
341 340
     /**
@@ -345,12 +344,12 @@  discard block
 block discarded – undo
345 344
      *
346 345
      * @return string Whitelist formatted for query
347 346
      */
348
-    protected function format_for_query( $whitelist ) {
349
-        foreach ( $whitelist as $key => $value ) {
350
-            $whitelist[ $key ] = "'$value'";
347
+    protected function format_for_query($whitelist) {
348
+        foreach ($whitelist as $key => $value) {
349
+            $whitelist[$key] = "'$value'";
351 350
         }
352 351
 
353
-        return implode( ', ', $whitelist );
352
+        return implode(', ', $whitelist);
354 353
     }
355 354
 
356 355
     /**
@@ -361,25 +360,25 @@  discard block
 block discarded – undo
361 360
      *
362 361
      * @return boolean                          True if supported, false if not.
363 362
      */
364
-    protected function is_post_supported( Writing_On_GitHub_Post $post ) {
365
-        if ( wp_is_post_revision( $post->id ) ) {
363
+    protected function is_post_supported(Writing_On_GitHub_Post $post) {
364
+        if (wp_is_post_revision($post->id)) {
366 365
             return false;
367 366
         }
368 367
 
369 368
         // We need to allow trashed posts to be queried, but they are not whitelisted for export.
370
-        if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
369
+        if ( ! in_array($post->status(), $this->get_whitelisted_post_statuses()) && 'trash' !== $post->status()) {
371 370
             return false;
372 371
         }
373 372
 
374
-        if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
373
+        if ( ! in_array($post->type(), $this->get_whitelisted_post_types())) {
375 374
             return false;
376 375
         }
377 376
 
378
-        if ( $post->has_password() ) {
377
+        if ($post->has_password()) {
379 378
             return false;
380 379
         }
381 380
 
382
-        return apply_filters( 'wogh_is_post_supported', true, $post );
381
+        return apply_filters('wogh_is_post_supported', true, $post);
383 382
     }
384 383
 
385 384
     /**
@@ -392,35 +391,35 @@  discard block
 block discarded – undo
392 391
      *
393 392
      * @return WP_Error|WP_User
394 393
      */
395
-    protected function fetch_commit_user( $display_name ) {
394
+    protected function fetch_commit_user($display_name) {
396 395
         // If we can't find a user and a default hasn't been set,
397 396
         // we're just going to set the revision author to 0.
398 397
         $user = false;
399 398
 
400
-        if ( ! empty( $display_name ) ) {
401
-            $search_string = esc_attr( $display_name );
402
-            $query = new WP_User_Query( array(
399
+        if ( ! empty($display_name)) {
400
+            $search_string = esc_attr($display_name);
401
+            $query = new WP_User_Query(array(
403 402
                 'search'         => "{$search_string}",
404 403
                 'search_columns' => array(
405 404
                     'display_name',
406 405
                     'user_nicename',
407 406
                     'user_login',
408 407
                 )
409
-            ) );
408
+            ));
410 409
             $users = $query->get_results();
411 410
             $user = empty($users) ? false : $users[0];
412 411
         }
413 412
 
414
-        if ( ! $user ) {
413
+        if ( ! $user) {
415 414
             // Use the default user.
416
-            $user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
415
+            $user = get_user_by('id', (int) get_option('wogh_default_user'));
417 416
         }
418 417
 
419
-        if ( ! $user ) {
418
+        if ( ! $user) {
420 419
             return new WP_Error(
421 420
                 'user_not_found',
422 421
                 sprintf(
423
-                    __( 'Commit user not found for email %s', 'writing-on-github' ),
422
+                    __('Commit user not found for email %s', 'writing-on-github'),
424 423
                     $email
425 424
                 )
426 425
             );
@@ -472,7 +471,7 @@  discard block
 block discarded – undo
472 471
      *
473 472
      * @return string|WP_Error
474 473
      */
475
-    protected function set_post_author( $post_id, $user_id ) {
474
+    protected function set_post_author($post_id, $user_id) {
476 475
         global $wpdb;
477 476
 
478 477
         $result = $wpdb->update(
@@ -483,25 +482,25 @@  discard block
 block discarded – undo
483 482
             array(
484 483
                 'ID' => (int) $post_id,
485 484
             ),
486
-            array( '%d' ),
487
-            array( '%d' )
485
+            array('%d'),
486
+            array('%d')
488 487
         );
489 488
 
490
-        if ( false === $result ) {
491
-            return new WP_Error( 'db_error', $wpdb->last_error );
489
+        if (false === $result) {
490
+            return new WP_Error('db_error', $wpdb->last_error);
492 491
         }
493 492
 
494
-        if ( 0 === $result ) {
493
+        if (0 === $result) {
495 494
             return sprintf(
496
-                __( 'No change for post ID %d.', 'writing-on-github' ),
495
+                __('No change for post ID %d.', 'writing-on-github'),
497 496
                 $post_id
498 497
             );
499 498
         }
500 499
 
501
-        clean_post_cache( $post_id );
500
+        clean_post_cache($post_id);
502 501
 
503 502
         return sprintf(
504
-            __( 'Successfully updated post ID %d.', 'writing-on-github' ),
503
+            __('Successfully updated post ID %d.', 'writing-on-github'),
505 504
             $post_id
506 505
         );
507 506
     }
Please login to merge, or discard this patch.
lib/admin.php 1 patch
Spacing   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -13,16 +13,16 @@  discard block
 block discarded – undo
13 13
      * Hook into GitHub API
14 14
      */
15 15
     public function __construct() {
16
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
17
-        add_action( 'admin_init', array( $this, 'register_settings' ) );
18
-        add_action( 'current_screen', array( $this, 'trigger_cron' ) );
16
+        add_action('admin_menu', array($this, 'add_admin_menu'));
17
+        add_action('admin_init', array($this, 'register_settings'));
18
+        add_action('current_screen', array($this, 'trigger_cron'));
19 19
     }
20 20
 
21 21
     /**
22 22
      * Callback to render the settings page view
23 23
      */
24 24
     public function settings_page() {
25
-        include dirname( dirname( __FILE__ ) ) . '/views/options.php';
25
+        include dirname(dirname(__FILE__)) . '/views/options.php';
26 26
     }
27 27
 
28 28
     /**
@@ -32,71 +32,71 @@  discard block
 block discarded – undo
32 32
         add_settings_section(
33 33
             'general',
34 34
             'General Settings',
35
-            array( $this, 'section_callback' ),
35
+            array($this, 'section_callback'),
36 36
             Writing_On_GitHub::$text_domain
37 37
         );
38 38
 
39
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
40
-        add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
39
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_host');
40
+        add_settings_field('wogh_host', __('GitHub hostname', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
41 41
                 'default'   => 'https://api.github.com',
42 42
                 'name'      => 'wogh_host',
43
-                'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
43
+                'help_text' => __('The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github'),
44 44
             )
45 45
         );
46 46
 
47
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
48
-        add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
47
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_repository');
48
+        add_settings_field('wogh_repository', __('Repository', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
49 49
                 'default'   => '',
50 50
                 'name'      => 'wogh_repository',
51
-                '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' ),
51
+                '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'),
52 52
             )
53 53
         );
54 54
 
55
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
56
-        add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
55
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_branch');
56
+        add_settings_field('wogh_branch', __('Branch', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
57 57
                 'default'   => 'master',
58 58
                 'name'      => 'wogh_branch',
59
-                'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
59
+                'help_text' => __('The GitHub branch to commit to, default is master.', 'writing-on-github'),
60 60
             )
61 61
         );
62 62
 
63
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
64
-        add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
63
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_oauth_token');
64
+        add_settings_field('wogh_oauth_token', __('Oauth Token', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
65 65
                 'default'   => '',
66 66
                 'name'      => 'wogh_oauth_token',
67
-                'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
67
+                'help_text' => __("A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github'),
68 68
             )
69 69
         );
70 70
 
71
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
72
-        add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
71
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_secret');
72
+        add_settings_field('wogh_secret', __('Webhook Secret', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
73 73
                 'default'   => '',
74 74
                 'name'      => 'wogh_secret',
75
-                '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' ),
75
+                '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'),
76 76
             )
77 77
         );
78 78
 
79
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
80
-        add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
79
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_default_user');
80
+        add_settings_field('wogh_default_user', __('Default Import User', 'writing-on-github'), array(&$this, 'user_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
81 81
                 'default'   => '',
82 82
                 'name'      => 'wogh_default_user',
83
-                'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
83
+                'help_text' => __('The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github'),
84 84
             )
85 85
         );
86 86
 
87
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
88
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
87
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_ignore_author');
88
+        add_settings_field('wogh_ignore_author', __('Ignore author', 'writing-on-github'), array(&$this, 'checkbox_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
89 89
                 'default'   => '',
90 90
                 'name'      => 'wogh_ignore_author',
91
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
91
+                'help_text' => __('Do not export author and do not use author info from GitHub.', 'writing-on-github'),
92 92
             )
93 93
         );
94 94
 
95
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_dont_export_content' );
96
-        add_settings_field( 'wogh_dont_export_content', __( 'Don\'t export content', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
95
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_dont_export_content');
96
+        add_settings_field('wogh_dont_export_content', __('Don\'t export content', 'writing-on-github'), array(&$this, 'checkbox_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
97 97
                 'default'   => '',
98 98
                 'name'      => 'wogh_dont_export_content',
99
-                'help_text' => __( 'Do not export post content to github, only export meta.', 'writing-on-github' ),
99
+                'help_text' => __('Do not export post content to github, only export meta.', 'writing-on-github'),
100 100
             )
101 101
         );
102 102
 
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
      *
115 115
      * @param array $args Field arguments.
116 116
      */
117
-    public function field_callback( $args ) {
118
-        include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
117
+    public function field_callback($args) {
118
+        include dirname(dirname(__FILE__)) . '/views/setting-field.php';
119 119
     }
120 120
 
121 121
     /**
@@ -123,8 +123,8 @@  discard block
 block discarded – undo
123 123
      *
124 124
      * @param array $args Field arguments.
125 125
      */
126
-    public function user_field_callback( $args ) {
127
-        include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
126
+    public function user_field_callback($args) {
127
+        include dirname(dirname(__FILE__)) . '/views/user-setting-field.php';
128 128
     }
129 129
 
130 130
     /**
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
      *
133 133
      * @param array $args Field arguments.
134 134
      */
135
-    public function textarea_field_callback( $args ) {
136
-        include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
135
+    public function textarea_field_callback($args) {
136
+        include dirname(dirname(__FILE__)) . '/views/textarea-setting-field.php';
137 137
     }
138 138
 
139 139
     /**
@@ -141,58 +141,58 @@  discard block
 block discarded – undo
141 141
      *
142 142
      * @param array $args Field arguments.
143 143
      */
144
-    public function checkbox_field_callback( $args ) {
145
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
144
+    public function checkbox_field_callback($args) {
145
+        include dirname(dirname(__FILE__)) . '/views/checkbox-setting-field.php';
146 146
     }
147 147
 
148 148
     /**
149 149
      * Displays settings messages from background processes
150 150
      */
151 151
     public function section_callback() {
152
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
152
+        if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
153 153
             return;
154 154
         }
155 155
 
156
-        if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
156
+        if ('yes' === get_option('_wogh_export_started')) { ?>
157 157
             <div class="updated">
158
-                <p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
158
+                <p><?php esc_html_e('Export to GitHub started.', 'writing-on-github'); ?></p>
159 159
             </div><?php
160
-            delete_option( '_wogh_export_started' );
160
+            delete_option('_wogh_export_started');
161 161
         }
162 162
 
163
-        if ( $message = get_option( '_wogh_export_error' ) ) { ?>
163
+        if ($message = get_option('_wogh_export_error')) { ?>
164 164
             <div class="error">
165
-                <p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
165
+                <p><?php esc_html_e('Export to GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
166 166
             </div><?php
167
-            delete_option( '_wogh_export_error' );
167
+            delete_option('_wogh_export_error');
168 168
         }
169 169
 
170
-        if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
170
+        if ('yes' === get_option('_wogh_export_complete')) { ?>
171 171
             <div class="updated">
172
-                <p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
172
+                <p><?php esc_html_e('Export to GitHub completed successfully.', 'writing-on-github'); ?></p>
173 173
             </div><?php
174
-            delete_option( '_wogh_export_complete' );
174
+            delete_option('_wogh_export_complete');
175 175
         }
176 176
 
177
-        if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
177
+        if ('yes' === get_option('_wogh_import_started')) { ?>
178 178
             <div class="updated">
179
-            <p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
179
+            <p><?php esc_html_e('Import from GitHub started.', 'writing-on-github'); ?></p>
180 180
             </div><?php
181
-            delete_option( '_wogh_import_started' );
181
+            delete_option('_wogh_import_started');
182 182
         }
183 183
 
184
-        if ( $message = get_option( '_wogh_import_error' ) ) { ?>
184
+        if ($message = get_option('_wogh_import_error')) { ?>
185 185
             <div class="error">
186
-            <p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
186
+            <p><?php esc_html_e('Import from GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
187 187
             </div><?php
188
-            delete_option( '_wogh_import_error' );
188
+            delete_option('_wogh_import_error');
189 189
         }
190 190
 
191
-        if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
191
+        if ('yes' === get_option('_wogh_import_complete')) { ?>
192 192
             <div class="updated">
193
-            <p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
193
+            <p><?php esc_html_e('Import from GitHub completed successfully.', 'writing-on-github'); ?></p>
194 194
             </div><?php
195
-            delete_option( '_wogh_import_complete' );
195
+            delete_option('_wogh_import_complete');
196 196
         }
197 197
     }
198 198
 
@@ -201,11 +201,11 @@  discard block
 block discarded – undo
201 201
      */
202 202
     public function add_admin_menu() {
203 203
         add_options_page(
204
-            __( 'Writing On GitHub', 'writing-on-github' ),
205
-            __( 'Writing On GitHub', 'writing-on-github' ),
204
+            __('Writing On GitHub', 'writing-on-github'),
205
+            __('Writing On GitHub', 'writing-on-github'),
206 206
             'manage_options',
207 207
             Writing_On_GitHub::$text_domain,
208
-            array( $this, 'settings_page' )
208
+            array($this, 'settings_page')
209 209
         );
210 210
     }
211 211
 
@@ -213,31 +213,31 @@  discard block
 block discarded – undo
213 213
      * Admin callback to trigger import/export because WordPress admin routing lol
214 214
      */
215 215
     public function trigger_cron() {
216
-        if ( ! current_user_can( 'manage_options' ) ) {
216
+        if ( ! current_user_can('manage_options')) {
217 217
             return;
218 218
         }
219 219
 
220
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
220
+        if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
221 221
             return;
222 222
         }
223 223
 
224
-        if ( ! isset( $_GET['action'] ) ) {
224
+        if ( ! isset($_GET['action'])) {
225 225
             return;
226 226
         }
227 227
 
228
-        if ( 'export' === $_GET['action'] ) {
228
+        if ('export' === $_GET['action']) {
229 229
             Writing_On_GitHub::$instance->start_export();
230 230
         }
231 231
 
232
-        if ( 'force_export' === $_GET['action'] ) {
232
+        if ('force_export' === $_GET['action']) {
233 233
             Writing_On_GitHub::$instance->start_export(true);
234 234
         }
235 235
 
236
-        if ( 'import' === $_GET['action'] ) {
236
+        if ('import' === $_GET['action']) {
237 237
             Writing_On_GitHub::$instance->start_import();
238 238
         }
239 239
 
240
-        wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
240
+        wp_redirect(admin_url('options-general.php?page=writing-on-github'));
241 241
         die;
242 242
     }
243 243
 }
Please login to merge, or discard this patch.
lib/import.php 1 patch
Spacing   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
      *
23 23
      * @param Writing_On_GitHub $app Application container.
24 24
      */
25
-    public function __construct( Writing_On_GitHub $app ) {
25
+    public function __construct(Writing_On_GitHub $app) {
26 26
         $this->app = $app;
27 27
     }
28 28
 
@@ -32,24 +32,24 @@  discard block
 block discarded – undo
32 32
      *
33 33
      * @return string|WP_Error
34 34
      */
35
-    public function payload( Writing_On_GitHub_Payload $payload ) {
35
+    public function payload(Writing_On_GitHub_Payload $payload) {
36 36
 
37
-        $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
37
+        $result = $this->app->api()->fetch()->compare($payload->get_before_commit_id());
38 38
 
39
-        if ( is_wp_error( $result ) ) {
39
+        if (is_wp_error($result)) {
40 40
             /* @var WP_Error $result */
41 41
             return $result;
42 42
         }
43 43
 
44
-        if ( is_array( $result ) ) {
45
-            $result = $this->import_files( $result );
44
+        if (is_array($result)) {
45
+            $result = $this->import_files($result);
46 46
         }
47 47
 
48
-        if ( is_wp_error( $result ) ) {
48
+        if (is_wp_error($result)) {
49 49
             return $files;
50 50
         }
51 51
 
52
-        return __( 'Payload processed', 'writing-on-github' );
52
+        return __('Payload processed', 'writing-on-github');
53 53
     }
54 54
 
55 55
     /**
@@ -58,37 +58,37 @@  discard block
 block discarded – undo
58 58
      *
59 59
      * @return true|WP_Error
60 60
      */
61
-    protected function import_files( $files ) {
61
+    protected function import_files($files) {
62 62
 
63 63
         $error = true;
64 64
 
65
-        foreach ( $files as $file ) {
66
-            if ( ! $this->importable_file( $file ) ) {
65
+        foreach ($files as $file) {
66
+            if ( ! $this->importable_file($file)) {
67 67
                 continue;
68 68
             }
69 69
 
70
-            $blob = $this->app->api()->fetch()->blob( $file );
70
+            $blob = $this->app->api()->fetch()->blob($file);
71 71
             // network error ?
72
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
72
+            if ( ! $blob instanceof Writing_On_GitHub_Blob) {
73 73
                 continue;
74 74
             }
75 75
 
76 76
             $is_remove = 'removed' == $file->status;
77 77
 
78 78
             $result = false;
79
-            if ( $this->importable_raw_file( $blob ) ) {
80
-                $result = $this->import_raw_file( $blob, $is_remove );
81
-            } elseif ( $this->importable_post( $blob ) ) {
82
-                if ( $is_remove ) {
83
-                    $result = $this->delete_post( $blob );
79
+            if ($this->importable_raw_file($blob)) {
80
+                $result = $this->import_raw_file($blob, $is_remove);
81
+            } elseif ($this->importable_post($blob)) {
82
+                if ($is_remove) {
83
+                    $result = $this->delete_post($blob);
84 84
                 } else {
85
-                    $result = $this->import_post( $blob );
85
+                    $result = $this->import_post($blob);
86 86
                 }
87 87
             }
88 88
 
89
-            if ( is_wp_error( $result ) ) {
89
+            if (is_wp_error($result)) {
90 90
                 /* @var WP_Error $result */
91
-                $error = wogh_append_error( $error, $result );
91
+                $error = wogh_append_error($error, $result);
92 92
             }
93 93
         }
94 94
 
@@ -103,21 +103,21 @@  discard block
 block discarded – undo
103 103
     public function master() {
104 104
         $result = $this->app->api()->fetch()->tree_recursive();
105 105
 
106
-        if ( is_wp_error( $result ) ) {
106
+        if (is_wp_error($result)) {
107 107
             /* @var WP_Error $result */
108 108
             return $result;
109 109
         }
110 110
 
111
-        if ( is_array( $result ) ) {
112
-            $result = $this->import_files( $result );
111
+        if (is_array($result)) {
112
+            $result = $this->import_files($result);
113 113
         }
114 114
 
115
-        if ( is_wp_error( $result ) ) {
115
+        if (is_wp_error($result)) {
116 116
             /* @var WP_Error $result */
117 117
             return $result;
118 118
         }
119 119
 
120
-        return __( 'Payload processed', 'writing-on-github' );
120
+        return __('Payload processed', 'writing-on-github');
121 121
     }
122 122
 
123 123
     /**
@@ -127,14 +127,14 @@  discard block
 block discarded – undo
127 127
      *
128 128
      * @return bool
129 129
      */
130
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
130
+    protected function importable_file(Writing_On_GitHub_File_Info $file) {
131 131
 
132 132
         $path = $file->path;
133 133
 
134 134
         // only _pages, _posts and images
135
-        $prefixs = array( '_pages/', '_posts/', 'images/');
135
+        $prefixs = array('_pages/', '_posts/', 'images/');
136 136
         foreach ($prefixs as $prefix) {
137
-            if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
137
+            if ( ! strncasecmp($path, $prefix, strlen($prefix))) {
138 138
                 return true;
139 139
             }
140 140
         }
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
      *
149 149
      * @return bool
150 150
      */
151
-    protected function importable_post( Writing_On_GitHub_Blob $blob ) {
151
+    protected function importable_post(Writing_On_GitHub_Blob $blob) {
152 152
         // global $wpdb;
153 153
 
154 154
         // // Skip the repo's readme.
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
         //  return false;
162 162
         // }
163 163
 
164
-        if ( ! $blob->has_frontmatter() ) {
164
+        if ( ! $blob->has_frontmatter()) {
165 165
             return false;
166 166
         }
167 167
 
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
      * @param  Writing_On_GitHub_Blob $blob
174 174
      * @return WP_Error|bool
175 175
      */
176
-    protected function delete_post( Writing_On_GitHub_Blob $blob ) {
176
+    protected function delete_post(Writing_On_GitHub_Blob $blob) {
177 177
         $id = $blob->id();
178
-        if ( empty( $id ) ) {
178
+        if (empty($id)) {
179 179
             return false;
180 180
         }
181
-        $result = $this->app->database()->delete_post( $id );
182
-        if ( is_wp_error( $result ) ) {
181
+        $result = $this->app->database()->delete_post($id);
182
+        if (is_wp_error($result)) {
183 183
             /* @var WP_Error $result */
184 184
             return $result;
185 185
         }
@@ -191,31 +191,31 @@  discard block
 block discarded – undo
191 191
      * @param  Writing_On_GitHub_Blob $blob
192 192
      * @return WP_Error|bool
193 193
      */
194
-    protected function import_post( Writing_On_GitHub_Blob $blob ) {
195
-        $post = $this->blob_to_post( $blob );
194
+    protected function import_post(Writing_On_GitHub_Blob $blob) {
195
+        $post = $this->blob_to_post($blob);
196 196
 
197
-        if ( ! $post instanceof Writing_On_GitHub_Post ) {
197
+        if ( ! $post instanceof Writing_On_GitHub_Post) {
198 198
             return false;
199 199
         }
200 200
 
201
-        $result = $this->app->database()->save_post( $post );
202
-        if ( is_wp_error( $result ) ) {
201
+        $result = $this->app->database()->save_post($post);
202
+        if (is_wp_error($result)) {
203 203
             /** @var WP_Error $result */
204 204
             return $result;
205 205
         }
206 206
 
207
-        if ( $post->is_new() ||
208
-                ! wogh_equal_front_matter( $post, $blob ) ) {
207
+        if ($post->is_new() ||
208
+                ! wogh_equal_front_matter($post, $blob)) {
209 209
 
210
-            $result = $this->app->export()->export_post( $post );
210
+            $result = $this->app->export()->export_post($post);
211 211
 
212
-            if ( is_wp_error( $result ) ) {
212
+            if (is_wp_error($result)) {
213 213
                 /** @var WP_Error $result */
214 214
                 return $result;
215 215
             }
216 216
         }
217 217
 
218
-        clean_post_cache( $post->id() );
218
+        clean_post_cache($post->id());
219 219
 
220 220
         return true;
221 221
     }
@@ -225,13 +225,13 @@  discard block
 block discarded – undo
225 225
      * @param  Writing_On_GitHub_Blob $blob
226 226
      * @return bool
227 227
      */
228
-    protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
229
-        if ( $blob->has_frontmatter() ) {
228
+    protected function importable_raw_file(Writing_On_GitHub_Blob $blob) {
229
+        if ($blob->has_frontmatter()) {
230 230
             return false;
231 231
         }
232 232
 
233 233
         // only images
234
-        if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
234
+        if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) {
235 235
             return false;
236 236
         }
237 237
 
@@ -243,16 +243,16 @@  discard block
 block discarded – undo
243 243
      * @param  Writing_On_GitHub_Blob $blob
244 244
      * @param  bool                   $is_remove
245 245
      */
246
-    protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
246
+    protected function import_raw_file(Writing_On_GitHub_Blob $blob, $is_remove) {
247 247
         $arr = wp_upload_dir();
248 248
         $path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
249
-        if ( $is_remove ) {
250
-            if ( file_exists($path) ) {
249
+        if ($is_remove) {
250
+            if (file_exists($path)) {
251 251
                 unlink($path);
252 252
             }
253 253
         } else {
254 254
             $dirname = dirname($path);
255
-            if ( ! file_exists($dirname) ) {
255
+            if ( ! file_exists($dirname)) {
256 256
                 wp_mkdir_p($dirname);
257 257
             }
258 258
 
@@ -268,58 +268,58 @@  discard block
 block discarded – undo
268 268
      *
269 269
      * @return Writing_On_GitHub_Post|false
270 270
      */
271
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
272
-        $args = array( 'post_content' => $blob->content_import() );
271
+    protected function blob_to_post(Writing_On_GitHub_Blob $blob) {
272
+        $args = array('post_content' => $blob->content_import());
273 273
         $meta = $blob->meta();
274 274
 
275 275
         $id = false;
276 276
 
277
-        if ( ! empty( $meta ) ) {
278
-            if ( array_key_exists( 'layout', $meta ) ) {
277
+        if ( ! empty($meta)) {
278
+            if (array_key_exists('layout', $meta)) {
279 279
                 $args['post_type'] = $meta['layout'];
280
-                unset( $meta['layout'] );
280
+                unset($meta['layout']);
281 281
             }
282 282
 
283
-            if ( array_key_exists( 'published', $meta ) ) {
283
+            if (array_key_exists('published', $meta)) {
284 284
                 $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
285
-                unset( $meta['published'] );
285
+                unset($meta['published']);
286 286
             }
287 287
 
288
-            if ( array_key_exists( 'post_title', $meta ) ) {
288
+            if (array_key_exists('post_title', $meta)) {
289 289
                 $args['post_title'] = $meta['post_title'];
290
-                unset( $meta['post_title'] );
290
+                unset($meta['post_title']);
291 291
             }
292 292
 
293
-            if ( array_key_exists( 'post_name', $meta ) ) {
293
+            if (array_key_exists('post_name', $meta)) {
294 294
                 $args['post_name'] = $meta['post_name'];
295
-                unset( $meta['post_name'] );
295
+                unset($meta['post_name']);
296 296
             }
297 297
 
298
-            if ( array_key_exists( 'ID', $meta ) ) {
298
+            if (array_key_exists('ID', $meta)) {
299 299
                 $id = $args['ID'] = $meta['ID'];
300 300
                 $blob->set_id($id);
301
-                unset( $meta['ID'] );
301
+                unset($meta['ID']);
302 302
             }
303 303
         }
304 304
 
305 305
         $meta['_wogh_sha'] = $blob->sha();
306 306
 
307
-        if ( $id ) {
308
-            $old_sha = get_post_meta( $id, '_wogh_sha', true );
309
-            $old_github_path = get_post_meta( $id, '_wogh_github_path', true );
307
+        if ($id) {
308
+            $old_sha = get_post_meta($id, '_wogh_sha', true);
309
+            $old_github_path = get_post_meta($id, '_wogh_github_path', true);
310 310
 
311 311
             // dont save post when has same sha
312
-            if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
313
-                 $old_github_path && $old_github_path == $blob->path() ) {
312
+            if ($old_sha && $old_sha == $meta['_wogh_sha'] &&
313
+                 $old_github_path && $old_github_path == $blob->path()) {
314 314
                 return false;
315 315
             }
316 316
         }
317 317
 
318
-        $post = new Writing_On_GitHub_Post( $args, $this->app->api() );
319
-        $post->set_old_github_path( $blob->path() );
320
-        $post->set_meta( $meta );
321
-        $post->set_blob( $blob );
322
-        $blob->set_id( $post->id() );
318
+        $post = new Writing_On_GitHub_Post($args, $this->app->api());
319
+        $post->set_old_github_path($blob->path());
320
+        $post->set_meta($meta);
321
+        $post->set_blob($blob);
322
+        $blob->set_id($post->id());
323 323
 
324 324
         return $post;
325 325
     }
Please login to merge, or discard this patch.