WordPoints / importer

tests/phpunit/includes/testcases/hook.php

Indentation +107 added lines, -107 removed lines

@@ -21,113 +21,113 @@
  * @coversNothing
  */
 abstract class WordPoints_Importer_Hook_UnitTestCase
-	extends WordPoints_Points_UnitTestCase {
-
-	/**
-	 * The option where CubePoints stores the number of points to award for this.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @var string
-	 */
-	protected $cubepoints_option;
-
-	/**
-	 * The type of hook being tested.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @var string
-	 */
-	protected $type;
-
-	/**
-	 * Test that the hook behaves properly.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @param string $type The type of test.
-	 *
-	 * @dataProvider data_provider_types
-	 */
-	abstract public function test( $type );
-
-	/**
-	 * Data provider for types of tests.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @return array
-	 */
-	public function data_provider_types() {
-		return array(
-			'cubepoints' => array( 'cubepoints' ),
-			'wordpoints' => array( 'wordpoints' ),
-		);
-	}
-
-	/**
-	 * Set up before a test.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @param string $type The type of test being run.
-	 */
-	protected function before( $type ) {
-
-		update_option( 'cp_reg_points', 0 );
-
-		$this->type = $type;
-
-		update_option( $this->cubepoints_option, 10 );
-
-		if ( 'wordpoints' === $this->type ) {
-			$this->do_points_import( 'settings' );
-		}
-	}
-
-	/**
-	 * Get the number of points a user has.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @param int $user_id The user ID.
-	 *
-	 * @return int The number of points the user has.
-	 */
-	protected function get_user_points( $user_id ) {
-		if ( 'cubepoints' === $this->type ) {
-			return cp_getPoints( $user_id );
-		} else {
-			return wordpoints_get_points( $user_id, 'points' );
-		}
-	}
-
-	/**
-	 * Do the import for the points settings.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @param string $type The type of points import.
-	 */
-	protected function do_points_import( $type ) {
-
-		$importer = new WordPoints_CubePoints_Importer( 'Test CubePoints' );
-		$feedback = new WordPoints_Importer_Tests_Feedback();
-
-		$importer->do_import(
-			array(
-				'points' => array(
-					$type => '1',
-					'_data' => array( 'points_type' => 'points' ),
-				),
-			)
-			, $feedback
-		);
-
-		$this->assertCount( 4, $feedback->messages['info'] );
-		$this->assertCount( 1, $feedback->messages['success'] );
-	}
+    extends WordPoints_Points_UnitTestCase {
+
+    /**
+     * The option where CubePoints stores the number of points to award for this.
+     *
+     * @since 1.2.0
+     *
+     * @var string
+     */
+    protected $cubepoints_option;
+
+    /**
+     * The type of hook being tested.
+     *
+     * @since 1.2.0
+     *
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * Test that the hook behaves properly.
+     *
+     * @since 1.2.0
+     *
+     * @param string $type The type of test.
+     *
+     * @dataProvider data_provider_types
+     */
+    abstract public function test( $type );
+
+    /**
+     * Data provider for types of tests.
+     *
+     * @since 1.2.0
+     *
+     * @return array
+     */
+    public function data_provider_types() {
+        return array(
+            'cubepoints' => array( 'cubepoints' ),
+            'wordpoints' => array( 'wordpoints' ),
+        );
+    }
+
+    /**
+     * Set up before a test.
+     *
+     * @since 1.2.0
+     *
+     * @param string $type The type of test being run.
+     */
+    protected function before( $type ) {
+
+        update_option( 'cp_reg_points', 0 );
+
+        $this->type = $type;
+
+        update_option( $this->cubepoints_option, 10 );
+
+        if ( 'wordpoints' === $this->type ) {
+            $this->do_points_import( 'settings' );
+        }
+    }
+
+    /**
+     * Get the number of points a user has.
+     *
+     * @since 1.2.0
+     *
+     * @param int $user_id The user ID.
+     *
+     * @return int The number of points the user has.
+     */
+    protected function get_user_points( $user_id ) {
+        if ( 'cubepoints' === $this->type ) {
+            return cp_getPoints( $user_id );
+        } else {
+            return wordpoints_get_points( $user_id, 'points' );
+        }
+    }
+
+    /**
+     * Do the import for the points settings.
+     *
+     * @since 1.2.0
+     *
+     * @param string $type The type of points import.
+     */
+    protected function do_points_import( $type ) {
+
+        $importer = new WordPoints_CubePoints_Importer( 'Test CubePoints' );
+        $feedback = new WordPoints_Importer_Tests_Feedback();
+
+        $importer->do_import(
+            array(
+                'points' => array(
+                    $type => '1',
+                    '_data' => array( 'points_type' => 'points' ),
+                ),
+            )
+            , $feedback
+        );
+
+        $this->assertCount( 4, $feedback->messages['info'] );
+        $this->assertCount( 1, $feedback->messages['success'] );
+    }
 }
 
 // EOF

Spacing +17 added lines, -17 removed lines

@@ -50,7 +50,7 @@ 
 	 *
 	 * @dataProvider data_provider_types
 	 */
-	abstract public function test( $type );
+	abstract public function test($type);
 
 	/**
 	 * Data provider for types of tests.
@@ -61,8 +61,8 @@ 
 	 */
 	public function data_provider_types() {
 		return array(
-			'cubepoints' => array( 'cubepoints' ),
-			'wordpoints' => array( 'wordpoints' ),
+			'cubepoints' => array('cubepoints'),
+			'wordpoints' => array('wordpoints'),
 		);
 	}
 
@@ -73,16 +73,16 @@ 
 	 *
 	 * @param string $type The type of test being run.
 	 */
-	protected function before( $type ) {
+	protected function before($type) {
 
-		update_option( 'cp_reg_points', 0 );
+		update_option('cp_reg_points', 0);
 
 		$this->type = $type;
 
-		update_option( $this->cubepoints_option, 10 );
+		update_option($this->cubepoints_option, 10);
 
-		if ( 'wordpoints' === $this->type ) {
-			$this->do_points_import( 'settings' );
+		if ('wordpoints' === $this->type) {
+			$this->do_points_import('settings');
 		}
 	}
 
@@ -95,11 +95,11 @@ 
 	 *
 	 * @return int The number of points the user has.
 	 */
-	protected function get_user_points( $user_id ) {
-		if ( 'cubepoints' === $this->type ) {
-			return cp_getPoints( $user_id );
+	protected function get_user_points($user_id) {
+		if ('cubepoints' === $this->type) {
+			return cp_getPoints($user_id);
 		} else {
-			return wordpoints_get_points( $user_id, 'points' );
+			return wordpoints_get_points($user_id, 'points');
 		}
 	}
 
@@ -110,23 +110,23 @@ 
 	 *
 	 * @param string $type The type of points import.
 	 */
-	protected function do_points_import( $type ) {
+	protected function do_points_import($type) {
 
-		$importer = new WordPoints_CubePoints_Importer( 'Test CubePoints' );
+		$importer = new WordPoints_CubePoints_Importer('Test CubePoints');
 		$feedback = new WordPoints_Importer_Tests_Feedback();
 
 		$importer->do_import(
 			array(
 				'points' => array(
 					$type => '1',
-					'_data' => array( 'points_type' => 'points' ),
+					'_data' => array('points_type' => 'points'),
 				),
 			)
 			, $feedback
 		);
 
-		$this->assertCount( 4, $feedback->messages['info'] );
-		$this->assertCount( 1, $feedback->messages['success'] );
+		$this->assertCount(4, $feedback->messages['info']);
+		$this->assertCount(1, $feedback->messages['success']);
 	}
 }
 

src/admin/screens/importing.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  */
 
 if ( true !== current_user_can( 'manage_options' ) ) {
-	wp_die();
+    wp_die();
 }
 
 check_admin_referer( 'wordpoints_import' );

Spacing +5 added lines, -5 removed lines

@@ -7,18 +7,18 @@
  * @since 1.0.0
  */
 
-if ( true !== current_user_can( 'manage_options' ) ) {
+if (true !== current_user_can('manage_options')) {
 	wp_die();
 }
 
-check_admin_referer( 'wordpoints_import' );
+check_admin_referer('wordpoints_import');
 
 ?>
 
-<h2><?php esc_html_e( 'WordPoints Importer', 'wordpoints-importer' ); ?></h2>
+<h2><?php esc_html_e('WordPoints Importer', 'wordpoints-importer'); ?></h2>
 
 <div class="wrap">
-	<p><?php esc_html_e( 'Starting import (this could take a few moments)&hellip;', 'wordpoints-importer' ); ?></p>
+	<p><?php esc_html_e('Starting import (this could take a few moments)&hellip;', 'wordpoints-importer'); ?></p>
 
-	<iframe src="<?php echo esc_url( self_admin_url( 'update.php?action=wordpoints_import&' . http_build_query( $_POST ) ) ); ?>" style="width: 100%; height:100%; min-height:850px;"></iframe>
+	<iframe src="<?php echo esc_url(self_admin_url('update.php?action=wordpoints_import&'.http_build_query($_POST))); ?>" style="width: 100%; height:100%; min-height:850px;"></iframe>
 </div>

src/admin/screens/import.php

Indentation +44 added lines, -44 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( true !== current_user_can( 'manage_options' ) ) {
-	wp_die();
+    wp_die();
 }
 
 $tabs = array( 'unavailable' => __( 'Unavailable', 'wordpoints-importer' ) );
@@ -16,19 +16,19 @@ 
 
 foreach ( WordPoints_Importers::get() as $slug => $args ) {
 
-	$importer = WordPoints_Importers::get_importer( $slug );
+    $importer = WordPoints_Importers::get_importer( $slug );
 
-	$is_available = $importer->is_available();
+    $is_available = $importer->is_available();
 
-	if ( is_wp_error( $is_available ) ) {
-		$unavailable[ $args['name'] ] = $is_available;
-	} else {
-		$tabs[ $slug ] = $args['name'];
-	}
+    if ( is_wp_error( $is_available ) ) {
+        $unavailable[ $args['name'] ] = $is_available;
+    } else {
+        $tabs[ $slug ] = $args['name'];
+    }
 }
 
 if ( empty( $unavailable ) ) {
-	unset( $tabs['unavailable'] );
+    unset( $tabs['unavailable'] );
 }
 
 $current_tab = wordpoints_admin_get_current_tab( $tabs );
@@ -51,14 +51,14 @@ 
 				<li>
 					<?php
 
-					printf(
-						/* translators: 1 is an importer name, 2 is the reason that it is unavailable. */
-						esc_html__( '%1$s — %2$s', 'wordpoints-importer' )
-						, '<strong>' . esc_html( $name ) . '</strong>'
-						, esc_html( $error->get_error_message() )
-					);
+                    printf(
+                        /* translators: 1 is an importer name, 2 is the reason that it is unavailable. */
+                        esc_html__( '%1$s — %2$s', 'wordpoints-importer' )
+                        , '<strong>' . esc_html( $name ) . '</strong>'
+                        , esc_html( $error->get_error_message() )
+                    );
 
-					?>
+                    ?>
 				</li>
 			<?php endforeach; ?>
 		</ul>
@@ -74,39 +74,39 @@ 
 
 				<?php
 
-				if ( ! $importer->supports_component( $slug ) ) {
-					continue;
-				}
+                if ( ! $importer->supports_component( $slug ) ) {
+                    continue;
+                }
 
-				$supported = true;
+                $supported = true;
 
-				?>
+                ?>
 
 				<h3><?php echo esc_html( $component['name'] ); ?></h3>
 
 				<?php
 
-				/**
-				 * Before the import option fields for a component.
-				 *
-				 * @since 1.0.0
-				 */
-				do_action( "wordpoints_importer_before_component_options-{$slug}" );
+                /**
+                 * Before the import option fields for a component.
+                 *
+                 * @since 1.0.0
+                 */
+                do_action( "wordpoints_importer_before_component_options-{$slug}" );
 
-				?>
+                ?>
 
 				<?php foreach ( $importer->get_options_for_component( $slug ) as $name => $option ) : ?>
 
 					<?php
 
-					$can_import = true;
+                    $can_import = true;
 
-					// Check if this option is available.
-					if ( isset( $option['can_import'] ) ) {
-						$can_import = call_user_func( $option['can_import'], array() );
-					}
+                    // Check if this option is available.
+                    if ( isset( $option['can_import'] ) ) {
+                        $can_import = call_user_func( $option['can_import'], array() );
+                    }
 
-					?>
+                    ?>
 
 					<label for="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]">
 						<input type="checkbox" value="1" id="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]" name="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]" <?php disabled( is_wp_error( $can_import ), true ); ?> />
@@ -132,20 +132,20 @@ 
 
 			<?php
 
-			if ( ! isset( $supported ) ) {
+            if ( ! isset( $supported ) ) {
 
-				esc_html_e(
-					'This importer does not support any of the installed components.'
-					, 'wordpoints-importer'
-				);
+                esc_html_e(
+                    'This importer does not support any of the installed components.'
+                    , 'wordpoints-importer'
+                );
 
-			} else {
+            } else {
 
-				wp_nonce_field( 'wordpoints_import' );
-				submit_button( __( 'Import', 'wordpoints-importer' ) );
-			}
+                wp_nonce_field( 'wordpoints_import' );
+                submit_button( __( 'Import', 'wordpoints-importer' ) );
+            }
 
-			?>
+            ?>
 		</form>
 	<?php endif; ?>
 </div>

Braces +10 added lines, -4 removed lines

@@ -63,9 +63,12 @@ 
 			<?php endforeach; ?>
 		</ul>
 
-	<?php else : ?>
+	<?php else {
+    : ?>
 
-		<?php $importer = WordPoints_Importers::get_importer( $current_tab ); ?>
+		<?php $importer = WordPoints_Importers::get_importer( $current_tab );
+}
+?>
 
 		<p><?php esc_html_e( 'Select which items you would like imported.', 'wordpoints-importer' ); ?></p>
 
@@ -120,9 +123,12 @@ 
 						<p class="description" style="margin-bottom: 10px; margin-left: 25px;">
 							<?php echo esc_html( $option['description'] ); ?>
 						</p>
-					<?php else : ?>
+					<?php else {
+    : ?>
 						<br style="margin-bottom: 10px" />
-					<?php endif; ?>
+					<?php endif;
+}
+?>
 
 				<?php endforeach; ?>
 

Spacing +39 added lines, -39 removed lines

@@ -7,55 +7,55 @@ 
  * @since 1.0.0
  */
 
-if ( true !== current_user_can( 'manage_options' ) ) {
+if (true !== current_user_can('manage_options')) {
 	wp_die();
 }
 
-$tabs = array( 'unavailable' => __( 'Unavailable', 'wordpoints-importer' ) );
+$tabs = array('unavailable' => __('Unavailable', 'wordpoints-importer'));
 $unavailable = array();
 
-foreach ( WordPoints_Importers::get() as $slug => $args ) {
+foreach (WordPoints_Importers::get() as $slug => $args) {
 
-	$importer = WordPoints_Importers::get_importer( $slug );
+	$importer = WordPoints_Importers::get_importer($slug);
 
 	$is_available = $importer->is_available();
 
-	if ( is_wp_error( $is_available ) ) {
-		$unavailable[ $args['name'] ] = $is_available;
+	if (is_wp_error($is_available)) {
+		$unavailable[$args['name']] = $is_available;
 	} else {
-		$tabs[ $slug ] = $args['name'];
+		$tabs[$slug] = $args['name'];
 	}
 }
 
-if ( empty( $unavailable ) ) {
-	unset( $tabs['unavailable'] );
+if (empty($unavailable)) {
+	unset($tabs['unavailable']);
 }
 
-$current_tab = wordpoints_admin_get_current_tab( $tabs );
+$current_tab = wordpoints_admin_get_current_tab($tabs);
 
 $components = WordPoints_Components::instance()->get();
 
 ?>
 
-<h2><?php esc_html_e( 'WordPoints Importer', 'wordpoints-importer' ); ?></h2>
+<h2><?php esc_html_e('WordPoints Importer', 'wordpoints-importer'); ?></h2>
 
 <div class="wrap">
-	<?php wordpoints_admin_show_tabs( $tabs, false ); ?>
+	<?php wordpoints_admin_show_tabs($tabs, false); ?>
 
-	<?php if ( 'unavailable' === $current_tab ) : ?>
+	<?php if ('unavailable' === $current_tab) : ?>
 
-		<p><?php esc_html_e( 'The below importers are not currently available.', 'wordpoints-importer' ); ?></p>
+		<p><?php esc_html_e('The below importers are not currently available.', 'wordpoints-importer'); ?></p>
 
 		<ul>
-			<?php foreach ( $unavailable as $name => $error ) : ?>
+			<?php foreach ($unavailable as $name => $error) : ?>
 				<li>
 					<?php
 
 					printf(
 						/* translators: 1 is an importer name, 2 is the reason that it is unavailable. */
-						esc_html__( '%1$s — %2$s', 'wordpoints-importer' )
-						, '<strong>' . esc_html( $name ) . '</strong>'
-						, esc_html( $error->get_error_message() )
+						esc_html__('%1$s — %2$s', 'wordpoints-importer')
+						, '<strong>'.esc_html($name).'</strong>'
+						, esc_html($error->get_error_message())
 					);
 
 					?>
@@ -65,16 +65,16 @@ 
 
 	<?php else : ?>
 
-		<?php $importer = WordPoints_Importers::get_importer( $current_tab ); ?>
+		<?php $importer = WordPoints_Importers::get_importer($current_tab); ?>
 
-		<p><?php esc_html_e( 'Select which items you would like imported.', 'wordpoints-importer' ); ?></p>
+		<p><?php esc_html_e('Select which items you would like imported.', 'wordpoints-importer'); ?></p>
 
-		<form method="post" action="<?php echo esc_url( self_admin_url( 'admin.php?page=wordpoints_importing' ) ); ?>">
-			<?php foreach ( $components as $slug => $component ) : ?>
+		<form method="post" action="<?php echo esc_url(self_admin_url('admin.php?page=wordpoints_importing')); ?>">
+			<?php foreach ($components as $slug => $component) : ?>
 
 				<?php
 
-				if ( ! $importer->supports_component( $slug ) ) {
+				if (!$importer->supports_component($slug)) {
 					continue;
 				}
 
@@ -82,7 +82,7 @@ 
 
 				?>
 
-				<h3><?php echo esc_html( $component['name'] ); ?></h3>
+				<h3><?php echo esc_html($component['name']); ?></h3>
 
 				<?php
 
@@ -91,34 +91,34 @@ 
 				 *
 				 * @since 1.0.0
 				 */
-				do_action( "wordpoints_importer_before_component_options-{$slug}" );
+				do_action("wordpoints_importer_before_component_options-{$slug}");
 
 				?>
 
-				<?php foreach ( $importer->get_options_for_component( $slug ) as $name => $option ) : ?>
+				<?php foreach ($importer->get_options_for_component($slug) as $name => $option) : ?>
 
 					<?php
 
 					$can_import = true;
 
 					// Check if this option is available.
-					if ( isset( $option['can_import'] ) ) {
-						$can_import = call_user_func( $option['can_import'], array() );
+					if (isset($option['can_import'])) {
+						$can_import = call_user_func($option['can_import'], array());
 					}
 
 					?>
 
-					<label for="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]">
-						<input type="checkbox" value="1" id="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]" name="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]" <?php disabled( is_wp_error( $can_import ), true ); ?> />
-						<?php echo esc_html( $option['label'] ); ?>
-						<?php if ( is_wp_error( $can_import ) ) : ?>
-							&nbsp;&nbsp;<em><?php printf( esc_html__( 'Disabled (%s)', 'wordpoints-importer' ), esc_html( $can_import->get_error_message() ) ); ?></em>
+					<label for="wordpoints_import[<?php echo esc_attr($slug); ?>][<?php echo esc_attr($name); ?>]">
+						<input type="checkbox" value="1" id="wordpoints_import[<?php echo esc_attr($slug); ?>][<?php echo esc_attr($name); ?>]" name="wordpoints_import[<?php echo esc_attr($slug); ?>][<?php echo esc_attr($name); ?>]" <?php disabled(is_wp_error($can_import), true); ?> />
+						<?php echo esc_html($option['label']); ?>
+						<?php if (is_wp_error($can_import)) : ?>
+							&nbsp;&nbsp;<em><?php printf(esc_html__('Disabled (%s)', 'wordpoints-importer'), esc_html($can_import->get_error_message())); ?></em>
 						<?php endif; ?>
 					</label>
 
-					<?php if ( isset( $option['description'] ) ) : ?>
+					<?php if (isset($option['description'])) : ?>
 						<p class="description" style="margin-bottom: 10px; margin-left: 25px;">
-							<?php echo esc_html( $option['description'] ); ?>
+							<?php echo esc_html($option['description']); ?>
 						</p>
 					<?php else : ?>
 						<br style="margin-bottom: 10px" />
@@ -128,11 +128,11 @@ 
 
 			<?php endforeach; ?>
 
-			<input type="hidden" value="<?php echo esc_attr( $current_tab ); ?>" name="importer" />
+			<input type="hidden" value="<?php echo esc_attr($current_tab); ?>" name="importer" />
 
 			<?php
 
-			if ( ! isset( $supported ) ) {
+			if (!isset($supported)) {
 
 				esc_html_e(
 					'This importer does not support any of the installed components.'
@@ -141,8 +141,8 @@ 
 
 			} else {
 
-				wp_nonce_field( 'wordpoints_import' );
-				submit_button( __( 'Import', 'wordpoints-importer' ) );
+				wp_nonce_field('wordpoints_import');
+				submit_button(__('Import', 'wordpoints-importer'));
 			}
 
 			?>

src/importer.php

Indentation +6 added lines, -6 removed lines

@@ -64,12 +64,12 @@
 
 if ( is_admin() ) {
 
-	/**
-	 * The module's admin-side code.
-	 *
-	 * @since 1.0.0
-	 */
-	require_once( dirname( __FILE__ ) . '/admin/admin.php' );
+    /**
+     * The module's admin-side code.
+     *
+     * @since 1.0.0
+     */
+    require_once( dirname( __FILE__ ) . '/admin/admin.php' );
 }
 
 // EOF

Spacing +5 added lines, -5 removed lines

@@ -46,30 +46,30 @@
  *
  * @since 1.0.0
  */
-require_once( dirname( __FILE__ ) . '/includes/class-feedback.php' );
+require_once(dirname(__FILE__).'/includes/class-feedback.php');
 
 /**
  * The base importer class.
  *
  * @since 1.0.0
  */
-require_once( dirname( __FILE__ ) . '/includes/class-importer.php' );
+require_once(dirname(__FILE__).'/includes/class-importer.php');
 
 /**
  * The module's general functions.
  *
  * @since 1.0.0
  */
-require_once( dirname( __FILE__ ) . '/includes/functions.php' );
+require_once(dirname(__FILE__).'/includes/functions.php');
 
-if ( is_admin() ) {
+if (is_admin()) {
 
 	/**
 	 * The module's admin-side code.
 	 *
 	 * @since 1.0.0
 	 */
-	require_once( dirname( __FILE__ ) . '/admin/admin.php' );
+	require_once(dirname(__FILE__).'/admin/admin.php');
 }
 
 // EOF

src/includes/class-feedback.php

Indentation +66 added lines, -66 removed lines

@@ -16,84 +16,84 @@
  */
 class WordPoints_Importer_Feedback {
 
-	/**
-	 * Send an info message.
-	 *
-	 * Use this to give the user any info that wouldn't be handles by the other
-	 * methods.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The info message.
-	 */
-	public function info( $message ) {
-		$this->_send( $message, 'info' );
-	}
+    /**
+     * Send an info message.
+     *
+     * Use this to give the user any info that wouldn't be handles by the other
+     * methods.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The info message.
+     */
+    public function info( $message ) {
+        $this->_send( $message, 'info' );
+    }
 
-	/**
-	 * Send a success message.
-	 *
-	 * Use this when you want to let the user know that something was a success.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The success message.
-	 */
-	public function success( $message ) {
-		$this->_send( $message, 'success' );
-	}
+    /**
+     * Send a success message.
+     *
+     * Use this when you want to let the user know that something was a success.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The success message.
+     */
+    public function success( $message ) {
+        $this->_send( $message, 'success' );
+    }
 
-	/**
-	 * Send an error message.
-	 *
-	 * Use this when you want to let the user know that there was an error.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The error message.
-	 */
-	public function error( $message ) {
-		$this->_send( $message, 'error' );
-	}
+    /**
+     * Send an error message.
+     *
+     * Use this when you want to let the user know that there was an error.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The error message.
+     */
+    public function error( $message ) {
+        $this->_send( $message, 'error' );
+    }
 
-	/**
-	 * Send a warning message.
-	 *
-	 * Use this to warn the user about something. A warning doesn't necessarily imply
-	 * an error, but that something unexpected has occured that the user might need
-	 * to know.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The warning message.
-	 */
-	public function warning( $message ) {
-		$this->_send( $message, 'warning' );
-	}
+    /**
+     * Send a warning message.
+     *
+     * Use this to warn the user about something. A warning doesn't necessarily imply
+     * an error, but that something unexpected has occured that the user might need
+     * to know.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The warning message.
+     */
+    public function warning( $message ) {
+        $this->_send( $message, 'warning' );
+    }
 
-	//
-	// Protected Methods.
-	//
+    //
+    // Protected Methods.
+    //
 
-	/**
-	 * Send a message to the user.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The feedback message.
-	 * @param string $type    The type of message: 'info' (defuault), 'sucess',
-	 *                        'error', 'warning'.
-	 */
-	protected function _send( $message, $type = 'info' ) {
+    /**
+     * Send a message to the user.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The feedback message.
+     * @param string $type    The type of message: 'info' (defuault), 'sucess',
+     *                        'error', 'warning'.
+     */
+    protected function _send( $message, $type = 'info' ) {
 
-		?>
+        ?>
 
 		<p class="wordpoints-feedback wordpoints-feedback-<?php echo esc_attr( $type ); ?>">
 			<?php echo wp_kses( $message, 'wordpoints_importer_feedback' ); ?>
 		</p>
 
 		<?php
-	}
+    }
 }
 
 // EOF

Spacing +11 added lines, -11 removed lines

@@ -26,8 +26,8 @@ 
 	 *
 	 * @param string $message The info message.
 	 */
-	public function info( $message ) {
-		$this->_send( $message, 'info' );
+	public function info($message) {
+		$this->_send($message, 'info');
 	}
 
 	/**
@@ -39,8 +39,8 @@ 
 	 *
 	 * @param string $message The success message.
 	 */
-	public function success( $message ) {
-		$this->_send( $message, 'success' );
+	public function success($message) {
+		$this->_send($message, 'success');
 	}
 
 	/**
@@ -52,8 +52,8 @@ 
 	 *
 	 * @param string $message The error message.
 	 */
-	public function error( $message ) {
-		$this->_send( $message, 'error' );
+	public function error($message) {
+		$this->_send($message, 'error');
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	 *
 	 * @param string $message The warning message.
 	 */
-	public function warning( $message ) {
-		$this->_send( $message, 'warning' );
+	public function warning($message) {
+		$this->_send($message, 'warning');
 	}
 
 	//
@@ -84,12 +84,12 @@ 
 	 * @param string $type    The type of message: 'info' (defuault), 'sucess',
 	 *                        'error', 'warning'.
 	 */
-	protected function _send( $message, $type = 'info' ) {
+	protected function _send($message, $type = 'info') {
 
 		?>
 
-		<p class="wordpoints-feedback wordpoints-feedback-<?php echo esc_attr( $type ); ?>">
-			<?php echo wp_kses( $message, 'wordpoints_importer_feedback' ); ?>
+		<p class="wordpoints-feedback wordpoints-feedback-<?php echo esc_attr($type); ?>">
+			<?php echo wp_kses($message, 'wordpoints_importer_feedback'); ?>
 		</p>
 
 		<?php

src/includes/functions.php

Indentation +15 added lines, -15 removed lines

@@ -14,10 +14,10 @@ 
  */
 function wordpoints_importer_load_textdomain() {
 
-	wordpoints_load_module_textdomain(
-		'wordpointsorg'
-		, wordpoints_module_basename( dirname( dirname( __FILE__ ) ) ) . '/languages'
-	);
+    wordpoints_load_module_textdomain(
+        'wordpointsorg'
+        , wordpoints_module_basename( dirname( dirname( __FILE__ ) ) ) . '/languages'
+    );
 }
 add_action( 'wordpoints_modules_loaded', 'wordpoints_importer_load_textdomain' );
 
@@ -28,19 +28,19 @@ 
  */
 function wordpoints_importer_register_importers() {
 
-	/**
-	 * The CubePoints importer.
-	 *
-	 * @since 1.0.0
-	 */
-	require_once( dirname( __FILE__ ) . '/importers/cubepoints.php' );
+    /**
+     * The CubePoints importer.
+     *
+     * @since 1.0.0
+     */
+    require_once( dirname( __FILE__ ) . '/importers/cubepoints.php' );
 
-	$args = array(
-		'class' => 'WordPoints_CubePoints_Importer',
-		'name'  => __( 'CubePoints', 'wordpoints-importer' ),
-	);
+    $args = array(
+        'class' => 'WordPoints_CubePoints_Importer',
+        'name'  => __( 'CubePoints', 'wordpoints-importer' ),
+    );
 
-	WordPoints_Importers::register( 'cubepoints', $args );
+    WordPoints_Importers::register( 'cubepoints', $args );
 }
 add_action( 'wordpoints_register_importers', 'wordpoints_importer_register_importers' );
 

Spacing +6 added lines, -6 removed lines

@@ -16,10 +16,10 @@ 
 
 	wordpoints_load_module_textdomain(
 		'wordpointsorg'
-		, wordpoints_module_basename( dirname( dirname( __FILE__ ) ) ) . '/languages'
+		, wordpoints_module_basename(dirname(dirname(__FILE__))).'/languages'
 	);
 }
-add_action( 'wordpoints_modules_loaded', 'wordpoints_importer_load_textdomain' );
+add_action('wordpoints_modules_loaded', 'wordpoints_importer_load_textdomain');
 
 /**
  * Register the included importers.
@@ -33,15 +33,15 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	require_once( dirname( __FILE__ ) . '/importers/cubepoints.php' );
+	require_once(dirname(__FILE__).'/importers/cubepoints.php');
 
 	$args = array(
 		'class' => 'WordPoints_CubePoints_Importer',
-		'name'  => __( 'CubePoints', 'wordpoints-importer' ),
+		'name'  => __('CubePoints', 'wordpoints-importer'),
 	);
 
-	WordPoints_Importers::register( 'cubepoints', $args );
+	WordPoints_Importers::register('cubepoints', $args);
 }
-add_action( 'wordpoints_register_importers', 'wordpoints_importer_register_importers' );
+add_action('wordpoints_register_importers', 'wordpoints_importer_register_importers');
 
 // EOF

src/includes/class-importer.php

Indentation +365 added lines, -365 removed lines

@@ -14,138 +14,138 @@ 
  */
 final class WordPoints_Importers {
 
-	//
-	// Private Vars.
-	//
-
-	/**
-	 * The registered importers.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type array $importers
-	 */
-	private static $importers = array();
-
-	/**
-	 * Whether the class has been initialized yet.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type bool $initialized
-	 */
-	private static $initialized = false;
-
-	//
-	// Private Functions.
-	//
-
-	/**
-	 * Initialize the class.
-	 *
-	 * @since 1.0.0
-	 */
-	private static function init() {
-
-		// We do this first so we avoid infinite loops if this class is called by a
-		// function hooked to the below action.
-		self::$initialized = true;
-
-		/**
-		 * Register importers.
-		 *
-		 * @since 1.0.0
-		 */
-		do_action( 'wordpoints_register_importers' );
-	}
-
-	//
-	// Public Functions.
-	//
-
-	/**
-	 * Get all of the registered importers.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return array All of the registered importers.
-	 */
-	public static function get() {
-
-		if ( ! self::$initialized ) {
-			self::init();
-		}
-
-		return self::$importers;
-	}
-
-	/**
-	 * Register an importer.
-	 *
-	 * If the importer is already registered, it will be overwritten.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $slug The unique identifier for this importer.
-	 * @param array  $args {
-	 *        Other importer arguments.
-	 *
-	 *        @type string $class The Importer class.
-	 *        @type string $name  The name of this importer.
-	 * }
-	 */
-	public static function register( $slug, array $args ) {
-		self::$importers[ $slug ] = $args;
-	}
-
-	/**
-	 * Deregister an importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $slug The slug of the importer to deregister.
-	 */
-	public static function deregister( $slug ) {
-		unset( self::$importers[ $slug ] );
-	}
-
-	/**
-	 * Check if an importer is registered.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $slug The slug of the importer.
-	 *
-	 * @return bool True if the importer is registered, otherwise false.
-	 */
-	public static function is_registered( $slug ) {
-
-		if ( ! self::$initialized ) {
-			self::init();
-		}
-
-		return isset( self::$importers[ $slug ] );
-	}
-
-	/**
-	 * Get an instance of an importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $slug The slug of the importer to get an instance of.
-	 *
-	 * @return WordPoints_Importer|false The importer, or false if it isn't registered.
-	 */
-	public static function get_importer( $slug ) {
-
-		if ( ! self::is_registered( $slug ) ) {
-			return false;
-		}
-
-		$importer = self::$importers[ $slug ];
-
-		return new $importer['class']( $importer['name'] );
-	}
+    //
+    // Private Vars.
+    //
+
+    /**
+     * The registered importers.
+     *
+     * @since 1.0.0
+     *
+     * @type array $importers
+     */
+    private static $importers = array();
+
+    /**
+     * Whether the class has been initialized yet.
+     *
+     * @since 1.0.0
+     *
+     * @type bool $initialized
+     */
+    private static $initialized = false;
+
+    //
+    // Private Functions.
+    //
+
+    /**
+     * Initialize the class.
+     *
+     * @since 1.0.0
+     */
+    private static function init() {
+
+        // We do this first so we avoid infinite loops if this class is called by a
+        // function hooked to the below action.
+        self::$initialized = true;
+
+        /**
+         * Register importers.
+         *
+         * @since 1.0.0
+         */
+        do_action( 'wordpoints_register_importers' );
+    }
+
+    //
+    // Public Functions.
+    //
+
+    /**
+     * Get all of the registered importers.
+     *
+     * @since 1.0.0
+     *
+     * @return array All of the registered importers.
+     */
+    public static function get() {
+
+        if ( ! self::$initialized ) {
+            self::init();
+        }
+
+        return self::$importers;
+    }
+
+    /**
+     * Register an importer.
+     *
+     * If the importer is already registered, it will be overwritten.
+     *
+     * @since 1.0.0
+     *
+     * @param string $slug The unique identifier for this importer.
+     * @param array  $args {
+     *        Other importer arguments.
+     *
+     *        @type string $class The Importer class.
+     *        @type string $name  The name of this importer.
+     * }
+     */
+    public static function register( $slug, array $args ) {
+        self::$importers[ $slug ] = $args;
+    }
+
+    /**
+     * Deregister an importer.
+     *
+     * @since 1.0.0
+     *
+     * @param string $slug The slug of the importer to deregister.
+     */
+    public static function deregister( $slug ) {
+        unset( self::$importers[ $slug ] );
+    }
+
+    /**
+     * Check if an importer is registered.
+     *
+     * @since 1.0.0
+     *
+     * @param string $slug The slug of the importer.
+     *
+     * @return bool True if the importer is registered, otherwise false.
+     */
+    public static function is_registered( $slug ) {
+
+        if ( ! self::$initialized ) {
+            self::init();
+        }
+
+        return isset( self::$importers[ $slug ] );
+    }
+
+    /**
+     * Get an instance of an importer.
+     *
+     * @since 1.0.0
+     *
+     * @param string $slug The slug of the importer to get an instance of.
+     *
+     * @return WordPoints_Importer|false The importer, or false if it isn't registered.
+     */
+    public static function get_importer( $slug ) {
+
+        if ( ! self::is_registered( $slug ) ) {
+            return false;
+        }
+
+        $importer = self::$importers[ $slug ];
+
+        return new $importer['class']( $importer['name'] );
+    }
 }
 
 /**
@@ -155,239 +155,239 @@ 
  */
 abstract class WordPoints_Importer {
 
-	/**
-	 * The name of the importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type string $name
-	 */
-	protected $name;
-
-	/**
-	 * The components supported by this importer.
-	 *
-	 * The keys are the component slugs, the values arrays of options for importing
-	 * to that component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type array[] $components
-	 */
-	protected $components = array();
-
-	/**
-	 * The feedback provider object.
-	 *
-	 * This is only set by self::do_import().
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type WordPoints_Importer_Feedback $feedback
-	 */
-	protected $feedback;
-
-	/**
-	 * Check if this importer is available.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return true|WP_Error A WP_Error if the importer is not available.
-	 */
-	abstract public function is_available();
-
-	/**
-	 * Construct the importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $name The name of the importer.
-	 */
-	public function __construct( $name ) {
-
-		$this->name = $name;
-	}
-
-	/**
-	 * Check if this importer supports a specific component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $component The slug of a component.
-	 *
-	 * @return bool True if the component is supported, otherwise false.
-	 */
-	public function supports_component( $component ) {
-
-		return isset( $this->components[ $component ] );
-	}
-
-	/**
-	 * Get the import options for a component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $component The slug of a component.
-	 *
-	 * @return array[] The options for this component.
-	 */
-	public function get_options_for_component( $component ) {
-
-		if ( ! $this->supports_component( $component ) ) {
-			return array();
-		}
-
-		return $this->components[ $component ];
-	}
-
-	/**
-	 * Run the import.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array                        $args     The settings for the import.
-	 * @param WordPoints_Importer_Feedback $feedback The feedback object.
-	 */
-	public function do_import( array $args, $feedback = null ) {
-
-		if ( ! ( $feedback instanceof WordPoints_Importer_Feedback ) ) {
-			$feedback = new WordPoints_Importer_Feedback;
-		}
-
-		$this->feedback = $feedback;
-
-		$this->feedback->info( sprintf( __( 'Importing from %s…', 'wordpoints-importer' ), $this->name ) );
-
-		$this->no_interruptions();
-
-		foreach ( $args as $component => $options ) {
-			$this->do_import_for_component( $component, $options );
-		}
-
-		$this->feedback->info( __( 'Import complete.', 'wordpoints-importer' ) );
-	}
-
-	/**
-	 * Prevent any interruptions from occurring during the import.
-	 *
-	 * @since 1.2.1
-	 */
-	protected function no_interruptions() {
-
-		ignore_user_abort( true );
-
-		if (
-			// Back-compat with WordPoints 2.1.
-			function_exists( 'wordpoints_is_function_disabled' )
-			&& ! wordpoints_is_function_disabled( 'set_time_limit' )
-		) {
-			set_time_limit( 0 );
-		}
-	}
-
-	/**
-	 * Validate the import settings for a component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $component The slug of the component.
-	 * @param array  $settings  The settings supplied for this component.
-	 *
-	 * @return bool Whether the settings are valid.
-	 */
-	protected function validate_import_settings( $component, $settings ) {
-
-		/**
-		 * Filter whether the settings are valid before importing.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param bool  $valid    Whether the settings are valid.
-		 * @param array $settings The settings for this component.
-		 * @param WordPoints_Importer_Feedback $feedback The feedback object.
-		 */
-		return apply_filters( "wordpoints_import_settings_valid-{$component}", true, $settings, $this->feedback );
-	}
-
-	/**
-	 * Run the import for a component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $component The component to run the import for.
-	 * @param array  $options   The selected options of what to import.
-	 */
-	protected function do_import_for_component( $component, $options ) {
-
-		$component_data = WordPoints_Components::instance()->get_component(
-			$component
-		);
-
-		if ( false === $component_data ) {
-			$this->feedback->warning( sprintf( __( 'Skipping %s component—not installed.', 'wordpoints-importer' ), esc_html( $component ) ) );
-			return;
-		}
-
-		if ( true !== $this->supports_component( $component ) ) {
-			$this->feedback->warning( sprintf( __( 'Skipping the %s component—not supported.', 'wordpoints-importer' ), $component_data['name'] ) );
-			return;
-		}
-
-		$settings = array();
-
-		if ( isset( $options['_data'] ) ) {
-			$settings = $options['_data'];
-			unset( $options['_data'] );
-		}
-
-		if ( empty( $options ) || ! $this->validate_import_settings( $component, $settings ) ) {
-			return;
-		}
-
-		$this->feedback->info( sprintf( __( 'Importing data to the %s component…', 'wordpoints-importer' ), $component_data['name'] ) );
-
-		foreach ( $options as $option => $unused ) {
-			$this->do_import_for_option( $option, $component, $settings );
-		}
-	}
-
-	/**
-	 * Run the import for an option.
-	 *
-	 * The import is split up into different options which the user can select (these
-	 * are displayed to the user as checkboxes in the form). This handles the import
-	 * for each of the individual things the user has selected to import. These are
-	 * all optional, so each is just termed an import "option" here.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $option    An import option that has been selected.
-	 * @param string $component The component this option is for.
-	 * @param array  $settings  Other settings for this component.
-	 */
-	protected function do_import_for_option( $option, $component, $settings ) {
-
-		if ( ! isset( $this->components[ $component ][ $option ] ) ) {
-			$this->feedback->warning( sprintf( __( 'Skipping unrecognized import option “%s”…', 'wordpoints-importer' ), $option ) );
-			return;
-		}
-
-		$option_data = $this->components[ $component ][ $option ];
-
-		// Check if we can actually run this option.
-		if ( isset( $option_data['can_import'] ) ) {
-
-			$cant_import = call_user_func( $option_data['can_import'], $settings );
-
-			if ( is_wp_error( $cant_import ) ) {
-				$this->feedback->warning( sprintf( __( 'Skipping importing %1$s. Reason: %2$s', 'wordpoints-importer' ), $option_data['label'], $cant_import->get_error_message() ) );
-				return;
-			}
-		}
-
-		// OK, we can run the import method for this option.
-		call_user_func( $option_data['function'], $settings );
-	}
+    /**
+     * The name of the importer.
+     *
+     * @since 1.0.0
+     *
+     * @type string $name
+     */
+    protected $name;
+
+    /**
+     * The components supported by this importer.
+     *
+     * The keys are the component slugs, the values arrays of options for importing
+     * to that component.
+     *
+     * @since 1.0.0
+     *
+     * @type array[] $components
+     */
+    protected $components = array();
+
+    /**
+     * The feedback provider object.
+     *
+     * This is only set by self::do_import().
+     *
+     * @since 1.0.0
+     *
+     * @type WordPoints_Importer_Feedback $feedback
+     */
+    protected $feedback;
+
+    /**
+     * Check if this importer is available.
+     *
+     * @since 1.0.0
+     *
+     * @return true|WP_Error A WP_Error if the importer is not available.
+     */
+    abstract public function is_available();
+
+    /**
+     * Construct the importer.
+     *
+     * @since 1.0.0
+     *
+     * @param string $name The name of the importer.
+     */
+    public function __construct( $name ) {
+
+        $this->name = $name;
+    }
+
+    /**
+     * Check if this importer supports a specific component.
+     *
+     * @since 1.0.0
+     *
+     * @param string $component The slug of a component.
+     *
+     * @return bool True if the component is supported, otherwise false.
+     */
+    public function supports_component( $component ) {
+
+        return isset( $this->components[ $component ] );
+    }
+
+    /**
+     * Get the import options for a component.
+     *
+     * @since 1.0.0
+     *
+     * @param string $component The slug of a component.
+     *
+     * @return array[] The options for this component.
+     */
+    public function get_options_for_component( $component ) {
+
+        if ( ! $this->supports_component( $component ) ) {
+            return array();
+        }
+
+        return $this->components[ $component ];
+    }
+
+    /**
+     * Run the import.
+     *
+     * @since 1.0.0
+     *
+     * @param array                        $args     The settings for the import.
+     * @param WordPoints_Importer_Feedback $feedback The feedback object.
+     */
+    public function do_import( array $args, $feedback = null ) {
+
+        if ( ! ( $feedback instanceof WordPoints_Importer_Feedback ) ) {
+            $feedback = new WordPoints_Importer_Feedback;
+        }
+
+        $this->feedback = $feedback;
+
+        $this->feedback->info( sprintf( __( 'Importing from %s…', 'wordpoints-importer' ), $this->name ) );
+
+        $this->no_interruptions();
+
+        foreach ( $args as $component => $options ) {
+            $this->do_import_for_component( $component, $options );
+        }
+
+        $this->feedback->info( __( 'Import complete.', 'wordpoints-importer' ) );
+    }
+
+    /**
+     * Prevent any interruptions from occurring during the import.
+     *
+     * @since 1.2.1
+     */
+    protected function no_interruptions() {
+
+        ignore_user_abort( true );
+
+        if (
+            // Back-compat with WordPoints 2.1.
+            function_exists( 'wordpoints_is_function_disabled' )
+            && ! wordpoints_is_function_disabled( 'set_time_limit' )
+        ) {
+            set_time_limit( 0 );
+        }
+    }
+
+    /**
+     * Validate the import settings for a component.
+     *
+     * @since 1.0.0
+     *
+     * @param string $component The slug of the component.
+     * @param array  $settings  The settings supplied for this component.
+     *
+     * @return bool Whether the settings are valid.
+     */
+    protected function validate_import_settings( $component, $settings ) {
+
+        /**
+         * Filter whether the settings are valid before importing.
+         *
+         * @since 1.0.0
+         *
+         * @param bool  $valid    Whether the settings are valid.
+         * @param array $settings The settings for this component.
+         * @param WordPoints_Importer_Feedback $feedback The feedback object.
+         */
+        return apply_filters( "wordpoints_import_settings_valid-{$component}", true, $settings, $this->feedback );
+    }
+
+    /**
+     * Run the import for a component.
+     *
+     * @since 1.0.0
+     *
+     * @param string $component The component to run the import for.
+     * @param array  $options   The selected options of what to import.
+     */
+    protected function do_import_for_component( $component, $options ) {
+
+        $component_data = WordPoints_Components::instance()->get_component(
+            $component
+        );
+
+        if ( false === $component_data ) {
+            $this->feedback->warning( sprintf( __( 'Skipping %s component—not installed.', 'wordpoints-importer' ), esc_html( $component ) ) );
+            return;
+        }
+
+        if ( true !== $this->supports_component( $component ) ) {
+            $this->feedback->warning( sprintf( __( 'Skipping the %s component—not supported.', 'wordpoints-importer' ), $component_data['name'] ) );
+            return;
+        }
+
+        $settings = array();
+
+        if ( isset( $options['_data'] ) ) {
+            $settings = $options['_data'];
+            unset( $options['_data'] );
+        }
+
+        if ( empty( $options ) || ! $this->validate_import_settings( $component, $settings ) ) {
+            return;
+        }
+
+        $this->feedback->info( sprintf( __( 'Importing data to the %s component…', 'wordpoints-importer' ), $component_data['name'] ) );
+
+        foreach ( $options as $option => $unused ) {
+            $this->do_import_for_option( $option, $component, $settings );
+        }
+    }
+
+    /**
+     * Run the import for an option.
+     *
+     * The import is split up into different options which the user can select (these
+     * are displayed to the user as checkboxes in the form). This handles the import
+     * for each of the individual things the user has selected to import. These are
+     * all optional, so each is just termed an import "option" here.
+     *
+     * @since 1.0.0
+     *
+     * @param string $option    An import option that has been selected.
+     * @param string $component The component this option is for.
+     * @param array  $settings  Other settings for this component.
+     */
+    protected function do_import_for_option( $option, $component, $settings ) {
+
+        if ( ! isset( $this->components[ $component ][ $option ] ) ) {
+            $this->feedback->warning( sprintf( __( 'Skipping unrecognized import option “%s”…', 'wordpoints-importer' ), $option ) );
+            return;
+        }
+
+        $option_data = $this->components[ $component ][ $option ];
+
+        // Check if we can actually run this option.
+        if ( isset( $option_data['can_import'] ) ) {
+
+            $cant_import = call_user_func( $option_data['can_import'], $settings );
+
+            if ( is_wp_error( $cant_import ) ) {
+                $this->feedback->warning( sprintf( __( 'Skipping importing %1$s. Reason: %2$s', 'wordpoints-importer' ), $option_data['label'], $cant_import->get_error_message() ) );
+                return;
+            }
+        }
+
+        // OK, we can run the import method for this option.
+        call_user_func( $option_data['function'], $settings );
+    }
 }
 
 // EOF

Spacing +51 added lines, -51 removed lines

@@ -56,7 +56,7 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		do_action( 'wordpoints_register_importers' );
+		do_action('wordpoints_register_importers');
 	}
 
 	//
@@ -72,7 +72,7 @@ 
 	 */
 	public static function get() {
 
-		if ( ! self::$initialized ) {
+		if (!self::$initialized) {
 			self::init();
 		}
 
@@ -94,8 +94,8 @@ 
 	 *        @type string $name  The name of this importer.
 	 * }
 	 */
-	public static function register( $slug, array $args ) {
-		self::$importers[ $slug ] = $args;
+	public static function register($slug, array $args) {
+		self::$importers[$slug] = $args;
 	}
 
 	/**
@@ -105,8 +105,8 @@ 
 	 *
 	 * @param string $slug The slug of the importer to deregister.
 	 */
-	public static function deregister( $slug ) {
-		unset( self::$importers[ $slug ] );
+	public static function deregister($slug) {
+		unset(self::$importers[$slug]);
 	}
 
 	/**
@@ -118,13 +118,13 @@ 
 	 *
 	 * @return bool True if the importer is registered, otherwise false.
 	 */
-	public static function is_registered( $slug ) {
+	public static function is_registered($slug) {
 
-		if ( ! self::$initialized ) {
+		if (!self::$initialized) {
 			self::init();
 		}
 
-		return isset( self::$importers[ $slug ] );
+		return isset(self::$importers[$slug]);
 	}
 
 	/**
@@ -136,15 +136,15 @@ 
 	 *
 	 * @return WordPoints_Importer|false The importer, or false if it isn't registered.
 	 */
-	public static function get_importer( $slug ) {
+	public static function get_importer($slug) {
 
-		if ( ! self::is_registered( $slug ) ) {
+		if (!self::is_registered($slug)) {
 			return false;
 		}
 
-		$importer = self::$importers[ $slug ];
+		$importer = self::$importers[$slug];
 
-		return new $importer['class']( $importer['name'] );
+		return new $importer['class']($importer['name']);
 	}
 }
 
@@ -203,7 +203,7 @@ 
 	 *
 	 * @param string $name The name of the importer.
 	 */
-	public function __construct( $name ) {
+	public function __construct($name) {
 
 		$this->name = $name;
 	}
@@ -217,9 +217,9 @@ 
 	 *
 	 * @return bool True if the component is supported, otherwise false.
 	 */
-	public function supports_component( $component ) {
+	public function supports_component($component) {
 
-		return isset( $this->components[ $component ] );
+		return isset($this->components[$component]);
 	}
 
 	/**
@@ -231,13 +231,13 @@ 
 	 *
 	 * @return array[] The options for this component.
 	 */
-	public function get_options_for_component( $component ) {
+	public function get_options_for_component($component) {
 
-		if ( ! $this->supports_component( $component ) ) {
+		if (!$this->supports_component($component)) {
 			return array();
 		}
 
-		return $this->components[ $component ];
+		return $this->components[$component];
 	}
 
 	/**
@@ -248,23 +248,23 @@ 
 	 * @param array                        $args     The settings for the import.
 	 * @param WordPoints_Importer_Feedback $feedback The feedback object.
 	 */
-	public function do_import( array $args, $feedback = null ) {
+	public function do_import(array $args, $feedback = null) {
 
-		if ( ! ( $feedback instanceof WordPoints_Importer_Feedback ) ) {
+		if (!($feedback instanceof WordPoints_Importer_Feedback)) {
 			$feedback = new WordPoints_Importer_Feedback;
 		}
 
 		$this->feedback = $feedback;
 
-		$this->feedback->info( sprintf( __( 'Importing from %s…', 'wordpoints-importer' ), $this->name ) );
+		$this->feedback->info(sprintf(__('Importing from %s…', 'wordpoints-importer'), $this->name));
 
 		$this->no_interruptions();
 
-		foreach ( $args as $component => $options ) {
-			$this->do_import_for_component( $component, $options );
+		foreach ($args as $component => $options) {
+			$this->do_import_for_component($component, $options);
 		}
 
-		$this->feedback->info( __( 'Import complete.', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Import complete.', 'wordpoints-importer'));
 	}
 
 	/**
@@ -274,14 +274,14 @@ 
 	 */
 	protected function no_interruptions() {
 
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
 		if (
 			// Back-compat with WordPoints 2.1.
-			function_exists( 'wordpoints_is_function_disabled' )
-			&& ! wordpoints_is_function_disabled( 'set_time_limit' )
+			function_exists('wordpoints_is_function_disabled')
+			&& !wordpoints_is_function_disabled('set_time_limit')
 		) {
-			set_time_limit( 0 );
+			set_time_limit(0);
 		}
 	}
 
@@ -295,7 +295,7 @@ 
 	 *
 	 * @return bool Whether the settings are valid.
 	 */
-	protected function validate_import_settings( $component, $settings ) {
+	protected function validate_import_settings($component, $settings) {
 
 		/**
 		 * Filter whether the settings are valid before importing.
@@ -306,7 +306,7 @@ 
 		 * @param array $settings The settings for this component.
 		 * @param WordPoints_Importer_Feedback $feedback The feedback object.
 		 */
-		return apply_filters( "wordpoints_import_settings_valid-{$component}", true, $settings, $this->feedback );
+		return apply_filters("wordpoints_import_settings_valid-{$component}", true, $settings, $this->feedback);
 	}
 
 	/**
@@ -317,37 +317,37 @@ 
 	 * @param string $component The component to run the import for.
 	 * @param array  $options   The selected options of what to import.
 	 */
-	protected function do_import_for_component( $component, $options ) {
+	protected function do_import_for_component($component, $options) {
 
 		$component_data = WordPoints_Components::instance()->get_component(
 			$component
 		);
 
-		if ( false === $component_data ) {
-			$this->feedback->warning( sprintf( __( 'Skipping %s component—not installed.', 'wordpoints-importer' ), esc_html( $component ) ) );
+		if (false === $component_data) {
+			$this->feedback->warning(sprintf(__('Skipping %s component—not installed.', 'wordpoints-importer'), esc_html($component)));
 			return;
 		}
 
-		if ( true !== $this->supports_component( $component ) ) {
-			$this->feedback->warning( sprintf( __( 'Skipping the %s component—not supported.', 'wordpoints-importer' ), $component_data['name'] ) );
+		if (true !== $this->supports_component($component)) {
+			$this->feedback->warning(sprintf(__('Skipping the %s component—not supported.', 'wordpoints-importer'), $component_data['name']));
 			return;
 		}
 
 		$settings = array();
 
-		if ( isset( $options['_data'] ) ) {
+		if (isset($options['_data'])) {
 			$settings = $options['_data'];
-			unset( $options['_data'] );
+			unset($options['_data']);
 		}
 
-		if ( empty( $options ) || ! $this->validate_import_settings( $component, $settings ) ) {
+		if (empty($options) || !$this->validate_import_settings($component, $settings)) {
 			return;
 		}
 
-		$this->feedback->info( sprintf( __( 'Importing data to the %s component…', 'wordpoints-importer' ), $component_data['name'] ) );
+		$this->feedback->info(sprintf(__('Importing data to the %s component…', 'wordpoints-importer'), $component_data['name']));
 
-		foreach ( $options as $option => $unused ) {
-			$this->do_import_for_option( $option, $component, $settings );
+		foreach ($options as $option => $unused) {
+			$this->do_import_for_option($option, $component, $settings);
 		}
 	}
 
@@ -365,28 +365,28 @@ 
 	 * @param string $component The component this option is for.
 	 * @param array  $settings  Other settings for this component.
 	 */
-	protected function do_import_for_option( $option, $component, $settings ) {
+	protected function do_import_for_option($option, $component, $settings) {
 
-		if ( ! isset( $this->components[ $component ][ $option ] ) ) {
-			$this->feedback->warning( sprintf( __( 'Skipping unrecognized import option “%s”…', 'wordpoints-importer' ), $option ) );
+		if (!isset($this->components[$component][$option])) {
+			$this->feedback->warning(sprintf(__('Skipping unrecognized import option “%s”…', 'wordpoints-importer'), $option));
 			return;
 		}
 
-		$option_data = $this->components[ $component ][ $option ];
+		$option_data = $this->components[$component][$option];
 
 		// Check if we can actually run this option.
-		if ( isset( $option_data['can_import'] ) ) {
+		if (isset($option_data['can_import'])) {
 
-			$cant_import = call_user_func( $option_data['can_import'], $settings );
+			$cant_import = call_user_func($option_data['can_import'], $settings);
 
-			if ( is_wp_error( $cant_import ) ) {
-				$this->feedback->warning( sprintf( __( 'Skipping importing %1$s. Reason: %2$s', 'wordpoints-importer' ), $option_data['label'], $cant_import->get_error_message() ) );
+			if (is_wp_error($cant_import)) {
+				$this->feedback->warning(sprintf(__('Skipping importing %1$s. Reason: %2$s', 'wordpoints-importer'), $option_data['label'], $cant_import->get_error_message()));
 				return;
 			}
 		}
 
 		// OK, we can run the import method for this option.
-		call_user_func( $option_data['function'], $settings );
+		call_user_func($option_data['function'], $settings);
 	}
 }
 

src/admin/admin.php

Indentation +106 added lines, -106 removed lines

@@ -14,23 +14,23 @@ 
  */
 function wordpoints_importer_admin_menu() {
 
-	add_submenu_page(
-		wordpoints_get_main_admin_menu()
-		,__( 'WordPoints — Import', 'wordpoints-importer' )
-		,__( 'Import', 'wordpoints-importer' )
-		,'manage_options'
-		,'wordpoints_import'
-		,'wordpoints_import_admin_screen'
-	);
-
-	add_submenu_page(
-		'_wordpoints_import' // Fake.
-		,__( 'WordPoints — Importing', 'wordpoints-importer' )
-		,__( 'Importing', 'wordpoints-importer' )
-		,'manage_options'
-		,'wordpoints_importing'
-		,'wordpoints_importing_admin_screen'
-	);
+    add_submenu_page(
+        wordpoints_get_main_admin_menu()
+        ,__( 'WordPoints — Import', 'wordpoints-importer' )
+        ,__( 'Import', 'wordpoints-importer' )
+        ,'manage_options'
+        ,'wordpoints_import'
+        ,'wordpoints_import_admin_screen'
+    );
+
+    add_submenu_page(
+        '_wordpoints_import' // Fake.
+        ,__( 'WordPoints — Importing', 'wordpoints-importer' )
+        ,__( 'Importing', 'wordpoints-importer' )
+        ,'manage_options'
+        ,'wordpoints_importing'
+        ,'wordpoints_importing_admin_screen'
+    );
 }
 add_action( 'admin_menu', 'wordpoints_importer_admin_menu' );
 add_action( 'network_admin_menu', 'wordpoints_importer_admin_menu' );
@@ -42,12 +42,12 @@ 
  */
 function wordpoints_import_admin_screen() {
 
-	/**
-	 * The importer admin screen.
-	 *
-	 * @since 1.0.0
-	 */
-	require( dirname( __FILE__ ) . '/screens/import.php' );
+    /**
+     * The importer admin screen.
+     *
+     * @since 1.0.0
+     */
+    require( dirname( __FILE__ ) . '/screens/import.php' );
 }
 
 /**
@@ -57,12 +57,12 @@ 
  */
 function wordpoints_importing_admin_screen() {
 
-	/**
-	 * The importer admin screen.
-	 *
-	 * @since 1.0.0
-	 */
-	require( dirname( __FILE__ ) . '/screens/importing.php' );
+    /**
+     * The importer admin screen.
+     *
+     * @since 1.0.0
+     */
+    require( dirname( __FILE__ ) . '/screens/importing.php' );
 }
 
 /**
@@ -72,15 +72,15 @@ 
  */
 function wordpoints_importer_register_admin_scripts() {
 
-	$assets_url = wordpoints_modules_url(
-		'admin/assets'
-		, dirname( dirname( __FILE__ ) ) . '/importer.php'
-	);
+    $assets_url = wordpoints_modules_url(
+        'admin/assets'
+        , dirname( dirname( __FILE__ ) ) . '/importer.php'
+    );
 
-	wp_register_style(
-		'wordpoints-importer-feedback'
-		, $assets_url . '/css/feedback.css'
-	);
+    wp_register_style(
+        'wordpoints-importer-feedback'
+        , $assets_url . '/css/feedback.css'
+    );
 }
 add_action( 'init', 'wordpoints_importer_register_admin_scripts' );
 
@@ -91,41 +91,41 @@ 
  */
 function wordpoints_importer_do_import() {
 
-	if ( ! defined( 'IFRAME_REQUEST' ) ) {
-		define( 'IFRAME_REQUEST', true );
-	}
+    if ( ! defined( 'IFRAME_REQUEST' ) ) {
+        define( 'IFRAME_REQUEST', true );
+    }
 
-	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_die( esc_html__( 'Sorry, you are not allowed to import to WordPoints.', 'wordpoints-importer' ) );
-	}
+    if ( ! current_user_can( 'manage_options' ) ) {
+        wp_die( esc_html__( 'Sorry, you are not allowed to import to WordPoints.', 'wordpoints-importer' ) );
+    }
 
-	check_admin_referer( 'wordpoints_import' );
+    check_admin_referer( 'wordpoints_import' );
 
-	if ( ! isset( $_GET['importer'] ) ) {
-		wp_die( esc_html__( 'No importer selected.', 'wordpoints-importer' ) );
-	}
+    if ( ! isset( $_GET['importer'] ) ) {
+        wp_die( esc_html__( 'No importer selected.', 'wordpoints-importer' ) );
+    }
 
-	$importer = WordPoints_Importers::get_importer(
-		sanitize_key( $_GET['importer'] )
-	);
+    $importer = WordPoints_Importers::get_importer(
+        sanitize_key( $_GET['importer'] )
+    );
 
-	if ( ! ( $importer instanceof WordPoints_Importer ) ) {
-		wp_die( esc_html__( 'Importer not installed.', 'wordpoints-importer' ) );
-	}
+    if ( ! ( $importer instanceof WordPoints_Importer ) ) {
+        wp_die( esc_html__( 'Importer not installed.', 'wordpoints-importer' ) );
+    }
 
-	wp_enqueue_style( 'wordpoints-importer-feedback' );
+    wp_enqueue_style( 'wordpoints-importer-feedback' );
 
-	$args = array();
+    $args = array();
 
-	if ( isset( $_GET['wordpoints_import'] ) && is_array( $_GET['wordpoints_import'] ) ) {
-		$args = wp_unslash( $_GET['wordpoints_import'] ); // WPCS: sanitization OK.
-	}
+    if ( isset( $_GET['wordpoints_import'] ) && is_array( $_GET['wordpoints_import'] ) ) {
+        $args = wp_unslash( $_GET['wordpoints_import'] ); // WPCS: sanitization OK.
+    }
 
-	iframe_header();
+    iframe_header();
 
-	$importer->do_import( $args );
+    $importer->do_import( $args );
 
-	iframe_footer();
+    iframe_footer();
 }
 add_action( 'update-custom_wordpoints_import', 'wordpoints_importer_do_import' );
 
@@ -136,9 +136,9 @@ 
  */
 function wordpoints_importer_admin_screen_points_type_select() {
 
-	$args = array( 'name' => 'wordpoints_import[points][_data][points_type]' );
+    $args = array( 'name' => 'wordpoints_import[points][_data][points_type]' );
 
-	?>
+    ?>
 
 	<p>
 		<label for="wordpoints_import[points][_data][points_type]">
@@ -150,8 +150,8 @@ 
 	<?php
 }
 add_action(
-	'wordpoints_importer_before_component_options-points'
-	, 'wordpoints_importer_admin_screen_points_type_select'
+    'wordpoints_importer_before_component_options-points'
+    , 'wordpoints_importer_admin_screen_points_type_select'
 );
 
 /**
@@ -167,24 +167,24 @@ 
  */
 function wordpoints_importer_validate_points_type_setting( $valid, $settings, $feedback ) {
 
-	if ( $valid ) {
+    if ( $valid ) {
 
-		if ( ! isset( $settings['points_type'] ) ) {
-			$feedback->warning( __( 'Skipping Points component—no points type specified.', 'wordpoints-importer' ) );
-			$valid = false;
-		} elseif ( ! wordpoints_is_points_type( $settings['points_type'] ) ) {
-			$feedback->warning( __( 'Skipping Points component—invalid points type selected.', 'wordpoints-importer' ) );
-			$valid = false;
-		}
-	}
+        if ( ! isset( $settings['points_type'] ) ) {
+            $feedback->warning( __( 'Skipping Points component—no points type specified.', 'wordpoints-importer' ) );
+            $valid = false;
+        } elseif ( ! wordpoints_is_points_type( $settings['points_type'] ) ) {
+            $feedback->warning( __( 'Skipping Points component—invalid points type selected.', 'wordpoints-importer' ) );
+            $valid = false;
+        }
+    }
 
-	return $valid;
+    return $valid;
 }
 add_action(
-	'wordpoints_import_settings_valid-points'
-	, 'wordpoints_importer_validate_points_type_setting'
-	, 10
-	, 3
+    'wordpoints_import_settings_valid-points'
+    , 'wordpoints_importer_validate_points_type_setting'
+    , 10
+    , 3
 );
 
 /**
@@ -194,20 +194,20 @@ 
  */
 function wordpoints_importer_admin_screen_rank_group_select() {
 
-	$rank_groups = WordPoints_Rank_Groups::get();
+    $rank_groups = WordPoints_Rank_Groups::get();
 
-	// See https://github.com/WordPoints/wordpoints/issues/310.
-	$options = array();
-	foreach ( $rank_groups as $rank_group ) {
-		$options[ $rank_group->slug ] = $rank_group->name;
-	}
+    // See https://github.com/WordPoints/wordpoints/issues/310.
+    $options = array();
+    foreach ( $rank_groups as $rank_group ) {
+        $options[ $rank_group->slug ] = $rank_group->name;
+    }
 
-	$dropdown = new WordPoints_Dropdown_Builder(
-		$options
-		, array( 'name' => 'wordpoints_import[ranks][_data][rank_group]' )
-	);
+    $dropdown = new WordPoints_Dropdown_Builder(
+        $options
+        , array( 'name' => 'wordpoints_import[ranks][_data][rank_group]' )
+    );
 
-	?>
+    ?>
 
 	<p>
 		<label for="wordpoints_import[ranks][_data][rank_group]">
@@ -219,8 +219,8 @@ 
 <?php
 }
 add_action(
-	'wordpoints_importer_before_component_options-ranks'
-	, 'wordpoints_importer_admin_screen_rank_group_select'
+    'wordpoints_importer_before_component_options-ranks'
+    , 'wordpoints_importer_admin_screen_rank_group_select'
 );
 
 /**
@@ -236,24 +236,24 @@ 
  */
 function wordpoints_importer_validate_rank_group_setting( $valid, $settings, $feedback ) {
 
-	if ( $valid ) {
+    if ( $valid ) {
 
-		if ( ! isset( $settings['rank_group'] ) ) {
-			$feedback->warning( __( 'Skipping Ranks component—no rank group specified.', 'wordpoints-importer' ) );
-			$valid = false;
-		} elseif ( ! WordPoints_Rank_Groups::is_group_registered( $settings['rank_group'] ) ) {
-			$feedback->warning( __( 'Skipping Ranks component—invalid rank group selected.', 'wordpoints-importer' ) );
-			$valid = false;
-		}
-	}
+        if ( ! isset( $settings['rank_group'] ) ) {
+            $feedback->warning( __( 'Skipping Ranks component—no rank group specified.', 'wordpoints-importer' ) );
+            $valid = false;
+        } elseif ( ! WordPoints_Rank_Groups::is_group_registered( $settings['rank_group'] ) ) {
+            $feedback->warning( __( 'Skipping Ranks component—invalid rank group selected.', 'wordpoints-importer' ) );
+            $valid = false;
+        }
+    }
 
-	return $valid;
+    return $valid;
 }
 add_action(
-	'wordpoints_import_settings_valid-ranks'
-	, 'wordpoints_importer_validate_rank_group_setting'
-	, 10
-	, 3
+    'wordpoints_import_settings_valid-ranks'
+    , 'wordpoints_importer_validate_rank_group_setting'
+    , 10
+    , 3
 );
 
 // EOF

Spacing +45 added lines, -45 removed lines

@@ -16,8 +16,8 @@ 
 
 	add_submenu_page(
 		wordpoints_get_main_admin_menu()
-		,__( 'WordPoints — Import', 'wordpoints-importer' )
-		,__( 'Import', 'wordpoints-importer' )
+		,__('WordPoints — Import', 'wordpoints-importer')
+		,__('Import', 'wordpoints-importer')
 		,'manage_options'
 		,'wordpoints_import'
 		,'wordpoints_import_admin_screen'
@@ -25,15 +25,15 @@ 
 
 	add_submenu_page(
 		'_wordpoints_import' // Fake.
-		,__( 'WordPoints — Importing', 'wordpoints-importer' )
-		,__( 'Importing', 'wordpoints-importer' )
+		,__('WordPoints — Importing', 'wordpoints-importer')
+		,__('Importing', 'wordpoints-importer')
 		,'manage_options'
 		,'wordpoints_importing'
 		,'wordpoints_importing_admin_screen'
 	);
 }
-add_action( 'admin_menu', 'wordpoints_importer_admin_menu' );
-add_action( 'network_admin_menu', 'wordpoints_importer_admin_menu' );
+add_action('admin_menu', 'wordpoints_importer_admin_menu');
+add_action('network_admin_menu', 'wordpoints_importer_admin_menu');
 
 /**
  * Display the importer administration screen.
@@ -47,7 +47,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	require( dirname( __FILE__ ) . '/screens/import.php' );
+	require(dirname(__FILE__).'/screens/import.php');
 }
 
 /**
@@ -62,7 +62,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	require( dirname( __FILE__ ) . '/screens/importing.php' );
+	require(dirname(__FILE__).'/screens/importing.php');
 }
 
 /**
@@ -74,15 +74,15 @@ 
 
 	$assets_url = wordpoints_modules_url(
 		'admin/assets'
-		, dirname( dirname( __FILE__ ) ) . '/importer.php'
+		, dirname(dirname(__FILE__)).'/importer.php'
 	);
 
 	wp_register_style(
 		'wordpoints-importer-feedback'
-		, $assets_url . '/css/feedback.css'
+		, $assets_url.'/css/feedback.css'
 	);
 }
-add_action( 'init', 'wordpoints_importer_register_admin_scripts' );
+add_action('init', 'wordpoints_importer_register_admin_scripts');
 
 /**
  * Handle an import request.
@@ -91,43 +91,43 @@ 
  */
 function wordpoints_importer_do_import() {
 
-	if ( ! defined( 'IFRAME_REQUEST' ) ) {
-		define( 'IFRAME_REQUEST', true );
+	if (!defined('IFRAME_REQUEST')) {
+		define('IFRAME_REQUEST', true);
 	}
 
-	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_die( esc_html__( 'Sorry, you are not allowed to import to WordPoints.', 'wordpoints-importer' ) );
+	if (!current_user_can('manage_options')) {
+		wp_die(esc_html__('Sorry, you are not allowed to import to WordPoints.', 'wordpoints-importer'));
 	}
 
-	check_admin_referer( 'wordpoints_import' );
+	check_admin_referer('wordpoints_import');
 
-	if ( ! isset( $_GET['importer'] ) ) {
-		wp_die( esc_html__( 'No importer selected.', 'wordpoints-importer' ) );
+	if (!isset($_GET['importer'])) {
+		wp_die(esc_html__('No importer selected.', 'wordpoints-importer'));
 	}
 
 	$importer = WordPoints_Importers::get_importer(
-		sanitize_key( $_GET['importer'] )
+		sanitize_key($_GET['importer'])
 	);
 
-	if ( ! ( $importer instanceof WordPoints_Importer ) ) {
-		wp_die( esc_html__( 'Importer not installed.', 'wordpoints-importer' ) );
+	if (!($importer instanceof WordPoints_Importer)) {
+		wp_die(esc_html__('Importer not installed.', 'wordpoints-importer'));
 	}
 
-	wp_enqueue_style( 'wordpoints-importer-feedback' );
+	wp_enqueue_style('wordpoints-importer-feedback');
 
 	$args = array();
 
-	if ( isset( $_GET['wordpoints_import'] ) && is_array( $_GET['wordpoints_import'] ) ) {
-		$args = wp_unslash( $_GET['wordpoints_import'] ); // WPCS: sanitization OK.
+	if (isset($_GET['wordpoints_import']) && is_array($_GET['wordpoints_import'])) {
+		$args = wp_unslash($_GET['wordpoints_import']); // WPCS: sanitization OK.
 	}
 
 	iframe_header();
 
-	$importer->do_import( $args );
+	$importer->do_import($args);
 
 	iframe_footer();
 }
-add_action( 'update-custom_wordpoints_import', 'wordpoints_importer_do_import' );
+add_action('update-custom_wordpoints_import', 'wordpoints_importer_do_import');
 
 /**
  * Display a points type dropdown above the points component settings.
@@ -136,14 +136,14 @@ 
  */
 function wordpoints_importer_admin_screen_points_type_select() {
 
-	$args = array( 'name' => 'wordpoints_import[points][_data][points_type]' );
+	$args = array('name' => 'wordpoints_import[points][_data][points_type]');
 
 	?>
 
 	<p>
 		<label for="wordpoints_import[points][_data][points_type]">
-			<?php esc_html_e( 'Import to points type:', 'wordpoints-importer' ); ?>
-			<?php wordpoints_points_types_dropdown( $args ); ?>
+			<?php esc_html_e('Import to points type:', 'wordpoints-importer'); ?>
+			<?php wordpoints_points_types_dropdown($args); ?>
 		</label>
 	</p>
 
@@ -165,15 +165,15 @@ 
  *
  * @return bool Whether the settings are valid.
  */
-function wordpoints_importer_validate_points_type_setting( $valid, $settings, $feedback ) {
+function wordpoints_importer_validate_points_type_setting($valid, $settings, $feedback) {
 
-	if ( $valid ) {
+	if ($valid) {
 
-		if ( ! isset( $settings['points_type'] ) ) {
-			$feedback->warning( __( 'Skipping Points component—no points type specified.', 'wordpoints-importer' ) );
+		if (!isset($settings['points_type'])) {
+			$feedback->warning(__('Skipping Points component—no points type specified.', 'wordpoints-importer'));
 			$valid = false;
-		} elseif ( ! wordpoints_is_points_type( $settings['points_type'] ) ) {
-			$feedback->warning( __( 'Skipping Points component—invalid points type selected.', 'wordpoints-importer' ) );
+		} elseif (!wordpoints_is_points_type($settings['points_type'])) {
+			$feedback->warning(__('Skipping Points component—invalid points type selected.', 'wordpoints-importer'));
 			$valid = false;
 		}
 	}
@@ -198,20 +198,20 @@ 
 
 	// See https://github.com/WordPoints/wordpoints/issues/310.
 	$options = array();
-	foreach ( $rank_groups as $rank_group ) {
-		$options[ $rank_group->slug ] = $rank_group->name;
+	foreach ($rank_groups as $rank_group) {
+		$options[$rank_group->slug] = $rank_group->name;
 	}
 
 	$dropdown = new WordPoints_Dropdown_Builder(
 		$options
-		, array( 'name' => 'wordpoints_import[ranks][_data][rank_group]' )
+		, array('name' => 'wordpoints_import[ranks][_data][rank_group]')
 	);
 
 	?>
 
 	<p>
 		<label for="wordpoints_import[ranks][_data][rank_group]">
-			<?php esc_html_e( 'Import to rank group:', 'wordpoints-importer' ); ?>
+			<?php esc_html_e('Import to rank group:', 'wordpoints-importer'); ?>
 			<?php $dropdown->display(); ?>
 		</label>
 	</p>
@@ -234,15 +234,15 @@ 
  *
  * @return bool Whether the settings are valid.
  */
-function wordpoints_importer_validate_rank_group_setting( $valid, $settings, $feedback ) {
+function wordpoints_importer_validate_rank_group_setting($valid, $settings, $feedback) {
 
-	if ( $valid ) {
+	if ($valid) {
 
-		if ( ! isset( $settings['rank_group'] ) ) {
-			$feedback->warning( __( 'Skipping Ranks component—no rank group specified.', 'wordpoints-importer' ) );
+		if (!isset($settings['rank_group'])) {
+			$feedback->warning(__('Skipping Ranks component—no rank group specified.', 'wordpoints-importer'));
 			$valid = false;
-		} elseif ( ! WordPoints_Rank_Groups::is_group_registered( $settings['rank_group'] ) ) {
-			$feedback->warning( __( 'Skipping Ranks component—invalid rank group selected.', 'wordpoints-importer' ) );
+		} elseif (!WordPoints_Rank_Groups::is_group_registered($settings['rank_group'])) {
+			$feedback->warning(__('Skipping Ranks component—invalid rank group selected.', 'wordpoints-importer'));
 			$valid = false;
 		}
 	}

tests/phpunit/includes/functions.php

Indentation +31 added lines, -31 removed lines

@@ -19,22 +19,22 @@ 
 // Back-compat with WordPoints 2.1.
 if ( class_exists( 'WordPoints_PHPUnit_Bootstrap_Loader' ) ) {
 
-	$loader = WordPoints_PHPUnit_Bootstrap_Loader::instance();
-	$loader->add_plugin( 'cubepoints/cubepoints.php' );
-	$loader->add_php_file(
-		WORDPOINTS_IMPORTER_TESTS_DIR . '/includes/activate-cubepoints-components.php'
-		, 'after'
-		, array( 'dailypoints', 'post_author_points' )
-	);
+    $loader = WordPoints_PHPUnit_Bootstrap_Loader::instance();
+    $loader->add_plugin( 'cubepoints/cubepoints.php' );
+    $loader->add_php_file(
+        WORDPOINTS_IMPORTER_TESTS_DIR . '/includes/activate-cubepoints-components.php'
+        , 'after'
+        , array( 'dailypoints', 'post_author_points' )
+    );
 
 } elseif ( ! defined( 'WORDPOINTS_MODULE_TESTS_LOADER' ) ) {
 
-	/**
-	 * The function that loads the module for the tests.
-	 *
-	 * @since 1.0.0
-	 */
-	define( 'WORDPOINTS_MODULE_TESTS_LOADER', 'wordpoints_importer_tests_manually_load_module' );
+    /**
+     * The function that loads the module for the tests.
+     *
+     * @since 1.0.0
+     */
+    define( 'WORDPOINTS_MODULE_TESTS_LOADER', 'wordpoints_importer_tests_manually_load_module' );
 }
 
 /**
@@ -45,10 +45,10 @@ 
  */
 function wordpoints_importer_tests_manually_load_module() {
 
-	require( WORDPOINTS_IMPORTER_TESTS_DIR . '/../../src/importer.php' );
-	require( WORDPOINTS_IMPORTER_TESTS_DIR . '/../../src/admin/admin.php' );
+    require( WORDPOINTS_IMPORTER_TESTS_DIR . '/../../src/importer.php' );
+    require( WORDPOINTS_IMPORTER_TESTS_DIR . '/../../src/admin/admin.php' );
 
-	wordpoints_importer_tests_manually_load_cubepoints();
+    wordpoints_importer_tests_manually_load_cubepoints();
 }
 
 /**
@@ -59,25 +59,25 @@ 
  */
 function wordpoints_importer_tests_manually_load_cubepoints() {
 
-	require( WP_PLUGIN_DIR . '/cubepoints/cubepoints.php' );
+    require( WP_PLUGIN_DIR . '/cubepoints/cubepoints.php' );
 
-	cp_activate();
+    cp_activate();
 
-	// We activate these now so that they will be fully loaded. Otherwise only part
-	// of their functions will be loaded, as the rest are defined in a conditional.
-	// Because of some of the functions are defined outside of the conditional, there
-	// is no way for us to load the functions later without a fatal error from
-	// "already defined function".
-	cp_module_activation_set( 'dailypoints', 'active' );
-	cp_module_activation_set( 'post_author_points', 'active' );
+    // We activate these now so that they will be fully loaded. Otherwise only part
+    // of their functions will be loaded, as the rest are defined in a conditional.
+    // Because of some of the functions are defined outside of the conditional, there
+    // is no way for us to load the functions later without a fatal error from
+    // "already defined function".
+    cp_module_activation_set( 'dailypoints', 'active' );
+    cp_module_activation_set( 'post_author_points', 'active' );
 
-	// We have to do this manually here after WordPress 4.7.
-	// https://core.trac.wordpress.org/ticket/38011#comment:3
-	global $wp_version;
+    // We have to do this manually here after WordPress 4.7.
+    // https://core.trac.wordpress.org/ticket/38011#comment:3
+    global $wp_version;
 
-	if ( version_compare( $wp_version, '4.6', '>' ) ) {
-		cp_modules_include();
-	}
+    if ( version_compare( $wp_version, '4.6', '>' ) ) {
+        cp_modules_include();
+    }
 }
 
 // EOF

Spacing +13 added lines, -13 removed lines

@@ -14,27 +14,27 @@ 
  *
  * @type string
  */
-define( 'WORDPOINTS_IMPORTER_TESTS_DIR', dirname( dirname( __FILE__ ) ) );
+define('WORDPOINTS_IMPORTER_TESTS_DIR', dirname(dirname(__FILE__)));
 
 // Back-compat with WordPoints 2.1.
-if ( class_exists( 'WordPoints_PHPUnit_Bootstrap_Loader' ) ) {
+if (class_exists('WordPoints_PHPUnit_Bootstrap_Loader')) {
 
 	$loader = WordPoints_PHPUnit_Bootstrap_Loader::instance();
-	$loader->add_plugin( 'cubepoints/cubepoints.php' );
+	$loader->add_plugin('cubepoints/cubepoints.php');
 	$loader->add_php_file(
-		WORDPOINTS_IMPORTER_TESTS_DIR . '/includes/activate-cubepoints-components.php'
+		WORDPOINTS_IMPORTER_TESTS_DIR.'/includes/activate-cubepoints-components.php'
 		, 'after'
-		, array( 'dailypoints', 'post_author_points' )
+		, array('dailypoints', 'post_author_points')
 	);
 
-} elseif ( ! defined( 'WORDPOINTS_MODULE_TESTS_LOADER' ) ) {
+} elseif (!defined('WORDPOINTS_MODULE_TESTS_LOADER')) {
 
 	/**
 	 * The function that loads the module for the tests.
 	 *
 	 * @since 1.0.0
 	 */
-	define( 'WORDPOINTS_MODULE_TESTS_LOADER', 'wordpoints_importer_tests_manually_load_module' );
+	define('WORDPOINTS_MODULE_TESTS_LOADER', 'wordpoints_importer_tests_manually_load_module');
 }
 
 /**
@@ -45,8 +45,8 @@ 
  */
 function wordpoints_importer_tests_manually_load_module() {
 
-	require( WORDPOINTS_IMPORTER_TESTS_DIR . '/../../src/importer.php' );
-	require( WORDPOINTS_IMPORTER_TESTS_DIR . '/../../src/admin/admin.php' );
+	require(WORDPOINTS_IMPORTER_TESTS_DIR.'/../../src/importer.php');
+	require(WORDPOINTS_IMPORTER_TESTS_DIR.'/../../src/admin/admin.php');
 
 	wordpoints_importer_tests_manually_load_cubepoints();
 }
@@ -59,7 +59,7 @@ 
  */
 function wordpoints_importer_tests_manually_load_cubepoints() {
 
-	require( WP_PLUGIN_DIR . '/cubepoints/cubepoints.php' );
+	require(WP_PLUGIN_DIR.'/cubepoints/cubepoints.php');
 
 	cp_activate();
 
@@ -68,14 +68,14 @@ 
 	// Because of some of the functions are defined outside of the conditional, there
 	// is no way for us to load the functions later without a fatal error from
 	// "already defined function".
-	cp_module_activation_set( 'dailypoints', 'active' );
-	cp_module_activation_set( 'post_author_points', 'active' );
+	cp_module_activation_set('dailypoints', 'active');
+	cp_module_activation_set('post_author_points', 'active');
 
 	// We have to do this manually here after WordPress 4.7.
 	// https://core.trac.wordpress.org/ticket/38011#comment:3
 	global $wp_version;
 
-	if ( version_compare( $wp_version, '4.6', '>' ) ) {
+	if (version_compare($wp_version, '4.6', '>')) {
 		cp_modules_include();
 	}
 }