litefeel / writing-on-github

lib/admin.php

Indentation +237 added lines, -237 removed lines

@@ -9,264 +9,264 @@
  */
 class Writing_On_GitHub_Admin {
 
-    /**
-     * plugin file name rel plugin dir.
-     * @var string
-     */
-    protected $plugin_file;
-
-    /**
-     * Hook into GitHub API
-     */
-    public function __construct( $plugin_file ) {
-        $this->plugin_file = $plugin_file;
-
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-        add_action( 'admin_init', array( $this, 'register_settings' ) );
-        add_action( 'current_screen', array( $this, 'trigger_cron' ) );
-        add_filter( 'plugin_action_links', array($this, 'settings_links'), 10, 2 );
-    }
-
-    /**
-     * settings link
-     * @param  string[] $links
-     * @param  string $file
-     * @return string[]
-     */
-    public function settings_links( $links, $file ) {
-        if ( $file != $this->plugin_file ) {
-            return $links;
-        }
-
-        $settings_link = '<a href="options-general.php?page=' .
-        Writing_On_GitHub::$text_domain . '">' . __( 'Settings', 'writing-on-github' ) . '</a>';
-
-        array_push( $links, $settings_link );
-
-        return $links;
-    }
-
-    /**
-     * Callback to render the settings page view
-     */
-    public function settings_page() {
-        include dirname( dirname( __FILE__ ) ) . '/views/options.php';
-    }
-
-    /**
-     * Callback to register the plugin's options
-     */
-    public function register_settings() {
-        add_settings_section(
-            'general',
-            'General Settings',
-            array( $this, 'section_callback' ),
-            Writing_On_GitHub::$text_domain
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
-        add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => 'https://api.github.com',
-                'name'      => 'wogh_host',
-                'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
-        add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_repository',
-                'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
-        add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => 'master',
-                'name'      => 'wogh_branch',
-                'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
-        add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_oauth_token',
-                'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
-        add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_secret',
-                'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
-        add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_default_user',
-                'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_dont_export_content' );
-        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(
-                'default'   => '',
-                'name'      => 'wogh_dont_export_content',
-                'help_text' => __( 'Do not export post content to github, only export meta.', 'writing-on-github' ),
-            )
-        );
-
-        // register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
-        // add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-        //      'default'   => '',
-        //      'name'      => 'wogh_ignore_metas',
-        //      'help_text' => __( 'These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github' ),
-        //  )
-        // );
-    }
-
-    /**
-     * Callback to render an individual options field
-     *
-     * @param array $args Field arguments.
-     */
-    public function field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
-    }
-
-    /**
-     * Callback to render the default import user field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function user_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
-    }
-
-    /**
-     * Callback to render the textarea field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function textarea_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
-    }
-
-    /**
-     * Callback to render the checkbox field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
-    }
-
-    /**
-     * Displays settings messages from background processes
-     */
-    public function section_callback() {
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
-            return;
-        }
-
-        if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+	/**
+	 * plugin file name rel plugin dir.
+	 * @var string
+	 */
+	protected $plugin_file;
+
+	/**
+	 * Hook into GitHub API
+	 */
+	public function __construct( $plugin_file ) {
+		$this->plugin_file = $plugin_file;
+
+		add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
+		add_action( 'admin_init', array( $this, 'register_settings' ) );
+		add_action( 'current_screen', array( $this, 'trigger_cron' ) );
+		add_filter( 'plugin_action_links', array($this, 'settings_links'), 10, 2 );
+	}
+
+	/**
+	 * settings link
+	 * @param  string[] $links
+	 * @param  string $file
+	 * @return string[]
+	 */
+	public function settings_links( $links, $file ) {
+		if ( $file != $this->plugin_file ) {
+			return $links;
+		}
+
+		$settings_link = '<a href="options-general.php?page=' .
+		Writing_On_GitHub::$text_domain . '">' . __( 'Settings', 'writing-on-github' ) . '</a>';
+
+		array_push( $links, $settings_link );
+
+		return $links;
+	}
+
+	/**
+	 * Callback to render the settings page view
+	 */
+	public function settings_page() {
+		include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+	}
+
+	/**
+	 * Callback to register the plugin's options
+	 */
+	public function register_settings() {
+		add_settings_section(
+			'general',
+			'General Settings',
+			array( $this, 'section_callback' ),
+			Writing_On_GitHub::$text_domain
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
+		add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => 'https://api.github.com',
+				'name'      => 'wogh_host',
+				'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
+		add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_repository',
+				'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
+		add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => 'master',
+				'name'      => 'wogh_branch',
+				'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
+		add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_oauth_token',
+				'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
+		add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_secret',
+				'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
+		add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_default_user',
+				'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
+		add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_ignore_author',
+				'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_dont_export_content' );
+		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(
+				'default'   => '',
+				'name'      => 'wogh_dont_export_content',
+				'help_text' => __( 'Do not export post content to github, only export meta.', 'writing-on-github' ),
+			)
+		);
+
+		// register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
+		// add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		//      'default'   => '',
+		//      'name'      => 'wogh_ignore_metas',
+		//      'help_text' => __( 'These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github' ),
+		//  )
+		// );
+	}
+
+	/**
+	 * Callback to render an individual options field
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+	}
+
+	/**
+	 * Callback to render the default import user field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function user_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+	}
+
+	/**
+	 * Callback to render the textarea field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function textarea_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+	}
+
+	/**
+	 * Callback to render the checkbox field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function checkbox_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+	}
+
+	/**
+	 * Displays settings messages from background processes
+	 */
+	public function section_callback() {
+		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+			return;
+		}
+
+		if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
             <div class="updated">
                 <p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
             </div><?php
-            delete_option( '_wogh_export_started' );
-        }
+			delete_option( '_wogh_export_started' );
+		}
 
-        if ( $message = get_option( '_wogh_export_error' ) ) { ?>
+		if ( $message = get_option( '_wogh_export_error' ) ) { ?>
             <div class="error">
                 <p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
             </div><?php
-            delete_option( '_wogh_export_error' );
-        }
+			delete_option( '_wogh_export_error' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
             <div class="updated">
                 <p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
             </div><?php
-            delete_option( '_wogh_export_complete' );
-        }
+			delete_option( '_wogh_export_complete' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
             <div class="updated">
             <p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
             </div><?php
-            delete_option( '_wogh_import_started' );
-        }
+			delete_option( '_wogh_import_started' );
+		}
 
-        if ( $message = get_option( '_wogh_import_error' ) ) { ?>
+		if ( $message = get_option( '_wogh_import_error' ) ) { ?>
             <div class="error">
             <p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
             </div><?php
-            delete_option( '_wogh_import_error' );
-        }
+			delete_option( '_wogh_import_error' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
             <div class="updated">
             <p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
             </div><?php
-            delete_option( '_wogh_import_complete' );
-        }
-    }
-
-    /**
-     * Add options menu to admin navbar
-     */
-    public function add_admin_menu() {
-        add_options_page(
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            'manage_options',
-            Writing_On_GitHub::$text_domain,
-            array( $this, 'settings_page' )
-        );
-    }
-
-    /**
-     * Admin callback to trigger import/export because WordPress admin routing lol
-     */
-    public function trigger_cron() {
-        if ( ! current_user_can( 'manage_options' ) ) {
-            return;
-        }
-
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
-            return;
-        }
-
-        if ( ! isset( $_GET['action'] ) ) {
-            return;
-        }
-
-        if ( 'export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export();
-        }
-        if ( 'force_export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export(true);
-        }
-        if ( 'import' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_import();
-        }
-        if ( 'force_import' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_import(true);
-        }
-
-        wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
-        die;
-    }
+			delete_option( '_wogh_import_complete' );
+		}
+	}
+
+	/**
+	 * Add options menu to admin navbar
+	 */
+	public function add_admin_menu() {
+		add_options_page(
+			__( 'Writing On GitHub', 'writing-on-github' ),
+			__( 'Writing On GitHub', 'writing-on-github' ),
+			'manage_options',
+			Writing_On_GitHub::$text_domain,
+			array( $this, 'settings_page' )
+		);
+	}
+
+	/**
+	 * Admin callback to trigger import/export because WordPress admin routing lol
+	 */
+	public function trigger_cron() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			return;
+		}
+
+		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+			return;
+		}
+
+		if ( ! isset( $_GET['action'] ) ) {
+			return;
+		}
+
+		if ( 'export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export();
+		}
+		if ( 'force_export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export(true);
+		}
+		if ( 'import' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_import();
+		}
+		if ( 'force_import' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_import(true);
+		}
+
+		wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+		die;
+	}
 }

Spacing +73 added lines, -73 removed lines

@@ -18,13 +18,13 @@ 
     /**
      * Hook into GitHub API
      */
-    public function __construct( $plugin_file ) {
+    public function __construct($plugin_file) {
         $this->plugin_file = $plugin_file;
 
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-        add_action( 'admin_init', array( $this, 'register_settings' ) );
-        add_action( 'current_screen', array( $this, 'trigger_cron' ) );
-        add_filter( 'plugin_action_links', array($this, 'settings_links'), 10, 2 );
+        add_action('admin_menu', array($this, 'add_admin_menu'));
+        add_action('admin_init', array($this, 'register_settings'));
+        add_action('current_screen', array($this, 'trigger_cron'));
+        add_filter('plugin_action_links', array($this, 'settings_links'), 10, 2);
     }
 
     /**
@@ -33,15 +33,15 @@ 
      * @param  string $file
      * @return string[]
      */
-    public function settings_links( $links, $file ) {
-        if ( $file != $this->plugin_file ) {
+    public function settings_links($links, $file) {
+        if ($file != $this->plugin_file) {
             return $links;
         }
 
         $settings_link = '<a href="options-general.php?page=' .
-        Writing_On_GitHub::$text_domain . '">' . __( 'Settings', 'writing-on-github' ) . '</a>';
+        Writing_On_GitHub::$text_domain . '">' . __('Settings', 'writing-on-github') . '</a>';
 
-        array_push( $links, $settings_link );
+        array_push($links, $settings_link);
 
         return $links;
     }
@@ -50,7 +50,7 @@ 
      * Callback to render the settings page view
      */
     public function settings_page() {
-        include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+        include dirname(dirname(__FILE__)) . '/views/options.php';
     }
 
     /**
@@ -60,71 +60,71 @@ 
         add_settings_section(
             'general',
             'General Settings',
-            array( $this, 'section_callback' ),
+            array($this, 'section_callback'),
             Writing_On_GitHub::$text_domain
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
-        add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_host');
+        add_settings_field('wogh_host', __('GitHub hostname', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => 'https://api.github.com',
                 'name'      => 'wogh_host',
-                'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
+                'help_text' => __('The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
-        add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_repository');
+        add_settings_field('wogh_repository', __('Repository', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_repository',
-                'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
+                'help_text' => __('The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
-        add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_branch');
+        add_settings_field('wogh_branch', __('Branch', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => 'master',
                 'name'      => 'wogh_branch',
-                'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
+                'help_text' => __('The GitHub branch to commit to, default is master.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
-        add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_oauth_token');
+        add_settings_field('wogh_oauth_token', __('Oauth Token', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_oauth_token',
-                'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
+                'help_text' => __("A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
-        add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_secret');
+        add_settings_field('wogh_secret', __('Webhook Secret', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_secret',
-                'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
+                'help_text' => __("The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
-        add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_default_user');
+        add_settings_field('wogh_default_user', __('Default Import User', 'writing-on-github'), array(&$this, 'user_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_default_user',
-                'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
+                'help_text' => __('The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_ignore_author');
+        add_settings_field('wogh_ignore_author', __('Ignore author', 'writing-on-github'), array(&$this, 'checkbox_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+                'help_text' => __('Do not export author and do not use author info from GitHub.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_dont_export_content' );
-        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(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_dont_export_content');
+        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(
                 'default'   => '',
                 'name'      => 'wogh_dont_export_content',
-                'help_text' => __( 'Do not export post content to github, only export meta.', 'writing-on-github' ),
+                'help_text' => __('Do not export post content to github, only export meta.', 'writing-on-github'),
             )
         );
 
@@ -142,8 +142,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+    public function field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/setting-field.php';
     }
 
     /**
@@ -151,8 +151,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function user_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+    public function user_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/user-setting-field.php';
     }
 
     /**
@@ -160,8 +160,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function textarea_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+    public function textarea_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/textarea-setting-field.php';
     }
 
     /**
@@ -169,58 +169,58 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+    public function checkbox_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/checkbox-setting-field.php';
     }
 
     /**
      * Displays settings messages from background processes
      */
     public function section_callback() {
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+        if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
             return;
         }
 
-        if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+        if ('yes' === get_option('_wogh_export_started')) { ?>
             <div class="updated">
-                <p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
+                <p><?php esc_html_e('Export to GitHub started.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_export_started' );
+            delete_option('_wogh_export_started');
         }
 
-        if ( $message = get_option( '_wogh_export_error' ) ) { ?>
+        if ($message = get_option('_wogh_export_error')) { ?>
             <div class="error">
-                <p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+                <p><?php esc_html_e('Export to GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
             </div><?php
-            delete_option( '_wogh_export_error' );
+            delete_option('_wogh_export_error');
         }
 
-        if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
+        if ('yes' === get_option('_wogh_export_complete')) { ?>
             <div class="updated">
-                <p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
+                <p><?php esc_html_e('Export to GitHub completed successfully.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_export_complete' );
+            delete_option('_wogh_export_complete');
         }
 
-        if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
+        if ('yes' === get_option('_wogh_import_started')) { ?>
             <div class="updated">
-            <p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
+            <p><?php esc_html_e('Import from GitHub started.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_import_started' );
+            delete_option('_wogh_import_started');
         }
 
-        if ( $message = get_option( '_wogh_import_error' ) ) { ?>
+        if ($message = get_option('_wogh_import_error')) { ?>
             <div class="error">
-            <p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+            <p><?php esc_html_e('Import from GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
             </div><?php
-            delete_option( '_wogh_import_error' );
+            delete_option('_wogh_import_error');
         }
 
-        if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
+        if ('yes' === get_option('_wogh_import_complete')) { ?>
             <div class="updated">
-            <p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
+            <p><?php esc_html_e('Import from GitHub completed successfully.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_import_complete' );
+            delete_option('_wogh_import_complete');
         }
     }
 
@@ -229,11 +229,11 @@ 
      */
     public function add_admin_menu() {
         add_options_page(
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            __( 'Writing On GitHub', 'writing-on-github' ),
+            __('Writing On GitHub', 'writing-on-github'),
+            __('Writing On GitHub', 'writing-on-github'),
             'manage_options',
             Writing_On_GitHub::$text_domain,
-            array( $this, 'settings_page' )
+            array($this, 'settings_page')
         );
     }
 
@@ -241,32 +241,32 @@ 
      * Admin callback to trigger import/export because WordPress admin routing lol
      */
     public function trigger_cron() {
-        if ( ! current_user_can( 'manage_options' ) ) {
+        if ( ! current_user_can('manage_options')) {
             return;
         }
 
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+        if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
             return;
         }
 
-        if ( ! isset( $_GET['action'] ) ) {
+        if ( ! isset($_GET['action'])) {
             return;
         }
 
-        if ( 'export' === $_GET['action'] ) {
+        if ('export' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_export();
         }
-        if ( 'force_export' === $_GET['action'] ) {
+        if ('force_export' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_export(true);
         }
-        if ( 'import' === $_GET['action'] ) {
+        if ('import' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_import();
         }
-        if ( 'force_import' === $_GET['action'] ) {
+        if ('force_import' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_import(true);
         }
 
-        wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+        wp_redirect(admin_url('options-general.php?page=writing-on-github'));
         die;
     }
 }

views/options.php

Spacing +15 added lines, -15 removed lines

@@ -6,35 +6,35 @@
 
 ?>
 <div class="wrap">
-	<h2><?php esc_html_e( 'Writing On GitHub', 'writing-on-github' ); ?></h2>
+	<h2><?php esc_html_e('Writing On GitHub', 'writing-on-github'); ?></h2>
 
 	<form method="post" action="options.php">
-		<?php settings_fields( Writing_On_GitHub::$text_domain ); ?>
-		<?php do_settings_sections( Writing_On_GitHub::$text_domain ); ?>
+		<?php settings_fields(Writing_On_GitHub::$text_domain); ?>
+		<?php do_settings_sections(Writing_On_GitHub::$text_domain); ?>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Webhook callback', 'writing-on-github' ); ?></th>
-				<td><code><?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>?action=wogh_push_request</code></td>
+				<th scope="row"><?php esc_html_e('Webhook callback', 'writing-on-github'); ?></th>
+				<td><code><?php echo esc_url(admin_url('admin-ajax.php')); ?>?action=wogh_push_request</code></td>
 			</tr>
 			<tr>
-                <th scope="row"><?php esc_html_e( 'Export', 'writing-on-github' ); ?></th>
+                <th scope="row"><?php esc_html_e('Export', 'writing-on-github'); ?></th>
                 <td>
-                    <p><a href="<?php echo esc_url( add_query_arg( array( 'action' => 'export' ) ) ); ?>">
-                        <input type="button" class="button button-secondary" value="<?php esc_html_e( 'Export to GitHub', 'writing-on-github' ); ?>" />
+                    <p><a href="<?php echo esc_url(add_query_arg(array('action' => 'export'))); ?>">
+                        <input type="button" class="button button-secondary" value="<?php esc_html_e('Export to GitHub', 'writing-on-github'); ?>" />
                     </a></p>
-                    <p><a href="<?php echo esc_url( add_query_arg( array( 'action' => 'force_export' ) ) ); ?>">
-                        <input type="button" class="button button-secondary" value="<?php esc_html_e( 'Force export to GitHub', 'writing-on-github' ); ?>" />
+                    <p><a href="<?php echo esc_url(add_query_arg(array('action' => 'force_export'))); ?>">
+                        <input type="button" class="button button-secondary" value="<?php esc_html_e('Force export to GitHub', 'writing-on-github'); ?>" />
                     </a></p>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php esc_html_e( 'Import', 'writing-on-github' ); ?></th>
+                <th scope="row"><?php esc_html_e('Import', 'writing-on-github'); ?></th>
                 <td>
-                    <p><a href="<?php echo esc_url( add_query_arg( array( 'action' => 'import' ) ) ); ?>">
-                        <input type="button" class="button button-secondary" value="<?php esc_html_e( 'Import from GitHub', 'writing-on-github' ); ?>" />
+                    <p><a href="<?php echo esc_url(add_query_arg(array('action' => 'import'))); ?>">
+                        <input type="button" class="button button-secondary" value="<?php esc_html_e('Import from GitHub', 'writing-on-github'); ?>" />
                     </a></p>
-                     <p><a href="<?php echo esc_url( add_query_arg( array( 'action' => 'force_import' ) ) ); ?>">
-                        <input type="button" class="button button-secondary" value="<?php esc_html_e( 'Force Import from GitHub', 'writing-on-github' ); ?>" />
+                     <p><a href="<?php echo esc_url(add_query_arg(array('action' => 'force_import'))); ?>">
+                        <input type="button" class="button button-secondary" value="<?php esc_html_e('Force Import from GitHub', 'writing-on-github'); ?>" />
                     </a></p>
                 </td>
             </tr>

lib/payload.php

Indentation +130 added lines, -130 removed lines

@@ -9,134 +9,134 @@
  */
 class Writing_On_GitHub_Payload {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Payload data.
-     *
-     * @var stdClass
-     */
-    protected $data;
-
-    /**
-     * Writing_On_GitHub_Payload constructor.
-     *
-     * @param Writing_On_GitHub $app      Application container.
-     * @param string                $raw_data Raw request data.
-     */
-    public function __construct( Writing_On_GitHub $app, $raw_data ) {
-        $this->app  = $app;
-        $this->data = json_decode( $raw_data );
-    }
-
-    /**
-     * Returns whether payload should be imported.
-     *
-     * @return true|WP_Error
-     */
-    public function should_import() {
-        // @todo how do we get this without importing the whole api object just for this?
-        if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
-            return new WP_Error(
-                'incorrect_repository',
-                sprintf( 'Incorrect repository, %s -> %s .',
-                    $this->data->repository->full_name,
-                    $this->app->api()->fetch()->repository()
-                )
-            );
-        }
-
-        // The last term in the ref is the payload_branch name.
-        $refs   = explode( '/', $this->data->ref );
-        $payload_branch = array_pop( $refs );
-
-        $branch = $this->app->api()->fetch()->branch();
-
-        if ( $branch !== $payload_branch ) {
-            return new WP_Error(
-                'incorrect_branch',
-                sprintf( 'Incorrect branch, %s -> %s .',
-                    $payload_branch,
-                    $branch
-                )
-            );
-        }
-
-        // We add a tag to commits we push out, so we shouldn't pull them in again.
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
-
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
-        }
-
-        if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
-            return new WP_Error(
-                'skip_import',
-                'Skip import on auto export post.'
-            );
-        }
-
-        if ( ! $this->get_commit_id() ) {
-            return new WP_Error(
-                'invalid_payload',
-                "[Missing Commit ID] won't be imported."
-            );
-        }
-
-        return true;
-    }
-
-    public function get_before_commit_id() {
-        return $this->data->before ? $this->data->before : null;
-    }
-
-    /**
-     * Returns the sha of the head commit.
-     *
-     * @return string
-     */
-    public function get_commit_id() {
-        return $this->data->head_commit ? $this->data->head_commit->id : null;
-    }
-
-    /**
-     * Returns the email address for the commit author.
-     *
-     * @return string
-     */
-    public function get_author_email() {
-        return $this->data->head_commit->author->email;
-    }
-
-    /**
-     * Returns array commits for the payload.
-     *
-     * @return array
-     */
-    public function get_commits() {
-        return $this->data->commits;
-    }
-
-    /**
-     * Returns the repository's full name.
-     *
-     * @return string
-     */
-    public function get_repository_name() {
-        return $this->data->repository->full_name;
-    }
-
-    /**
-     * Returns the payload's commit message.
-     *
-     * @return string
-     */
-    protected function message() {
-        return $this->data->head_commit->message;
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Payload data.
+	 *
+	 * @var stdClass
+	 */
+	protected $data;
+
+	/**
+	 * Writing_On_GitHub_Payload constructor.
+	 *
+	 * @param Writing_On_GitHub $app      Application container.
+	 * @param string                $raw_data Raw request data.
+	 */
+	public function __construct( Writing_On_GitHub $app, $raw_data ) {
+		$this->app  = $app;
+		$this->data = json_decode( $raw_data );
+	}
+
+	/**
+	 * Returns whether payload should be imported.
+	 *
+	 * @return true|WP_Error
+	 */
+	public function should_import() {
+		// @todo how do we get this without importing the whole api object just for this?
+		if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
+			return new WP_Error(
+				'incorrect_repository',
+				sprintf( 'Incorrect repository, %s -> %s .',
+					$this->data->repository->full_name,
+					$this->app->api()->fetch()->repository()
+				)
+			);
+		}
+
+		// The last term in the ref is the payload_branch name.
+		$refs   = explode( '/', $this->data->ref );
+		$payload_branch = array_pop( $refs );
+
+		$branch = $this->app->api()->fetch()->branch();
+
+		if ( $branch !== $payload_branch ) {
+			return new WP_Error(
+				'incorrect_branch',
+				sprintf( 'Incorrect branch, %s -> %s .',
+					$payload_branch,
+					$branch
+				)
+			);
+		}
+
+		// We add a tag to commits we push out, so we shouldn't pull them in again.
+		$tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+
+		if ( ! $tag ) {
+			throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+		}
+
+		if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
+			return new WP_Error(
+				'skip_import',
+				'Skip import on auto export post.'
+			);
+		}
+
+		if ( ! $this->get_commit_id() ) {
+			return new WP_Error(
+				'invalid_payload',
+				"[Missing Commit ID] won't be imported."
+			);
+		}
+
+		return true;
+	}
+
+	public function get_before_commit_id() {
+		return $this->data->before ? $this->data->before : null;
+	}
+
+	/**
+	 * Returns the sha of the head commit.
+	 *
+	 * @return string
+	 */
+	public function get_commit_id() {
+		return $this->data->head_commit ? $this->data->head_commit->id : null;
+	}
+
+	/**
+	 * Returns the email address for the commit author.
+	 *
+	 * @return string
+	 */
+	public function get_author_email() {
+		return $this->data->head_commit->author->email;
+	}
+
+	/**
+	 * Returns array commits for the payload.
+	 *
+	 * @return array
+	 */
+	public function get_commits() {
+		return $this->data->commits;
+	}
+
+	/**
+	 * Returns the repository's full name.
+	 *
+	 * @return string
+	 */
+	public function get_repository_name() {
+		return $this->data->repository->full_name;
+	}
+
+	/**
+	 * Returns the payload's commit message.
+	 *
+	 * @return string
+	 */
+	protected function message() {
+		return $this->data->head_commit->message;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -29,9 +29,9 @@ 
      * @param Writing_On_GitHub $app      Application container.
      * @param string                $raw_data Raw request data.
      */
-    public function __construct( Writing_On_GitHub $app, $raw_data ) {
+    public function __construct(Writing_On_GitHub $app, $raw_data) {
         $this->app  = $app;
-        $this->data = json_decode( $raw_data );
+        $this->data = json_decode($raw_data);
     }
 
     /**
@@ -41,10 +41,10 @@ 
      */
     public function should_import() {
         // @todo how do we get this without importing the whole api object just for this?
-        if ( strtolower( $this->data->repository->full_name ) !== strtolower( $this->app->api()->fetch()->repository() ) ) {
+        if (strtolower($this->data->repository->full_name) !== strtolower($this->app->api()->fetch()->repository())) {
             return new WP_Error(
                 'incorrect_repository',
-                sprintf( 'Incorrect repository, %s -> %s .',
+                sprintf('Incorrect repository, %s -> %s .',
                     $this->data->repository->full_name,
                     $this->app->api()->fetch()->repository()
                 )
@@ -52,15 +52,15 @@ 
         }
 
         // The last term in the ref is the payload_branch name.
-        $refs   = explode( '/', $this->data->ref );
-        $payload_branch = array_pop( $refs );
+        $refs   = explode('/', $this->data->ref);
+        $payload_branch = array_pop($refs);
 
         $branch = $this->app->api()->fetch()->branch();
 
-        if ( $branch !== $payload_branch ) {
+        if ($branch !== $payload_branch) {
             return new WP_Error(
                 'incorrect_branch',
-                sprintf( 'Incorrect branch, %s -> %s .',
+                sprintf('Incorrect branch, %s -> %s .',
                     $payload_branch,
                     $branch
                 )
@@ -68,20 +68,20 @@ 
         }
 
         // We add a tag to commits we push out, so we shouldn't pull them in again.
-        $tag = apply_filters( 'wogh_commit_msg_tag', 'wogh' );
+        $tag = apply_filters('wogh_commit_msg_tag', 'wogh');
 
-        if ( ! $tag ) {
-            throw new Exception( __( 'Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github' ) );
+        if ( ! $tag) {
+            throw new Exception(__('Commit message tag not set. Filter `wogh_commit_msg_tag` misconfigured.', 'writing-on-github'));
         }
 
-        if ( $tag === substr( $this->message(), -1 * strlen( $tag ) ) ) {
+        if ($tag === substr($this->message(), -1 * strlen($tag))) {
             return new WP_Error(
                 'skip_import',
                 'Skip import on auto export post.'
             );
         }
 
-        if ( ! $this->get_commit_id() ) {
+        if ( ! $this->get_commit_id()) {
             return new WP_Error(
                 'invalid_payload',
                 "[Missing Commit ID] won't be imported."

lib/controller.php

Indentation +228 added lines, -228 removed lines

@@ -9,232 +9,232 @@
  */
 class Writing_On_GitHub_Controller {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    public $app;
-
-    /**
-     * Instantiates a new Controller object
-     *
-     * @param Writing_On_GitHub $app Applicatio container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Webhook callback as triggered from GitHub push.
-     *
-     * Reads the Webhook payload and syncs posts as necessary.
-     *
-     * @return boolean
-     */
-    public function pull_posts() {
-        $this->set_ajax();
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
-            ) );
-        }
-
-        if ( ! $this->app->request()->is_secret_valid() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_headers',
-                __( 'Failed to validate secret.', 'writing-on-github' )
-            ) );
-        }
-
-        // ping
-        if ( $this->app->request()->is_ping() ) {
-            return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
-        }
-
-        // push
-        if ( ! $this->app->request()->is_push() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_headers',
-                sprintf( 'Failed to validate webhook event: %s.',
-                    $this->app->request()->webhook_event() )
-            ) );
-        }
-        $payload = $this->app->request()->payload();
-
-        $error = $payload->should_import();
-        if ( is_wp_error( $error ) ) {
-            /*　@var WP_Error $error */
-            return $this->app->response()->error( $error );
-        }
-
-        $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'delete_post', array( $this, 'delete_post' ) );
-
-        $result = $this->app->import()->payload( $payload );
-
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Imports posts from the current master branch.
-     * @param  integer $user_id
-     * @param  boolean $force
-     * @return boolean
-     */
-    public function import_master( $user_id = 0, $force = false ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'save_post', array( $this, 'delete_post' ) );
-
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
-        }
-
-        $result = $this->app->import()->master( $force );
-
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_import_error', $result->get_error_message() );
-
-            return $this->app->response()->error( $result );
-        }
-
-        update_option( '_wogh_import_complete', 'yes' );
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Export all the posts in the database to GitHub.
-     *
-     * @param  int        $user_id
-     * @param  boolean    $force
-     * @return boolean
-     */
-    public function export_all( $user_id = 0, $force = false ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
-        }
-
-        $result = $this->app->export()->full($force);
-        $this->app->semaphore()->unlock();
-
-        // Maybe move option updating out of this class/upgrade message display?
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_export_error', $result->get_error_message() );
-
-            return $this->app->response()->error( $result );
-        } else {
-            update_option( '_wogh_export_complete', 'yes' );
-            update_option( '_wogh_fully_exported', 'yes' );
-
-            return $this->app->response()->success( $result );
-        }
-    }
-
-    /**
-     * Exports a single post to GitHub by ID.
-     *
-     * Called on the save_post hook.
-     *
-     * @param int $post_id Post ID.
-     *
-     * @return boolean
-     */
-    public function export_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
-            return;
-        }
-
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        $result = $this->app->export()->update( $post_id );
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Removes the post from the tree.
-     *
-     * Called the delete_post hook.
-     *
-     * @param int $post_id Post ID.
-     *
-     * @return boolean
-     */
-    public function delete_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
-            return;
-        }
-
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        $result = $this->app->export()->delete( $post_id );
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Indicates we're running our own AJAX hook
-     * and thus should respond with JSON, rather
-     * than just returning data.
-     */
-    protected function set_ajax() {
-        if ( ! defined( 'WOGH_AJAX' ) ) {
-            define( 'WOGH_AJAX', true );
-        }
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	public $app;
+
+	/**
+	 * Instantiates a new Controller object
+	 *
+	 * @param Writing_On_GitHub $app Applicatio container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Webhook callback as triggered from GitHub push.
+	 *
+	 * Reads the Webhook payload and syncs posts as necessary.
+	 *
+	 * @return boolean
+	 */
+	public function pull_posts() {
+		$this->set_ajax();
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
+			) );
+		}
+
+		if ( ! $this->app->request()->is_secret_valid() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_headers',
+				__( 'Failed to validate secret.', 'writing-on-github' )
+			) );
+		}
+
+		// ping
+		if ( $this->app->request()->is_ping() ) {
+			return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
+		}
+
+		// push
+		if ( ! $this->app->request()->is_push() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_headers',
+				sprintf( 'Failed to validate webhook event: %s.',
+					$this->app->request()->webhook_event() )
+			) );
+		}
+		$payload = $this->app->request()->payload();
+
+		$error = $payload->should_import();
+		if ( is_wp_error( $error ) ) {
+			/*　@var WP_Error $error */
+			return $this->app->response()->error( $error );
+		}
+
+		$this->app->semaphore()->lock();
+		remove_action( 'save_post', array( $this, 'export_post' ) );
+		remove_action( 'delete_post', array( $this, 'delete_post' ) );
+
+		$result = $this->app->import()->payload( $payload );
+
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Imports posts from the current master branch.
+	 * @param  integer $user_id
+	 * @param  boolean $force
+	 * @return boolean
+	 */
+	public function import_master( $user_id = 0, $force = false ) {
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		remove_action( 'save_post', array( $this, 'export_post' ) );
+		remove_action( 'save_post', array( $this, 'delete_post' ) );
+
+		if ( $user_id ) {
+			wp_set_current_user( $user_id );
+		}
+
+		$result = $this->app->import()->master( $force );
+
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			update_option( '_wogh_import_error', $result->get_error_message() );
+
+			return $this->app->response()->error( $result );
+		}
+
+		update_option( '_wogh_import_complete', 'yes' );
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Export all the posts in the database to GitHub.
+	 *
+	 * @param  int        $user_id
+	 * @param  boolean    $force
+	 * @return boolean
+	 */
+	public function export_all( $user_id = 0, $force = false ) {
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+
+		if ( $user_id ) {
+			wp_set_current_user( $user_id );
+		}
+
+		$result = $this->app->export()->full($force);
+		$this->app->semaphore()->unlock();
+
+		// Maybe move option updating out of this class/upgrade message display?
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			update_option( '_wogh_export_error', $result->get_error_message() );
+
+			return $this->app->response()->error( $result );
+		} else {
+			update_option( '_wogh_export_complete', 'yes' );
+			update_option( '_wogh_fully_exported', 'yes' );
+
+			return $this->app->response()->success( $result );
+		}
+	}
+
+	/**
+	 * Exports a single post to GitHub by ID.
+	 *
+	 * Called on the save_post hook.
+	 *
+	 * @param int $post_id Post ID.
+	 *
+	 * @return boolean
+	 */
+	public function export_post( $post_id ) {
+		if ( wp_is_post_revision( $post_id ) ) {
+			return;
+		}
+
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		$result = $this->app->export()->update( $post_id );
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Removes the post from the tree.
+	 *
+	 * Called the delete_post hook.
+	 *
+	 * @param int $post_id Post ID.
+	 *
+	 * @return boolean
+	 */
+	public function delete_post( $post_id ) {
+		if ( wp_is_post_revision( $post_id ) ) {
+			return;
+		}
+
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		$result = $this->app->export()->delete( $post_id );
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Indicates we're running our own AJAX hook
+	 * and thus should respond with JSON, rather
+	 * than just returning data.
+	 */
+	protected function set_ajax() {
+		if ( ! defined( 'WOGH_AJAX' ) ) {
+			define( 'WOGH_AJAX', true );
+		}
+	}
 }

Spacing +74 added lines, -74 removed lines

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

lib/import.php

Indentation +326 added lines, -326 removed lines

@@ -10,330 +10,330 @@
  */
 class Writing_On_GitHub_Import {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Initializes a new import manager.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Imports a payload.
-     * @param  Writing_On_GitHub_Payload $payload
-     *
-     * @return string|WP_Error
-     */
-    public function payload( Writing_On_GitHub_Payload $payload ) {
-
-        $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
-        }
-
-        if ( is_wp_error( $result ) ) {
-            return $files;
-        }
-
-        return __( 'Payload processed', 'writing-on-github' );
-    }
-
-    /**
-     * import blob by files
-     * @param  Writing_On_GitHub_File_Info[] $files
-     * @param  boolean $force
-     *
-     * @return true|WP_Error
-     */
-    protected function import_files( $files, $force = false ) {
-
-        $error = true;
-
-        foreach ( $files as $file ) {
-            if ( ! $this->importable_file( $file ) ) {
-                continue;
-            }
-
-            $blob = $this->app->api()->fetch()->blob( $file );
-            // network error ?
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
-                continue;
-            }
-
-            $is_remove = 'removed' == $file->status;
-
-            $result = false;
-            if ( $this->importable_raw_file( $blob ) ) {
-                $result = $this->import_raw_file( $blob, $is_remove );
-            } elseif ( $this->importable_post( $blob ) ) {
-                if ( $is_remove ) {
-                    $result = $this->delete_post( $blob );
-                } else {
-                    $result = $this->import_post( $blob, $force );
-                }
-            }
-
-            if ( is_wp_error( $result ) ) {
-                /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
-            }
-        }
-
-        return $error;
-    }
-
-    /**
-     * Imports the latest commit on the master branch.
-     *
-     * @param  boolean $force
-     * @return string|WP_Error
-     */
-    public function master( $force = false ) {
-        $result = $this->app->api()->fetch()->tree_recursive();
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result, $force );
-        }
-
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-
-        return __( 'Payload processed', 'writing-on-github' );
-    }
-
-    /**
-     * Checks whether the provided blob should be imported.
-     *
-     * @param Writing_On_GitHub_File_Info $file
-     *
-     * @return bool
-     */
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
-
-        $path = $file->path;
-
-        // only _pages, _posts and images
-        $prefixs = array( '_pages/', '_posts/', 'images/');
-        foreach ($prefixs as $prefix) {
-            if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Checks whether the provided blob should be imported.
-     *
-     * @param Writing_On_GitHub_Blob $blob Blob to validate.
-     *
-     * @return bool
-     */
-    protected function importable_post( Writing_On_GitHub_Blob $blob ) {
-        // global $wpdb;
-
-        // // Skip the repo's readme.
-        // if ( 'readme' === strtolower( substr( $blob->path(), 0, 6 ) ) ) {
-        //  return false;
-        // }
-
-        // // If the blob sha already matches a post, then move on.
-        // if ( ! is_wp_error( $this->app->database()->fetch_by_sha( $blob->sha() ) ) ) {
-        //  return false;
-        // }
-
-        if ( ! $blob->has_frontmatter() ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Delete post
-     * @param  Writing_On_GitHub_Blob $blob
-     * @return WP_Error|bool
-     */
-    protected function delete_post( Writing_On_GitHub_Blob $blob ) {
-        $id = $blob->id();
-        if ( empty( $id ) ) {
-            return false;
-        }
-        $result = $this->app->database()->delete_post( $id );
-        if ( is_wp_error( $result ) ) {
-            /* @var WP_Error $result */
-            return $result;
-        }
-        return true;
-    }
-
-    /**
-     * Imports a post into wordpress
-     * @param  Writing_On_GitHub_Blob $blob
-     * @param  boolean                $force
-     * @return WP_Error|bool
-     */
-    protected function import_post( Writing_On_GitHub_Blob $blob, $force = false ) {
-        $post = $this->blob_to_post( $blob, $force );
-
-        if ( ! $post instanceof Writing_On_GitHub_Post ) {
-            return false;
-        }
-
-        $result = $this->app->database()->save_post( $post );
-        if ( is_wp_error( $result ) ) {
-            /** @var WP_Error $result */
-            return $result;
-        }
-
-        if ( $post->is_new() ||
-                ! wogh_equal_front_matter( $post, $blob ) ) {
-
-            $result = $this->app->export()->export_post( $post );
-
-            if ( is_wp_error( $result ) ) {
-                /** @var WP_Error $result */
-                return $result;
-            }
-        }
-
-        clean_post_cache( $post->id() );
-
-        return true;
-    }
-
-    /**
-     * import raw file
-     * @param  Writing_On_GitHub_Blob $blob
-     * @return bool
-     */
-    protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
-        if ( $blob->has_frontmatter() ) {
-            return false;
-        }
-
-        // only images
-        if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Imports a raw file content into file system.
-     * @param  Writing_On_GitHub_Blob $blob
-     * @param  bool                   $is_remove
-     */
-    protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
-        $arr = wp_upload_dir();
-        $path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
-        if ( $is_remove ) {
-            if ( file_exists($path) ) {
-                unlink($path);
-            }
-        } else {
-            $dirname = dirname($path);
-            if ( ! file_exists($dirname) ) {
-                wp_mkdir_p($dirname);
-            }
-
-            file_put_contents($path, $blob->content());
-        }
-        return true;
-    }
-
-    /**
-     * Imports a single blob content into matching post.
-     *
-     * @param Writing_On_GitHub_Blob $blob Blob to transform into a Post.
-     * @param boolean                $force
-     *
-     * @return Writing_On_GitHub_Post|false
-     */
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob, $force = false ) {
-        $args = array( 'post_content' => $blob->content_import() );
-        $meta = $blob->meta();
-
-        $id = false;
-
-        if ( ! empty( $meta ) ) {
-            if ( array_key_exists( 'layout', $meta ) ) {
-                $args['post_type'] = $meta['layout'];
-                unset( $meta['layout'] );
-            }
-
-            if ( array_key_exists( 'published', $meta ) ) {
-                $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
-                unset( $meta['published'] );
-            }
-
-            if ( array_key_exists( 'post_title', $meta ) ) {
-                $args['post_title'] = $meta['post_title'];
-                unset( $meta['post_title'] );
-            }
-
-            if ( array_key_exists( 'post_name', $meta ) ) {
-                $args['post_name'] = $meta['post_name'];
-                unset( $meta['post_name'] );
-            }
-
-            if ( array_key_exists( 'ID', $meta ) ) {
-                $id = $args['ID'] = $meta['ID'];
-                $blob->set_id($id);
-                unset( $meta['ID'] );
-            }
-
-            if ( array_key_exists( 'post_date', $meta ) ) {
-                if ( empty( $meta['post_date'] ) ) {
-                    $meta['post_date'] = current_time( 'mysql' );
-                }
-
-                $args['post_date'] = $meta['post_date'];
-                unset( $meta['post_date'] );
-            }
-        }
-
-        $meta['_wogh_sha'] = $blob->sha();
-
-        if ( ! $force && $id ) {
-            $old_sha = get_post_meta( $id, '_wogh_sha', true );
-            $old_github_path = get_post_meta( $id, '_wogh_github_path', true );
-
-            // dont save post when has same sha
-            if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
-                 $old_github_path && $old_github_path == $blob->path() ) {
-                return false;
-            }
-        }
-
-        $post = new Writing_On_GitHub_Post( $args, $this->app->api() );
-        $post->set_old_github_path( $blob->path() );
-        $post->set_meta( $meta );
-        $post->set_blob( $blob );
-        $blob->set_id( $post->id() );
-
-        return $post;
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Initializes a new import manager.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Imports a payload.
+	 * @param  Writing_On_GitHub_Payload $payload
+	 *
+	 * @return string|WP_Error
+	 */
+	public function payload( Writing_On_GitHub_Payload $payload ) {
+
+		$result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		if ( is_array( $result ) ) {
+			$result = $this->import_files( $result );
+		}
+
+		if ( is_wp_error( $result ) ) {
+			return $files;
+		}
+
+		return __( 'Payload processed', 'writing-on-github' );
+	}
+
+	/**
+	 * import blob by files
+	 * @param  Writing_On_GitHub_File_Info[] $files
+	 * @param  boolean $force
+	 *
+	 * @return true|WP_Error
+	 */
+	protected function import_files( $files, $force = false ) {
+
+		$error = true;
+
+		foreach ( $files as $file ) {
+			if ( ! $this->importable_file( $file ) ) {
+				continue;
+			}
+
+			$blob = $this->app->api()->fetch()->blob( $file );
+			// network error ?
+			if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+				continue;
+			}
+
+			$is_remove = 'removed' == $file->status;
+
+			$result = false;
+			if ( $this->importable_raw_file( $blob ) ) {
+				$result = $this->import_raw_file( $blob, $is_remove );
+			} elseif ( $this->importable_post( $blob ) ) {
+				if ( $is_remove ) {
+					$result = $this->delete_post( $blob );
+				} else {
+					$result = $this->import_post( $blob, $force );
+				}
+			}
+
+			if ( is_wp_error( $result ) ) {
+				/* @var WP_Error $result */
+				$error = wogh_append_error( $error, $result );
+			}
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Imports the latest commit on the master branch.
+	 *
+	 * @param  boolean $force
+	 * @return string|WP_Error
+	 */
+	public function master( $force = false ) {
+		$result = $this->app->api()->fetch()->tree_recursive();
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		if ( is_array( $result ) ) {
+			$result = $this->import_files( $result, $force );
+		}
+
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+
+		return __( 'Payload processed', 'writing-on-github' );
+	}
+
+	/**
+	 * Checks whether the provided blob should be imported.
+	 *
+	 * @param Writing_On_GitHub_File_Info $file
+	 *
+	 * @return bool
+	 */
+	protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+
+		$path = $file->path;
+
+		// only _pages, _posts and images
+		$prefixs = array( '_pages/', '_posts/', 'images/');
+		foreach ($prefixs as $prefix) {
+			if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Checks whether the provided blob should be imported.
+	 *
+	 * @param Writing_On_GitHub_Blob $blob Blob to validate.
+	 *
+	 * @return bool
+	 */
+	protected function importable_post( Writing_On_GitHub_Blob $blob ) {
+		// global $wpdb;
+
+		// // Skip the repo's readme.
+		// if ( 'readme' === strtolower( substr( $blob->path(), 0, 6 ) ) ) {
+		//  return false;
+		// }
+
+		// // If the blob sha already matches a post, then move on.
+		// if ( ! is_wp_error( $this->app->database()->fetch_by_sha( $blob->sha() ) ) ) {
+		//  return false;
+		// }
+
+		if ( ! $blob->has_frontmatter() ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Delete post
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @return WP_Error|bool
+	 */
+	protected function delete_post( Writing_On_GitHub_Blob $blob ) {
+		$id = $blob->id();
+		if ( empty( $id ) ) {
+			return false;
+		}
+		$result = $this->app->database()->delete_post( $id );
+		if ( is_wp_error( $result ) ) {
+			/* @var WP_Error $result */
+			return $result;
+		}
+		return true;
+	}
+
+	/**
+	 * Imports a post into wordpress
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @param  boolean                $force
+	 * @return WP_Error|bool
+	 */
+	protected function import_post( Writing_On_GitHub_Blob $blob, $force = false ) {
+		$post = $this->blob_to_post( $blob, $force );
+
+		if ( ! $post instanceof Writing_On_GitHub_Post ) {
+			return false;
+		}
+
+		$result = $this->app->database()->save_post( $post );
+		if ( is_wp_error( $result ) ) {
+			/** @var WP_Error $result */
+			return $result;
+		}
+
+		if ( $post->is_new() ||
+				! wogh_equal_front_matter( $post, $blob ) ) {
+
+			$result = $this->app->export()->export_post( $post );
+
+			if ( is_wp_error( $result ) ) {
+				/** @var WP_Error $result */
+				return $result;
+			}
+		}
+
+		clean_post_cache( $post->id() );
+
+		return true;
+	}
+
+	/**
+	 * import raw file
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @return bool
+	 */
+	protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
+		if ( $blob->has_frontmatter() ) {
+			return false;
+		}
+
+		// only images
+		if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Imports a raw file content into file system.
+	 * @param  Writing_On_GitHub_Blob $blob
+	 * @param  bool                   $is_remove
+	 */
+	protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
+		$arr = wp_upload_dir();
+		$path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
+		if ( $is_remove ) {
+			if ( file_exists($path) ) {
+				unlink($path);
+			}
+		} else {
+			$dirname = dirname($path);
+			if ( ! file_exists($dirname) ) {
+				wp_mkdir_p($dirname);
+			}
+
+			file_put_contents($path, $blob->content());
+		}
+		return true;
+	}
+
+	/**
+	 * Imports a single blob content into matching post.
+	 *
+	 * @param Writing_On_GitHub_Blob $blob Blob to transform into a Post.
+	 * @param boolean                $force
+	 *
+	 * @return Writing_On_GitHub_Post|false
+	 */
+	protected function blob_to_post( Writing_On_GitHub_Blob $blob, $force = false ) {
+		$args = array( 'post_content' => $blob->content_import() );
+		$meta = $blob->meta();
+
+		$id = false;
+
+		if ( ! empty( $meta ) ) {
+			if ( array_key_exists( 'layout', $meta ) ) {
+				$args['post_type'] = $meta['layout'];
+				unset( $meta['layout'] );
+			}
+
+			if ( array_key_exists( 'published', $meta ) ) {
+				$args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
+				unset( $meta['published'] );
+			}
+
+			if ( array_key_exists( 'post_title', $meta ) ) {
+				$args['post_title'] = $meta['post_title'];
+				unset( $meta['post_title'] );
+			}
+
+			if ( array_key_exists( 'post_name', $meta ) ) {
+				$args['post_name'] = $meta['post_name'];
+				unset( $meta['post_name'] );
+			}
+
+			if ( array_key_exists( 'ID', $meta ) ) {
+				$id = $args['ID'] = $meta['ID'];
+				$blob->set_id($id);
+				unset( $meta['ID'] );
+			}
+
+			if ( array_key_exists( 'post_date', $meta ) ) {
+				if ( empty( $meta['post_date'] ) ) {
+					$meta['post_date'] = current_time( 'mysql' );
+				}
+
+				$args['post_date'] = $meta['post_date'];
+				unset( $meta['post_date'] );
+			}
+		}
+
+		$meta['_wogh_sha'] = $blob->sha();
+
+		if ( ! $force && $id ) {
+			$old_sha = get_post_meta( $id, '_wogh_sha', true );
+			$old_github_path = get_post_meta( $id, '_wogh_github_path', true );
+
+			// dont save post when has same sha
+			if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
+				 $old_github_path && $old_github_path == $blob->path() ) {
+				return false;
+			}
+		}
+
+		$post = new Writing_On_GitHub_Post( $args, $this->app->api() );
+		$post->set_old_github_path( $blob->path() );
+		$post->set_meta( $meta );
+		$post->set_blob( $blob );
+		$blob->set_id( $post->id() );
+
+		return $post;
+	}
 }

Spacing +80 added lines, -80 removed lines

@@ -22,7 +22,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -32,24 +32,24 @@ 
      *
      * @return string|WP_Error
      */
-    public function payload( Writing_On_GitHub_Payload $payload ) {
+    public function payload(Writing_On_GitHub_Payload $payload) {
 
-        $result = $this->app->api()->fetch()->compare( $payload->get_before_commit_id() );
+        $result = $this->app->api()->fetch()->compare($payload->get_before_commit_id());
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result );
+        if (is_array($result)) {
+            $result = $this->import_files($result);
         }
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             return $files;
         }
 
-        return __( 'Payload processed', 'writing-on-github' );
+        return __('Payload processed', 'writing-on-github');
     }
 
     /**
@@ -59,37 +59,37 @@ 
      *
      * @return true|WP_Error
      */
-    protected function import_files( $files, $force = false ) {
+    protected function import_files($files, $force = false) {
 
         $error = true;
 
-        foreach ( $files as $file ) {
-            if ( ! $this->importable_file( $file ) ) {
+        foreach ($files as $file) {
+            if ( ! $this->importable_file($file)) {
                 continue;
             }
 
-            $blob = $this->app->api()->fetch()->blob( $file );
+            $blob = $this->app->api()->fetch()->blob($file);
             // network error ?
-            if ( ! $blob instanceof Writing_On_GitHub_Blob ) {
+            if ( ! $blob instanceof Writing_On_GitHub_Blob) {
                 continue;
             }
 
             $is_remove = 'removed' == $file->status;
 
             $result = false;
-            if ( $this->importable_raw_file( $blob ) ) {
-                $result = $this->import_raw_file( $blob, $is_remove );
-            } elseif ( $this->importable_post( $blob ) ) {
-                if ( $is_remove ) {
-                    $result = $this->delete_post( $blob );
+            if ($this->importable_raw_file($blob)) {
+                $result = $this->import_raw_file($blob, $is_remove);
+            } elseif ($this->importable_post($blob)) {
+                if ($is_remove) {
+                    $result = $this->delete_post($blob);
                 } else {
-                    $result = $this->import_post( $blob, $force );
+                    $result = $this->import_post($blob, $force);
                 }
             }
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 /* @var WP_Error $result */
-                $error = wogh_append_error( $error, $result );
+                $error = wogh_append_error($error, $result);
             }
         }
 
@@ -102,24 +102,24 @@ 
      * @param  boolean $force
      * @return string|WP_Error
      */
-    public function master( $force = false ) {
+    public function master($force = false) {
         $result = $this->app->api()->fetch()->tree_recursive();
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        if ( is_array( $result ) ) {
-            $result = $this->import_files( $result, $force );
+        if (is_array($result)) {
+            $result = $this->import_files($result, $force);
         }
 
-        if ( is_wp_error( $result ) ) {
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
 
-        return __( 'Payload processed', 'writing-on-github' );
+        return __('Payload processed', 'writing-on-github');
     }
 
     /**
@@ -129,14 +129,14 @@ 
      *
      * @return bool
      */
-    protected function importable_file( Writing_On_GitHub_File_Info $file ) {
+    protected function importable_file(Writing_On_GitHub_File_Info $file) {
 
         $path = $file->path;
 
         // only _pages, _posts and images
-        $prefixs = array( '_pages/', '_posts/', 'images/');
+        $prefixs = array('_pages/', '_posts/', 'images/');
         foreach ($prefixs as $prefix) {
-            if ( ! strncasecmp($path, $prefix, strlen( $prefix ) ) ) {
+            if ( ! strncasecmp($path, $prefix, strlen($prefix))) {
                 return true;
             }
         }
@@ -150,7 +150,7 @@ 
      *
      * @return bool
      */
-    protected function importable_post( Writing_On_GitHub_Blob $blob ) {
+    protected function importable_post(Writing_On_GitHub_Blob $blob) {
         // global $wpdb;
 
         // // Skip the repo's readme.
@@ -163,7 +163,7 @@ 
         //  return false;
         // }
 
-        if ( ! $blob->has_frontmatter() ) {
+        if ( ! $blob->has_frontmatter()) {
             return false;
         }
 
@@ -175,13 +175,13 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return WP_Error|bool
      */
-    protected function delete_post( Writing_On_GitHub_Blob $blob ) {
+    protected function delete_post(Writing_On_GitHub_Blob $blob) {
         $id = $blob->id();
-        if ( empty( $id ) ) {
+        if (empty($id)) {
             return false;
         }
-        $result = $this->app->database()->delete_post( $id );
-        if ( is_wp_error( $result ) ) {
+        $result = $this->app->database()->delete_post($id);
+        if (is_wp_error($result)) {
             /* @var WP_Error $result */
             return $result;
         }
@@ -194,31 +194,31 @@ 
      * @param  boolean                $force
      * @return WP_Error|bool
      */
-    protected function import_post( Writing_On_GitHub_Blob $blob, $force = false ) {
-        $post = $this->blob_to_post( $blob, $force );
+    protected function import_post(Writing_On_GitHub_Blob $blob, $force = false) {
+        $post = $this->blob_to_post($blob, $force);
 
-        if ( ! $post instanceof Writing_On_GitHub_Post ) {
+        if ( ! $post instanceof Writing_On_GitHub_Post) {
             return false;
         }
 
-        $result = $this->app->database()->save_post( $post );
-        if ( is_wp_error( $result ) ) {
+        $result = $this->app->database()->save_post($post);
+        if (is_wp_error($result)) {
             /** @var WP_Error $result */
             return $result;
         }
 
-        if ( $post->is_new() ||
-                ! wogh_equal_front_matter( $post, $blob ) ) {
+        if ($post->is_new() ||
+                ! wogh_equal_front_matter($post, $blob)) {
 
-            $result = $this->app->export()->export_post( $post );
+            $result = $this->app->export()->export_post($post);
 
-            if ( is_wp_error( $result ) ) {
+            if (is_wp_error($result)) {
                 /** @var WP_Error $result */
                 return $result;
             }
         }
 
-        clean_post_cache( $post->id() );
+        clean_post_cache($post->id());
 
         return true;
     }
@@ -228,13 +228,13 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @return bool
      */
-    protected function importable_raw_file( Writing_On_GitHub_Blob $blob ) {
-        if ( $blob->has_frontmatter() ) {
+    protected function importable_raw_file(Writing_On_GitHub_Blob $blob) {
+        if ($blob->has_frontmatter()) {
             return false;
         }
 
         // only images
-        if ( strncasecmp($blob->path(), 'images/', strlen('images/') ) != 0) {
+        if (strncasecmp($blob->path(), 'images/', strlen('images/')) != 0) {
             return false;
         }
 
@@ -246,16 +246,16 @@ 
      * @param  Writing_On_GitHub_Blob $blob
      * @param  bool                   $is_remove
      */
-    protected function import_raw_file( Writing_On_GitHub_Blob $blob, $is_remove ) {
+    protected function import_raw_file(Writing_On_GitHub_Blob $blob, $is_remove) {
         $arr = wp_upload_dir();
         $path = $arr['basedir'] . '/writing-on-github/' . $blob->path();
-        if ( $is_remove ) {
-            if ( file_exists($path) ) {
+        if ($is_remove) {
+            if (file_exists($path)) {
                 unlink($path);
             }
         } else {
             $dirname = dirname($path);
-            if ( ! file_exists($dirname) ) {
+            if ( ! file_exists($dirname)) {
                 wp_mkdir_p($dirname);
             }
 
@@ -272,67 +272,67 @@ 
      *
      * @return Writing_On_GitHub_Post|false
      */
-    protected function blob_to_post( Writing_On_GitHub_Blob $blob, $force = false ) {
-        $args = array( 'post_content' => $blob->content_import() );
+    protected function blob_to_post(Writing_On_GitHub_Blob $blob, $force = false) {
+        $args = array('post_content' => $blob->content_import());
         $meta = $blob->meta();
 
         $id = false;
 
-        if ( ! empty( $meta ) ) {
-            if ( array_key_exists( 'layout', $meta ) ) {
+        if ( ! empty($meta)) {
+            if (array_key_exists('layout', $meta)) {
                 $args['post_type'] = $meta['layout'];
-                unset( $meta['layout'] );
+                unset($meta['layout']);
             }
 
-            if ( array_key_exists( 'published', $meta ) ) {
+            if (array_key_exists('published', $meta)) {
                 $args['post_status'] = true === $meta['published'] ? 'publish' : 'draft';
-                unset( $meta['published'] );
+                unset($meta['published']);
             }
 
-            if ( array_key_exists( 'post_title', $meta ) ) {
+            if (array_key_exists('post_title', $meta)) {
                 $args['post_title'] = $meta['post_title'];
-                unset( $meta['post_title'] );
+                unset($meta['post_title']);
             }
 
-            if ( array_key_exists( 'post_name', $meta ) ) {
+            if (array_key_exists('post_name', $meta)) {
                 $args['post_name'] = $meta['post_name'];
-                unset( $meta['post_name'] );
+                unset($meta['post_name']);
             }
 
-            if ( array_key_exists( 'ID', $meta ) ) {
+            if (array_key_exists('ID', $meta)) {
                 $id = $args['ID'] = $meta['ID'];
                 $blob->set_id($id);
-                unset( $meta['ID'] );
+                unset($meta['ID']);
             }
 
-            if ( array_key_exists( 'post_date', $meta ) ) {
-                if ( empty( $meta['post_date'] ) ) {
-                    $meta['post_date'] = current_time( 'mysql' );
+            if (array_key_exists('post_date', $meta)) {
+                if (empty($meta['post_date'])) {
+                    $meta['post_date'] = current_time('mysql');
                 }
 
                 $args['post_date'] = $meta['post_date'];
-                unset( $meta['post_date'] );
+                unset($meta['post_date']);
             }
         }
 
         $meta['_wogh_sha'] = $blob->sha();
 
-        if ( ! $force && $id ) {
-            $old_sha = get_post_meta( $id, '_wogh_sha', true );
-            $old_github_path = get_post_meta( $id, '_wogh_github_path', true );
+        if ( ! $force && $id) {
+            $old_sha = get_post_meta($id, '_wogh_sha', true);
+            $old_github_path = get_post_meta($id, '_wogh_github_path', true);
 
             // dont save post when has same sha
-            if ( $old_sha  && $old_sha == $meta['_wogh_sha'] &&
-                 $old_github_path && $old_github_path == $blob->path() ) {
+            if ($old_sha && $old_sha == $meta['_wogh_sha'] &&
+                 $old_github_path && $old_github_path == $blob->path()) {
                 return false;
             }
         }
 
-        $post = new Writing_On_GitHub_Post( $args, $this->app->api() );
-        $post->set_old_github_path( $blob->path() );
-        $post->set_meta( $meta );
-        $post->set_blob( $blob );
-        $blob->set_id( $post->id() );
+        $post = new Writing_On_GitHub_Post($args, $this->app->api());
+        $post->set_old_github_path($blob->path());
+        $post->set_meta($meta);
+        $post->set_blob($blob);
+        $blob->set_id($post->id());
 
         return $post;
     }

tests/unit/client/test-persist.php

Indentation +212 added lines, -212 removed lines

@@ -5,216 +5,216 @@
  */
 class Writing_On_GitHub_Persist_Client_Test extends Writing_On_GitHub_Base_Client_Test {
 
-    public function setUp() {
-        parent::setUp();
-
-        $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
-        // $this->commit
-        //  ->shouldReceive( 'tree' )
-        //  ->andReturn( $this->tree );
-    }
-
-    public function test_should_delete_file() {
-        // $this->tree->shouldReceive();
-
-        $this->set_delete_contents( true, '_posts_test.md' );
-        $this->persist->delete_file( '_posts_test.md', 'mysha', 'this is message for delete file' );
-    }
-
-    // public function test_should_not_add_commit_if_no_change() {
-    //  $this->tree
-    //      ->shouldReceive( 'is_changed' )
-    //      ->once()
-    //      ->andReturn( false );
-
-    //  $this->assertWPError( $error = $this->persist->commit( $this->commit ) );
-    //  $this->assertSame( 'no_commit', $error->get_error_code() );
-    // }
-
-    // public function test_should_fail_if_create_tree_fails() {
-    //  $this->tree
-    //      ->shouldReceive( 'is_changed' )
-    //      ->once()
-    //      ->andReturn( true );
-    //  $this->tree
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn(
-    //          array(
-    //              'tree' => array(
-    //                  array(
-    //                      'path'    => '_posts/2015-10-23-new-post.md',
-    //                      'type'    => 'blob',
-    //                      'content' => 'Post content 1',
-    //                      'mode'    => '100644',
-    //                  )
-    //              )
-    //          )
-    //      );
-    //  $this->set_post_trees( false );
-
-    //  $this->assertWPError( $error = $this->persist->commit( $this->commit ) );
-    //  $this->assertSame( '404_not_found', $error->get_error_code() );
-    // }
-
-    // public function test_should_fail_if_create_commit_fails() {
-    //  $this->tree
-    //      ->shouldReceive( 'is_changed' )
-    //      ->once()
-    //      ->andReturn( true );
-    //  $this->tree
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn(
-    //          array(
-    //              'tree' => array(
-    //                  array(
-    //                      'path'    => '_posts/2015-10-23-new-post.md',
-    //                      'type'    => 'blob',
-    //                      'content' => 'Post content 1',
-    //                      'mode'    => '100644',
-    //                  )
-    //              )
-    //          )
-    //      );
-    //  $this->tree
-    //      ->shouldReceive( 'set_sha' )
-    //      ->once()
-    //      ->with( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' );
-    //  $this->commit
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn( array(
-    //          'tree'    => 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8',
-    //          'message' => 'Commit message',
-    //          'parents' => array( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' )
-    //      ) );
-    //  $this->set_post_trees( true );
-    //  $this->set_post_commits( false );
-
-    //  $this->assertWPError( $error = $this->persist->commit( $this->commit ) );
-    //  $this->assertSame( '404_not_found', $error->get_error_code() );
-    // }
-
-    // public function test_should_fail_if_update_master_fails() {
-    //  $this->tree
-    //      ->shouldReceive( 'is_changed' )
-    //      ->once()
-    //      ->andReturn( true );
-    //  $this->tree
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn(
-    //          array(
-    //              'tree' => array(
-    //                  array(
-    //                      'path'    => '_posts/2015-10-23-new-post.md',
-    //                      'type'    => 'blob',
-    //                      'content' => 'Post content 1',
-    //                      'mode'    => '100644',
-    //                  )
-    //              )
-    //          )
-    //      );
-    //  $this->tree
-    //      ->shouldReceive( 'set_sha' )
-    //      ->once()
-    //      ->with( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' );
-    //  $this->commit
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn( array(
-    //          'tree'    => 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8',
-    //          'message' => 'Commit message',
-    //          'parents' => array( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' )
-    //      ) );
-    //  $this->set_post_trees( true );
-    //  $this->set_post_commits( true );
-    //  $this->set_patch_refs_heads_master( false );
-
-    //  $this->assertWPError( $error = $this->persist->commit( $this->commit ) );
-    //  $this->assertSame( '404_not_found', $error->get_error_code() );
-    // }
-
-    // public function test_should_create_anonymous_commit() {
-    //  $this->tree
-    //      ->shouldReceive( 'is_changed' )
-    //      ->once()
-    //      ->andReturn( true );
-    //  $this->tree
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn(
-    //          array(
-    //              'tree' => array(
-    //                  array(
-    //                      'path'    => '_posts/2015-10-23-new-post.md',
-    //                      'type'    => 'blob',
-    //                      'content' => 'Post content 1',
-    //                      'mode'    => '100644',
-    //                  )
-    //              )
-    //          )
-    //      );
-    //  $this->tree
-    //      ->shouldReceive( 'set_sha' )
-    //      ->once()
-    //      ->with( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' );
-    //  $this->commit
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn( array(
-    //          'tree'    => 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8',
-    //          'message' => 'Commit message',
-    //          'parents' => array( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' )
-    //      ) );
-    //  $this->set_post_trees( true );
-    //  $this->set_post_commits( true );
-    //  $this->set_patch_refs_heads_master( true );
-
-    //  $this->assertTrue( $this->persist->commit( $this->commit ) );
-    // }
-
-    // public function test_should_create_authored_commit() {
-    //  $this->tree
-    //      ->shouldReceive( 'is_changed' )
-    //      ->once()
-    //      ->andReturn( true );
-    //  $this->tree
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn(
-    //          array(
-    //              'tree' => array(
-    //                  array(
-    //                      'path'    => '_posts/2015-10-23-new-post.md',
-    //                      'type'    => 'blob',
-    //                      'content' => 'Post content 1',
-    //                      'mode'    => '100644',
-    //                  )
-    //              )
-    //          )
-    //      );
-    //  $this->tree
-    //      ->shouldReceive( 'set_sha' )
-    //      ->once()
-    //      ->with( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' );
-    //  $this->commit
-    //      ->shouldReceive( 'to_body' )
-    //      ->once()
-    //      ->andReturn( array(
-    //          'tree'    => 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8',
-    //          'message' => 'Commit message',
-    //          'parents' => array( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' )
-    //      ) );
-    //  $this->set_post_trees( true );
-    //  update_option( '_wogh_export_user_id', $this->factory->user->create( array(
-    //      'display_name' => 'James DiGioia',
-    //      'user_email'   => 'jamesorodig@gmail.com',
-    //  ) ) );
-    //  $this->set_post_commits( true, false );
-    //  $this->set_patch_refs_heads_master( true );
-
-    //  $this->assertTrue( $this->persist->commit( $this->commit ) );
-    // }
+	public function setUp() {
+		parent::setUp();
+
+		$this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+		// $this->commit
+		//  ->shouldReceive( 'tree' )
+		//  ->andReturn( $this->tree );
+	}
+
+	public function test_should_delete_file() {
+		// $this->tree->shouldReceive();
+
+		$this->set_delete_contents( true, '_posts_test.md' );
+		$this->persist->delete_file( '_posts_test.md', 'mysha', 'this is message for delete file' );
+	}
+
+	// public function test_should_not_add_commit_if_no_change() {
+	//  $this->tree
+	//      ->shouldReceive( 'is_changed' )
+	//      ->once()
+	//      ->andReturn( false );
+
+	//  $this->assertWPError( $error = $this->persist->commit( $this->commit ) );
+	//  $this->assertSame( 'no_commit', $error->get_error_code() );
+	// }
+
+	// public function test_should_fail_if_create_tree_fails() {
+	//  $this->tree
+	//      ->shouldReceive( 'is_changed' )
+	//      ->once()
+	//      ->andReturn( true );
+	//  $this->tree
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn(
+	//          array(
+	//              'tree' => array(
+	//                  array(
+	//                      'path'    => '_posts/2015-10-23-new-post.md',
+	//                      'type'    => 'blob',
+	//                      'content' => 'Post content 1',
+	//                      'mode'    => '100644',
+	//                  )
+	//              )
+	//          )
+	//      );
+	//  $this->set_post_trees( false );
+
+	//  $this->assertWPError( $error = $this->persist->commit( $this->commit ) );
+	//  $this->assertSame( '404_not_found', $error->get_error_code() );
+	// }
+
+	// public function test_should_fail_if_create_commit_fails() {
+	//  $this->tree
+	//      ->shouldReceive( 'is_changed' )
+	//      ->once()
+	//      ->andReturn( true );
+	//  $this->tree
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn(
+	//          array(
+	//              'tree' => array(
+	//                  array(
+	//                      'path'    => '_posts/2015-10-23-new-post.md',
+	//                      'type'    => 'blob',
+	//                      'content' => 'Post content 1',
+	//                      'mode'    => '100644',
+	//                  )
+	//              )
+	//          )
+	//      );
+	//  $this->tree
+	//      ->shouldReceive( 'set_sha' )
+	//      ->once()
+	//      ->with( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' );
+	//  $this->commit
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn( array(
+	//          'tree'    => 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8',
+	//          'message' => 'Commit message',
+	//          'parents' => array( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' )
+	//      ) );
+	//  $this->set_post_trees( true );
+	//  $this->set_post_commits( false );
+
+	//  $this->assertWPError( $error = $this->persist->commit( $this->commit ) );
+	//  $this->assertSame( '404_not_found', $error->get_error_code() );
+	// }
+
+	// public function test_should_fail_if_update_master_fails() {
+	//  $this->tree
+	//      ->shouldReceive( 'is_changed' )
+	//      ->once()
+	//      ->andReturn( true );
+	//  $this->tree
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn(
+	//          array(
+	//              'tree' => array(
+	//                  array(
+	//                      'path'    => '_posts/2015-10-23-new-post.md',
+	//                      'type'    => 'blob',
+	//                      'content' => 'Post content 1',
+	//                      'mode'    => '100644',
+	//                  )
+	//              )
+	//          )
+	//      );
+	//  $this->tree
+	//      ->shouldReceive( 'set_sha' )
+	//      ->once()
+	//      ->with( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' );
+	//  $this->commit
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn( array(
+	//          'tree'    => 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8',
+	//          'message' => 'Commit message',
+	//          'parents' => array( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' )
+	//      ) );
+	//  $this->set_post_trees( true );
+	//  $this->set_post_commits( true );
+	//  $this->set_patch_refs_heads_master( false );
+
+	//  $this->assertWPError( $error = $this->persist->commit( $this->commit ) );
+	//  $this->assertSame( '404_not_found', $error->get_error_code() );
+	// }
+
+	// public function test_should_create_anonymous_commit() {
+	//  $this->tree
+	//      ->shouldReceive( 'is_changed' )
+	//      ->once()
+	//      ->andReturn( true );
+	//  $this->tree
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn(
+	//          array(
+	//              'tree' => array(
+	//                  array(
+	//                      'path'    => '_posts/2015-10-23-new-post.md',
+	//                      'type'    => 'blob',
+	//                      'content' => 'Post content 1',
+	//                      'mode'    => '100644',
+	//                  )
+	//              )
+	//          )
+	//      );
+	//  $this->tree
+	//      ->shouldReceive( 'set_sha' )
+	//      ->once()
+	//      ->with( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' );
+	//  $this->commit
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn( array(
+	//          'tree'    => 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8',
+	//          'message' => 'Commit message',
+	//          'parents' => array( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' )
+	//      ) );
+	//  $this->set_post_trees( true );
+	//  $this->set_post_commits( true );
+	//  $this->set_patch_refs_heads_master( true );
+
+	//  $this->assertTrue( $this->persist->commit( $this->commit ) );
+	// }
+
+	// public function test_should_create_authored_commit() {
+	//  $this->tree
+	//      ->shouldReceive( 'is_changed' )
+	//      ->once()
+	//      ->andReturn( true );
+	//  $this->tree
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn(
+	//          array(
+	//              'tree' => array(
+	//                  array(
+	//                      'path'    => '_posts/2015-10-23-new-post.md',
+	//                      'type'    => 'blob',
+	//                      'content' => 'Post content 1',
+	//                      'mode'    => '100644',
+	//                  )
+	//              )
+	//          )
+	//      );
+	//  $this->tree
+	//      ->shouldReceive( 'set_sha' )
+	//      ->once()
+	//      ->with( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' );
+	//  $this->commit
+	//      ->shouldReceive( 'to_body' )
+	//      ->once()
+	//      ->andReturn( array(
+	//          'tree'    => 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8',
+	//          'message' => 'Commit message',
+	//          'parents' => array( 'c0d2cb90b51826096c826b61a0e74d2c973d7ad8' )
+	//      ) );
+	//  $this->set_post_trees( true );
+	//  update_option( '_wogh_export_user_id', $this->factory->user->create( array(
+	//      'display_name' => 'James DiGioia',
+	//      'user_email'   => 'jamesorodig@gmail.com',
+	//  ) ) );
+	//  $this->set_post_commits( true, false );
+	//  $this->set_patch_refs_heads_master( true );
+
+	//  $this->assertTrue( $this->persist->commit( $this->commit ) );
+	// }
 }

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
     public function setUp() {
         parent::setUp();
 
-        $this->persist = new Writing_On_GitHub_Persist_Client( $this->app );
+        $this->persist = new Writing_On_GitHub_Persist_Client($this->app);
         // $this->commit
         //  ->shouldReceive( 'tree' )
         //  ->andReturn( $this->tree );
@@ -17,8 +17,8 @@ 
     public function test_should_delete_file() {
         // $this->tree->shouldReceive();
 
-        $this->set_delete_contents( true, '_posts_test.md' );
-        $this->persist->delete_file( '_posts_test.md', 'mysha', 'this is message for delete file' );
+        $this->set_delete_contents(true, '_posts_test.md');
+        $this->persist->delete_file('_posts_test.md', 'mysha', 'this is message for delete file');
     }
 
     // public function test_should_not_add_commit_if_no_change() {

tests/unit/client/test-fetch.php

Indentation +143 added lines, -143 removed lines

@@ -6,147 +6,147 @@
  */
 class Writing_On_GitHub_Fetch_Client_Test extends Writing_On_GitHub_Base_Client_Test {
 
-    public function setUp() {
-        parent::setUp();
-
-        $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
-    }
-
-    public function test_should_fail_if_missing_token() {
-        delete_option( Base::TOKEN_OPTION_KEY );
-
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'missing_token', $error->get_error_code() );
-    }
-
-    public function test_should_fail_if_missing_repo() {
-        delete_option( Base::REPO_OPTION_KEY );
-
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'missing_repository', $error->get_error_code() );
-    }
-
-    public function test_should_fail_if_malformed_repo() {
-        // If you find a particular name passing that shouldn't,
-        // add it to the list here and make it pass.
-        $this->malformed_repo( 'repositoryname' );
-    }
-
-    public function test_compare() {
-        $this->set_get_trees( true, 'master' );
-        $this->set_get_compare( true );
-        $infos = $this->fetch->compare( '861f87e8851b8debb78db548269d29f8da4d94ac' );
-        $this->assertCount( 1, $infos );
-        $this->assertInstanceOf( 'Writing_On_GitHub_File_Info', $infos[0] );
-    }
-
-    public function test_should_return_files_with_tree() {
-        // $this->set_get_refs_heads_master( true );
-        // $this->set_get_commits( true );
-        $this->set_get_trees( true, 'master' );
-
-        $this->assertCount( 3, $this->fetch->tree_recursive() );
-    }
-
-    public function test_should_fail_if_cant_fetch_tree() {
-        $this->set_get_trees( false, 'master' );
-
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( '422_unprocessable_entity', $error->get_error_code() );
-    }
-
-    public function test_should_return_commit_with_no_blobs_if_api_fails() {
-        $this->set_get_trees( true, 'master' );
-        $this->set_get_blobs( false );
-
-        $this->assertCount( 3, $files = $this->fetch->tree_recursive() );
-
-        foreach ( $files as $file ) {
-            $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->blob( $file ) );
-            $this->assertSame( '404_not_found', $error->get_error_code() );
-        }
-    }
-
-    // public function test_should_return_and_validate_full_commit() {
-    //  $this->set_get_refs_heads_master( true );
-    //  $this->set_get_commits( true );
-    //  $this->set_get_trees( true );
-    //  $this->set_get_blobs( true );
-    //  $this->api_cache
-    //      ->shouldReceive( 'set_blob' )
-    //      ->times( 3 )
-    //      ->with(
-    //          Mockery::anyOf(
-    //              '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
-    //              '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
-    //              '2d73165945b0ccbe4932f1363457986b0ed49f19'
-    //          ),
-    //          Mockery::type( 'Writing_On_GitHub_Blob' )
-    //      )
-    //      ->andReturnUsing( function ( $sha, $blob ) {
-    //          return $blob;
-    //      } );
-    //  $this->api_cache
-    //      ->shouldReceive( 'set_tree' )
-    //      ->once()
-    //      ->with( '9108868e3800bec6763e51beb0d33e15036c3626', Mockery::type( 'Writing_On_GitHub_Tree' ) )
-    //      ->andReturnUsing( function ( $sha, $tree ) {
-    //          return $tree;
-    //      } );
-    //  $this->api_cache
-    //      ->shouldReceive( 'set_commit' )
-    //      ->once()
-    //      ->with( 'db2510854e6aeab68ead26b48328b19f4bdf926e', Mockery::type( 'Writing_On_GitHub_Commit' ) )
-    //      ->andReturnUsing( function ( $sha, $commit ) {
-    //          return $commit;
-    //      } );
-
-    //  $this->assertInstanceOf( 'Writing_On_GitHub_Commit', $master = $this->fetch->master() );
-
-    //  /**
-    //   * Validate the commit's api data mapped correctly.
-    //   */
-    //  $this->assertSame( '7497c0574b9430ff5e5521b4572b7452ea36a056', $master->sha() );
-    //  $this->assertSame( 'test@test.com', $master->author()->email );
-    //  $this->assertSame( '2015-11-02T00:36:54Z', $master->author()->date );
-    //  $this->assertSame( 'test@test.com', $master->committer()->email );
-    //  $this->assertSame( '2015-11-02T00:36:54Z', $master->committer()->date );
-    //  $this->assertSame( 'Initial full site export - wogh', $master->message() );
-    //  $this->assertCount( 1, $parents = $master->parents() );
-    //  $this->assertSame( 'db2510854e6aeab68ead26b48328b19f4bdf926e', $parents[0]->sha );
-
-    //  $this->assertInstanceOf( 'Writing_On_GitHub_Tree', $tree = $master->tree() );
-
-    //  /**
-    //   * Validate the tree's api data mapped correctly.
-    //   */
-    //  $this->assertSame( '9108868e3800bec6763e51beb0d33e15036c3626', $tree->sha() );
-
-    //  $this->assertCount( 3, $blobs = $tree->blobs() );
-
-    //  /**
-    //   * Validate the blobs' api data mapped correctly.
-    //   */
-    //  $blobs = $tree->blobs();
-    //  $this->assertCount( 3, $blobs );
-    //  foreach ( $blobs as $blob ) {
-    //      $this->assertTrue( in_array( $blob->sha(), array(
-    //          '2d73165945b0ccbe4932f1363457986b0ed49f19',
-    //          '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
-    //          '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
-    //      ) ) );
-    //      $this->assertTrue( in_array( $blob->path(), array(
-    //          '_pages/sample-page.md',
-    //          '_posts/2015-11-02-hello-world.md',
-    //          'README.md',
-    //      ) ) );
-    //  }
-    // }
-
-    protected function malformed_repo( $repo ) {
-        update_option( Base::REPO_OPTION_KEY, $repo );
-
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'malformed_repository', $error->get_error_code() );
-    }
+	public function setUp() {
+		parent::setUp();
+
+		$this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+	}
+
+	public function test_should_fail_if_missing_token() {
+		delete_option( Base::TOKEN_OPTION_KEY );
+
+		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
+		$this->assertSame( 'missing_token', $error->get_error_code() );
+	}
+
+	public function test_should_fail_if_missing_repo() {
+		delete_option( Base::REPO_OPTION_KEY );
+
+		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
+		$this->assertSame( 'missing_repository', $error->get_error_code() );
+	}
+
+	public function test_should_fail_if_malformed_repo() {
+		// If you find a particular name passing that shouldn't,
+		// add it to the list here and make it pass.
+		$this->malformed_repo( 'repositoryname' );
+	}
+
+	public function test_compare() {
+		$this->set_get_trees( true, 'master' );
+		$this->set_get_compare( true );
+		$infos = $this->fetch->compare( '861f87e8851b8debb78db548269d29f8da4d94ac' );
+		$this->assertCount( 1, $infos );
+		$this->assertInstanceOf( 'Writing_On_GitHub_File_Info', $infos[0] );
+	}
+
+	public function test_should_return_files_with_tree() {
+		// $this->set_get_refs_heads_master( true );
+		// $this->set_get_commits( true );
+		$this->set_get_trees( true, 'master' );
+
+		$this->assertCount( 3, $this->fetch->tree_recursive() );
+	}
+
+	public function test_should_fail_if_cant_fetch_tree() {
+		$this->set_get_trees( false, 'master' );
+
+		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
+		$this->assertSame( '422_unprocessable_entity', $error->get_error_code() );
+	}
+
+	public function test_should_return_commit_with_no_blobs_if_api_fails() {
+		$this->set_get_trees( true, 'master' );
+		$this->set_get_blobs( false );
+
+		$this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+
+		foreach ( $files as $file ) {
+			$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->blob( $file ) );
+			$this->assertSame( '404_not_found', $error->get_error_code() );
+		}
+	}
+
+	// public function test_should_return_and_validate_full_commit() {
+	//  $this->set_get_refs_heads_master( true );
+	//  $this->set_get_commits( true );
+	//  $this->set_get_trees( true );
+	//  $this->set_get_blobs( true );
+	//  $this->api_cache
+	//      ->shouldReceive( 'set_blob' )
+	//      ->times( 3 )
+	//      ->with(
+	//          Mockery::anyOf(
+	//              '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
+	//              '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
+	//              '2d73165945b0ccbe4932f1363457986b0ed49f19'
+	//          ),
+	//          Mockery::type( 'Writing_On_GitHub_Blob' )
+	//      )
+	//      ->andReturnUsing( function ( $sha, $blob ) {
+	//          return $blob;
+	//      } );
+	//  $this->api_cache
+	//      ->shouldReceive( 'set_tree' )
+	//      ->once()
+	//      ->with( '9108868e3800bec6763e51beb0d33e15036c3626', Mockery::type( 'Writing_On_GitHub_Tree' ) )
+	//      ->andReturnUsing( function ( $sha, $tree ) {
+	//          return $tree;
+	//      } );
+	//  $this->api_cache
+	//      ->shouldReceive( 'set_commit' )
+	//      ->once()
+	//      ->with( 'db2510854e6aeab68ead26b48328b19f4bdf926e', Mockery::type( 'Writing_On_GitHub_Commit' ) )
+	//      ->andReturnUsing( function ( $sha, $commit ) {
+	//          return $commit;
+	//      } );
+
+	//  $this->assertInstanceOf( 'Writing_On_GitHub_Commit', $master = $this->fetch->master() );
+
+	//  /**
+	//   * Validate the commit's api data mapped correctly.
+	//   */
+	//  $this->assertSame( '7497c0574b9430ff5e5521b4572b7452ea36a056', $master->sha() );
+	//  $this->assertSame( 'test@test.com', $master->author()->email );
+	//  $this->assertSame( '2015-11-02T00:36:54Z', $master->author()->date );
+	//  $this->assertSame( 'test@test.com', $master->committer()->email );
+	//  $this->assertSame( '2015-11-02T00:36:54Z', $master->committer()->date );
+	//  $this->assertSame( 'Initial full site export - wogh', $master->message() );
+	//  $this->assertCount( 1, $parents = $master->parents() );
+	//  $this->assertSame( 'db2510854e6aeab68ead26b48328b19f4bdf926e', $parents[0]->sha );
+
+	//  $this->assertInstanceOf( 'Writing_On_GitHub_Tree', $tree = $master->tree() );
+
+	//  /**
+	//   * Validate the tree's api data mapped correctly.
+	//   */
+	//  $this->assertSame( '9108868e3800bec6763e51beb0d33e15036c3626', $tree->sha() );
+
+	//  $this->assertCount( 3, $blobs = $tree->blobs() );
+
+	//  /**
+	//   * Validate the blobs' api data mapped correctly.
+	//   */
+	//  $blobs = $tree->blobs();
+	//  $this->assertCount( 3, $blobs );
+	//  foreach ( $blobs as $blob ) {
+	//      $this->assertTrue( in_array( $blob->sha(), array(
+	//          '2d73165945b0ccbe4932f1363457986b0ed49f19',
+	//          '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
+	//          '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
+	//      ) ) );
+	//      $this->assertTrue( in_array( $blob->path(), array(
+	//          '_pages/sample-page.md',
+	//          '_posts/2015-11-02-hello-world.md',
+	//          'README.md',
+	//      ) ) );
+	//  }
+	// }
+
+	protected function malformed_repo( $repo ) {
+		update_option( Base::REPO_OPTION_KEY, $repo );
+
+		$this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
+		$this->assertSame( 'malformed_repository', $error->get_error_code() );
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -9,61 +9,61 @@ 
     public function setUp() {
         parent::setUp();
 
-        $this->fetch = new Writing_On_GitHub_Fetch_Client( $this->app );
+        $this->fetch = new Writing_On_GitHub_Fetch_Client($this->app);
     }
 
     public function test_should_fail_if_missing_token() {
-        delete_option( Base::TOKEN_OPTION_KEY );
+        delete_option(Base::TOKEN_OPTION_KEY);
 
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'missing_token', $error->get_error_code() );
+        $this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+        $this->assertSame('missing_token', $error->get_error_code());
     }
 
     public function test_should_fail_if_missing_repo() {
-        delete_option( Base::REPO_OPTION_KEY );
+        delete_option(Base::REPO_OPTION_KEY);
 
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'missing_repository', $error->get_error_code() );
+        $this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+        $this->assertSame('missing_repository', $error->get_error_code());
     }
 
     public function test_should_fail_if_malformed_repo() {
         // If you find a particular name passing that shouldn't,
         // add it to the list here and make it pass.
-        $this->malformed_repo( 'repositoryname' );
+        $this->malformed_repo('repositoryname');
     }
 
     public function test_compare() {
-        $this->set_get_trees( true, 'master' );
-        $this->set_get_compare( true );
-        $infos = $this->fetch->compare( '861f87e8851b8debb78db548269d29f8da4d94ac' );
-        $this->assertCount( 1, $infos );
-        $this->assertInstanceOf( 'Writing_On_GitHub_File_Info', $infos[0] );
+        $this->set_get_trees(true, 'master');
+        $this->set_get_compare(true);
+        $infos = $this->fetch->compare('861f87e8851b8debb78db548269d29f8da4d94ac');
+        $this->assertCount(1, $infos);
+        $this->assertInstanceOf('Writing_On_GitHub_File_Info', $infos[0]);
     }
 
     public function test_should_return_files_with_tree() {
         // $this->set_get_refs_heads_master( true );
         // $this->set_get_commits( true );
-        $this->set_get_trees( true, 'master' );
+        $this->set_get_trees(true, 'master');
 
-        $this->assertCount( 3, $this->fetch->tree_recursive() );
+        $this->assertCount(3, $this->fetch->tree_recursive());
     }
 
     public function test_should_fail_if_cant_fetch_tree() {
-        $this->set_get_trees( false, 'master' );
+        $this->set_get_trees(false, 'master');
 
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( '422_unprocessable_entity', $error->get_error_code() );
+        $this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+        $this->assertSame('422_unprocessable_entity', $error->get_error_code());
     }
 
     public function test_should_return_commit_with_no_blobs_if_api_fails() {
-        $this->set_get_trees( true, 'master' );
-        $this->set_get_blobs( false );
+        $this->set_get_trees(true, 'master');
+        $this->set_get_blobs(false);
 
-        $this->assertCount( 3, $files = $this->fetch->tree_recursive() );
+        $this->assertCount(3, $files = $this->fetch->tree_recursive());
 
-        foreach ( $files as $file ) {
-            $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->blob( $file ) );
-            $this->assertSame( '404_not_found', $error->get_error_code() );
+        foreach ($files as $file) {
+            $this->assertInstanceOf('WP_Error', $error = $this->fetch->blob($file));
+            $this->assertSame('404_not_found', $error->get_error_code());
         }
     }
 
@@ -143,10 +143,10 @@ 
     //  }
     // }
 
-    protected function malformed_repo( $repo ) {
-        update_option( Base::REPO_OPTION_KEY, $repo );
+    protected function malformed_repo($repo) {
+        update_option(Base::REPO_OPTION_KEY, $repo);
 
-        $this->assertInstanceOf( 'WP_Error', $error = $this->fetch->tree_recursive() );
-        $this->assertSame( 'malformed_repository', $error->get_error_code() );
+        $this->assertInstanceOf('WP_Error', $error = $this->fetch->tree_recursive());
+        $this->assertSame('malformed_repository', $error->get_error_code());
     }
 }

tests/unit/client/test-base.php

Indentation +271 added lines, -271 removed lines

@@ -2,275 +2,275 @@
 
 abstract class Writing_On_GitHub_Base_Client_Test extends Writing_On_GitHub_TestCase {
 
-    /**
-     * @var string
-     */
-    const HOST_OPTION_VALUE = 'https://api.github.com';
-
-    /**
-     * @var string
-     */
-    const REPO_OPTION_VALUE = 'woghtest/wogh-test';
-
-    /**
-     * @var string
-     */
-    const TOKEN_OPTION_VALUE = 'the-token';
-
-    /**
-     * @var string
-     */
-    const BRANCH_OPTION_VALUE = 'master';
-
-    /**
-     * @var array
-     */
-    protected static $responses = array();
-
-    /**
-     * @var array
-     */
-    protected static $validations = array();
-
-    public function setUp() {
-        parent::setUp();
-
-        WP_HTTP_TestCase::init();
-        update_option( 'wogh_repository', self::REPO_OPTION_VALUE );
-        update_option( 'wogh_oauth_token', self::TOKEN_OPTION_VALUE );
-        update_option( 'wogh_host', self::HOST_OPTION_VALUE );
-        update_option( 'wogh_branch', self::BRANCH_OPTION_VALUE );
-        $this->http_responder = array( $this, 'mock_github_api' );
-    }
-
-    /**
-     * This does some checks and fails the test if something is wrong
-     * or returns intended mock data for the given endpoint + method.
-     *
-     * @return void|string
-     */
-    public function mock_github_api( $request, $url ) {
-        $host_length = strlen( self::HOST_OPTION_VALUE );
-
-        if ( self::HOST_OPTION_VALUE !== substr( $url, 0, $host_length ) ) {
-            $this->assertTrue( false, 'Called wrong host.' );
-        }
-
-        if (
-            ! isset( $request['headers']['Authorization'] ) ||
-            'token ' . self::TOKEN_OPTION_VALUE !== $request['headers']['Authorization']
-        ) {
-            $this->assertTrue( false, 'Missing authorization key.' );
-        }
-
-        $url = explode( '/', substr( $url, $host_length + 1 ) );
-
-        if ( 'repos' !== $url[0] ) {
-            $this->assertTrue( false, 'Called wrong endpoint.' );
-        }
-
-        $repo = $url[1] . '/' . $url[2];
-
-        if ( self::REPO_OPTION_VALUE !== $repo ) {
-            $this->assertTrue( false, 'Called wrong repo.' );
-        }
-
-        // git api
-        $parts = array_slice( $url, $url[3] === 'git' ? 4 : 3 );
-        array_unshift( $parts, strtolower( $request['method'] ) );
-        $endpoint = implode( '_', $parts );
-        $endpoint = str_replace( '?recursive=1', '', $endpoint );
-        $this->assertTrue( call_user_func( static::$validations[ $endpoint ], $request ), 'Request did not validate.' );
-
-        return static::$responses[ $endpoint ];
-    }
-
-    protected function set_get_refs_heads_master( $succeed ) {
-        $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
-                    return false;
-                }
-
-                return true;
-            }, $succeed ? '200 OK' : '404 Not Found', $succeed
-        );
-    }
-
-    protected function set_get_commits( $succeed ) {
-        $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
-                    return false;
-                }
-
-                return true;
-            }, $succeed ? '200 OK' : '404 Not Found', $succeed, 'db2510854e6aeab68ead26b48328b19f4bdf926e'
-        );
-    }
-
-    protected function set_get_trees( $succeed, $sha = '' ) {
-        $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
-                    return false;
-                }
-
-                return true;
-            }, $succeed ? '200 OK' : '422 Unprocessable Entity', $succeed,
-            $sha ? $sha : '9108868e3800bec6763e51beb0d33e15036c3626'
-        );
-    }
-
-    protected function set_get_blobs( $succeed ) {
-        $shas = array(
-            '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
-            '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
-            '2d73165945b0ccbe4932f1363457986b0ed49f19',
-        );
-
-        foreach ( $shas as $sha ) {
-            $this->set_endpoint(
-                function ( $request ) {
-                    if ( '[]' === $request['body'] ) {
-                        return false;
-                    }
-
-                    return true;
-                }, $succeed ? '200 OK' : '404 Not Found', $succeed, $sha
-            );
-        }
-    }
-
-    protected function set_post_trees( $succeed ) {
-        $this->set_endpoint(
-            function ( $request ) {
-                $body = json_decode( $request['body'], true );
-
-                if ( ! isset( $body['tree'] ) ) {
-                    return false;
-                }
-
-                if ( 1 !== count( $body['tree'] ) ) {
-                    return false;
-                }
-
-                $blob = reset( $body['tree'] );
-
-                if (
-                    ! isset( $blob['path'] ) ||
-                    ! isset( $blob['type'] ) ||
-                    ! isset( $blob['content'] ) ||
-                    ! isset( $blob['mode'] )
-                ) {
-                    return false;
-                }
-
-                return true;
-            },
-            $succeed ? '201 Created' : '404 Not Found',
-            $succeed
-        );
-    }
-
-    protected function set_post_commits( $succeed, $anonymous = true ) {
-        $this->set_endpoint(
-            function ( $request ) use ( $anonymous ) {
-                $body = json_decode( $request['body'], true );
-
-                if (
-                    ! isset( $body['tree'] ) ||
-                    ! isset( $body['message'] ) ||
-                    ! isset( $body['parents'] ) ||
-                    ! isset( $body['author'] )
-                ) {
-                    return false;
-                }
-
-                if ( 1 !== count( $body['parents'] ) ) {
-                    return false;
-                }
-
-                if ( ! $anonymous ) {
-                    if (
-                        'James DiGioia' !== $body['author']['name'] ||
-                        'jamesorodig@gmail.com' !== $body['author']['email']
-                    ) {
-                        return false;
-                    }
-                } else {
-                    if (
-                        'Anonymous' !== $body['author']['name'] ||
-                        'anonymous@users.noreply.github.com' !== $body['author']['email']
-                    ) {
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-            $succeed ? '201 Created' : '404 Not Found',
-            $succeed
-        );
-    }
-
-    protected function set_get_compare( $succeed ) {
-        $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
-                    return false;
-                }
-                return true;
-            },
-            $succeed ? '200 OK' : '404 Not Found',
-            $succeed,
-            '861f87e8851b8debb78db548269d29f8da4d94ac...master'
-        );
-    }
-
-    protected function set_delete_contents( $succeed, $filepath ) {
-        $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
-                    return false;
-                }
-                return true;
-            },
-            $succeed ? '200 OK' : '404 Not Found',
-            $succeed,
-            $filepath
-        );
-    }
-
-    protected function set_patch_refs_heads_master( $succeed ) {
-        $this->set_endpoint(
-            function ( $request ) {
-                $body = json_decode( $request['body'], true );
-
-                if ( ! isset( $body['sha'] ) ) {
-                    return false;
-                }
-
-                return true;
-            },
-            $succeed ? '201 Created' : '404 Not Found',
-            $succeed
-        );
-    }
-
-    private function set_endpoint( $validation, $status, $succeed, $sha = '' ) {
-        list( , $caller ) = debug_backtrace( false );
-        $endpoint = substr( $caller['function'], 4 ) . ( $sha ? "_$sha" : '' );
-
-        static::$validations[ $endpoint ] = $validation;
-
-        static::$responses[ $endpoint ] = array(
-            'headers' => array(
-                'status' => $status,
-            ),
-            'body'    => file_get_contents(
-                $this->data_dir . $endpoint . '_' . ( $succeed ? 'succeed' : 'fail' ) . '.json'
-            ),
-        );
-    }
+	/**
+	 * @var string
+	 */
+	const HOST_OPTION_VALUE = 'https://api.github.com';
+
+	/**
+	 * @var string
+	 */
+	const REPO_OPTION_VALUE = 'woghtest/wogh-test';
+
+	/**
+	 * @var string
+	 */
+	const TOKEN_OPTION_VALUE = 'the-token';
+
+	/**
+	 * @var string
+	 */
+	const BRANCH_OPTION_VALUE = 'master';
+
+	/**
+	 * @var array
+	 */
+	protected static $responses = array();
+
+	/**
+	 * @var array
+	 */
+	protected static $validations = array();
+
+	public function setUp() {
+		parent::setUp();
+
+		WP_HTTP_TestCase::init();
+		update_option( 'wogh_repository', self::REPO_OPTION_VALUE );
+		update_option( 'wogh_oauth_token', self::TOKEN_OPTION_VALUE );
+		update_option( 'wogh_host', self::HOST_OPTION_VALUE );
+		update_option( 'wogh_branch', self::BRANCH_OPTION_VALUE );
+		$this->http_responder = array( $this, 'mock_github_api' );
+	}
+
+	/**
+	 * This does some checks and fails the test if something is wrong
+	 * or returns intended mock data for the given endpoint + method.
+	 *
+	 * @return void|string
+	 */
+	public function mock_github_api( $request, $url ) {
+		$host_length = strlen( self::HOST_OPTION_VALUE );
+
+		if ( self::HOST_OPTION_VALUE !== substr( $url, 0, $host_length ) ) {
+			$this->assertTrue( false, 'Called wrong host.' );
+		}
+
+		if (
+			! isset( $request['headers']['Authorization'] ) ||
+			'token ' . self::TOKEN_OPTION_VALUE !== $request['headers']['Authorization']
+		) {
+			$this->assertTrue( false, 'Missing authorization key.' );
+		}
+
+		$url = explode( '/', substr( $url, $host_length + 1 ) );
+
+		if ( 'repos' !== $url[0] ) {
+			$this->assertTrue( false, 'Called wrong endpoint.' );
+		}
+
+		$repo = $url[1] . '/' . $url[2];
+
+		if ( self::REPO_OPTION_VALUE !== $repo ) {
+			$this->assertTrue( false, 'Called wrong repo.' );
+		}
+
+		// git api
+		$parts = array_slice( $url, $url[3] === 'git' ? 4 : 3 );
+		array_unshift( $parts, strtolower( $request['method'] ) );
+		$endpoint = implode( '_', $parts );
+		$endpoint = str_replace( '?recursive=1', '', $endpoint );
+		$this->assertTrue( call_user_func( static::$validations[ $endpoint ], $request ), 'Request did not validate.' );
+
+		return static::$responses[ $endpoint ];
+	}
+
+	protected function set_get_refs_heads_master( $succeed ) {
+		$this->set_endpoint(
+			function ( $request ) {
+				if ( '[]' === $request['body'] ) {
+					return false;
+				}
+
+				return true;
+			}, $succeed ? '200 OK' : '404 Not Found', $succeed
+		);
+	}
+
+	protected function set_get_commits( $succeed ) {
+		$this->set_endpoint(
+			function ( $request ) {
+				if ( '[]' === $request['body'] ) {
+					return false;
+				}
+
+				return true;
+			}, $succeed ? '200 OK' : '404 Not Found', $succeed, 'db2510854e6aeab68ead26b48328b19f4bdf926e'
+		);
+	}
+
+	protected function set_get_trees( $succeed, $sha = '' ) {
+		$this->set_endpoint(
+			function ( $request ) {
+				if ( '[]' === $request['body'] ) {
+					return false;
+				}
+
+				return true;
+			}, $succeed ? '200 OK' : '422 Unprocessable Entity', $succeed,
+			$sha ? $sha : '9108868e3800bec6763e51beb0d33e15036c3626'
+		);
+	}
+
+	protected function set_get_blobs( $succeed ) {
+		$shas = array(
+			'9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
+			'8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
+			'2d73165945b0ccbe4932f1363457986b0ed49f19',
+		);
+
+		foreach ( $shas as $sha ) {
+			$this->set_endpoint(
+				function ( $request ) {
+					if ( '[]' === $request['body'] ) {
+						return false;
+					}
+
+					return true;
+				}, $succeed ? '200 OK' : '404 Not Found', $succeed, $sha
+			);
+		}
+	}
+
+	protected function set_post_trees( $succeed ) {
+		$this->set_endpoint(
+			function ( $request ) {
+				$body = json_decode( $request['body'], true );
+
+				if ( ! isset( $body['tree'] ) ) {
+					return false;
+				}
+
+				if ( 1 !== count( $body['tree'] ) ) {
+					return false;
+				}
+
+				$blob = reset( $body['tree'] );
+
+				if (
+					! isset( $blob['path'] ) ||
+					! isset( $blob['type'] ) ||
+					! isset( $blob['content'] ) ||
+					! isset( $blob['mode'] )
+				) {
+					return false;
+				}
+
+				return true;
+			},
+			$succeed ? '201 Created' : '404 Not Found',
+			$succeed
+		);
+	}
+
+	protected function set_post_commits( $succeed, $anonymous = true ) {
+		$this->set_endpoint(
+			function ( $request ) use ( $anonymous ) {
+				$body = json_decode( $request['body'], true );
+
+				if (
+					! isset( $body['tree'] ) ||
+					! isset( $body['message'] ) ||
+					! isset( $body['parents'] ) ||
+					! isset( $body['author'] )
+				) {
+					return false;
+				}
+
+				if ( 1 !== count( $body['parents'] ) ) {
+					return false;
+				}
+
+				if ( ! $anonymous ) {
+					if (
+						'James DiGioia' !== $body['author']['name'] ||
+						'jamesorodig@gmail.com' !== $body['author']['email']
+					) {
+						return false;
+					}
+				} else {
+					if (
+						'Anonymous' !== $body['author']['name'] ||
+						'anonymous@users.noreply.github.com' !== $body['author']['email']
+					) {
+						return false;
+					}
+				}
+
+				return true;
+			},
+			$succeed ? '201 Created' : '404 Not Found',
+			$succeed
+		);
+	}
+
+	protected function set_get_compare( $succeed ) {
+		$this->set_endpoint(
+			function ( $request ) {
+				if ( '[]' === $request['body'] ) {
+					return false;
+				}
+				return true;
+			},
+			$succeed ? '200 OK' : '404 Not Found',
+			$succeed,
+			'861f87e8851b8debb78db548269d29f8da4d94ac...master'
+		);
+	}
+
+	protected function set_delete_contents( $succeed, $filepath ) {
+		$this->set_endpoint(
+			function ( $request ) {
+				if ( '[]' === $request['body'] ) {
+					return false;
+				}
+				return true;
+			},
+			$succeed ? '200 OK' : '404 Not Found',
+			$succeed,
+			$filepath
+		);
+	}
+
+	protected function set_patch_refs_heads_master( $succeed ) {
+		$this->set_endpoint(
+			function ( $request ) {
+				$body = json_decode( $request['body'], true );
+
+				if ( ! isset( $body['sha'] ) ) {
+					return false;
+				}
+
+				return true;
+			},
+			$succeed ? '201 Created' : '404 Not Found',
+			$succeed
+		);
+	}
+
+	private function set_endpoint( $validation, $status, $succeed, $sha = '' ) {
+		list( , $caller ) = debug_backtrace( false );
+		$endpoint = substr( $caller['function'], 4 ) . ( $sha ? "_$sha" : '' );
+
+		static::$validations[ $endpoint ] = $validation;
+
+		static::$responses[ $endpoint ] = array(
+			'headers' => array(
+				'status' => $status,
+			),
+			'body'    => file_get_contents(
+				$this->data_dir . $endpoint . '_' . ( $succeed ? 'succeed' : 'fail' ) . '.json'
+			),
+		);
+	}
 }

Spacing +70 added lines, -70 removed lines

@@ -36,11 +36,11 @@ 
         parent::setUp();
 
         WP_HTTP_TestCase::init();
-        update_option( 'wogh_repository', self::REPO_OPTION_VALUE );
-        update_option( 'wogh_oauth_token', self::TOKEN_OPTION_VALUE );
-        update_option( 'wogh_host', self::HOST_OPTION_VALUE );
-        update_option( 'wogh_branch', self::BRANCH_OPTION_VALUE );
-        $this->http_responder = array( $this, 'mock_github_api' );
+        update_option('wogh_repository', self::REPO_OPTION_VALUE);
+        update_option('wogh_oauth_token', self::TOKEN_OPTION_VALUE);
+        update_option('wogh_host', self::HOST_OPTION_VALUE);
+        update_option('wogh_branch', self::BRANCH_OPTION_VALUE);
+        $this->http_responder = array($this, 'mock_github_api');
     }
 
     /**
@@ -49,46 +49,46 @@ 
      *
      * @return void|string
      */
-    public function mock_github_api( $request, $url ) {
-        $host_length = strlen( self::HOST_OPTION_VALUE );
+    public function mock_github_api($request, $url) {
+        $host_length = strlen(self::HOST_OPTION_VALUE);
 
-        if ( self::HOST_OPTION_VALUE !== substr( $url, 0, $host_length ) ) {
-            $this->assertTrue( false, 'Called wrong host.' );
+        if (self::HOST_OPTION_VALUE !== substr($url, 0, $host_length)) {
+            $this->assertTrue(false, 'Called wrong host.');
         }
 
         if (
-            ! isset( $request['headers']['Authorization'] ) ||
+            ! isset($request['headers']['Authorization']) ||
             'token ' . self::TOKEN_OPTION_VALUE !== $request['headers']['Authorization']
         ) {
-            $this->assertTrue( false, 'Missing authorization key.' );
+            $this->assertTrue(false, 'Missing authorization key.');
         }
 
-        $url = explode( '/', substr( $url, $host_length + 1 ) );
+        $url = explode('/', substr($url, $host_length + 1));
 
-        if ( 'repos' !== $url[0] ) {
-            $this->assertTrue( false, 'Called wrong endpoint.' );
+        if ('repos' !== $url[0]) {
+            $this->assertTrue(false, 'Called wrong endpoint.');
         }
 
         $repo = $url[1] . '/' . $url[2];
 
-        if ( self::REPO_OPTION_VALUE !== $repo ) {
-            $this->assertTrue( false, 'Called wrong repo.' );
+        if (self::REPO_OPTION_VALUE !== $repo) {
+            $this->assertTrue(false, 'Called wrong repo.');
         }
 
         // git api
-        $parts = array_slice( $url, $url[3] === 'git' ? 4 : 3 );
-        array_unshift( $parts, strtolower( $request['method'] ) );
-        $endpoint = implode( '_', $parts );
-        $endpoint = str_replace( '?recursive=1', '', $endpoint );
-        $this->assertTrue( call_user_func( static::$validations[ $endpoint ], $request ), 'Request did not validate.' );
+        $parts = array_slice($url, $url[3] === 'git' ? 4 : 3);
+        array_unshift($parts, strtolower($request['method']));
+        $endpoint = implode('_', $parts);
+        $endpoint = str_replace('?recursive=1', '', $endpoint);
+        $this->assertTrue(call_user_func(static::$validations[$endpoint], $request), 'Request did not validate.');
 
-        return static::$responses[ $endpoint ];
+        return static::$responses[$endpoint];
     }
 
-    protected function set_get_refs_heads_master( $succeed ) {
+    protected function set_get_refs_heads_master($succeed) {
         $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
+            function($request) {
+                if ('[]' === $request['body']) {
                     return false;
                 }
 
@@ -97,10 +97,10 @@ 
         );
     }
 
-    protected function set_get_commits( $succeed ) {
+    protected function set_get_commits($succeed) {
         $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
+            function($request) {
+                if ('[]' === $request['body']) {
                     return false;
                 }
 
@@ -109,10 +109,10 @@ 
         );
     }
 
-    protected function set_get_trees( $succeed, $sha = '' ) {
+    protected function set_get_trees($succeed, $sha = '') {
         $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
+            function($request) {
+                if ('[]' === $request['body']) {
                     return false;
                 }
 
@@ -122,17 +122,17 @@ 
         );
     }
 
-    protected function set_get_blobs( $succeed ) {
+    protected function set_get_blobs($succeed) {
         $shas = array(
             '9fa5c7537f8582b71028ff34b8c20dfd0f3b2a25',
             '8d9b2e6fd93761211dc03abd71f4a9189d680fd0',
             '2d73165945b0ccbe4932f1363457986b0ed49f19',
         );
 
-        foreach ( $shas as $sha ) {
+        foreach ($shas as $sha) {
             $this->set_endpoint(
-                function ( $request ) {
-                    if ( '[]' === $request['body'] ) {
+                function($request) {
+                    if ('[]' === $request['body']) {
                         return false;
                     }
 
@@ -142,26 +142,26 @@ 
         }
     }
 
-    protected function set_post_trees( $succeed ) {
+    protected function set_post_trees($succeed) {
         $this->set_endpoint(
-            function ( $request ) {
-                $body = json_decode( $request['body'], true );
+            function($request) {
+                $body = json_decode($request['body'], true);
 
-                if ( ! isset( $body['tree'] ) ) {
+                if ( ! isset($body['tree'])) {
                     return false;
                 }
 
-                if ( 1 !== count( $body['tree'] ) ) {
+                if (1 !== count($body['tree'])) {
                     return false;
                 }
 
-                $blob = reset( $body['tree'] );
+                $blob = reset($body['tree']);
 
                 if (
-                    ! isset( $blob['path'] ) ||
-                    ! isset( $blob['type'] ) ||
-                    ! isset( $blob['content'] ) ||
-                    ! isset( $blob['mode'] )
+                    ! isset($blob['path']) ||
+                    ! isset($blob['type']) ||
+                    ! isset($blob['content']) ||
+                    ! isset($blob['mode'])
                 ) {
                     return false;
                 }
@@ -173,25 +173,25 @@ 
         );
     }
 
-    protected function set_post_commits( $succeed, $anonymous = true ) {
+    protected function set_post_commits($succeed, $anonymous = true) {
         $this->set_endpoint(
-            function ( $request ) use ( $anonymous ) {
-                $body = json_decode( $request['body'], true );
+            function($request) use ($anonymous) {
+                $body = json_decode($request['body'], true);
 
                 if (
-                    ! isset( $body['tree'] ) ||
-                    ! isset( $body['message'] ) ||
-                    ! isset( $body['parents'] ) ||
-                    ! isset( $body['author'] )
+                    ! isset($body['tree']) ||
+                    ! isset($body['message']) ||
+                    ! isset($body['parents']) ||
+                    ! isset($body['author'])
                 ) {
                     return false;
                 }
 
-                if ( 1 !== count( $body['parents'] ) ) {
+                if (1 !== count($body['parents'])) {
                     return false;
                 }
 
-                if ( ! $anonymous ) {
+                if ( ! $anonymous) {
                     if (
                         'James DiGioia' !== $body['author']['name'] ||
                         'jamesorodig@gmail.com' !== $body['author']['email']
@@ -214,10 +214,10 @@ 
         );
     }
 
-    protected function set_get_compare( $succeed ) {
+    protected function set_get_compare($succeed) {
         $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
+            function($request) {
+                if ('[]' === $request['body']) {
                     return false;
                 }
                 return true;
@@ -228,10 +228,10 @@ 
         );
     }
 
-    protected function set_delete_contents( $succeed, $filepath ) {
+    protected function set_delete_contents($succeed, $filepath) {
         $this->set_endpoint(
-            function ( $request ) {
-                if ( '[]' === $request['body'] ) {
+            function($request) {
+                if ('[]' === $request['body']) {
                     return false;
                 }
                 return true;
@@ -242,12 +242,12 @@ 
         );
     }
 
-    protected function set_patch_refs_heads_master( $succeed ) {
+    protected function set_patch_refs_heads_master($succeed) {
         $this->set_endpoint(
-            function ( $request ) {
-                $body = json_decode( $request['body'], true );
+            function($request) {
+                $body = json_decode($request['body'], true);
 
-                if ( ! isset( $body['sha'] ) ) {
+                if ( ! isset($body['sha'])) {
                     return false;
                 }
 
@@ -258,18 +258,18 @@ 
         );
     }
 
-    private function set_endpoint( $validation, $status, $succeed, $sha = '' ) {
-        list( , $caller ) = debug_backtrace( false );
-        $endpoint = substr( $caller['function'], 4 ) . ( $sha ? "_$sha" : '' );
+    private function set_endpoint($validation, $status, $succeed, $sha = '') {
+        list(, $caller) = debug_backtrace(false);
+        $endpoint = substr($caller['function'], 4) . ($sha ? "_$sha" : '');
 
-        static::$validations[ $endpoint ] = $validation;
+        static::$validations[$endpoint] = $validation;
 
-        static::$responses[ $endpoint ] = array(
+        static::$responses[$endpoint] = array(
             'headers' => array(
                 'status' => $status,
             ),
             'body'    => file_get_contents(
-                $this->data_dir . $endpoint . '_' . ( $succeed ? 'succeed' : 'fail' ) . '.json'
+                $this->data_dir . $endpoint . '_' . ($succeed ? 'succeed' : 'fail') . '.json'
             ),
         );
     }

tests/include/testcase.php

Indentation +142 added lines, -142 removed lines

@@ -2,146 +2,146 @@
 
 abstract class Writing_On_GitHub_TestCase extends WP_HTTP_TestCase {
 
-    /**
-     * @var string
-     */
-    protected $data_dir;
-
-    /**
-     * @var Writing_On_GitHub|Mockery\Mock
-     */
-    protected $app;
-
-    /**
-     * @var Writing_On_GitHub_Controller|Mockery\Mock
-     */
-    protected $controller;
-
-    /**
-     * @var Writing_On_GitHub_Request|Mockery\Mock
-     */
-    protected $request;
-
-    /**
-     * @var Writing_On_GitHub_Import|Mockery\Mock
-     */
-    protected $import;
-
-    /**
-     * @var Writing_On_GitHub_Export|Mockery\Mock
-     */
-    protected $export;
-
-    /**
-     * @var Writing_On_GitHub_Response|Mockery\Mock
-     */
-    protected $response;
-
-    /**
-     * @var Writing_On_GitHub_Payload|Mockery\Mock
-     */
-    protected $payload;
-
-    /**
-     * @var Writing_On_GitHub_Api|Mockery\Mock
-     */
-    protected $api;
-
-    /**
-     * @var Writing_On_GitHub_Semaphore|Mockery\Mock
-     */
-    protected $semaphore;
-
-    /**
-     * @var Writing_On_GitHub_Database|Mockery\Mock
-     */
-    protected $database;
-
-    /**
-     * @var Writing_On_GitHub_Post|Mockery\Mock
-     */
-    protected $post;
-
-    /**
-     * @var Writing_On_GitHub_Blob|Mockery\Mock
-     */
-    protected $blob;
-
-    /**
-     * @var Writing_On_GitHub_Fetch_Client|Mockery\Mock
-     */
-    protected $fetch;
-
-    /**
-     * @var Writing_On_GitHub_Persist_Client|Mockery\Mock
-     */
-    protected $persist;
-
-    public function setUp() {
-        parent::setUp();
-
-        $this->data_dir = dirname( __DIR__ ) . '/data/';
-
-        $this->app        = Mockery::mock( 'Writing_On_GitHub' );
-        $this->controller = Mockery::mock( 'Writing_On_GitHub_Controller' );
-        $this->request    = Mockery::mock( 'Writing_On_GitHub_Request' );
-        $this->import     = Mockery::mock( 'Writing_On_GitHub_Import' );
-        $this->export     = Mockery::mock( 'Writing_On_GitHub_Export' );
-        $this->response   = Mockery::mock( 'Writing_On_GitHub_Response' );
-        $this->payload    = Mockery::mock( 'Writing_On_GitHub_Payload' );
-        $this->api        = Mockery::mock( 'Writing_On_GitHub_Api' );
-        $this->semaphore  = Mockery::mock( 'Writing_On_GitHub_Semaphore' );
-        $this->database   = Mockery::mock( 'Writing_On_GitHub_Database' );
-        $this->post       = Mockery::mock( 'Writing_On_GitHub_Post' );
-        $this->blob       = Mockery::mock( 'Writing_On_GitHub_Blob' );
-        $this->fetch      = Mockery::mock( 'Writing_On_GitHub_Fetch_Client' );
-        $this->persist    = Mockery::mock( 'Writing_On_GitHub_Persist_Client' );
-
-        Writing_On_GitHub::$instance = $this->app;
-
-        $this->app
-            ->shouldReceive( 'request' )
-            ->andReturn( $this->request )
-            ->byDefault();
-        $this->app
-            ->shouldReceive( 'import' )
-            ->andReturn( $this->import )
-            ->byDefault();
-        $this->app
-            ->shouldReceive( 'export' )
-            ->andReturn( $this->export )
-            ->byDefault();
-        $this->app
-            ->shouldReceive( 'response' )
-            ->andReturn( $this->response )
-            ->byDefault();
-        $this->app
-            ->shouldReceive( 'api' )
-            ->andReturn( $this->api )
-            ->byDefault();
-        $this->app
-            ->shouldReceive( 'semaphore' )
-            ->andReturn( $this->semaphore )
-            ->byDefault();
-        $this->app
-            ->shouldReceive( 'database' )
-            ->andReturn( $this->database )
-            ->byDefault();
-        $this->app
-            ->shouldReceive( 'blob' )
-            ->andReturn( $this->blob )
-            ->byDefault();
-        $this->api
-            ->shouldReceive( 'fetch' )
-            ->andReturn( $this->fetch )
-            ->byDefault();
-        $this->api
-            ->shouldReceive( 'persist' )
-            ->andReturn( $this->persist )
-            ->byDefault();
-    }
-
-    public function tearDown() {
-        Mockery::close();
-    }
+	/**
+	 * @var string
+	 */
+	protected $data_dir;
+
+	/**
+	 * @var Writing_On_GitHub|Mockery\Mock
+	 */
+	protected $app;
+
+	/**
+	 * @var Writing_On_GitHub_Controller|Mockery\Mock
+	 */
+	protected $controller;
+
+	/**
+	 * @var Writing_On_GitHub_Request|Mockery\Mock
+	 */
+	protected $request;
+
+	/**
+	 * @var Writing_On_GitHub_Import|Mockery\Mock
+	 */
+	protected $import;
+
+	/**
+	 * @var Writing_On_GitHub_Export|Mockery\Mock
+	 */
+	protected $export;
+
+	/**
+	 * @var Writing_On_GitHub_Response|Mockery\Mock
+	 */
+	protected $response;
+
+	/**
+	 * @var Writing_On_GitHub_Payload|Mockery\Mock
+	 */
+	protected $payload;
+
+	/**
+	 * @var Writing_On_GitHub_Api|Mockery\Mock
+	 */
+	protected $api;
+
+	/**
+	 * @var Writing_On_GitHub_Semaphore|Mockery\Mock
+	 */
+	protected $semaphore;
+
+	/**
+	 * @var Writing_On_GitHub_Database|Mockery\Mock
+	 */
+	protected $database;
+
+	/**
+	 * @var Writing_On_GitHub_Post|Mockery\Mock
+	 */
+	protected $post;
+
+	/**
+	 * @var Writing_On_GitHub_Blob|Mockery\Mock
+	 */
+	protected $blob;
+
+	/**
+	 * @var Writing_On_GitHub_Fetch_Client|Mockery\Mock
+	 */
+	protected $fetch;
+
+	/**
+	 * @var Writing_On_GitHub_Persist_Client|Mockery\Mock
+	 */
+	protected $persist;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->data_dir = dirname( __DIR__ ) . '/data/';
+
+		$this->app        = Mockery::mock( 'Writing_On_GitHub' );
+		$this->controller = Mockery::mock( 'Writing_On_GitHub_Controller' );
+		$this->request    = Mockery::mock( 'Writing_On_GitHub_Request' );
+		$this->import     = Mockery::mock( 'Writing_On_GitHub_Import' );
+		$this->export     = Mockery::mock( 'Writing_On_GitHub_Export' );
+		$this->response   = Mockery::mock( 'Writing_On_GitHub_Response' );
+		$this->payload    = Mockery::mock( 'Writing_On_GitHub_Payload' );
+		$this->api        = Mockery::mock( 'Writing_On_GitHub_Api' );
+		$this->semaphore  = Mockery::mock( 'Writing_On_GitHub_Semaphore' );
+		$this->database   = Mockery::mock( 'Writing_On_GitHub_Database' );
+		$this->post       = Mockery::mock( 'Writing_On_GitHub_Post' );
+		$this->blob       = Mockery::mock( 'Writing_On_GitHub_Blob' );
+		$this->fetch      = Mockery::mock( 'Writing_On_GitHub_Fetch_Client' );
+		$this->persist    = Mockery::mock( 'Writing_On_GitHub_Persist_Client' );
+
+		Writing_On_GitHub::$instance = $this->app;
+
+		$this->app
+			->shouldReceive( 'request' )
+			->andReturn( $this->request )
+			->byDefault();
+		$this->app
+			->shouldReceive( 'import' )
+			->andReturn( $this->import )
+			->byDefault();
+		$this->app
+			->shouldReceive( 'export' )
+			->andReturn( $this->export )
+			->byDefault();
+		$this->app
+			->shouldReceive( 'response' )
+			->andReturn( $this->response )
+			->byDefault();
+		$this->app
+			->shouldReceive( 'api' )
+			->andReturn( $this->api )
+			->byDefault();
+		$this->app
+			->shouldReceive( 'semaphore' )
+			->andReturn( $this->semaphore )
+			->byDefault();
+		$this->app
+			->shouldReceive( 'database' )
+			->andReturn( $this->database )
+			->byDefault();
+		$this->app
+			->shouldReceive( 'blob' )
+			->andReturn( $this->blob )
+			->byDefault();
+		$this->api
+			->shouldReceive( 'fetch' )
+			->andReturn( $this->fetch )
+			->byDefault();
+		$this->api
+			->shouldReceive( 'persist' )
+			->andReturn( $this->persist )
+			->byDefault();
+	}
+
+	public function tearDown() {
+		Mockery::close();
+	}
 }

Spacing +36 added lines, -36 removed lines

@@ -80,64 +80,64 @@
     public function setUp() {
         parent::setUp();
 
-        $this->data_dir = dirname( __DIR__ ) . '/data/';
-
-        $this->app        = Mockery::mock( 'Writing_On_GitHub' );
-        $this->controller = Mockery::mock( 'Writing_On_GitHub_Controller' );
-        $this->request    = Mockery::mock( 'Writing_On_GitHub_Request' );
-        $this->import     = Mockery::mock( 'Writing_On_GitHub_Import' );
-        $this->export     = Mockery::mock( 'Writing_On_GitHub_Export' );
-        $this->response   = Mockery::mock( 'Writing_On_GitHub_Response' );
-        $this->payload    = Mockery::mock( 'Writing_On_GitHub_Payload' );
-        $this->api        = Mockery::mock( 'Writing_On_GitHub_Api' );
-        $this->semaphore  = Mockery::mock( 'Writing_On_GitHub_Semaphore' );
-        $this->database   = Mockery::mock( 'Writing_On_GitHub_Database' );
-        $this->post       = Mockery::mock( 'Writing_On_GitHub_Post' );
-        $this->blob       = Mockery::mock( 'Writing_On_GitHub_Blob' );
-        $this->fetch      = Mockery::mock( 'Writing_On_GitHub_Fetch_Client' );
-        $this->persist    = Mockery::mock( 'Writing_On_GitHub_Persist_Client' );
+        $this->data_dir = dirname(__DIR__) . '/data/';
+
+        $this->app        = Mockery::mock('Writing_On_GitHub');
+        $this->controller = Mockery::mock('Writing_On_GitHub_Controller');
+        $this->request    = Mockery::mock('Writing_On_GitHub_Request');
+        $this->import     = Mockery::mock('Writing_On_GitHub_Import');
+        $this->export     = Mockery::mock('Writing_On_GitHub_Export');
+        $this->response   = Mockery::mock('Writing_On_GitHub_Response');
+        $this->payload    = Mockery::mock('Writing_On_GitHub_Payload');
+        $this->api        = Mockery::mock('Writing_On_GitHub_Api');
+        $this->semaphore  = Mockery::mock('Writing_On_GitHub_Semaphore');
+        $this->database   = Mockery::mock('Writing_On_GitHub_Database');
+        $this->post       = Mockery::mock('Writing_On_GitHub_Post');
+        $this->blob       = Mockery::mock('Writing_On_GitHub_Blob');
+        $this->fetch      = Mockery::mock('Writing_On_GitHub_Fetch_Client');
+        $this->persist    = Mockery::mock('Writing_On_GitHub_Persist_Client');
 
         Writing_On_GitHub::$instance = $this->app;
 
         $this->app
-            ->shouldReceive( 'request' )
-            ->andReturn( $this->request )
+            ->shouldReceive('request')
+            ->andReturn($this->request)
             ->byDefault();
         $this->app
-            ->shouldReceive( 'import' )
-            ->andReturn( $this->import )
+            ->shouldReceive('import')
+            ->andReturn($this->import)
             ->byDefault();
         $this->app
-            ->shouldReceive( 'export' )
-            ->andReturn( $this->export )
+            ->shouldReceive('export')
+            ->andReturn($this->export)
             ->byDefault();
         $this->app
-            ->shouldReceive( 'response' )
-            ->andReturn( $this->response )
+            ->shouldReceive('response')
+            ->andReturn($this->response)
             ->byDefault();
         $this->app
-            ->shouldReceive( 'api' )
-            ->andReturn( $this->api )
+            ->shouldReceive('api')
+            ->andReturn($this->api)
             ->byDefault();
         $this->app
-            ->shouldReceive( 'semaphore' )
-            ->andReturn( $this->semaphore )
+            ->shouldReceive('semaphore')
+            ->andReturn($this->semaphore)
             ->byDefault();
         $this->app
-            ->shouldReceive( 'database' )
-            ->andReturn( $this->database )
+            ->shouldReceive('database')
+            ->andReturn($this->database)
             ->byDefault();
         $this->app
-            ->shouldReceive( 'blob' )
-            ->andReturn( $this->blob )
+            ->shouldReceive('blob')
+            ->andReturn($this->blob)
             ->byDefault();
         $this->api
-            ->shouldReceive( 'fetch' )
-            ->andReturn( $this->fetch )
+            ->shouldReceive('fetch')
+            ->andReturn($this->fetch)
             ->byDefault();
         $this->api
-            ->shouldReceive( 'persist' )
-            ->andReturn( $this->persist )
+            ->shouldReceive('persist')
+            ->andReturn($this->persist)
             ->byDefault();
     }