Passed
Push — ci ( 5ed1e2...7ea632 )
by litefeel
02:23
created
lib/import.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -26,24 +26,24 @@  discard block
 block discarded – undo
26 26
 		$this->app = $app;
27 27
 	}
28 28
 
29
-    /**
30
-     * Imports a payload.
31
-     * @param  Writing_On_GitHub_Payload $payload
32
-     *
33
-     * @return string|WP_Error
34
-     */
29
+	/**
30
+	 * Imports a payload.
31
+	 * @param  Writing_On_GitHub_Payload $payload
32
+	 *
33
+	 * @return string|WP_Error
34
+	 */
35 35
 	public function payload( Writing_On_GitHub_Payload $payload ) {
36 36
 
37 37
 		$result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
38 38
 
39 39
 		if ( is_wp_error( $result ) ) {
40
-            /* @var WP_Error $result */
40
+			/* @var WP_Error $result */
41 41
 			return $result;
42 42
 		}
43 43
 
44
-        if ( is_array( $result ) ) {
45
-            $result = $this->import_files( $result );
46
-        }
44
+		if ( is_array( $result ) ) {
45
+			$result = $this->import_files( $result );
46
+		}
47 47
 
48 48
 		if ( is_wp_error( $result ) ) {
49 49
 			return $files;
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	/**
56 56
 	 * import blob by files
57 57
 	 * @param  Writing_On_GitHub_File_Info[] $files
58
-     *
58
+	 *
59 59
 	 * @return string|WP_Error
60 60
 	 */
61 61
 	protected function import_files( $files ) {
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
 			foreach ($delete_ids as $id) {
74 74
 				$result = $this->app->database()->delete_post( $id );
75 75
 				if ( is_wp_error( $result ) ) {
76
-                    /* @var WP_Error $result */
77
-                    $error = wogh_append_error( $error, $result );
76
+					/* @var WP_Error $result */
77
+					$error = wogh_append_error( $error, $result );
78 78
 				}
79 79
 			}
80 80
 		}
@@ -91,32 +91,32 @@  discard block
 block discarded – undo
91 91
 		$result = $this->app->api()->fetch()->tree_recursive();
92 92
 
93 93
 		if ( is_wp_error( $result ) ) {
94
-            /* @var WP_Error $result */
94
+			/* @var WP_Error $result */
95 95
 			return $result;
96 96
 		}
97 97
 
98
-        if ( is_array( $result ) ) {
99
-            $result = $this->import_files( $result );
100
-        }
98
+		if ( is_array( $result ) ) {
99
+			$result = $this->import_files( $result );
100
+		}
101 101
 
102 102
 		if ( is_wp_error( $result ) ) {
103
-            /* @var WP_Error $result */
103
+			/* @var WP_Error $result */
104 104
 			return $result;
105 105
 		}
106 106
 
107 107
 		return __( 'Payload processed', 'writing-on-github' );
108 108
 	}
109 109
 
110
-    /**
111
-     * Do compare
112
-     * @param  Writing_On_GitHub_File_Info[]|WP_Error $files
113
-     * @param  int[] &$delete_ids
114
-     *
115
-     * @return string|WP_Error
116
-     */
110
+	/**
111
+	 * Do compare
112
+	 * @param  Writing_On_GitHub_File_Info[]|WP_Error $files
113
+	 * @param  int[] &$delete_ids
114
+	 *
115
+	 * @return string|WP_Error
116
+	 */
117 117
 	protected function compare( $files, &$delete_ids ) {
118 118
 		if ( is_wp_error( $files ) ) {
119
-            /* @var WP_Error $files */
119
+			/* @var WP_Error $files */
120 120
 			return $files;
121 121
 		}
122 122
 
Please login to merge, or discard this patch.
Spacing   +79 added lines, -79 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,23 +58,23 @@  discard block
 block discarded – undo
58 58
      *
59 59
 	 * @return string|WP_Error
60 60
 	 */
61
-	protected function import_files( $files ) {
61
+	protected function import_files($files) {
62 62
 
63
-		$error 		= false;
63
+		$error = false;
64 64
 		$delete_ids = false;
65 65
 
66
-		$result = $this->compare( $files, $delete_ids );
66
+		$result = $this->compare($files, $delete_ids);
67 67
 
68
-		if ( is_wp_error( $result ) ) {
68
+		if (is_wp_error($result)) {
69 69
 			return $result;
70 70
 		}
71 71
 
72
-		if ( $delete_ids ) {
72
+		if ($delete_ids) {
73 73
 			foreach ($delete_ids as $id) {
74
-				$result = $this->app->database()->delete_post( $id );
75
-				if ( is_wp_error( $result ) ) {
74
+				$result = $this->app->database()->delete_post($id);
75
+				if (is_wp_error($result)) {
76 76
                     /* @var WP_Error $result */
77
-                    $error = wogh_append_error( $error, $result );
77
+                    $error = wogh_append_error($error, $result);
78 78
 				}
79 79
 			}
80 80
 		}
@@ -90,21 +90,21 @@  discard block
 block discarded – undo
90 90
 	public function master() {
91 91
 		$result = $this->app->api()->fetch()->tree_recursive();
92 92
 
93
-		if ( is_wp_error( $result ) ) {
93
+		if (is_wp_error($result)) {
94 94
             /* @var WP_Error $result */
95 95
 			return $result;
96 96
 		}
97 97
 
98
-        if ( is_array( $result ) ) {
99
-            $result = $this->import_files( $result );
98
+        if (is_array($result)) {
99
+            $result = $this->import_files($result);
100 100
         }
101 101
 
102
-		if ( is_wp_error( $result ) ) {
102
+		if (is_wp_error($result)) {
103 103
             /* @var WP_Error $result */
104 104
 			return $result;
105 105
 		}
106 106
 
107
-		return __( 'Payload processed', 'writing-on-github' );
107
+		return __('Payload processed', 'writing-on-github');
108 108
 	}
109 109
 
110 110
     /**
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
      *
115 115
      * @return string|WP_Error
116 116
      */
117
-	protected function compare( $files, &$delete_ids ) {
118
-		if ( is_wp_error( $files ) ) {
117
+	protected function compare($files, &$delete_ids) {
118
+		if (is_wp_error($files)) {
119 119
             /* @var WP_Error $files */
120 120
 			return $files;
121 121
 		}
@@ -125,62 +125,62 @@  discard block
 block discarded – undo
125 125
 
126 126
 		$idsmap = array();
127 127
 
128
-		foreach ( $files as $file ) {
129
-			if ( ! $this->importable_file( $file ) ) {
128
+		foreach ($files as $file) {
129
+			if ( ! $this->importable_file($file)) {
130 130
 				continue;
131 131
 			}
132 132
 
133
-			$blob = $this->app->api()->fetch()->blob( $file );
133
+			$blob = $this->app->api()->fetch()->blob($file);
134 134
 			// network error ?
135
-			if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
135
+			if ( ! $blob instanceof Writing_On_GitHub_Blob) {
136 136
 				continue;
137 137
 			}
138 138
 
139
-			if ( $this->importable_raw_file( $blob ) ) {
140
-				$this->import_raw_file( $blob, $file->status == 'removed' );
139
+			if ($this->importable_raw_file($blob)) {
140
+				$this->import_raw_file($blob, $file->status == 'removed');
141 141
 				continue;
142 142
 			}
143 143
 
144
-			if ( ! $this->importable_blob( $blob ) ) {
144
+			if ( ! $this->importable_blob($blob)) {
145 145
 				continue;
146 146
 			}
147 147
 
148
-			$post = $this->blob_to_post( $blob );
148
+			$post = $this->blob_to_post($blob);
149 149
 
150
-			if ( $file->status == 'removed' ) {
151
-				if ( $blob->id() ) {
150
+			if ($file->status == 'removed') {
151
+				if ($blob->id()) {
152 152
 					$idsmap[$blob->id()] = true;
153 153
 				}
154
-			} elseif ( $post != false ) {
154
+			} elseif ($post != false) {
155 155
 				$posts[] = $post;
156
-				if ( $post->is_new() ) {
156
+				if ($post->is_new()) {
157 157
 					$new[] = $post;
158 158
 				}
159 159
 			}
160 160
 		}
161 161
 
162
-		foreach ( $posts as $post ) {
163
-			if ( $post->id() && isset( $idsmap[ $post->id() ] ) ) {
164
-				unset( $idsmap[ $post->id() ] );
162
+		foreach ($posts as $post) {
163
+			if ($post->id() && isset($idsmap[$post->id()])) {
164
+				unset($idsmap[$post->id()]);
165 165
 			}
166 166
 		}
167 167
 		$delete_ids = array();
168
-		foreach ( $idsmap as $id => $value ) {
168
+		foreach ($idsmap as $id => $value) {
169 169
 			$delete_ids[] = $id;
170 170
 		}
171 171
 
172 172
 		// $this->app->database()->save_posts( $posts, $commit->author_email() );
173 173
 
174
-		$result = $this->app->database()->save_posts( $posts );
174
+		$result = $this->app->database()->save_posts($posts);
175 175
 
176
-		if ( is_wp_error( $result ) ) {
176
+		if (is_wp_error($result)) {
177 177
 			return $result;
178 178
 		}
179 179
 
180
-		if ( ! empty( $new ) ) {
181
-			$result = $this->app->export()->new_posts( $new );
180
+		if ( ! empty($new)) {
181
+			$result = $this->app->export()->new_posts($new);
182 182
 
183
-			if ( is_wp_error( $result ) ) {
183
+			if (is_wp_error($result)) {
184 184
 				return $result;
185 185
 			}
186 186
 		}
@@ -195,12 +195,12 @@  discard block
 block discarded – undo
195 195
 	 *
196 196
 	 * @return bool
197 197
 	 */
198
-	protected function importable_file( Writing_On_GitHub_File_Info $file ) {
198
+	protected function importable_file(Writing_On_GitHub_File_Info $file) {
199 199
 
200 200
 		// only _pages and _posts
201
-		if ( strncasecmp($file->path, '_pages/', strlen('_pages/') ) != 0 &&
202
-			 strncasecmp($file->path, '_posts/', strlen('_posts/') ) != 0 &&
203
-			 strncasecmp($file->path, 'images/', strlen('images/') ) != 0 ) {
201
+		if (strncasecmp($file->path, '_pages/', strlen('_pages/')) != 0 &&
202
+			 strncasecmp($file->path, '_posts/', strlen('_posts/')) != 0 &&
203
+			 strncasecmp($file->path, 'images/', strlen('images/')) != 0) {
204 204
 			return false;
205 205
 		}
206 206
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 	 *
220 220
 	 * @return bool
221 221
 	 */
222
-	protected function importable_blob( Writing_On_GitHub_Blob $blob ) {
222
+	protected function importable_blob(Writing_On_GitHub_Blob $blob) {
223 223
 		// global $wpdb;
224 224
 
225 225
 		// // Skip the repo's readme.
@@ -232,20 +232,20 @@  discard block
 block discarded – undo
232 232
 		// 	return false;
233 233
 		// }
234 234
 
235
-		if ( ! $blob->has_frontmatter() ) {
235
+		if ( ! $blob->has_frontmatter()) {
236 236
 			return false;
237 237
 		}
238 238
 
239 239
 		return true;
240 240
 	}
241 241
 
242
-	protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
243
-		if ( $blob->has_frontmatter() ) {
242
+	protected function importable_raw_file(Writing_On_GitHub_Blob $blob) {
243
+		if ($blob->has_frontmatter()) {
244 244
 			return false;
245 245
 		}
246 246
 
247 247
 		// only images
248
-		if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
248
+		if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) {
249 249
 			return false;
250 250
 		}
251 251
 
@@ -257,16 +257,16 @@  discard block
 block discarded – undo
257 257
 	 * @param  Writing_On_GitHub_Blob $blob
258 258
 	 * @param  bool                   $is_remove
259 259
 	 */
260
-	protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
260
+	protected function import_raw_file(Writing_On_GitHub_Blob $blob, $is_remove) {
261 261
 		$arr = wp_upload_dir();
262 262
 		$path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
263
-		if ( $is_remove ) {
264
-			if ( file_exists($path) ) {
263
+		if ($is_remove) {
264
+			if (file_exists($path)) {
265 265
 				unlink($path);
266 266
 			}
267 267
 		} else {
268 268
 			$dirname = dirname($path);
269
-			if ( ! file_exists($dirname) ) {
269
+			if ( ! file_exists($dirname)) {
270 270
 				wp_mkdir_p($dirname);
271 271
 			}
272 272
 
@@ -281,57 +281,57 @@  discard block
 block discarded – undo
281 281
 	 *
282 282
 	 * @return Writing_On_GitHub_Post|false
283 283
 	 */
284
-	protected function blob_to_post( Writing_On_GitHub_Blob $blob ) {
285
-		$args = array( 'post_content' => $blob->content_import() );
284
+	protected function blob_to_post(Writing_On_GitHub_Blob $blob) {
285
+		$args = array('post_content' => $blob->content_import());
286 286
 		$meta = $blob->meta();
287 287
 
288 288
 		$id = false;
289 289
 
290
-		if ( ! empty( $meta ) ) {
291
-			if ( array_key_exists( 'layout', $meta ) ) {
290
+		if ( ! empty($meta)) {
291
+			if (array_key_exists('layout', $meta)) {
292 292
 				$args['post_type'] = $meta['layout'];
293
-				unset( $meta['layout'] );
293
+				unset($meta['layout']);
294 294
 			}
295 295
 
296
-			if ( array_key_exists( 'published', $meta ) ) {
296
+			if (array_key_exists('published', $meta)) {
297 297
 				$args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
298
-				unset( $meta['published'] );
298
+				unset($meta['published']);
299 299
 			}
300 300
 
301
-			if ( array_key_exists( 'post_title', $meta ) ) {
301
+			if (array_key_exists('post_title', $meta)) {
302 302
 				$args['post_title'] = $meta['post_title'];
303
-				unset( $meta['post_title'] );
303
+				unset($meta['post_title']);
304 304
 			}
305 305
 
306
-			if ( array_key_exists( 'post_name', $meta ) ) {
306
+			if (array_key_exists('post_name', $meta)) {
307 307
 				$args['post_name'] = $meta['post_name'];
308
-				unset( $meta['post_name'] );
308
+				unset($meta['post_name']);
309 309
 			}
310 310
 
311
-			if ( array_key_exists( 'ID', $meta ) ) {
311
+			if (array_key_exists('ID', $meta)) {
312 312
 				$id = $args['ID'] = $meta['ID'];
313 313
 				$blob->set_id($id);
314
-				unset( $meta['ID'] );
314
+				unset($meta['ID']);
315 315
 			}
316 316
 		}
317 317
 
318 318
 		$meta['_wogh_sha'] = $blob->sha();
319 319
 
320
-		if ( $id ) {
321
-			$old_sha = get_post_meta( $id, '_wogh_sha', true );
322
-			$old_github_path = get_post_meta( $id, '_wogh_github_path', true );
320
+		if ($id) {
321
+			$old_sha = get_post_meta($id, '_wogh_sha', true);
322
+			$old_github_path = get_post_meta($id, '_wogh_github_path', true);
323 323
 
324 324
 			// dont save post when has same sha
325
-			if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
326
-				 $old_github_path && $old_github_path == $blob->path() ) {
325
+			if ($old_sha && $old_sha == $meta['_wogh_sha'] &&
326
+				 $old_github_path && $old_github_path == $blob->path()) {
327 327
 				return false;
328 328
 			}
329 329
 		}
330 330
 
331
-		$post = new Writing_On_GitHub_Post( $args, $this->app->api() );
332
-		$post->set_old_github_path( $blob->path() );
333
-		$post->set_meta( $meta );
334
-		$blob->set_id( $post->id() );
331
+		$post = new Writing_On_GitHub_Post($args, $this->app->api());
332
+		$post->set_old_github_path($blob->path());
333
+		$post->set_meta($meta);
334
+		$blob->set_id($post->id());
335 335
 
336 336
 		return $post;
337 337
 	}
Please login to merge, or discard this patch.
lib/export.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -29,34 +29,34 @@  discard block
 block discarded – undo
29 29
 	/**
30 30
 	 * Updates all of the current posts in the database on master.
31 31
 	 *
32
-     * @param  bool    $force
33
-     *
34
-     * @return string|WP_Error
35
-     */
32
+	 * @param  bool    $force
33
+	 *
34
+	 * @return string|WP_Error
35
+	 */
36 36
 	public function full( $force = false ) {
37 37
 		$posts = $this->app->database()->fetch_all_supported( $force );
38 38
 
39 39
 		if ( is_wp_error( $posts ) ) {
40
-            /* @var WP_Error $posts */
40
+			/* @var WP_Error $posts */
41 41
 			return $posts;
42 42
 		}
43 43
 
44
-        $error = '';
44
+		$error = '';
45 45
 
46
-        foreach ( $posts as $post ) {
47
-            $result = $this->update( $post->id() );
48
-            if ( is_wp_error( $result ) ) {
49
-                /* @var WP_Error $result */
50
-                $error = wogh_append_error( $error, $result );
51
-            }
52
-        }
46
+		foreach ( $posts as $post ) {
47
+			$result = $this->update( $post->id() );
48
+			if ( is_wp_error( $result ) ) {
49
+				/* @var WP_Error $result */
50
+				$error = wogh_append_error( $error, $result );
51
+			}
52
+		}
53 53
 
54
-        if ( is_wp_error( $error ) ) {
55
-            /* @var WP_Error $error */
56
-            return $error;
57
-        }
54
+		if ( is_wp_error( $error ) ) {
55
+			/* @var WP_Error $error */
56
+			return $error;
57
+		}
58 58
 
59
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
59
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
60 60
 	}
61 61
 
62 62
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 		$post = $this->app->database()->fetch_by_id( $post_id );
87 87
 
88 88
 		if ( is_wp_error( $post ) ) {
89
-            /* @var WP_Error $post */
89
+			/* @var WP_Error $post */
90 90
 			return $post;
91 91
 		}
92 92
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		$result = $this->new_posts( array( $post ) );
103 103
 
104 104
 		if ( is_wp_error( $result ) ) {
105
-            /* @var WP_Error $result */
105
+			/* @var WP_Error $result */
106 106
 			return $result;
107 107
 		}
108 108
 
@@ -117,14 +117,14 @@  discard block
 block discarded – undo
117 117
 	 * @return string|WP_Error
118 118
 	 */
119 119
 	public function new_posts( array $posts ) {
120
-        $persist = $this->app->api()->persist();
120
+		$persist = $this->app->api()->persist();
121 121
 
122 122
 		$error = '';
123 123
 		foreach ( $posts as $post ) {
124 124
 			$result = $this->new_post( $post, $persist );
125 125
 			if ( is_wp_error( $result ) ) {
126
-                /* @var WP_Error $result */
127
-                $error = wogh_append_error( $error, $result );
126
+				/* @var WP_Error $result */
127
+				$error = wogh_append_error( $error, $result );
128 128
 			}
129 129
 		}
130 130
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 			return $error;
133 133
 		}
134 134
 
135
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
135
+		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
136 136
 	}
137 137
 
138 138
 	protected function new_post( $post, $persist ) {
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$post = $this->app->database()->fetch_by_id( $post_id );
213 213
 
214 214
 		if ( is_wp_error( $post ) ) {
215
-            /* @var WP_Error $post */
215
+			/* @var WP_Error $post */
216 216
 			return $post;
217 217
 		}
218 218
 
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 		$result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
233 233
 
234 234
 		if ( is_wp_error( $result ) ) {
235
-            /* @var WP_Error $result */
235
+			/* @var WP_Error $result */
236 236
 			return $result;
237 237
 		}
238 238
 
Please login to merge, or discard this patch.
Spacing   +57 added lines, -57 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
 
@@ -33,30 +33,30 @@  discard block
 block discarded – undo
33 33
      *
34 34
      * @return string|WP_Error
35 35
      */
36
-	public function full( $force = false ) {
37
-		$posts = $this->app->database()->fetch_all_supported( $force );
36
+	public function full($force = false) {
37
+		$posts = $this->app->database()->fetch_all_supported($force);
38 38
 
39
-		if ( is_wp_error( $posts ) ) {
39
+		if (is_wp_error($posts)) {
40 40
             /* @var WP_Error $posts */
41 41
 			return $posts;
42 42
 		}
43 43
 
44 44
         $error = '';
45 45
 
46
-        foreach ( $posts as $post ) {
47
-            $result = $this->update( $post->id() );
48
-            if ( is_wp_error( $result ) ) {
46
+        foreach ($posts as $post) {
47
+            $result = $this->update($post->id());
48
+            if (is_wp_error($result)) {
49 49
                 /* @var WP_Error $result */
50
-                $error = wogh_append_error( $error, $result );
50
+                $error = wogh_append_error($error, $result);
51 51
             }
52 52
         }
53 53
 
54
-        if ( is_wp_error( $error ) ) {
54
+        if (is_wp_error($error)) {
55 55
             /* @var WP_Error $error */
56 56
             return $error;
57 57
         }
58 58
 
59
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
59
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
60 60
 	}
61 61
 
62 62
 
@@ -65,10 +65,10 @@  discard block
 block discarded – undo
65 65
 	 * @param  int  $post_id
66 66
 	 * @return boolean
67 67
 	 */
68
-	protected function github_path( $post_id ) {
69
-		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
68
+	protected function github_path($post_id) {
69
+		$github_path = get_post_meta($post_id, '_wogh_github_path', true);
70 70
 
71
-		if ( $github_path && $this->app->api()->fetch()->exists( $github_path ) ) {
71
+		if ($github_path && $this->app->api()->fetch()->exists($github_path)) {
72 72
 			return $github_path;
73 73
 		}
74 74
 
@@ -82,31 +82,31 @@  discard block
 block discarded – undo
82 82
 	 *
83 83
 	 * @return string|WP_Error
84 84
 	 */
85
-	public function update( $post_id ) {
86
-		$post = $this->app->database()->fetch_by_id( $post_id );
85
+	public function update($post_id) {
86
+		$post = $this->app->database()->fetch_by_id($post_id);
87 87
 
88
-		if ( is_wp_error( $post ) ) {
88
+		if (is_wp_error($post)) {
89 89
             /* @var WP_Error $post */
90 90
 			return $post;
91 91
 		}
92 92
 
93
-		if ( 'trash' === $post->status() ) {
94
-			return $this->delete( $post_id );
93
+		if ('trash' === $post->status()) {
94
+			return $this->delete($post_id);
95 95
 		}
96 96
 
97
-		if ( $old_github_path = $this->github_path( $post->id() ) ) {
97
+		if ($old_github_path = $this->github_path($post->id())) {
98 98
 			error_log("old_github_path: $old_github_path");
99 99
 			$post->set_old_github_path($old_github_path);
100 100
 		}
101 101
 
102
-		$result = $this->new_posts( array( $post ) );
102
+		$result = $this->new_posts(array($post));
103 103
 
104
-		if ( is_wp_error( $result ) ) {
104
+		if (is_wp_error($result)) {
105 105
             /* @var WP_Error $result */
106 106
 			return $result;
107 107
 		}
108 108
 
109
-		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
109
+		return __('Export to GitHub completed successfully.', 'writing-on-github');
110 110
 	}
111 111
 
112 112
 	/**
@@ -116,32 +116,32 @@  discard block
 block discarded – undo
116 116
 	 *
117 117
 	 * @return string|WP_Error
118 118
 	 */
119
-	public function new_posts( array $posts ) {
119
+	public function new_posts(array $posts) {
120 120
         $persist = $this->app->api()->persist();
121 121
 
122 122
 		$error = '';
123
-		foreach ( $posts as $post ) {
124
-			$result = $this->new_post( $post, $persist );
125
-			if ( is_wp_error( $result ) ) {
123
+		foreach ($posts as $post) {
124
+			$result = $this->new_post($post, $persist);
125
+			if (is_wp_error($result)) {
126 126
                 /* @var WP_Error $result */
127
-                $error = wogh_append_error( $error, $result );
127
+                $error = wogh_append_error($error, $result);
128 128
 			}
129 129
 		}
130 130
 
131
-		if ( is_wp_error( $error ) ) {
131
+		if (is_wp_error($error)) {
132 132
 			return $error;
133 133
 		}
134 134
 
135
-        return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
135
+        return __('Export to GitHub completed successfully.', 'writing-on-github');
136 136
 	}
137 137
 
138
-	protected function new_post( $post, $persist ) {
138
+	protected function new_post($post, $persist) {
139 139
 		$github_path = $post->github_path();
140 140
 		$old_github_path = $post->old_github_path();
141 141
 		$blob = $post->to_blob();
142 142
 		$result = false;
143 143
 
144
-		if ( $old_github_path && $old_github_path != $github_path ) {
144
+		if ($old_github_path && $old_github_path != $github_path) {
145 145
 			// rename
146 146
 			$message = apply_filters(
147 147
 				'wogh_commit_msg_move_post',
@@ -149,20 +149,20 @@  discard block
 block discarded – undo
149 149
 					'Move %s to %s via WordPress at %s (%s)',
150 150
 					$old_github_path, $github_path,
151 151
 					site_url(),
152
-					get_bloginfo( 'name' )
152
+					get_bloginfo('name')
153 153
 				)
154 154
 			) . $this->get_commit_msg_tag();
155 155
 
156
-			$result = $persist->delete_file( $post->old_github_path(), $blob->sha(), $message );
157
-			if ( is_wp_error( $result ) ) {
156
+			$result = $persist->delete_file($post->old_github_path(), $blob->sha(), $message);
157
+			if (is_wp_error($result)) {
158 158
 				return $result;
159 159
 			}
160 160
 
161
-			$result = $persist->create_file( $blob, $message );
162
-			if ( is_wp_error( $result ) ) {
161
+			$result = $persist->create_file($blob, $message);
162
+			if (is_wp_error($result)) {
163 163
 				return $result;
164 164
 			}
165
-		} elseif ( ! $old_github_path ) {
165
+		} elseif ( ! $old_github_path) {
166 166
 			// create new
167 167
 			$message = apply_filters(
168 168
 				'wogh_commit_msg_new_post',
@@ -170,14 +170,14 @@  discard block
 block discarded – undo
170 170
 					'Create new post %s from WordPress at %s (%s)',
171 171
 					$github_path,
172 172
 					site_url(),
173
-					get_bloginfo( 'name' )
173
+					get_bloginfo('name')
174 174
 				)
175 175
 			) . $this->get_commit_msg_tag();
176
-			$result = $persist->create_file( $blob, $message );
177
-			if ( is_wp_error( $result ) ) {
176
+			$result = $persist->create_file($blob, $message);
177
+			if (is_wp_error($result)) {
178 178
 				return $result;
179 179
 			}
180
-		} elseif ( $old_github_path && $old_github_path == $github_path ) {
180
+		} elseif ($old_github_path && $old_github_path == $github_path) {
181 181
 			// update
182 182
 			$message = apply_filters(
183 183
 				'wogh_commit_msg_update_post',
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
185 185
 					'Update post %s from WordPress at %s (%s)',
186 186
 					$github_path,
187 187
 					site_url(),
188
-					get_bloginfo( 'name' )
188
+					get_bloginfo('name')
189 189
 				)
190 190
 			) . $this->get_commit_msg_tag();
191
-			$result = $persist->update_file( $blob, $message );
192
-			if ( is_wp_error( $result ) ) {
191
+			$result = $persist->update_file($blob, $message);
192
+			if (is_wp_error($result)) {
193 193
 				return $result;
194 194
 			}
195 195
 		}
@@ -208,15 +208,15 @@  discard block
 block discarded – undo
208 208
 	 *
209 209
 	 * @return string|WP_Error
210 210
 	 */
211
-	public function delete( $post_id ) {
212
-		$post = $this->app->database()->fetch_by_id( $post_id );
211
+	public function delete($post_id) {
212
+		$post = $this->app->database()->fetch_by_id($post_id);
213 213
 
214
-		if ( is_wp_error( $post ) ) {
214
+		if (is_wp_error($post)) {
215 215
             /* @var WP_Error $post */
216 216
 			return $post;
217 217
 		}
218 218
 
219
-		$github_path = get_post_meta( $post_id, '_wogh_github_path', true );
219
+		$github_path = get_post_meta($post_id, '_wogh_github_path', true);
220 220
 
221 221
 		$message = apply_filters(
222 222
 			'wogh_commit_msg_delete',
@@ -224,19 +224,19 @@  discard block
 block discarded – undo
224 224
 				'Deleting %s via WordPress at %s (%s)',
225 225
 				$github_path,
226 226
 				site_url(),
227
-				get_bloginfo( 'name' )
227
+				get_bloginfo('name')
228 228
 			),
229 229
 			$post
230 230
 		) . $this->get_commit_msg_tag();
231 231
 
232
-		$result = $this->app->api()->persist()->delete_file( $github_path, $post->sha(), $message );
232
+		$result = $this->app->api()->persist()->delete_file($github_path, $post->sha(), $message);
233 233
 
234
-		if ( is_wp_error( $result ) ) {
234
+		if (is_wp_error($result)) {
235 235
             /* @var WP_Error $result */
236 236
 			return $result;
237 237
 		}
238 238
 
239
-		return __( 'Export to GitHub completed successfully.', 'writing-on-github' );
239
+		return __('Export to GitHub completed successfully.', 'writing-on-github');
240 240
 	}
241 241
 
242 242
 
@@ -247,8 +247,8 @@  discard block
 block discarded – undo
247 247
 	 *
248 248
 	 * @return bool
249 249
 	 */
250
-	public function set_user( $user_id ) {
251
-		return update_option( self::EXPORT_USER_OPTION, (int) $user_id );
250
+	public function set_user($user_id) {
251
+		return update_option(self::EXPORT_USER_OPTION, (int) $user_id);
252 252
 	}
253 253
 
254 254
 	/**
@@ -257,10 +257,10 @@  discard block
 block discarded – undo
257 257
 	 * @return string
258 258
 	 */
259 259
 	protected function get_commit_msg_tag() {
260
-		$tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
260
+		$tag = apply_filters('wogh_commit_msg_tag', 'wogh');
261 261
 
262
-		if ( ! $tag ) {
263
-			throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
262
+		if ( ! $tag) {
263
+			throw new Exception(__('Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github'));
264 264
 		}
265 265
 
266 266
 		return ' - ' . $tag;
Please login to merge, or discard this patch.
lib/function.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@
 block discarded – undo
8 8
  * @return WP_Error
9 9
  */
10 10
 function wogh_append_error( $error, $error2 ) {
11
-    if ( is_wp_error( $error ) ) {
12
-        $error->add( $error2->get_error_code(), $error2->get_error_message() );
13
-    }
14
-    return $error2;
11
+	if ( is_wp_error( $error ) ) {
12
+		$error->add( $error2->get_error_code(), $error2->get_error_message() );
13
+	}
14
+	return $error2;
15 15
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@
 block discarded – undo
7 7
  * @param  WP_Error   $error2
8 8
  * @return WP_Error
9 9
  */
10
-function wogh_append_error( $error, $error2 ) {
11
-    if ( is_wp_error( $error ) ) {
12
-        $error->add( $error2->get_error_code(), $error2->get_error_message() );
10
+function wogh_append_error($error, $error2) {
11
+    if (is_wp_error($error)) {
12
+        $error->add($error2->get_error_code(), $error2->get_error_message());
13 13
     }
14 14
     return $error2;
15 15
 }
Please login to merge, or discard this patch.
lib/database.php 2 patches
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@  discard block
 block discarded – undo
42 42
 	/**
43 43
 	 * Queries the database for all of the supported posts.
44 44
 	 *
45
-     * @param  bool $force
46
-     *
47
-     * @return Writing_On_GitHub_Post[]|WP_Error
48
-     */
45
+	 * @param  bool $force
46
+	 *
47
+	 * @return Writing_On_GitHub_Post[]|WP_Error
48
+	 */
49 49
 	public function fetch_all_supported( $force = false ) {
50 50
 		$args  = array(
51 51
 			'post_type'   => $this->get_whitelisted_post_types(),
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 			);
66 66
 		}
67 67
 
68
-        /* @var Writing_On_GitHub_Post[] $results */
68
+		/* @var Writing_On_GitHub_Post[] $results */
69 69
 		$results = array();
70 70
 		foreach ( $post_ids as $post_id ) {
71 71
 			// Do not export posts that have already been exported
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
 			add_filter( 'content_save_pre', 'wp_filter_post_kses' );
133 133
 
134 134
 			if ( is_wp_error( $post_id ) ) {
135
-                /* @var WP_Error $post_id */
136
-                $error = wogh_append_error( $error, $post_id );
135
+				/* @var WP_Error $post_id */
136
+				$error = wogh_append_error( $error, $post_id );
137 137
 
138 138
 				// Abort saving if updating the post fails.
139 139
 				continue;
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 			$meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
156 156
 
157
-            update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
157
+			update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
158 158
 
159 159
 			// unset( $meta['tags'] );
160 160
 			// unset( $meta['categories'] );
@@ -185,65 +185,65 @@  discard block
 block discarded – undo
185 185
 
186 186
 		// update tags
187 187
 		if ( ! empty( $meta['tags'] ) ) {
188
-		    $args['tags_input'] = $meta['tags'];
188
+			$args['tags_input'] = $meta['tags'];
189 189
 		}
190 190
 
191 191
 		// update categories
192 192
 		if ( ! empty( $meta['categories'] ) ) {
193
-		    $categories = $meta['categories'];
194
-		    if ( ! is_array( $categories ) ) {
195
-		        $categories = array( $categories );
196
-		    }
197
-		    $terms = get_terms( array(
198
-		        'taxonomy' => 'category',
199
-		        'fields' => 'id=>name',
200
-		        'hide_empty' => 0,
201
-		        'name' => $categories
202
-		        )
203
-		    );
204
-		    $map = array();
205
-		    foreach ( $categories as $name ) {
206
-		        $map[$name] = 1;
207
-		    }
208
-
209
-		    $ids = array();
210
-		    if ( ! empty( $terms ) ) {
211
-		        foreach ( $terms as $id => $name ) {
212
-		            $ids[] = $id;
213
-		            unset( $map[$name] );
214
-		        }
215
-		    }
216
-
217
-		    // create new terms
218
-		    if ( ! empty( $map ) ) {
219
-		        foreach ( $map as $name => $value ) {
220
-		            $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
221
-		            // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
222
-		            $ids[] = $term['term_id'];
223
-		        }
224
-		    }
225
-
226
-		    $args['post_category'] = $ids;
193
+			$categories = $meta['categories'];
194
+			if ( ! is_array( $categories ) ) {
195
+				$categories = array( $categories );
196
+			}
197
+			$terms = get_terms( array(
198
+				'taxonomy' => 'category',
199
+				'fields' => 'id=>name',
200
+				'hide_empty' => 0,
201
+				'name' => $categories
202
+				)
203
+			);
204
+			$map = array();
205
+			foreach ( $categories as $name ) {
206
+				$map[$name] = 1;
207
+			}
208
+
209
+			$ids = array();
210
+			if ( ! empty( $terms ) ) {
211
+				foreach ( $terms as $id => $name ) {
212
+					$ids[] = $id;
213
+					unset( $map[$name] );
214
+				}
215
+			}
216
+
217
+			// create new terms
218
+			if ( ! empty( $map ) ) {
219
+				foreach ( $map as $name => $value ) {
220
+					$term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
221
+					// array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
222
+					$ids[] = $term['term_id'];
223
+				}
224
+			}
225
+
226
+			$args['post_category'] = $ids;
227 227
 		}
228 228
 
229 229
 		return $args;
230 230
 	}
231 231
 
232
-    private function get_post_id_by_filename( $filename, $pattern  ) {
233
-        preg_match( $pattern , $filename, $matches );
234
-        $title = $matches[4];
232
+	private function get_post_id_by_filename( $filename, $pattern  ) {
233
+		preg_match( $pattern , $filename, $matches );
234
+		$title = $matches[4];
235 235
 
236
-        $query = new WP_Query( array(
237
-            'name'     => $title,
238
-            'posts_per_page' => 1,
239
-            'post_type' => $this->get_whitelisted_post_types(),
240
-            'fields'         => 'ids',
241
-        ) );
236
+		$query = new WP_Query( array(
237
+			'name'     => $title,
238
+			'posts_per_page' => 1,
239
+			'post_type' => $this->get_whitelisted_post_types(),
240
+			'fields'         => 'ids',
241
+		) );
242 242
 
243
-        $post_id = $query->get_posts();
244
-        $post_id = array_pop( $post_id );
245
-        return $post_id;
246
-    }
243
+		$post_id = $query->get_posts();
244
+		$post_id = array_pop( $post_id );
245
+		return $post_id;
246
+	}
247 247
 
248 248
 	/**
249 249
 	 * Deletes a post from the database based on its GitHub path.
@@ -270,11 +270,11 @@  discard block
 block discarded – undo
270 270
 			$directory = $parts ? array_shift( $parts ) : '';
271 271
 
272 272
 			if ( false !== strpos( $directory, 'post' ) ) {
273
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
273
+				$post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
274 274
 			}
275 275
 
276 276
 			if ( ! $post_id ) {
277
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
277
+				$post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
278 278
 			}
279 279
 		}
280 280
 
@@ -419,12 +419,12 @@  discard block
 block discarded – undo
419 419
 		if ( ! empty( $display_name ) ) {
420 420
 			$search_string = esc_attr( $display_name );
421 421
 			$query = new WP_User_Query( array(
422
-			    'search'         => "{$search_string}",
423
-			    'search_columns' => array(
424
-			        'display_name',
425
-			        'user_nicename',
426
-			        'user_login',
427
-			    )
422
+				'search'         => "{$search_string}",
423
+				'search_columns' => array(
424
+					'display_name',
425
+					'user_nicename',
426
+					'user_login',
427
+				)
428 428
 			) );
429 429
 			$users = $query->get_results();
430 430
 			$user = empty($users) ? false : $users[0];
Please login to merge, or discard this patch.
Spacing   +109 added lines, -110 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(
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 *
114 114
 	 * @return string|WP_Error
115 115
 	 */
116
-	public function save_posts( array $posts ) {
116
+	public function save_posts(array $posts) {
117 117
 
118 118
 		/**
119 119
 		 * Whether an error has occurred.
@@ -122,39 +122,38 @@  discard block
 block discarded – undo
122 122
 		 */
123 123
 		$error = false;
124 124
 
125
-		foreach ( $posts as $post ) {
126
-			$args = apply_filters( 'wogh_pre_import_args', $this->post_args( $post ), $post );
125
+		foreach ($posts as $post) {
126
+			$args = apply_filters('wogh_pre_import_args', $this->post_args($post), $post);
127 127
 
128
-			remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
128
+			remove_filter('content_save_pre', 'wp_filter_post_kses');
129 129
 			$post_id = $post->is_new() ?
130
-				wp_insert_post( $args, true ) :
131
-				wp_update_post( $args, true );
132
-			add_filter( 'content_save_pre', 'wp_filter_post_kses' );
130
+				wp_insert_post($args, true) : wp_update_post($args, true);
131
+			add_filter('content_save_pre', 'wp_filter_post_kses');
133 132
 
134
-			if ( is_wp_error( $post_id ) ) {
133
+			if (is_wp_error($post_id)) {
135 134
                 /* @var WP_Error $post_id */
136
-                $error = wogh_append_error( $error, $post_id );
135
+                $error = wogh_append_error($error, $post_id);
137 136
 
138 137
 				// Abort saving if updating the post fails.
139 138
 				continue;
140 139
 			}
141 140
 
142
-			if ( $post->is_new() ) {
141
+			if ($post->is_new()) {
143 142
 				$author = false;
144 143
 				$meta = $post->get_meta();
145
-				if ( ! empty( $meta ) && ! empty( $meta['author'] ) ) {
144
+				if ( ! empty($meta) && ! empty($meta['author'])) {
146 145
 					$author = $meta['author'];
147 146
 				}
148
-				$user    = $this->fetch_commit_user( $author );
149
-				$user_id = is_wp_error( $user ) ? 0 : $user->ID;
150
-				$this->set_post_author( $post_id, $user_id );
147
+				$user    = $this->fetch_commit_user($author);
148
+				$user_id = is_wp_error($user) ? 0 : $user->ID;
149
+				$this->set_post_author($post_id, $user_id);
151 150
 			}
152 151
 
153
-			$post->set_post( get_post( $post_id ) );
152
+			$post->set_post(get_post($post_id));
154 153
 
155
-			$meta = apply_filters( 'wogh_pre_import_meta', $post->get_meta(), $post );
154
+			$meta = apply_filters('wogh_pre_import_meta', $post->get_meta(), $post);
156 155
 
157
-            update_post_meta( $post_id, '_wogh_sha', $meta['_wogh_sha'] );
156
+            update_post_meta($post_id, '_wogh_sha', $meta['_wogh_sha']);
158 157
 
159 158
 			// unset( $meta['tags'] );
160 159
 			// unset( $meta['categories'] );
@@ -169,32 +168,32 @@  discard block
 block discarded – undo
169 168
 			// }
170 169
 		}
171 170
 
172
-		if ( $error ) {
171
+		if ($error) {
173 172
 			return $error;
174 173
 		}
175 174
 
176
-		return __( 'Successfully saved posts.', 'writing-on-github' );
175
+		return __('Successfully saved posts.', 'writing-on-github');
177 176
 	}
178 177
 
179
-	protected function post_args( $post ) {
178
+	protected function post_args($post) {
180 179
 		$args = $post->get_args();
181 180
 		$meta = $post->get_meta();
182 181
 
183 182
 		// prevent backslash loss
184
-		$args['post_content'] = addslashes( $args['post_content'] );
183
+		$args['post_content'] = addslashes($args['post_content']);
185 184
 
186 185
 		// update tags
187
-		if ( ! empty( $meta['tags'] ) ) {
186
+		if ( ! empty($meta['tags'])) {
188 187
 		    $args['tags_input'] = $meta['tags'];
189 188
 		}
190 189
 
191 190
 		// update categories
192
-		if ( ! empty( $meta['categories'] ) ) {
191
+		if ( ! empty($meta['categories'])) {
193 192
 		    $categories = $meta['categories'];
194
-		    if ( ! is_array( $categories ) ) {
195
-		        $categories = array( $categories );
193
+		    if ( ! is_array($categories)) {
194
+		        $categories = array($categories);
196 195
 		    }
197
-		    $terms = get_terms( array(
196
+		    $terms = get_terms(array(
198 197
 		        'taxonomy' => 'category',
199 198
 		        'fields' => 'id=>name',
200 199
 		        'hide_empty' => 0,
@@ -202,22 +201,22 @@  discard block
 block discarded – undo
202 201
 		        )
203 202
 		    );
204 203
 		    $map = array();
205
-		    foreach ( $categories as $name ) {
204
+		    foreach ($categories as $name) {
206 205
 		        $map[$name] = 1;
207 206
 		    }
208 207
 
209 208
 		    $ids = array();
210
-		    if ( ! empty( $terms ) ) {
211
-		        foreach ( $terms as $id => $name ) {
209
+		    if ( ! empty($terms)) {
210
+		        foreach ($terms as $id => $name) {
212 211
 		            $ids[] = $id;
213
-		            unset( $map[$name] );
212
+		            unset($map[$name]);
214 213
 		        }
215 214
 		    }
216 215
 
217 216
 		    // create new terms
218
-		    if ( ! empty( $map ) ) {
219
-		        foreach ( $map as $name => $value ) {
220
-		            $term = wp_insert_term( $name, 'category', array( 'parent' => 0 ) );
217
+		    if ( ! empty($map)) {
218
+		        foreach ($map as $name => $value) {
219
+		            $term = wp_insert_term($name, 'category', array('parent' => 0));
221 220
 		            // array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
222 221
 		            $ids[] = $term['term_id'];
223 222
 		        }
@@ -229,19 +228,19 @@  discard block
 block discarded – undo
229 228
 		return $args;
230 229
 	}
231 230
 
232
-    private function get_post_id_by_filename( $filename, $pattern  ) {
233
-        preg_match( $pattern , $filename, $matches );
231
+    private function get_post_id_by_filename($filename, $pattern) {
232
+        preg_match($pattern, $filename, $matches);
234 233
         $title = $matches[4];
235 234
 
236
-        $query = new WP_Query( array(
235
+        $query = new WP_Query(array(
237 236
             'name'     => $title,
238 237
             'posts_per_page' => 1,
239 238
             'post_type' => $this->get_whitelisted_post_types(),
240 239
             'fields'         => 'ids',
241
-        ) );
240
+        ));
242 241
 
243 242
         $post_id = $query->get_posts();
244
-        $post_id = array_pop( $post_id );
243
+        $post_id = array_pop($post_id);
245 244
         return $post_id;
246 245
     }
247 246
 
@@ -252,55 +251,55 @@  discard block
 block discarded – undo
252 251
 	 *
253 252
 	 * @return string|WP_Error
254 253
 	 */
255
-	public function delete_post_by_path( $path ) {
256
-		$query = new WP_Query( array(
254
+	public function delete_post_by_path($path) {
255
+		$query = new WP_Query(array(
257 256
 			'meta_key'       => '_wogh_github_path',
258 257
 			'meta_value'     => $path,
259 258
 			'meta_compare'   => '=',
260 259
 			'posts_per_page' => 1,
261 260
 			'fields'         => 'ids',
262
-		) );
261
+		));
263 262
 
264 263
 		$post_id = $query->get_posts();
265
-		$post_id = array_pop( $post_id );
264
+		$post_id = array_pop($post_id);
266 265
 
267
-		if ( ! $post_id ) {
268
-			$parts     = explode( '/', $path );
269
-			$filename  = array_pop( $parts );
270
-			$directory = $parts ? array_shift( $parts ) : '';
266
+		if ( ! $post_id) {
267
+			$parts     = explode('/', $path);
268
+			$filename  = array_pop($parts);
269
+			$directory = $parts ? array_shift($parts) : '';
271 270
 
272
-			if ( false !== strpos( $directory, 'post' ) ) {
273
-                $post_id = get_post_id_by_filename( $filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/' );
271
+			if (false !== strpos($directory, 'post')) {
272
+                $post_id = get_post_id_by_filename($filename, '/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.*)\.md/');
274 273
 			}
275 274
 
276
-			if ( ! $post_id ) {
277
-                $post_id = get_post_id_by_filename( $filename, '/(.*)\.md/' );
275
+			if ( ! $post_id) {
276
+                $post_id = get_post_id_by_filename($filename, '/(.*)\.md/');
278 277
 			}
279 278
 		}
280 279
 
281
-		if ( ! $post_id ) {
280
+		if ( ! $post_id) {
282 281
 			return new WP_Error(
283 282
 				'path_not_found',
284 283
 				sprintf(
285
-					__( 'Post not found for path %s.', 'writing-on-github' ),
284
+					__('Post not found for path %s.', 'writing-on-github'),
286 285
 					$path
287 286
 				)
288 287
 			);
289 288
 		}
290 289
 
291
-		$result = wp_delete_post( $post_id );
290
+		$result = wp_delete_post($post_id);
292 291
 
293 292
 		// If deleting fails...
294
-		if ( false === $result ) {
295
-			$post = get_post( $post_id );
293
+		if (false === $result) {
294
+			$post = get_post($post_id);
296 295
 
297 296
 			// ...and the post both exists and isn't in the trash...
298
-			if ( $post && 'trash' !== $post->post_status ) {
297
+			if ($post && 'trash' !== $post->post_status) {
299 298
 				// ... then something went wrong.
300 299
 				return new WP_Error(
301 300
 					'db_error',
302 301
 					sprintf(
303
-						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
302
+						__('Failed to delete post ID %d.', 'writing-on-github'),
304 303
 						$post_id
305 304
 					)
306 305
 				);
@@ -308,25 +307,25 @@  discard block
 block discarded – undo
308 307
 		}
309 308
 
310 309
 		return sprintf(
311
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
310
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
312 311
 			$post_id
313 312
 		);
314 313
 	}
315 314
 
316
-	public function delete_post( $post_id ) {
317
-		$result = wp_delete_post( $post_id );
315
+	public function delete_post($post_id) {
316
+		$result = wp_delete_post($post_id);
318 317
 
319 318
 		// If deleting fails...
320
-		if ( false === $result ) {
321
-			$post = get_post( $post_id );
319
+		if (false === $result) {
320
+			$post = get_post($post_id);
322 321
 
323 322
 			// ...and the post both exists and isn't in the trash...
324
-			if ( $post && 'trash' !== $post->post_status ) {
323
+			if ($post && 'trash' !== $post->post_status) {
325 324
 				// ... then something went wrong.
326 325
 				return new WP_Error(
327 326
 					'db_error',
328 327
 					sprintf(
329
-						__( 'Failed to delete post ID %d.', 'writing-on-github' ),
328
+						__('Failed to delete post ID %d.', 'writing-on-github'),
330 329
 						$post_id
331 330
 					)
332 331
 				);
@@ -334,7 +333,7 @@  discard block
 block discarded – undo
334 333
 		}
335 334
 
336 335
 		return sprintf(
337
-			__( 'Successfully deleted post ID %d.', 'writing-on-github' ),
336
+			__('Successfully deleted post ID %d.', 'writing-on-github'),
338 337
 			$post_id
339 338
 		);
340 339
 	}
@@ -345,7 +344,7 @@  discard block
 block discarded – undo
345 344
 	 * @return array
346 345
 	 */
347 346
 	protected function get_whitelisted_post_types() {
348
-		return apply_filters( 'wogh_whitelisted_post_types', $this->whitelisted_post_types );
347
+		return apply_filters('wogh_whitelisted_post_types', $this->whitelisted_post_types);
349 348
 	}
350 349
 
351 350
 	/**
@@ -354,7 +353,7 @@  discard block
 block discarded – undo
354 353
 	 * @return array
355 354
 	 */
356 355
 	protected function get_whitelisted_post_statuses() {
357
-		return apply_filters( 'wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses );
356
+		return apply_filters('wogh_whitelisted_post_statuses', $this->whitelisted_post_statuses);
358 357
 	}
359 358
 
360 359
 	/**
@@ -364,12 +363,12 @@  discard block
 block discarded – undo
364 363
 	 *
365 364
 	 * @return string Whitelist formatted for query
366 365
 	 */
367
-	protected function format_for_query( $whitelist ) {
368
-		foreach ( $whitelist as $key => $value ) {
369
-			$whitelist[ $key ] = "'$value'";
366
+	protected function format_for_query($whitelist) {
367
+		foreach ($whitelist as $key => $value) {
368
+			$whitelist[$key] = "'$value'";
370 369
 		}
371 370
 
372
-		return implode( ', ', $whitelist );
371
+		return implode(', ', $whitelist);
373 372
 	}
374 373
 
375 374
 	/**
@@ -380,25 +379,25 @@  discard block
 block discarded – undo
380 379
 	 *
381 380
 	 * @return boolean                          True if supported, false if not.
382 381
 	 */
383
-	protected function is_post_supported( Writing_On_GitHub_Post $post ) {
384
-		if ( wp_is_post_revision( $post->id ) ) {
382
+	protected function is_post_supported(Writing_On_GitHub_Post $post) {
383
+		if (wp_is_post_revision($post->id)) {
385 384
 			return false;
386 385
 		}
387 386
 
388 387
 		// We need to allow trashed posts to be queried, but they are not whitelisted for export.
389
-		if ( ! in_array( $post->status(), $this->get_whitelisted_post_statuses() ) && 'trash' !== $post->status() ) {
388
+		if ( ! in_array($post->status(), $this->get_whitelisted_post_statuses()) && 'trash' !== $post->status()) {
390 389
 			return false;
391 390
 		}
392 391
 
393
-		if ( ! in_array( $post->type(), $this->get_whitelisted_post_types() ) ) {
392
+		if ( ! in_array($post->type(), $this->get_whitelisted_post_types())) {
394 393
 			return false;
395 394
 		}
396 395
 
397
-		if ( $post->has_password() ) {
396
+		if ($post->has_password()) {
398 397
 			return false;
399 398
 		}
400 399
 
401
-		return apply_filters( 'wogh_is_post_supported', true, $post );
400
+		return apply_filters('wogh_is_post_supported', true, $post);
402 401
 	}
403 402
 
404 403
 	/**
@@ -411,35 +410,35 @@  discard block
 block discarded – undo
411 410
 	 *
412 411
 	 * @return WP_Error|WP_User
413 412
 	 */
414
-	protected function fetch_commit_user( $display_name ) {
413
+	protected function fetch_commit_user($display_name) {
415 414
 		// If we can't find a user and a default hasn't been set,
416 415
 		// we're just going to set the revision author to 0.
417 416
 		$user = false;
418 417
 
419
-		if ( ! empty( $display_name ) ) {
420
-			$search_string = esc_attr( $display_name );
421
-			$query = new WP_User_Query( array(
418
+		if ( ! empty($display_name)) {
419
+			$search_string = esc_attr($display_name);
420
+			$query = new WP_User_Query(array(
422 421
 			    'search'         => "{$search_string}",
423 422
 			    'search_columns' => array(
424 423
 			        'display_name',
425 424
 			        'user_nicename',
426 425
 			        'user_login',
427 426
 			    )
428
-			) );
427
+			));
429 428
 			$users = $query->get_results();
430 429
 			$user = empty($users) ? false : $users[0];
431 430
 		}
432 431
 
433
-		if ( ! $user ) {
432
+		if ( ! $user) {
434 433
 			// Use the default user.
435
-			$user = get_user_by( 'id', (int) get_option( 'wogh_default_user' ) );
434
+			$user = get_user_by('id', (int) get_option('wogh_default_user'));
436 435
 		}
437 436
 
438
-		if ( ! $user ) {
437
+		if ( ! $user) {
439 438
 			return new WP_Error(
440 439
 				'user_not_found',
441 440
 				sprintf(
442
-					__( 'Commit user not found for email %s', 'writing-on-github' ),
441
+					__('Commit user not found for email %s', 'writing-on-github'),
443 442
 					$email
444 443
 				)
445 444
 			);
@@ -491,7 +490,7 @@  discard block
 block discarded – undo
491 490
 	 *
492 491
 	 * @return string|WP_Error
493 492
 	 */
494
-	protected function set_post_author( $post_id, $user_id ) {
493
+	protected function set_post_author($post_id, $user_id) {
495 494
 		global $wpdb;
496 495
 
497 496
 		$result = $wpdb->update(
@@ -502,25 +501,25 @@  discard block
 block discarded – undo
502 501
 			array(
503 502
 				'ID' => (int) $post_id,
504 503
 			),
505
-			array( '%d' ),
506
-			array( '%d' )
504
+			array('%d'),
505
+			array('%d')
507 506
 		);
508 507
 
509
-		if ( false === $result ) {
510
-			return new WP_Error( 'db_error', $wpdb->last_error );
508
+		if (false === $result) {
509
+			return new WP_Error('db_error', $wpdb->last_error);
511 510
 		}
512 511
 
513
-		if ( 0 === $result ) {
512
+		if (0 === $result) {
514 513
 			return sprintf(
515
-				__( 'No change for post ID %d.', 'writing-on-github' ),
514
+				__('No change for post ID %d.', 'writing-on-github'),
516 515
 				$post_id
517 516
 			);
518 517
 		}
519 518
 
520
-		clean_post_cache( $post_id );
519
+		clean_post_cache($post_id);
521 520
 
522 521
 		return sprintf(
523
-			__( 'Successfully updated post ID %d.', 'writing-on-github' ),
522
+			__('Successfully updated post ID %d.', 'writing-on-github'),
524 523
 			$post_id
525 524
 		);
526 525
 	}
Please login to merge, or discard this patch.