@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | // This fixes function duplication during unit testing. |
| 15 | 15 | $path = dirname( __FILE__ ) . '/vendor/autoload.php'; |
| 16 | 16 | if ( file_exists( $path ) ) { |
| 17 | - require_once( $path ); |
|
| 17 | + require_once( $path ); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) ); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | add_action( 'save_post', array( $this->controller, 'export_post' ) ); |
| 132 | 132 | add_action( 'delete_post', array( $this->controller, 'delete_post' ) ); |
| 133 | 133 | add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) ); |
| 134 | - add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 ); |
|
| 134 | + add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 ); |
|
| 135 | 135 | add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 ); |
| 136 | 136 | add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 ); |
| 137 | 137 | |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - return $link; |
|
| 153 | + return $link; |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | public function ignore_post_meta($meta) { |
@@ -392,9 +392,9 @@ discard block |
||
| 392 | 392 | /** |
| 393 | 393 | * Kicks of an import or export cronjob. |
| 394 | 394 | * |
| 395 | - * @param bool $force |
|
| 396 | - * @param string $type |
|
| 397 | - */ |
|
| 395 | + * @param bool $force |
|
| 396 | + * @param string $type |
|
| 397 | + */ |
|
| 398 | 398 | protected function start_cron( $type, $force = false ) { |
| 399 | 399 | update_option( '_wogh_' . $type . '_started', 'yes' ); |
| 400 | 400 | $user_id = get_current_user_id(); |
@@ -12,12 +12,12 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | // If the functions have already been autoloaded, don't reload. |
| 14 | 14 | // This fixes function duplication during unit testing. |
| 15 | -$path = dirname( __FILE__ ) . '/vendor/autoload.php'; |
|
| 16 | -if ( file_exists( $path ) ) { |
|
| 17 | - require_once( $path ); |
|
| 15 | +$path = dirname(__FILE__) . '/vendor/autoload.php'; |
|
| 16 | +if (file_exists($path)) { |
|
| 17 | + require_once($path); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | -add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) ); |
|
| 20 | +add_action('plugins_loaded', array(new Writing_On_GitHub, 'boot')); |
|
| 21 | 21 | |
| 22 | 22 | class Writing_On_GitHub { |
| 23 | 23 | |
@@ -107,14 +107,14 @@ discard block |
||
| 107 | 107 | public function __construct() { |
| 108 | 108 | self::$instance = $this; |
| 109 | 109 | |
| 110 | - if ( is_admin() ) { |
|
| 110 | + if (is_admin()) { |
|
| 111 | 111 | $this->admin = new Writing_On_GitHub_Admin; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - $this->controller = new Writing_On_GitHub_Controller( $this ); |
|
| 114 | + $this->controller = new Writing_On_GitHub_Controller($this); |
|
| 115 | 115 | |
| 116 | - if ( defined( 'WP_CLI' ) && WP_CLI ) { |
|
| 117 | - WP_CLI::add_command( 'wogh', $this->cli() ); |
|
| 116 | + if (defined('WP_CLI') && WP_CLI) { |
|
| 117 | + WP_CLI::add_command('wogh', $this->cli()); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | |
@@ -122,30 +122,30 @@ discard block |
||
| 122 | 122 | * Attaches the plugin's hooks into WordPress. |
| 123 | 123 | */ |
| 124 | 124 | public function boot() { |
| 125 | - register_activation_hook( __FILE__, array( $this, 'activate' ) ); |
|
| 126 | - add_action( 'admin_notices', array( $this, 'activation_notice' ) ); |
|
| 125 | + register_activation_hook(__FILE__, array($this, 'activate')); |
|
| 126 | + add_action('admin_notices', array($this, 'activation_notice')); |
|
| 127 | 127 | |
| 128 | - add_action( 'init', array( $this, 'l10n' ) ); |
|
| 128 | + add_action('init', array($this, 'l10n')); |
|
| 129 | 129 | |
| 130 | 130 | // Controller actions. |
| 131 | - add_action( 'save_post', array( $this->controller, 'export_post' ) ); |
|
| 132 | - add_action( 'delete_post', array( $this->controller, 'delete_post' ) ); |
|
| 133 | - add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) ); |
|
| 134 | - add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 ); |
|
| 135 | - add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 ); |
|
| 136 | - add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 ); |
|
| 131 | + add_action('save_post', array($this->controller, 'export_post')); |
|
| 132 | + add_action('delete_post', array($this->controller, 'delete_post')); |
|
| 133 | + add_action('wp_ajax_nopriv_wogh_push_request', array($this->controller, 'pull_posts')); |
|
| 134 | + add_action('wogh_export', array($this->controller, 'export_all'), 10, 2); |
|
| 135 | + add_action('wogh_import', array($this->controller, 'import_master'), 10, 1); |
|
| 136 | + add_filter('get_edit_post_link', array($this, 'edit_post_link'), 10, 3); |
|
| 137 | 137 | |
| 138 | 138 | // add_filter( 'wogh_post_meta', array( $this, 'ignore_post_meta' ), 10, 1 ); |
| 139 | 139 | // add_filter( 'wogh_pre_import_meta', array( $this, 'ignore_post_meta' ), 10, 1 ); |
| 140 | - add_filter( 'the_content', array( $this, 'the_content' ) ); |
|
| 140 | + add_filter('the_content', array($this, 'the_content')); |
|
| 141 | 141 | |
| 142 | - do_action( 'wogh_boot', $this ); |
|
| 142 | + do_action('wogh_boot', $this); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | public function edit_post_link($link, $postID, $context) { |
| 146 | - if ( ! wp_is_post_revision( $postID ) ) { |
|
| 147 | - $post = new Writing_On_GitHub_Post( $postID, Writing_On_GitHub::$instance->api() ); |
|
| 148 | - if ( $post->is_on_github() ) { |
|
| 146 | + if ( ! wp_is_post_revision($postID)) { |
|
| 147 | + $post = new Writing_On_GitHub_Post($postID, Writing_On_GitHub::$instance->api()); |
|
| 148 | + if ($post->is_on_github()) { |
|
| 149 | 149 | return $post->github_edit_url(); |
| 150 | 150 | } |
| 151 | 151 | } |
@@ -204,29 +204,29 @@ discard block |
||
| 204 | 204 | * Init i18n files |
| 205 | 205 | */ |
| 206 | 206 | public function l10n() { |
| 207 | - load_plugin_textdomain( self::$text_domain ); |
|
| 207 | + load_plugin_textdomain(self::$text_domain); |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | /** |
| 211 | 211 | * Sets and kicks off the export cronjob |
| 212 | 212 | */ |
| 213 | - public function start_export( $force = false ) { |
|
| 214 | - $this->start_cron( 'export', $force ); |
|
| 213 | + public function start_export($force = false) { |
|
| 214 | + $this->start_cron('export', $force); |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | /** |
| 218 | 218 | * Sets and kicks off the import cronjob |
| 219 | 219 | */ |
| 220 | 220 | public function start_import() { |
| 221 | - $this->start_cron( 'import' ); |
|
| 221 | + $this->start_cron('import'); |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | /** |
| 225 | 225 | * Enables the admin notice on initial activation |
| 226 | 226 | */ |
| 227 | 227 | public function activate() { |
| 228 | - if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) { |
|
| 229 | - set_transient( '_wogh_activated', 'yes' ); |
|
| 228 | + if ('yes' !== get_option('_wogh_fully_exported')) { |
|
| 229 | + set_transient('_wogh_activated', 'yes'); |
|
| 230 | 230 | } |
| 231 | 231 | } |
| 232 | 232 | |
@@ -234,18 +234,18 @@ discard block |
||
| 234 | 234 | * Displays the activation admin notice |
| 235 | 235 | */ |
| 236 | 236 | public function activation_notice() { |
| 237 | - if ( ! get_transient( '_wogh_activated' ) ) { |
|
| 237 | + if ( ! get_transient('_wogh_activated')) { |
|
| 238 | 238 | return; |
| 239 | 239 | } |
| 240 | 240 | |
| 241 | - delete_transient( '_wogh_activated' ); |
|
| 241 | + delete_transient('_wogh_activated'); |
|
| 242 | 242 | |
| 243 | 243 | ?><div class="updated"> |
| 244 | 244 | <p> |
| 245 | 245 | <?php |
| 246 | 246 | printf( |
| 247 | - __( 'To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github' ), |
|
| 248 | - admin_url( 'options-general.php?page=' . static::$text_domain) |
|
| 247 | + __('To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github'), |
|
| 248 | + admin_url('options-general.php?page=' . static::$text_domain) |
|
| 249 | 249 | ); |
| 250 | 250 | ?> |
| 251 | 251 | </p> |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | * @return Writing_On_GitHub_CLI |
| 268 | 268 | */ |
| 269 | 269 | public function cli() { |
| 270 | - if ( ! $this->cli ) { |
|
| 270 | + if ( ! $this->cli) { |
|
| 271 | 271 | $this->cli = new Writing_On_GitHub_CLI; |
| 272 | 272 | } |
| 273 | 273 | |
@@ -280,8 +280,8 @@ discard block |
||
| 280 | 280 | * @return Writing_On_GitHub_Request |
| 281 | 281 | */ |
| 282 | 282 | public function request() { |
| 283 | - if ( ! $this->request ) { |
|
| 284 | - $this->request = new Writing_On_GitHub_Request( $this ); |
|
| 283 | + if ( ! $this->request) { |
|
| 284 | + $this->request = new Writing_On_GitHub_Request($this); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | return $this->request; |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | * @return Writing_On_GitHub_Response |
| 294 | 294 | */ |
| 295 | 295 | public function response() { |
| 296 | - if ( ! $this->response ) { |
|
| 297 | - $this->response = new Writing_On_GitHub_Response( $this ); |
|
| 296 | + if ( ! $this->response) { |
|
| 297 | + $this->response = new Writing_On_GitHub_Response($this); |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | return $this->response; |
@@ -306,8 +306,8 @@ discard block |
||
| 306 | 306 | * @return Writing_On_GitHub_Api |
| 307 | 307 | */ |
| 308 | 308 | public function api() { |
| 309 | - if ( ! $this->api ) { |
|
| 310 | - $this->api = new Writing_On_GitHub_Api( $this ); |
|
| 309 | + if ( ! $this->api) { |
|
| 310 | + $this->api = new Writing_On_GitHub_Api($this); |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | return $this->api; |
@@ -319,8 +319,8 @@ discard block |
||
| 319 | 319 | * @return Writing_On_GitHub_Import |
| 320 | 320 | */ |
| 321 | 321 | public function import() { |
| 322 | - if ( ! $this->import ) { |
|
| 323 | - $this->import = new Writing_On_GitHub_Import( $this ); |
|
| 322 | + if ( ! $this->import) { |
|
| 323 | + $this->import = new Writing_On_GitHub_Import($this); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | return $this->import; |
@@ -332,8 +332,8 @@ discard block |
||
| 332 | 332 | * @return Writing_On_GitHub_Export |
| 333 | 333 | */ |
| 334 | 334 | public function export() { |
| 335 | - if ( ! $this->export ) { |
|
| 336 | - $this->export = new Writing_On_GitHub_Export( $this ); |
|
| 335 | + if ( ! $this->export) { |
|
| 336 | + $this->export = new Writing_On_GitHub_Export($this); |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | return $this->export; |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | * @return Writing_On_GitHub_Semaphore |
| 346 | 346 | */ |
| 347 | 347 | public function semaphore() { |
| 348 | - if ( ! $this->semaphore ) { |
|
| 348 | + if ( ! $this->semaphore) { |
|
| 349 | 349 | $this->semaphore = new Writing_On_GitHub_Semaphore; |
| 350 | 350 | } |
| 351 | 351 | |
@@ -358,8 +358,8 @@ discard block |
||
| 358 | 358 | * @return Writing_On_GitHub_Database |
| 359 | 359 | */ |
| 360 | 360 | public function database() { |
| 361 | - if ( ! $this->database ) { |
|
| 362 | - $this->database = new Writing_On_GitHub_Database( $this ); |
|
| 361 | + if ( ! $this->database) { |
|
| 362 | + $this->database = new Writing_On_GitHub_Database($this); |
|
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | return $this->database; |
@@ -373,18 +373,18 @@ discard block |
||
| 373 | 373 | * @param mixed $msg |
| 374 | 374 | * @param string $write |
| 375 | 375 | */ |
| 376 | - public static function write_log( $msg, $write = 'line' ) { |
|
| 377 | - if ( defined( 'WP_CLI' ) && WP_CLI ) { |
|
| 378 | - if ( is_array( $msg ) || is_object( $msg ) ) { |
|
| 379 | - WP_CLI::print_value( $msg ); |
|
| 376 | + public static function write_log($msg, $write = 'line') { |
|
| 377 | + if (defined('WP_CLI') && WP_CLI) { |
|
| 378 | + if (is_array($msg) || is_object($msg)) { |
|
| 379 | + WP_CLI::print_value($msg); |
|
| 380 | 380 | } else { |
| 381 | - WP_CLI::$write( $msg ); |
|
| 381 | + WP_CLI::$write($msg); |
|
| 382 | 382 | } |
| 383 | - } elseif ( true === WP_DEBUG ) { |
|
| 384 | - if ( is_array( $msg ) || is_object( $msg ) ) { |
|
| 385 | - error_log( print_r( $msg, true ) ); |
|
| 383 | + } elseif (true === WP_DEBUG) { |
|
| 384 | + if (is_array($msg) || is_object($msg)) { |
|
| 385 | + error_log(print_r($msg, true)); |
|
| 386 | 386 | } else { |
| 387 | - error_log( $msg ); |
|
| 387 | + error_log($msg); |
|
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | 390 | } |
@@ -395,10 +395,10 @@ discard block |
||
| 395 | 395 | * @param bool $force |
| 396 | 396 | * @param string $type |
| 397 | 397 | */ |
| 398 | - protected function start_cron( $type, $force = false ) { |
|
| 399 | - update_option( '_wogh_' . $type . '_started', 'yes' ); |
|
| 398 | + protected function start_cron($type, $force = false) { |
|
| 399 | + update_option('_wogh_' . $type . '_started', 'yes'); |
|
| 400 | 400 | $user_id = get_current_user_id(); |
| 401 | - wp_schedule_single_event( time(), 'wogh_' . $type . '', array( $user_id, $force ) ); |
|
| 401 | + wp_schedule_single_event(time(), 'wogh_' . $type . '', array($user_id, $force)); |
|
| 402 | 402 | spawn_cron(); |
| 403 | 403 | } |
| 404 | 404 | } |
@@ -140,12 +140,12 @@ |
||
| 140 | 140 | return __( 'Payload processed', 'writing-on-github' ); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - /** |
|
| 144 | - * Do compare |
|
| 145 | - * @param Writing_On_GitHub_File_Info[] $files |
|
| 146 | - * @param int[] &$delete_ids |
|
| 147 | - * @return string|WP_Error |
|
| 148 | - */ |
|
| 143 | + /** |
|
| 144 | + * Do compare |
|
| 145 | + * @param Writing_On_GitHub_File_Info[] $files |
|
| 146 | + * @param int[] &$delete_ids |
|
| 147 | + * @return string|WP_Error |
|
| 148 | + */ |
|
| 149 | 149 | protected function compare( $files, &$delete_ids ) { |
| 150 | 150 | if ( is_wp_error( $files ) ) { |
| 151 | 151 | return $files; |
@@ -22,7 +22,7 @@ discard block |
||
| 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 | |
@@ -70,21 +70,21 @@ discard block |
||
| 70 | 70 | // return __( 'Payload processed', 'writing-on-github' ); |
| 71 | 71 | // } |
| 72 | 72 | |
| 73 | - public function payload( Writing_On_GitHub_Payload $payload ) { |
|
| 73 | + public function payload(Writing_On_GitHub_Payload $payload) { |
|
| 74 | 74 | |
| 75 | - $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() ); |
|
| 75 | + $result = $this->app->api()->fetch()->compare($payload->get_before_commit_id()); |
|
| 76 | 76 | |
| 77 | - if ( is_wp_error( $result ) ) { |
|
| 77 | + if (is_wp_error($result)) { |
|
| 78 | 78 | return $result; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - $result = $this->import_files( $result ); |
|
| 81 | + $result = $this->import_files($result); |
|
| 82 | 82 | |
| 83 | - if ( is_wp_error( $result ) ) { |
|
| 83 | + if (is_wp_error($result)) { |
|
| 84 | 84 | return $files; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - return __( 'Payload processed', 'writing-on-github' ); |
|
| 87 | + return __('Payload processed', 'writing-on-github'); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | /** |
@@ -92,23 +92,23 @@ discard block |
||
| 92 | 92 | * @param array $files [Writing_On_GitHub_File_Info] |
| 93 | 93 | * @return string|WP_ERROR |
| 94 | 94 | */ |
| 95 | - protected function import_files( $files ) { |
|
| 95 | + protected function import_files($files) { |
|
| 96 | 96 | |
| 97 | - $error = false; |
|
| 97 | + $error = false; |
|
| 98 | 98 | $delete_ids = false; |
| 99 | 99 | |
| 100 | - $result = $this->compare( $files, $delete_ids ); |
|
| 100 | + $result = $this->compare($files, $delete_ids); |
|
| 101 | 101 | |
| 102 | - if ( is_wp_error( $result ) ) { |
|
| 102 | + if (is_wp_error($result)) { |
|
| 103 | 103 | return $result; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - if ( $delete_ids ) { |
|
| 106 | + if ($delete_ids) { |
|
| 107 | 107 | foreach ($delete_ids as $id) { |
| 108 | - $result = $this->app->database()->delete_post( $id ); |
|
| 109 | - if ( is_wp_error( $result ) ) { |
|
| 110 | - if ( $error ) { |
|
| 111 | - $error->add( $result->get_error_code(), $result->get_error_message() ); |
|
| 108 | + $result = $this->app->database()->delete_post($id); |
|
| 109 | + if (is_wp_error($result)) { |
|
| 110 | + if ($error) { |
|
| 111 | + $error->add($result->get_error_code(), $result->get_error_message()); |
|
| 112 | 112 | } else { |
| 113 | 113 | $error = $result; |
| 114 | 114 | } |
@@ -127,17 +127,17 @@ discard block |
||
| 127 | 127 | public function master() { |
| 128 | 128 | $result = $this->app->api()->fetch()->tree_recursive(); |
| 129 | 129 | |
| 130 | - if ( is_wp_error( $result ) ) { |
|
| 130 | + if (is_wp_error($result)) { |
|
| 131 | 131 | return $result; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - $result = $this->import_files( $result ); |
|
| 134 | + $result = $this->import_files($result); |
|
| 135 | 135 | |
| 136 | - if ( is_wp_error( $result ) ) { |
|
| 136 | + if (is_wp_error($result)) { |
|
| 137 | 137 | return $result; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - return __( 'Payload processed', 'writing-on-github' ); |
|
| 140 | + return __('Payload processed', 'writing-on-github'); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | * @param int[] &$delete_ids |
| 147 | 147 | * @return string|WP_Error |
| 148 | 148 | */ |
| 149 | - protected function compare( $files, &$delete_ids ) { |
|
| 150 | - if ( is_wp_error( $files ) ) { |
|
| 149 | + protected function compare($files, &$delete_ids) { |
|
| 150 | + if (is_wp_error($files)) { |
|
| 151 | 151 | return $files; |
| 152 | 152 | } |
| 153 | 153 | |
@@ -156,62 +156,62 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | $idsmap = array(); |
| 158 | 158 | |
| 159 | - foreach ( $files as $file ) { |
|
| 160 | - if ( ! $this->importable_file( $file ) ) { |
|
| 159 | + foreach ($files as $file) { |
|
| 160 | + if ( ! $this->importable_file($file)) { |
|
| 161 | 161 | continue; |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - $blob = $this->app->api()->fetch()->blob( $file ); |
|
| 164 | + $blob = $this->app->api()->fetch()->blob($file); |
|
| 165 | 165 | // network error ? |
| 166 | - if ( is_wp_error( $blob ) ) { |
|
| 166 | + if (is_wp_error($blob)) { |
|
| 167 | 167 | continue; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - if ( $this->importable_raw_file( $blob ) ) { |
|
| 171 | - $this->import_raw_file( $blob, $file->status == 'removed' ); |
|
| 170 | + if ($this->importable_raw_file($blob)) { |
|
| 171 | + $this->import_raw_file($blob, $file->status == 'removed'); |
|
| 172 | 172 | continue; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if ( ! $this->importable_blob( $blob ) ) { |
|
| 175 | + if ( ! $this->importable_blob($blob)) { |
|
| 176 | 176 | continue; |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - $post = $this->blob_to_post( $blob ); |
|
| 179 | + $post = $this->blob_to_post($blob); |
|
| 180 | 180 | |
| 181 | - if ( $file->status == 'removed' ) { |
|
| 182 | - if ( $blob->id() ) { |
|
| 181 | + if ($file->status == 'removed') { |
|
| 182 | + if ($blob->id()) { |
|
| 183 | 183 | $idsmap[$blob->id()] = true; |
| 184 | 184 | } |
| 185 | - } elseif ( $post != false ) { |
|
| 185 | + } elseif ($post != false) { |
|
| 186 | 186 | $posts[] = $post; |
| 187 | - if ( $post->is_new() ) { |
|
| 187 | + if ($post->is_new()) { |
|
| 188 | 188 | $new[] = $post; |
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | - foreach ( $posts as $post ) { |
|
| 194 | - if ( $post->id() && isset( $idsmap[ $post->id() ] ) ) { |
|
| 195 | - unset( $idsmap[$post->id() ] ); |
|
| 193 | + foreach ($posts as $post) { |
|
| 194 | + if ($post->id() && isset($idsmap[$post->id()])) { |
|
| 195 | + unset($idsmap[$post->id()]); |
|
| 196 | 196 | } |
| 197 | 197 | } |
| 198 | 198 | $delete_ids = array(); |
| 199 | - foreach ( $idsmap as $id => $value ) { |
|
| 199 | + foreach ($idsmap as $id => $value) { |
|
| 200 | 200 | $delete_ids[] = $id; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | // $this->app->database()->save_posts( $posts, $commit->author_email() ); |
| 204 | 204 | |
| 205 | - $result = $this->app->database()->save_posts( $posts ); |
|
| 205 | + $result = $this->app->database()->save_posts($posts); |
|
| 206 | 206 | |
| 207 | - if ( is_wp_error( $result ) ) { |
|
| 207 | + if (is_wp_error($result)) { |
|
| 208 | 208 | return $result; |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - if ( $new ) { |
|
| 212 | - $result = $this->app->export()->new_posts( $new ); |
|
| 211 | + if ($new) { |
|
| 212 | + $result = $this->app->export()->new_posts($new); |
|
| 213 | 213 | |
| 214 | - if ( is_wp_error( $result ) ) { |
|
| 214 | + if (is_wp_error($result)) { |
|
| 215 | 215 | return $result; |
| 216 | 216 | } |
| 217 | 217 | } |
@@ -226,12 +226,12 @@ discard block |
||
| 226 | 226 | * |
| 227 | 227 | * @return bool |
| 228 | 228 | */ |
| 229 | - protected function importable_file( Writing_On_GitHub_File_Info $file ) { |
|
| 229 | + protected function importable_file(Writing_On_GitHub_File_Info $file) { |
|
| 230 | 230 | |
| 231 | 231 | // only _pages and _posts |
| 232 | - if ( strncasecmp($file->path, '_pages/', strlen('_pages/') ) != 0 && |
|
| 233 | - strncasecmp($file->path, '_posts/', strlen('_posts/') ) != 0 && |
|
| 234 | - strncasecmp($file->path, 'images/', strlen('images/') ) != 0 ) { |
|
| 232 | + if (strncasecmp($file->path, '_pages/', strlen('_pages/')) != 0 && |
|
| 233 | + strncasecmp($file->path, '_posts/', strlen('_posts/')) != 0 && |
|
| 234 | + strncasecmp($file->path, 'images/', strlen('images/')) != 0) { |
|
| 235 | 235 | return false; |
| 236 | 236 | } |
| 237 | 237 | |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * |
| 251 | 251 | * @return bool |
| 252 | 252 | */ |
| 253 | - protected function importable_blob( Writing_On_GitHub_Blob $blob ) { |
|
| 253 | + protected function importable_blob(Writing_On_GitHub_Blob $blob) { |
|
| 254 | 254 | // global $wpdb; |
| 255 | 255 | |
| 256 | 256 | // // Skip the repo's readme. |
@@ -263,20 +263,20 @@ discard block |
||
| 263 | 263 | // return false; |
| 264 | 264 | // } |
| 265 | 265 | |
| 266 | - if ( ! $blob->has_frontmatter() ) { |
|
| 266 | + if ( ! $blob->has_frontmatter()) { |
|
| 267 | 267 | return false; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | return true; |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | - protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) { |
|
| 274 | - if ( $blob->has_frontmatter() ) { |
|
| 273 | + protected function importable_raw_file(Writing_On_GitHub_Blob $blob) { |
|
| 274 | + if ($blob->has_frontmatter()) { |
|
| 275 | 275 | return false; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | // only images |
| 279 | - if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) { |
|
| 279 | + if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) { |
|
| 280 | 280 | return false; |
| 281 | 281 | } |
| 282 | 282 | |
@@ -288,16 +288,16 @@ discard block |
||
| 288 | 288 | * @param Writing_On_GitHub_Blob $blob |
| 289 | 289 | * @param bool $is_remove |
| 290 | 290 | */ |
| 291 | - protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) { |
|
| 291 | + protected function import_raw_file(Writing_On_GitHub_Blob $blob, $is_remove) { |
|
| 292 | 292 | $arr = wp_upload_dir(); |
| 293 | 293 | $path = $arr['basedir'] . '/writing-on-github/' . $blob->path(); |
| 294 | - if ( $is_remove ) { |
|
| 295 | - if ( file_exists($path) ) { |
|
| 294 | + if ($is_remove) { |
|
| 295 | + if (file_exists($path)) { |
|
| 296 | 296 | unlink($path); |
| 297 | 297 | } |
| 298 | 298 | } else { |
| 299 | 299 | $dirname = dirname($path); |
| 300 | - if ( ! file_exists($dirname) ) { |
|
| 300 | + if ( ! file_exists($dirname)) { |
|
| 301 | 301 | wp_mkdir_p($dirname); |
| 302 | 302 | } |
| 303 | 303 | |
@@ -312,57 +312,57 @@ discard block |
||
| 312 | 312 | * |
| 313 | 313 | * @return Writing_On_GitHub_Post |
| 314 | 314 | */ |
| 315 | - protected function blob_to_post( Writing_On_GitHub_Blob $blob ) { |
|
| 316 | - $args = array( 'post_content' => $blob->content_import() ); |
|
| 315 | + protected function blob_to_post(Writing_On_GitHub_Blob $blob) { |
|
| 316 | + $args = array('post_content' => $blob->content_import()); |
|
| 317 | 317 | $meta = $blob->meta(); |
| 318 | 318 | |
| 319 | 319 | $id = false; |
| 320 | 320 | |
| 321 | - if ( $meta ) { |
|
| 322 | - if ( array_key_exists( 'layout', $meta ) ) { |
|
| 321 | + if ($meta) { |
|
| 322 | + if (array_key_exists('layout', $meta)) { |
|
| 323 | 323 | $args['post_type'] = $meta['layout']; |
| 324 | - unset( $meta['layout'] ); |
|
| 324 | + unset($meta['layout']); |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | - if ( array_key_exists( 'published', $meta ) ) { |
|
| 327 | + if (array_key_exists('published', $meta)) { |
|
| 328 | 328 | $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft'; |
| 329 | - unset( $meta['published'] ); |
|
| 329 | + unset($meta['published']); |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | - if ( array_key_exists( 'post_title', $meta ) ) { |
|
| 332 | + if (array_key_exists('post_title', $meta)) { |
|
| 333 | 333 | $args['post_title'] = $meta['post_title']; |
| 334 | - unset( $meta['post_title'] ); |
|
| 334 | + unset($meta['post_title']); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | - if ( array_key_exists( 'post_name', $meta ) ) { |
|
| 337 | + if (array_key_exists('post_name', $meta)) { |
|
| 338 | 338 | $args['post_name'] = $meta['post_name']; |
| 339 | - unset( $meta['post_name'] ); |
|
| 339 | + unset($meta['post_name']); |
|
| 340 | 340 | } |
| 341 | 341 | |
| 342 | - if ( array_key_exists( 'ID', $meta ) ) { |
|
| 342 | + if (array_key_exists('ID', $meta)) { |
|
| 343 | 343 | $id = $args['ID'] = $meta['ID']; |
| 344 | 344 | $blob->set_id($id); |
| 345 | - unset( $meta['ID'] ); |
|
| 345 | + unset($meta['ID']); |
|
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | $meta['_wogh_sha'] = $blob->sha(); |
| 350 | 350 | |
| 351 | - if ( $id ) { |
|
| 352 | - $old_sha = get_post_meta( $id, '_wogh_sha', true ); |
|
| 353 | - $old_github_path = get_post_meta( $id, '_wogh_github_path', true ); |
|
| 351 | + if ($id) { |
|
| 352 | + $old_sha = get_post_meta($id, '_wogh_sha', true); |
|
| 353 | + $old_github_path = get_post_meta($id, '_wogh_github_path', true); |
|
| 354 | 354 | |
| 355 | 355 | // dont save post when has same sha |
| 356 | - if ( $old_sha && $old_sha == $meta['_wogh_sha'] && |
|
| 357 | - $old_github_path && $old_github_path == $blob->path() ) { |
|
| 356 | + if ($old_sha && $old_sha == $meta['_wogh_sha'] && |
|
| 357 | + $old_github_path && $old_github_path == $blob->path()) { |
|
| 358 | 358 | return false; |
| 359 | 359 | } |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - $post = new Writing_On_GitHub_Post( $args, $this->app->api() ); |
|
| 363 | - $post->set_old_github_path( $blob->path() ); |
|
| 364 | - $post->set_meta( $meta ); |
|
| 365 | - $blob->set_id( $post->id() ); |
|
| 362 | + $post = new Writing_On_GitHub_Post($args, $this->app->api()); |
|
| 363 | + $post->set_old_github_path($blob->path()); |
|
| 364 | + $post->set_meta($meta); |
|
| 365 | + $blob->set_id($post->id()); |
|
| 366 | 366 | |
| 367 | 367 | return $post; |
| 368 | 368 | } |
@@ -16,13 +16,13 @@ discard block |
||
| 16 | 16 | * |
| 17 | 17 | * @return array[Writing_On_GitHub_File_Info]|WP_Error |
| 18 | 18 | */ |
| 19 | - public function compare( $sha ) { |
|
| 19 | + public function compare($sha) { |
|
| 20 | 20 | // https://api.github.com/repos/litefeel/testwpsync/compare/861f87e8851b8debb78db548269d29f8da4d94ac...master |
| 21 | 21 | $endpoint = $this->compare_endpoint(); |
| 22 | 22 | $branch = $this->branch(); |
| 23 | - $data = $this->call( 'GET', "$endpoint/$sha...$branch" ); |
|
| 23 | + $data = $this->call('GET', "$endpoint/$sha...$branch"); |
|
| 24 | 24 | |
| 25 | - if ( is_wp_error( $data ) ) { |
|
| 25 | + if (is_wp_error($data)) { |
|
| 26 | 26 | return $data; |
| 27 | 27 | } |
| 28 | 28 | |
@@ -44,13 +44,13 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @return mixed |
| 46 | 46 | */ |
| 47 | - public function remote_contents( $post ) { |
|
| 48 | - return $this->call( 'GET', $this->content_endpoint( $post->github_path() ) ); |
|
| 47 | + public function remote_contents($post) { |
|
| 48 | + return $this->call('GET', $this->content_endpoint($post->github_path())); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function exists( $path ) { |
|
| 52 | - $result = $this->call( 'GET', $this->content_endpoint( $path ) ); |
|
| 53 | - if ( is_wp_error( $result ) ) { |
|
| 51 | + public function exists($path) { |
|
| 52 | + $result = $this->call('GET', $this->content_endpoint($path)); |
|
| 53 | + if (is_wp_error($result)) { |
|
| 54 | 54 | return false; |
| 55 | 55 | } |
| 56 | 56 | return true; |
@@ -63,27 +63,27 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * @return Writing_On_GitHub_Tree|WP_Error |
| 65 | 65 | */ |
| 66 | - public function tree_recursive( $sha = '_default' ) { |
|
| 66 | + public function tree_recursive($sha = '_default') { |
|
| 67 | 67 | |
| 68 | - if ( '_default' === $sha ) { |
|
| 68 | + if ('_default' === $sha) { |
|
| 69 | 69 | $sha = $this->branch(); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - $data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' ); |
|
| 72 | + $data = $this->call('GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1'); |
|
| 73 | 73 | |
| 74 | - if ( is_wp_error( $data ) ) { |
|
| 74 | + if (is_wp_error($data)) { |
|
| 75 | 75 | return $data; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | $files = array(); |
| 79 | 79 | |
| 80 | - foreach ( $data->tree as $index => $thing ) { |
|
| 80 | + foreach ($data->tree as $index => $thing) { |
|
| 81 | 81 | // We need to remove the trees because |
| 82 | 82 | // the recursive tree includes both |
| 83 | 83 | // the subtrees as well the subtrees' blobs. |
| 84 | - if ( 'blob' === $thing->type ) { |
|
| 84 | + if ('blob' === $thing->type) { |
|
| 85 | 85 | $thing->status = ''; |
| 86 | - $files[] = new Writing_On_GitHub_File_Info( $thing ); |
|
| 86 | + $files[] = new Writing_On_GitHub_File_Info($thing); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
@@ -97,14 +97,14 @@ discard block |
||
| 97 | 97 | * |
| 98 | 98 | * @return Writing_On_GitHub_Blob|WP_Error |
| 99 | 99 | */ |
| 100 | - public function blob( Writing_On_GitHub_File_Info $fileinfo ) { |
|
| 101 | - $data = $this->call( 'GET', $this->blob_endpoint() . '/' . $fileinfo->sha ); |
|
| 100 | + public function blob(Writing_On_GitHub_File_Info $fileinfo) { |
|
| 101 | + $data = $this->call('GET', $this->blob_endpoint() . '/' . $fileinfo->sha); |
|
| 102 | 102 | |
| 103 | - if ( is_wp_error( $data ) ) { |
|
| 103 | + if (is_wp_error($data)) { |
|
| 104 | 104 | return $data; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | $data->path = $fileinfo->path; |
| 108 | - return new Writing_On_GitHub_Blob( $data ); |
|
| 108 | + return new Writing_On_GitHub_Blob($data); |
|
| 109 | 109 | } |
| 110 | 110 | } |