WordPoints / importer

src/includes/importers/cubepoints.php

Doc Comments +6 added lines

@@ -65,6 +65,7 @@ 
 
 	/**
 	 * @since 1.0.0
+	 * @param string $name
 	 */
 	public function __construct( $name ) {
 
@@ -611,6 +612,11 @@ 
 	 * Generate the log text when importing a points log.
 	 *
 	 * @since 1.0.0
+	 * @param string $text
+	 * @param integer $user_id
+	 * @param integer $points
+	 * @param string $points_type
+	 * @param string $log_type
 	 */
 	public function render_points_log_text( $text, $user_id, $points, $points_type, $log_type, $meta ) {
 

Indentation +668 added lines, -668 removed lines

@@ -14,702 +14,702 @@
  */
 class WordPoints_CubePoints_Importer extends WordPoints_Importer {
 
-	/**
-	 * Reversible log types indexed by the reversing log type.
-	 *
-	 * This information is used to set the `auto_reversed` and `original_log_id`
-	 * points log metadata for the imported logs.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @see WordPoints_CubePoints_Importer::import_points_log()
-	 *
-	 * @var array
-	 */
-	protected $reversible_log_types = array(
-		'comment_remove'      => 'comment',
-		'post_comment_remove' => 'post_comment',
-	);
-
-	/**
-	 * Primary entity slugs for each imported log type.
-	 *
-	 * These are points log meta keys under which to save the entity ID in the
-	 * CubePoints `data` log field.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @see WordPoints_CubePoints_Importer::import_points_log()
-	 *
-	 * @var array
-	 */
-	protected $log_type_entities = array(
-		'comment'             => 'comment',
-		'comment_remove'      => 'comment',
-		'post'                => 'post',
-		'post_comment'        => 'comment',
-		'post_comment_remove' => 'comment',
-		'register'            => 'user',
-	);
-
-	/**
-	 * IDs of reversible logs, indexed by CubePoints log type and object ID.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @see WordPoints_CubePoints_Importer::import_points_log()
-	 *
-	 * @var int[][]
-	 */
-	protected $reversible_log_ids;
-
-	/**
-	 * @since 1.0.0
-	 */
-	public function __construct( $name ) {
-
-		parent::__construct( $name );
-
-		$this->components = array(
-			'points' => array(
-				'excluded_users' => array(
-					'label' => __( 'Excluded users', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_excluded_users' ),
-				),
-				'settings'    => array(
-					'label' => __( 'Points Reactions', 'wordpoints-importer' ),
-					'description' => __( 'If checked, the settings for the number of points to award for posts, comments, etc. are imported.', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_points_settings' ),
-				),
-				'user_points' => array(
-					'label' => __( 'User points', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_user_points' ),
-				),
-				'logs' => array(
-					'label' => __( 'Points logs', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_points_logs' ),
-					'can_import' => array( $this, 'can_import_points_logs' ),
-				),
-			),
-			'ranks' => array(
-				'ranks' => array(
-					'label' => __( 'Rank settings', 'wordpoints-importer' ),
-					'description' => __( 'If checked, the list of ranks is imported, and users will have the correct ranks assigned to them.', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_ranks' ),
-				),
-			),
-		);
-	}
-
-	/**
-	 * @since 1.0.0
-	 */
-	public function is_available() {
-
-		if ( ! $this->is_cubepoints_installed() ) {
-			return new WP_Error(
-				'cubepoints_not_installed'
-				, __( 'CubePoints is not installed', 'wordpoints-importer' )
-			);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if CubePoints is installed.
-	 *
-	 * @since 1.0.0
-	 */
-	public function is_cubepoints_installed() {
-
-		return (bool) get_option( 'cp_db_version' );
-	}
-
-	/**
-	 * Check if CubePoints is active.
-	 *
-	 * @since 1.0.0
-	 */
-	public function is_cubepoints_active() {
-
-		return function_exists( 'cp_ready' );
-	}
-
-	/**
-	 * Import the excluded users.
-	 *
-	 * @since 1.0.0
-	 */
-	protected function import_excluded_users() {
-
-		$this->feedback->info( __( 'Importing excluded users…', 'wordpoints-importer' ) );
-
-		$excluded_users = get_option( 'cp_topfilter' );
-
-		if ( ! is_array( $excluded_users ) ) {
-			$this->feedback->warning( __( 'No excluded users found.', 'wordpoints-importer' ) );
-			return;
-		}
-
-		$user_ids = array();
-
-		foreach ( $excluded_users as $user_login ) {
-
-			$user = get_user_by( 'login', $user_login );
-
-			if ( $user instanceof WP_User ) {
-				$user_ids[] = $user->ID;
-			}
-		}
-
-		$excluded_user_ids = wordpoints_get_maybe_network_array_option(
-			'wordpoints_excluded_users'
-		);
-
-		$excluded_user_ids = array_unique(
-			array_merge( $excluded_user_ids, $user_ids )
-		);
-
-		wordpoints_update_maybe_network_option(
-			'wordpoints_excluded_users'
-			, $excluded_user_ids
-		);
-
-		$this->feedback->success(
-			sprintf(
-				__( 'Imported %s excluded users.', 'wordpoints-importer' )
-				, count( $user_ids )
-			)
-		);
-	}
-
-	/**
-	 * Import the points settings to the points hooks.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @param array $settings The settings for the points component import.
-	 */
-	protected function import_points_settings( $settings ) {
-
-		$this->feedback->info( __( 'Importing points reactions…', 'wordpoints-importer' ) );
-
-		$options = array(
-			'cp_comment_points'     => array(
-				'event' => 'comment_leave\post',
-				'target' => array( 'comment\post', 'author', 'user' ),
-				/* translators: The post type name */
-				'log_text' => __( 'Comment on a %s.', 'wordpoints-importer' ),
-				/* translators: The post type name */
-				'description' => __( 'Commenting on a %s.', 'wordpoints-importer' ),
-				'legacy_log_type' => 'cubepoints-comment',
-				'legacy_meta_key' => 'comment',
-			),
-			'cp_post_points'        => array(
-				'event' => 'post_publish\post',
-				'target' => array( 'post\post', 'author', 'user' ),
-				/* translators: The post type name */
-				'log_text' => __( 'Published a Post.', 'wordpoints-importer' ),
-				/* translators: The post type name */
-				'description' => __( 'Publishing a Post.', 'wordpoints-importer' ),
-				'legacy_log_type' => 'cubepoints-post',
-				'legacy_meta_key' => 'post',
-				// CubePoints doesn't remove points when a post is deleted.
-				'blocker' => array( 'toggle_off' => true ),
-				'points_legacy_repeat_blocker' => array( 'toggle_on' => true ),
-			),
-			'cp_reg_points'         => array(
-				'event' => 'user_register',
-				'log_text' => __( 'Registration.', 'wordpoints-importer' ),
-				'description' => __( 'Registration.', 'wordpoints-importer' ),
-				'legacy_log_type' => 'cubepoints-register',
-			),
-			'cp_post_author_points' => array(
-				'event' => 'comment_leave\post',
-				'target' => array( 'comment\post', 'post\post', 'post\post', 'author', 'user' ),
-				/* translators: The post type name */
-				'log_text' => __( 'Received a comment on a %s.', 'wordpoints-importer' ),
-				/* translators: The post type name */
-				'description' => __( 'Receiving a comment on a %s.', 'wordpoints-importer' ),
-				'legacy_log_type' => 'cubepoints-post_author',
-				'legacy_meta_key' => 'comment',
-			),
-		);
-
-		// Don't import this module setting if the module isn't active.
-		if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'post_author_points' ) ) {
-			unset( $options['cp_post_author_points'] );
-		}
-
-		$imported = 0;
-
-		foreach ( $options as $option => $hook_settings ) {
-
-			$points = get_option( $option );
-
-			if ( wordpoints_posint( $points ) ) {
-
-				$hook_settings['points'] = $points;
-				$hook_settings['points_type'] = $settings['points_type'];
-
-				if (
-					// The CubePoints post points were only awarded for Posts.
-					'post_publish\post' !== $hook_settings['event']
-					&& strpos( $hook_settings['event'], '\post' )
-				) {
-
-					$post_type_slugs = get_post_types( array( 'public' => true ) );
-
-					foreach ( $post_type_slugs as $post_type_slug ) {
-
-						$added = $this->add_points_hook(
-							$this->format_settings_for_post_type(
-								$post_type_slug
-								, $hook_settings
-							)
-						);
-
-						if ( $added ) {
-							$imported++;
-						}
-					}
-
-				} else {
-					if ( $this->add_points_hook( $hook_settings ) ) {
-						$imported++;
-					}
-				}
-			}
-
-		} // End foreach ( $options ).
-
-		if ( $this->import_daily_points_hook( $settings ) ) {
-			$imported++;
-		}
-
-		$this->feedback->success(
-			sprintf( __( 'Imported %s points reactions.', 'wordpoints-importer' ), $imported )
-		);
-	}
-
-	/**
-	 * Import the settings for the Daily Points module to a points hook.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @param array $settings The settings for the points component import.
-	 *
-	 * @return bool True if the settings were imported, false otherwise.
-	 */
-	protected function import_daily_points_hook( $settings ) {
-
-		// Don't import this module setting if the module isn't active.
-		if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'dailypoints' ) ) {
-			return false;
-		}
-
-		$points = get_option( 'cp_module_dailypoints_points' );
-		$period = get_option( 'cp_module_dailypoints_time' );
-
-		if ( ! wordpoints_int( $points ) || ! wordpoints_posint( $period ) ) {
-			return false;
-		}
-
-		return $this->add_points_hook(
-			array(
-				'event' => 'user_visit',
-				'target' => array( 'current:user' ),
-				'reactor' => 'points_legacy',
-				'points' => $points,
-				'points_type' => $settings['points_type'],
-				'points_legacy_periods' => array(
-					'fire' => array(
-						array(
-							'length' => $period,
-							'args' => array( array( 'current:user' ) ),
-							'relative' => true,
-						),
-					),
-				),
-				'log_text' => __( 'Visiting the site.', 'wordpoints-importer' ),
-				'description' => __( 'Visiting the site.', 'wordpoints-importer' ),
-				'points_legacy_reversals' => array(),
-				'legacy_log_type' => 'cubepoints-dailypoints',
-			)
-		);
-	}
-
-	/**
-	 * Programmatically create a new instance of a points hook.
-	 *
-	 * @since 1.0.0
-	 * @since 1.2.0 Now just accepts a single argument, $settings.
-	 *
-	 * @param array $settings The settings for this hook.
-	 *
-	 * @return bool True if added successfully, or false on failure.
-	 */
-	private function add_points_hook( $settings = array() ) {
-
-		$reaction_store = wordpoints_hooks()->get_reaction_store( 'points' );
-
-		$settings = array_merge(
-			array(
-				'target' => array( 'user' ),
-				'reactor' => 'points_legacy',
-				'points_legacy_reversals' => array( 'toggle_off' => 'toggle_on' ),
-			)
-			, $settings
-		);
-
-		$reaction = $reaction_store->create_reaction( $settings );
-
-		if ( ! $reaction instanceof WordPoints_Hook_ReactionI ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Format the settings for a reaction for a particular post type.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @param string $post_type The slug of the post type to format the settings for.
-	 * @param array  $settings  The reaction settings.
-	 *
-	 * @return array The settings modified for this particular post type.
-	 */
-	protected function format_settings_for_post_type( $post_type, $settings ) {
-
-		$settings['event'] = str_replace(
-			'\post'
-			, '\\' . $post_type
-			, $settings['event']
-		);
-
-		$settings['target'] = str_replace(
-			'\post'
-			, '\\' . $post_type
-			, $settings['target']
-		);
-
-		$labels = get_post_type_labels( get_post_type_object( $post_type ) );
-
-		$settings['log_text'] = sprintf( $settings['log_text'], $labels->singular_name );
-		$settings['description'] = sprintf( $settings['description'], $labels->singular_name );
-
-		return $settings;
-	}
-
-	/**
-	 * Import the user points.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array $settings The settings for the points component import.
-	 */
-	protected function import_user_points( $settings ) {
-
-		$this->feedback->info( __( 'Importing users' points…', 'wordpoints-importer' ) );
-
-		// We don't log the import transactions.
-		add_filter( 'wordpoints_points_log', '__return_false' );
-
-		$start = 0;
-
-		// We do the import in batches.
-		while ( $rows = $this->get_next_user_points_batch( $start ) ) {
-
-			$start += count( $rows );
-
-			foreach ( $rows as $row ) {
-
-				wordpoints_alter_points(
-					$row->user_id
-					, $row->points
-					, $settings['points_type']
-					, 'cubepoints_import' // This is only for the hooks, it isn't being logged.
-				);
-			}
-
-			unset( $rows );
-		}
-
-		remove_filter( 'wordpoints_points_log', '__return_false' );
-
-		$this->feedback->success( sprintf( __( 'Imported points for %s users…', 'wordpoints-importer' ), $start ) );
-	}
-
-	/**
-	 * Get a batch of user points to import.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param int $start The offset number to begin counting at.
-	 *
-	 * @return object[]|false The rows, or false.
-	 */
-	protected function get_next_user_points_batch( $start ) {
-
-		global $wpdb;
-
-		$rows = $wpdb->get_results(
-			$wpdb->prepare(
-				"
+    /**
+     * Reversible log types indexed by the reversing log type.
+     *
+     * This information is used to set the `auto_reversed` and `original_log_id`
+     * points log metadata for the imported logs.
+     *
+     * @since 1.2.0
+     *
+     * @see WordPoints_CubePoints_Importer::import_points_log()
+     *
+     * @var array
+     */
+    protected $reversible_log_types = array(
+        'comment_remove'      => 'comment',
+        'post_comment_remove' => 'post_comment',
+    );
+
+    /**
+     * Primary entity slugs for each imported log type.
+     *
+     * These are points log meta keys under which to save the entity ID in the
+     * CubePoints `data` log field.
+     *
+     * @since 1.2.0
+     *
+     * @see WordPoints_CubePoints_Importer::import_points_log()
+     *
+     * @var array
+     */
+    protected $log_type_entities = array(
+        'comment'             => 'comment',
+        'comment_remove'      => 'comment',
+        'post'                => 'post',
+        'post_comment'        => 'comment',
+        'post_comment_remove' => 'comment',
+        'register'            => 'user',
+    );
+
+    /**
+     * IDs of reversible logs, indexed by CubePoints log type and object ID.
+     *
+     * @since 1.2.0
+     *
+     * @see WordPoints_CubePoints_Importer::import_points_log()
+     *
+     * @var int[][]
+     */
+    protected $reversible_log_ids;
+
+    /**
+     * @since 1.0.0
+     */
+    public function __construct( $name ) {
+
+        parent::__construct( $name );
+
+        $this->components = array(
+            'points' => array(
+                'excluded_users' => array(
+                    'label' => __( 'Excluded users', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_excluded_users' ),
+                ),
+                'settings'    => array(
+                    'label' => __( 'Points Reactions', 'wordpoints-importer' ),
+                    'description' => __( 'If checked, the settings for the number of points to award for posts, comments, etc. are imported.', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_points_settings' ),
+                ),
+                'user_points' => array(
+                    'label' => __( 'User points', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_user_points' ),
+                ),
+                'logs' => array(
+                    'label' => __( 'Points logs', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_points_logs' ),
+                    'can_import' => array( $this, 'can_import_points_logs' ),
+                ),
+            ),
+            'ranks' => array(
+                'ranks' => array(
+                    'label' => __( 'Rank settings', 'wordpoints-importer' ),
+                    'description' => __( 'If checked, the list of ranks is imported, and users will have the correct ranks assigned to them.', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_ranks' ),
+                ),
+            ),
+        );
+    }
+
+    /**
+     * @since 1.0.0
+     */
+    public function is_available() {
+
+        if ( ! $this->is_cubepoints_installed() ) {
+            return new WP_Error(
+                'cubepoints_not_installed'
+                , __( 'CubePoints is not installed', 'wordpoints-importer' )
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if CubePoints is installed.
+     *
+     * @since 1.0.0
+     */
+    public function is_cubepoints_installed() {
+
+        return (bool) get_option( 'cp_db_version' );
+    }
+
+    /**
+     * Check if CubePoints is active.
+     *
+     * @since 1.0.0
+     */
+    public function is_cubepoints_active() {
+
+        return function_exists( 'cp_ready' );
+    }
+
+    /**
+     * Import the excluded users.
+     *
+     * @since 1.0.0
+     */
+    protected function import_excluded_users() {
+
+        $this->feedback->info( __( 'Importing excluded users…', 'wordpoints-importer' ) );
+
+        $excluded_users = get_option( 'cp_topfilter' );
+
+        if ( ! is_array( $excluded_users ) ) {
+            $this->feedback->warning( __( 'No excluded users found.', 'wordpoints-importer' ) );
+            return;
+        }
+
+        $user_ids = array();
+
+        foreach ( $excluded_users as $user_login ) {
+
+            $user = get_user_by( 'login', $user_login );
+
+            if ( $user instanceof WP_User ) {
+                $user_ids[] = $user->ID;
+            }
+        }
+
+        $excluded_user_ids = wordpoints_get_maybe_network_array_option(
+            'wordpoints_excluded_users'
+        );
+
+        $excluded_user_ids = array_unique(
+            array_merge( $excluded_user_ids, $user_ids )
+        );
+
+        wordpoints_update_maybe_network_option(
+            'wordpoints_excluded_users'
+            , $excluded_user_ids
+        );
+
+        $this->feedback->success(
+            sprintf(
+                __( 'Imported %s excluded users.', 'wordpoints-importer' )
+                , count( $user_ids )
+            )
+        );
+    }
+
+    /**
+     * Import the points settings to the points hooks.
+     *
+     * @since 1.1.0
+     *
+     * @param array $settings The settings for the points component import.
+     */
+    protected function import_points_settings( $settings ) {
+
+        $this->feedback->info( __( 'Importing points reactions…', 'wordpoints-importer' ) );
+
+        $options = array(
+            'cp_comment_points'     => array(
+                'event' => 'comment_leave\post',
+                'target' => array( 'comment\post', 'author', 'user' ),
+                /* translators: The post type name */
+                'log_text' => __( 'Comment on a %s.', 'wordpoints-importer' ),
+                /* translators: The post type name */
+                'description' => __( 'Commenting on a %s.', 'wordpoints-importer' ),
+                'legacy_log_type' => 'cubepoints-comment',
+                'legacy_meta_key' => 'comment',
+            ),
+            'cp_post_points'        => array(
+                'event' => 'post_publish\post',
+                'target' => array( 'post\post', 'author', 'user' ),
+                /* translators: The post type name */
+                'log_text' => __( 'Published a Post.', 'wordpoints-importer' ),
+                /* translators: The post type name */
+                'description' => __( 'Publishing a Post.', 'wordpoints-importer' ),
+                'legacy_log_type' => 'cubepoints-post',
+                'legacy_meta_key' => 'post',
+                // CubePoints doesn't remove points when a post is deleted.
+                'blocker' => array( 'toggle_off' => true ),
+                'points_legacy_repeat_blocker' => array( 'toggle_on' => true ),
+            ),
+            'cp_reg_points'         => array(
+                'event' => 'user_register',
+                'log_text' => __( 'Registration.', 'wordpoints-importer' ),
+                'description' => __( 'Registration.', 'wordpoints-importer' ),
+                'legacy_log_type' => 'cubepoints-register',
+            ),
+            'cp_post_author_points' => array(
+                'event' => 'comment_leave\post',
+                'target' => array( 'comment\post', 'post\post', 'post\post', 'author', 'user' ),
+                /* translators: The post type name */
+                'log_text' => __( 'Received a comment on a %s.', 'wordpoints-importer' ),
+                /* translators: The post type name */
+                'description' => __( 'Receiving a comment on a %s.', 'wordpoints-importer' ),
+                'legacy_log_type' => 'cubepoints-post_author',
+                'legacy_meta_key' => 'comment',
+            ),
+        );
+
+        // Don't import this module setting if the module isn't active.
+        if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'post_author_points' ) ) {
+            unset( $options['cp_post_author_points'] );
+        }
+
+        $imported = 0;
+
+        foreach ( $options as $option => $hook_settings ) {
+
+            $points = get_option( $option );
+
+            if ( wordpoints_posint( $points ) ) {
+
+                $hook_settings['points'] = $points;
+                $hook_settings['points_type'] = $settings['points_type'];
+
+                if (
+                    // The CubePoints post points were only awarded for Posts.
+                    'post_publish\post' !== $hook_settings['event']
+                    && strpos( $hook_settings['event'], '\post' )
+                ) {
+
+                    $post_type_slugs = get_post_types( array( 'public' => true ) );
+
+                    foreach ( $post_type_slugs as $post_type_slug ) {
+
+                        $added = $this->add_points_hook(
+                            $this->format_settings_for_post_type(
+                                $post_type_slug
+                                , $hook_settings
+                            )
+                        );
+
+                        if ( $added ) {
+                            $imported++;
+                        }
+                    }
+
+                } else {
+                    if ( $this->add_points_hook( $hook_settings ) ) {
+                        $imported++;
+                    }
+                }
+            }
+
+        } // End foreach ( $options ).
+
+        if ( $this->import_daily_points_hook( $settings ) ) {
+            $imported++;
+        }
+
+        $this->feedback->success(
+            sprintf( __( 'Imported %s points reactions.', 'wordpoints-importer' ), $imported )
+        );
+    }
+
+    /**
+     * Import the settings for the Daily Points module to a points hook.
+     *
+     * @since 1.1.0
+     *
+     * @param array $settings The settings for the points component import.
+     *
+     * @return bool True if the settings were imported, false otherwise.
+     */
+    protected function import_daily_points_hook( $settings ) {
+
+        // Don't import this module setting if the module isn't active.
+        if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'dailypoints' ) ) {
+            return false;
+        }
+
+        $points = get_option( 'cp_module_dailypoints_points' );
+        $period = get_option( 'cp_module_dailypoints_time' );
+
+        if ( ! wordpoints_int( $points ) || ! wordpoints_posint( $period ) ) {
+            return false;
+        }
+
+        return $this->add_points_hook(
+            array(
+                'event' => 'user_visit',
+                'target' => array( 'current:user' ),
+                'reactor' => 'points_legacy',
+                'points' => $points,
+                'points_type' => $settings['points_type'],
+                'points_legacy_periods' => array(
+                    'fire' => array(
+                        array(
+                            'length' => $period,
+                            'args' => array( array( 'current:user' ) ),
+                            'relative' => true,
+                        ),
+                    ),
+                ),
+                'log_text' => __( 'Visiting the site.', 'wordpoints-importer' ),
+                'description' => __( 'Visiting the site.', 'wordpoints-importer' ),
+                'points_legacy_reversals' => array(),
+                'legacy_log_type' => 'cubepoints-dailypoints',
+            )
+        );
+    }
+
+    /**
+     * Programmatically create a new instance of a points hook.
+     *
+     * @since 1.0.0
+     * @since 1.2.0 Now just accepts a single argument, $settings.
+     *
+     * @param array $settings The settings for this hook.
+     *
+     * @return bool True if added successfully, or false on failure.
+     */
+    private function add_points_hook( $settings = array() ) {
+
+        $reaction_store = wordpoints_hooks()->get_reaction_store( 'points' );
+
+        $settings = array_merge(
+            array(
+                'target' => array( 'user' ),
+                'reactor' => 'points_legacy',
+                'points_legacy_reversals' => array( 'toggle_off' => 'toggle_on' ),
+            )
+            , $settings
+        );
+
+        $reaction = $reaction_store->create_reaction( $settings );
+
+        if ( ! $reaction instanceof WordPoints_Hook_ReactionI ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Format the settings for a reaction for a particular post type.
+     *
+     * @since 1.2.0
+     *
+     * @param string $post_type The slug of the post type to format the settings for.
+     * @param array  $settings  The reaction settings.
+     *
+     * @return array The settings modified for this particular post type.
+     */
+    protected function format_settings_for_post_type( $post_type, $settings ) {
+
+        $settings['event'] = str_replace(
+            '\post'
+            , '\\' . $post_type
+            , $settings['event']
+        );
+
+        $settings['target'] = str_replace(
+            '\post'
+            , '\\' . $post_type
+            , $settings['target']
+        );
+
+        $labels = get_post_type_labels( get_post_type_object( $post_type ) );
+
+        $settings['log_text'] = sprintf( $settings['log_text'], $labels->singular_name );
+        $settings['description'] = sprintf( $settings['description'], $labels->singular_name );
+
+        return $settings;
+    }
+
+    /**
+     * Import the user points.
+     *
+     * @since 1.0.0
+     *
+     * @param array $settings The settings for the points component import.
+     */
+    protected function import_user_points( $settings ) {
+
+        $this->feedback->info( __( 'Importing users' points…', 'wordpoints-importer' ) );
+
+        // We don't log the import transactions.
+        add_filter( 'wordpoints_points_log', '__return_false' );
+
+        $start = 0;
+
+        // We do the import in batches.
+        while ( $rows = $this->get_next_user_points_batch( $start ) ) {
+
+            $start += count( $rows );
+
+            foreach ( $rows as $row ) {
+
+                wordpoints_alter_points(
+                    $row->user_id
+                    , $row->points
+                    , $settings['points_type']
+                    , 'cubepoints_import' // This is only for the hooks, it isn't being logged.
+                );
+            }
+
+            unset( $rows );
+        }
+
+        remove_filter( 'wordpoints_points_log', '__return_false' );
+
+        $this->feedback->success( sprintf( __( 'Imported points for %s users…', 'wordpoints-importer' ), $start ) );
+    }
+
+    /**
+     * Get a batch of user points to import.
+     *
+     * @since 1.0.0
+     *
+     * @param int $start The offset number to begin counting at.
+     *
+     * @return object[]|false The rows, or false.
+     */
+    protected function get_next_user_points_batch( $start ) {
+
+        global $wpdb;
+
+        $rows = $wpdb->get_results(
+            $wpdb->prepare(
+                "
 					SELECT `user_id`, `meta_value` as points
 					FROM {$wpdb->usermeta}
 					WHERE `meta_key` = 'cpoints'
 					ORDER BY `umeta_id`
 					LIMIT %d,500
 				"
-				, $start
-			)
-		); // WPCS: cache OK.
-
-		if ( ! is_array( $rows ) ) {
-			return false;
-		}
-
-		return $rows;
-	}
-
-	/**
-	 * Check if the points logs can be imported.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return true|WP_Error True on success or a WP_Error on failure.
-	 */
-	public function can_import_points_logs() {
-
-		if ( ! $this->is_cubepoints_active() ) {
-
-			return new WP_Error(
-				'wordpoints_import_points_logs_cubepoints_inactive'
-				, __( 'CubePoints must be active.', 'wordpoints-importer' )
-			);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Import the points logs.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array $settings The import settings for the points component.
-	 */
-	protected function import_points_logs( $settings ) {
-
-		$this->feedback->info( __( 'Importing points logs…', 'wordpoints-importer' ) );
-
-		$start = 0;
-
-		while ( $logs = $this->get_next_points_logs_batch( $start ) ) {
-
-			$start += count( $logs );
-
-			foreach ( $logs as $log ) {
-
-				$this->import_points_log(
-					$log->uid
-					, $log->points
-					, $settings['points_type']
-					, "cubepoints-{$log->type}"
-					, array(
-						'cubepoints_type' => $log->type,
-						'cubepoints_data' => $log->data,
-					)
-					, date( 'Y-m-d H:i:s', $log->timestamp )
-				);
-			}
-
-			unset( $logs );
-		}
-
-		$this->feedback->success( sprintf( __( 'Imported %s points log entries.', 'wordpoints-importer' ), $start ) );
-	}
-
-	/**
-	 * Import a points log.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param int    $user_id     The ID of the user the log is for.
-	 * @param int    $points      The number of points awarded.
-	 * @param string $points_type The points type.
-	 * @param string $log_type    The log type.
-	 * @param array  $meta        The metadata for this log.
-	 * @param int    $date        The date the transaction took place.
-	 */
-	protected function import_points_log( $user_id, $points, $points_type, $log_type, $meta, $date ) {
-
-		global $wpdb;
-
-		$result = $wpdb->insert(
-			$wpdb->wordpoints_points_logs,
-			array(
-				'user_id'     => $user_id,
-				'points'      => $points,
-				'points_type' => $points_type,
-				'log_type'    => $log_type,
-				'text'        => $this->render_points_log_text( '', $user_id, $points, $points_type, $log_type, $meta ),
-				'date'        => $date,
-				'site_id'     => $wpdb->siteid,
-				'blog_id'     => $wpdb->blogid,
-			),
-			array( '%d', '%d', '%s', '%s', '%s', '%s', '%d', '%d' )
-		);
-
-		if ( false !== $result ) {
-
-			$log_id = (int) $wpdb->insert_id;
-
-			// Set auto_reversed and original_log_id metadata for reversed logs.
-			foreach ( $this->reversible_log_types as $reverse_type => $type ) {
-
-				if ( $meta['cubepoints_type'] === $type ) {
-
-					// Save this log ID for later, in case this log was reversed.
-					// cubepoints_data will contain the entity ID.
-					$this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] = $log_id;
-
-				} elseif (
-					$meta['cubepoints_type'] === $reverse_type
-					&& isset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] )
-				) {
-
-					// This log was reverses another one. Set the original log ID.
-					$meta['original_log_id'] = $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ];
-
-					// And mark the original as auto_reversed.
-					wordpoints_add_points_log_meta( $meta['original_log_id'], 'auto_reversed', $log_id );
-
-					// No need to keep this info anymore.
-					unset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] );
-				}
-			}
-
-			// Set the entity IDs to their own meta keys, for the sake of reversals.
-			if ( isset( $this->log_type_entities[ $meta['cubepoints_type'] ] ) ) {
-				$meta[ $this->log_type_entities[ $meta['cubepoints_type'] ] ] = $meta['cubepoints_data'];
-			}
-
-			foreach ( $meta as $meta_key => $meta_value ) {
-
-				wordpoints_add_points_log_meta( $log_id, $meta_key, $meta_value );
-			}
-
-			do_action( 'wordpoints_points_log', $user_id, $points, $points_type, $log_type, $meta, $log_id );
-
-		} // End if ( inserted successfully ).
-	}
-
-	/**
-	 * Generate the log text when importing a points log.
-	 *
-	 * @since 1.0.0
-	 */
-	public function render_points_log_text( $text, $user_id, $points, $points_type, $log_type, $meta ) {
-
-		ob_start();
-		do_action( 'cp_logs_description', $meta['cubepoints_type'], $user_id, $points, $meta['cubepoints_data'] );
-		return ob_get_clean();
-	}
-
-	/**
-	 * Get the next 500 points logs from CubePoints.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param int $start The offset number to begin counting the 500 at.
-	 *
-	 * @return object[]|false The rows from the database.
-	 */
-	protected function get_next_points_logs_batch( $start ) {
-
-		global $wpdb;
-
-		$logs = $wpdb->get_results( // WPCS: unprepared SQL OK.
-			$wpdb->prepare( // WPCS: unprepared SQL OK.
-				'
+                , $start
+            )
+        ); // WPCS: cache OK.
+
+        if ( ! is_array( $rows ) ) {
+            return false;
+        }
+
+        return $rows;
+    }
+
+    /**
+     * Check if the points logs can be imported.
+     *
+     * @since 1.0.0
+     *
+     * @return true|WP_Error True on success or a WP_Error on failure.
+     */
+    public function can_import_points_logs() {
+
+        if ( ! $this->is_cubepoints_active() ) {
+
+            return new WP_Error(
+                'wordpoints_import_points_logs_cubepoints_inactive'
+                , __( 'CubePoints must be active.', 'wordpoints-importer' )
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Import the points logs.
+     *
+     * @since 1.0.0
+     *
+     * @param array $settings The import settings for the points component.
+     */
+    protected function import_points_logs( $settings ) {
+
+        $this->feedback->info( __( 'Importing points logs…', 'wordpoints-importer' ) );
+
+        $start = 0;
+
+        while ( $logs = $this->get_next_points_logs_batch( $start ) ) {
+
+            $start += count( $logs );
+
+            foreach ( $logs as $log ) {
+
+                $this->import_points_log(
+                    $log->uid
+                    , $log->points
+                    , $settings['points_type']
+                    , "cubepoints-{$log->type}"
+                    , array(
+                        'cubepoints_type' => $log->type,
+                        'cubepoints_data' => $log->data,
+                    )
+                    , date( 'Y-m-d H:i:s', $log->timestamp )
+                );
+            }
+
+            unset( $logs );
+        }
+
+        $this->feedback->success( sprintf( __( 'Imported %s points log entries.', 'wordpoints-importer' ), $start ) );
+    }
+
+    /**
+     * Import a points log.
+     *
+     * @since 1.0.0
+     *
+     * @param int    $user_id     The ID of the user the log is for.
+     * @param int    $points      The number of points awarded.
+     * @param string $points_type The points type.
+     * @param string $log_type    The log type.
+     * @param array  $meta        The metadata for this log.
+     * @param int    $date        The date the transaction took place.
+     */
+    protected function import_points_log( $user_id, $points, $points_type, $log_type, $meta, $date ) {
+
+        global $wpdb;
+
+        $result = $wpdb->insert(
+            $wpdb->wordpoints_points_logs,
+            array(
+                'user_id'     => $user_id,
+                'points'      => $points,
+                'points_type' => $points_type,
+                'log_type'    => $log_type,
+                'text'        => $this->render_points_log_text( '', $user_id, $points, $points_type, $log_type, $meta ),
+                'date'        => $date,
+                'site_id'     => $wpdb->siteid,
+                'blog_id'     => $wpdb->blogid,
+            ),
+            array( '%d', '%d', '%s', '%s', '%s', '%s', '%d', '%d' )
+        );
+
+        if ( false !== $result ) {
+
+            $log_id = (int) $wpdb->insert_id;
+
+            // Set auto_reversed and original_log_id metadata for reversed logs.
+            foreach ( $this->reversible_log_types as $reverse_type => $type ) {
+
+                if ( $meta['cubepoints_type'] === $type ) {
+
+                    // Save this log ID for later, in case this log was reversed.
+                    // cubepoints_data will contain the entity ID.
+                    $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] = $log_id;
+
+                } elseif (
+                    $meta['cubepoints_type'] === $reverse_type
+                    && isset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] )
+                ) {
+
+                    // This log was reverses another one. Set the original log ID.
+                    $meta['original_log_id'] = $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ];
+
+                    // And mark the original as auto_reversed.
+                    wordpoints_add_points_log_meta( $meta['original_log_id'], 'auto_reversed', $log_id );
+
+                    // No need to keep this info anymore.
+                    unset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] );
+                }
+            }
+
+            // Set the entity IDs to their own meta keys, for the sake of reversals.
+            if ( isset( $this->log_type_entities[ $meta['cubepoints_type'] ] ) ) {
+                $meta[ $this->log_type_entities[ $meta['cubepoints_type'] ] ] = $meta['cubepoints_data'];
+            }
+
+            foreach ( $meta as $meta_key => $meta_value ) {
+
+                wordpoints_add_points_log_meta( $log_id, $meta_key, $meta_value );
+            }
+
+            do_action( 'wordpoints_points_log', $user_id, $points, $points_type, $log_type, $meta, $log_id );
+
+        } // End if ( inserted successfully ).
+    }
+
+    /**
+     * Generate the log text when importing a points log.
+     *
+     * @since 1.0.0
+     */
+    public function render_points_log_text( $text, $user_id, $points, $points_type, $log_type, $meta ) {
+
+        ob_start();
+        do_action( 'cp_logs_description', $meta['cubepoints_type'], $user_id, $points, $meta['cubepoints_data'] );
+        return ob_get_clean();
+    }
+
+    /**
+     * Get the next 500 points logs from CubePoints.
+     *
+     * @since 1.0.0
+     *
+     * @param int $start The offset number to begin counting the 500 at.
+     *
+     * @return object[]|false The rows from the database.
+     */
+    protected function get_next_points_logs_batch( $start ) {
+
+        global $wpdb;
+
+        $logs = $wpdb->get_results( // WPCS: unprepared SQL OK.
+            $wpdb->prepare( // WPCS: unprepared SQL OK.
+                '
 					SELECT *
 					FROM `' . CP_DB . '`
 					ORDER BY `id`
 					LIMIT %d,500
 				'
-				, $start
-			)
-		); // WPCS: cache OK.
+                , $start
+            )
+        ); // WPCS: cache OK.
 
-		if ( ! is_array( $logs ) ) {
-			$this->feedback->error( __( 'Unable to retrieve the logs from CubePoints…', 'wordpoints-importer' ) );
-			return false;
-		}
+        if ( ! is_array( $logs ) ) {
+            $this->feedback->error( __( 'Unable to retrieve the logs from CubePoints…', 'wordpoints-importer' ) );
+            return false;
+        }
 
-		return $logs;
-	}
+        return $logs;
+    }
 
-	/**
-	 * Import ranks.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @param array $settings The import settings for the ranks component.
-	 */
-	public function import_ranks( $settings ) {
+    /**
+     * Import ranks.
+     *
+     * @since 1.1.0
+     *
+     * @param array $settings The import settings for the ranks component.
+     */
+    public function import_ranks( $settings ) {
 
-		$this->feedback->info( __( 'Importing ranks…', 'wordpoints-importer' ) );
+        $this->feedback->info( __( 'Importing ranks…', 'wordpoints-importer' ) );
 
-		$ranks_data = get_option( 'cp_module_ranks_data' );
+        $ranks_data = get_option( 'cp_module_ranks_data' );
 
-		if ( empty( $ranks_data ) || ! is_array( $ranks_data ) ) {
-			$this->feedback->error( __( 'No ranks found.', 'wordpoints-importer' ) );
-			return;
-		}
+        if ( empty( $ranks_data ) || ! is_array( $ranks_data ) ) {
+            $this->feedback->error( __( 'No ranks found.', 'wordpoints-importer' ) );
+            return;
+        }
 
-		$i = 0;
+        $i = 0;
 
-		// The base rank already exists, so we just update it.
-		if ( isset( $ranks_data[0] ) ) {
+        // The base rank already exists, so we just update it.
+        if ( isset( $ranks_data[0] ) ) {
 
-			wordpoints_update_rank(
-				WordPoints_Rank_Groups::get_group( $settings['rank_group'] )->get_rank( 0 )
-				, $ranks_data[0]
-				, 'base'
-				, $settings['rank_group']
-				, 0
-			);
+            wordpoints_update_rank(
+                WordPoints_Rank_Groups::get_group( $settings['rank_group'] )->get_rank( 0 )
+                , $ranks_data[0]
+                , 'base'
+                , $settings['rank_group']
+                , 0
+            );
 
-			$i++;
+            $i++;
 
-			unset( $ranks_data[0] );
-		}
+            unset( $ranks_data[0] );
+        }
 
-		$points_type = substr( $settings['rank_group'], strlen( 'points_type-' ) );
-		$rank_type = 'points-' . $points_type;
+        $points_type = substr( $settings['rank_group'], strlen( 'points_type-' ) );
+        $rank_type = 'points-' . $points_type;
 
-		ksort( $ranks_data );
+        ksort( $ranks_data );
 
-		foreach ( $ranks_data as $points => $rank_name ) {
+        foreach ( $ranks_data as $points => $rank_name ) {
 
-			wordpoints_add_rank(
-				$rank_name
-				, $rank_type
-				, $settings['rank_group']
-				, $i
-				, array( 'points' => $points, 'points_type' => $points_type )
-			);
+            wordpoints_add_rank(
+                $rank_name
+                , $rank_type
+                , $settings['rank_group']
+                , $i
+                , array( 'points' => $points, 'points_type' => $points_type )
+            );
 
-			$i++;
-		}
+            $i++;
+        }
 
-		$this->feedback->success( sprintf( __( 'Imported %s ranks.', 'wordpoints-importer' ), $i ) );
-	}
+        $this->feedback->success( sprintf( __( 'Imported %s ranks.', 'wordpoints-importer' ), $i ) );
+    }
 }
 
 // EOF

Spacing +134 added lines, -134 removed lines

@@ -66,36 +66,36 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function __construct( $name ) {
+	public function __construct($name) {
 
-		parent::__construct( $name );
+		parent::__construct($name);
 
 		$this->components = array(
 			'points' => array(
 				'excluded_users' => array(
-					'label' => __( 'Excluded users', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_excluded_users' ),
+					'label' => __('Excluded users', 'wordpoints-importer'),
+					'function' => array($this, 'import_excluded_users'),
 				),
 				'settings'    => array(
-					'label' => __( 'Points Reactions', 'wordpoints-importer' ),
-					'description' => __( 'If checked, the settings for the number of points to award for posts, comments, etc. are imported.', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_points_settings' ),
+					'label' => __('Points Reactions', 'wordpoints-importer'),
+					'description' => __('If checked, the settings for the number of points to award for posts, comments, etc. are imported.', 'wordpoints-importer'),
+					'function' => array($this, 'import_points_settings'),
 				),
 				'user_points' => array(
-					'label' => __( 'User points', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_user_points' ),
+					'label' => __('User points', 'wordpoints-importer'),
+					'function' => array($this, 'import_user_points'),
 				),
 				'logs' => array(
-					'label' => __( 'Points logs', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_points_logs' ),
-					'can_import' => array( $this, 'can_import_points_logs' ),
+					'label' => __('Points logs', 'wordpoints-importer'),
+					'function' => array($this, 'import_points_logs'),
+					'can_import' => array($this, 'can_import_points_logs'),
 				),
 			),
 			'ranks' => array(
 				'ranks' => array(
-					'label' => __( 'Rank settings', 'wordpoints-importer' ),
-					'description' => __( 'If checked, the list of ranks is imported, and users will have the correct ranks assigned to them.', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_ranks' ),
+					'label' => __('Rank settings', 'wordpoints-importer'),
+					'description' => __('If checked, the list of ranks is imported, and users will have the correct ranks assigned to them.', 'wordpoints-importer'),
+					'function' => array($this, 'import_ranks'),
 				),
 			),
 		);
@@ -106,10 +106,10 @@ 
 	 */
 	public function is_available() {
 
-		if ( ! $this->is_cubepoints_installed() ) {
+		if (!$this->is_cubepoints_installed()) {
 			return new WP_Error(
 				'cubepoints_not_installed'
-				, __( 'CubePoints is not installed', 'wordpoints-importer' )
+				, __('CubePoints is not installed', 'wordpoints-importer')
 			);
 		}
 
@@ -123,7 +123,7 @@ 
 	 */
 	public function is_cubepoints_installed() {
 
-		return (bool) get_option( 'cp_db_version' );
+		return (bool) get_option('cp_db_version');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function is_cubepoints_active() {
 
-		return function_exists( 'cp_ready' );
+		return function_exists('cp_ready');
 	}
 
 	/**
@@ -143,22 +143,22 @@ 
 	 */
 	protected function import_excluded_users() {
 
-		$this->feedback->info( __( 'Importing excluded users…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing excluded users…', 'wordpoints-importer'));
 
-		$excluded_users = get_option( 'cp_topfilter' );
+		$excluded_users = get_option('cp_topfilter');
 
-		if ( ! is_array( $excluded_users ) ) {
-			$this->feedback->warning( __( 'No excluded users found.', 'wordpoints-importer' ) );
+		if (!is_array($excluded_users)) {
+			$this->feedback->warning(__('No excluded users found.', 'wordpoints-importer'));
 			return;
 		}
 
 		$user_ids = array();
 
-		foreach ( $excluded_users as $user_login ) {
+		foreach ($excluded_users as $user_login) {
 
-			$user = get_user_by( 'login', $user_login );
+			$user = get_user_by('login', $user_login);
 
-			if ( $user instanceof WP_User ) {
+			if ($user instanceof WP_User) {
 				$user_ids[] = $user->ID;
 			}
 		}
@@ -168,7 +168,7 @@ 
 		);
 
 		$excluded_user_ids = array_unique(
-			array_merge( $excluded_user_ids, $user_ids )
+			array_merge($excluded_user_ids, $user_ids)
 		);
 
 		wordpoints_update_maybe_network_option(
@@ -178,8 +178,8 @@ 
 
 		$this->feedback->success(
 			sprintf(
-				__( 'Imported %s excluded users.', 'wordpoints-importer' )
-				, count( $user_ids )
+				__('Imported %s excluded users.', 'wordpoints-importer')
+				, count($user_ids)
 			)
 		);
 	}
@@ -191,64 +191,64 @@ 
 	 *
 	 * @param array $settings The settings for the points component import.
 	 */
-	protected function import_points_settings( $settings ) {
+	protected function import_points_settings($settings) {
 
-		$this->feedback->info( __( 'Importing points reactions…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing points reactions…', 'wordpoints-importer'));
 
 		$options = array(
 			'cp_comment_points'     => array(
 				'event' => 'comment_leave\post',
-				'target' => array( 'comment\post', 'author', 'user' ),
+				'target' => array('comment\post', 'author', 'user'),
 				/* translators: The post type name */
-				'log_text' => __( 'Comment on a %s.', 'wordpoints-importer' ),
+				'log_text' => __('Comment on a %s.', 'wordpoints-importer'),
 				/* translators: The post type name */
-				'description' => __( 'Commenting on a %s.', 'wordpoints-importer' ),
+				'description' => __('Commenting on a %s.', 'wordpoints-importer'),
 				'legacy_log_type' => 'cubepoints-comment',
 				'legacy_meta_key' => 'comment',
 			),
 			'cp_post_points'        => array(
 				'event' => 'post_publish\post',
-				'target' => array( 'post\post', 'author', 'user' ),
+				'target' => array('post\post', 'author', 'user'),
 				/* translators: The post type name */
-				'log_text' => __( 'Published a Post.', 'wordpoints-importer' ),
+				'log_text' => __('Published a Post.', 'wordpoints-importer'),
 				/* translators: The post type name */
-				'description' => __( 'Publishing a Post.', 'wordpoints-importer' ),
+				'description' => __('Publishing a Post.', 'wordpoints-importer'),
 				'legacy_log_type' => 'cubepoints-post',
 				'legacy_meta_key' => 'post',
 				// CubePoints doesn't remove points when a post is deleted.
-				'blocker' => array( 'toggle_off' => true ),
-				'points_legacy_repeat_blocker' => array( 'toggle_on' => true ),
+				'blocker' => array('toggle_off' => true),
+				'points_legacy_repeat_blocker' => array('toggle_on' => true),
 			),
 			'cp_reg_points'         => array(
 				'event' => 'user_register',
-				'log_text' => __( 'Registration.', 'wordpoints-importer' ),
-				'description' => __( 'Registration.', 'wordpoints-importer' ),
+				'log_text' => __('Registration.', 'wordpoints-importer'),
+				'description' => __('Registration.', 'wordpoints-importer'),
 				'legacy_log_type' => 'cubepoints-register',
 			),
 			'cp_post_author_points' => array(
 				'event' => 'comment_leave\post',
-				'target' => array( 'comment\post', 'post\post', 'post\post', 'author', 'user' ),
+				'target' => array('comment\post', 'post\post', 'post\post', 'author', 'user'),
 				/* translators: The post type name */
-				'log_text' => __( 'Received a comment on a %s.', 'wordpoints-importer' ),
+				'log_text' => __('Received a comment on a %s.', 'wordpoints-importer'),
 				/* translators: The post type name */
-				'description' => __( 'Receiving a comment on a %s.', 'wordpoints-importer' ),
+				'description' => __('Receiving a comment on a %s.', 'wordpoints-importer'),
 				'legacy_log_type' => 'cubepoints-post_author',
 				'legacy_meta_key' => 'comment',
 			),
 		);
 
 		// Don't import this module setting if the module isn't active.
-		if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'post_author_points' ) ) {
-			unset( $options['cp_post_author_points'] );
+		if (function_exists('cp_module_activated') && !cp_module_activated('post_author_points')) {
+			unset($options['cp_post_author_points']);
 		}
 
 		$imported = 0;
 
-		foreach ( $options as $option => $hook_settings ) {
+		foreach ($options as $option => $hook_settings) {
 
-			$points = get_option( $option );
+			$points = get_option($option);
 
-			if ( wordpoints_posint( $points ) ) {
+			if (wordpoints_posint($points)) {
 
 				$hook_settings['points'] = $points;
 				$hook_settings['points_type'] = $settings['points_type'];
@@ -256,12 +256,12 @@ 
 				if (
 					// The CubePoints post points were only awarded for Posts.
 					'post_publish\post' !== $hook_settings['event']
-					&& strpos( $hook_settings['event'], '\post' )
+					&& strpos($hook_settings['event'], '\post')
 				) {
 
-					$post_type_slugs = get_post_types( array( 'public' => true ) );
+					$post_type_slugs = get_post_types(array('public' => true));
 
-					foreach ( $post_type_slugs as $post_type_slug ) {
+					foreach ($post_type_slugs as $post_type_slug) {
 
 						$added = $this->add_points_hook(
 							$this->format_settings_for_post_type(
@@ -270,13 +270,13 @@ 
 							)
 						);
 
-						if ( $added ) {
+						if ($added) {
 							$imported++;
 						}
 					}
 
 				} else {
-					if ( $this->add_points_hook( $hook_settings ) ) {
+					if ($this->add_points_hook($hook_settings)) {
 						$imported++;
 					}
 				}
@@ -284,12 +284,12 @@ 
 
 		} // End foreach ( $options ).
 
-		if ( $this->import_daily_points_hook( $settings ) ) {
+		if ($this->import_daily_points_hook($settings)) {
 			$imported++;
 		}
 
 		$this->feedback->success(
-			sprintf( __( 'Imported %s points reactions.', 'wordpoints-importer' ), $imported )
+			sprintf(__('Imported %s points reactions.', 'wordpoints-importer'), $imported)
 		);
 	}
 
@@ -302,24 +302,24 @@ 
 	 *
 	 * @return bool True if the settings were imported, false otherwise.
 	 */
-	protected function import_daily_points_hook( $settings ) {
+	protected function import_daily_points_hook($settings) {
 
 		// Don't import this module setting if the module isn't active.
-		if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'dailypoints' ) ) {
+		if (function_exists('cp_module_activated') && !cp_module_activated('dailypoints')) {
 			return false;
 		}
 
-		$points = get_option( 'cp_module_dailypoints_points' );
-		$period = get_option( 'cp_module_dailypoints_time' );
+		$points = get_option('cp_module_dailypoints_points');
+		$period = get_option('cp_module_dailypoints_time');
 
-		if ( ! wordpoints_int( $points ) || ! wordpoints_posint( $period ) ) {
+		if (!wordpoints_int($points) || !wordpoints_posint($period)) {
 			return false;
 		}
 
 		return $this->add_points_hook(
 			array(
 				'event' => 'user_visit',
-				'target' => array( 'current:user' ),
+				'target' => array('current:user'),
 				'reactor' => 'points_legacy',
 				'points' => $points,
 				'points_type' => $settings['points_type'],
@@ -327,13 +327,13 @@ 
 					'fire' => array(
 						array(
 							'length' => $period,
-							'args' => array( array( 'current:user' ) ),
+							'args' => array(array('current:user')),
 							'relative' => true,
 						),
 					),
 				),
-				'log_text' => __( 'Visiting the site.', 'wordpoints-importer' ),
-				'description' => __( 'Visiting the site.', 'wordpoints-importer' ),
+				'log_text' => __('Visiting the site.', 'wordpoints-importer'),
+				'description' => __('Visiting the site.', 'wordpoints-importer'),
 				'points_legacy_reversals' => array(),
 				'legacy_log_type' => 'cubepoints-dailypoints',
 			)
@@ -350,22 +350,22 @@ 
 	 *
 	 * @return bool True if added successfully, or false on failure.
 	 */
-	private function add_points_hook( $settings = array() ) {
+	private function add_points_hook($settings = array()) {
 
-		$reaction_store = wordpoints_hooks()->get_reaction_store( 'points' );
+		$reaction_store = wordpoints_hooks()->get_reaction_store('points');
 
 		$settings = array_merge(
 			array(
-				'target' => array( 'user' ),
+				'target' => array('user'),
 				'reactor' => 'points_legacy',
-				'points_legacy_reversals' => array( 'toggle_off' => 'toggle_on' ),
+				'points_legacy_reversals' => array('toggle_off' => 'toggle_on'),
 			)
 			, $settings
 		);
 
-		$reaction = $reaction_store->create_reaction( $settings );
+		$reaction = $reaction_store->create_reaction($settings);
 
-		if ( ! $reaction instanceof WordPoints_Hook_ReactionI ) {
+		if (!$reaction instanceof WordPoints_Hook_ReactionI) {
 			return false;
 		}
 
@@ -382,24 +382,24 @@ 
 	 *
 	 * @return array The settings modified for this particular post type.
 	 */
-	protected function format_settings_for_post_type( $post_type, $settings ) {
+	protected function format_settings_for_post_type($post_type, $settings) {
 
 		$settings['event'] = str_replace(
 			'\post'
-			, '\\' . $post_type
+			, '\\'.$post_type
 			, $settings['event']
 		);
 
 		$settings['target'] = str_replace(
 			'\post'
-			, '\\' . $post_type
+			, '\\'.$post_type
 			, $settings['target']
 		);
 
-		$labels = get_post_type_labels( get_post_type_object( $post_type ) );
+		$labels = get_post_type_labels(get_post_type_object($post_type));
 
-		$settings['log_text'] = sprintf( $settings['log_text'], $labels->singular_name );
-		$settings['description'] = sprintf( $settings['description'], $labels->singular_name );
+		$settings['log_text'] = sprintf($settings['log_text'], $labels->singular_name);
+		$settings['description'] = sprintf($settings['description'], $labels->singular_name);
 
 		return $settings;
 	}
@@ -411,21 +411,21 @@ 
 	 *
 	 * @param array $settings The settings for the points component import.
 	 */
-	protected function import_user_points( $settings ) {
+	protected function import_user_points($settings) {
 
-		$this->feedback->info( __( 'Importing users' points…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing users' points…', 'wordpoints-importer'));
 
 		// We don't log the import transactions.
-		add_filter( 'wordpoints_points_log', '__return_false' );
+		add_filter('wordpoints_points_log', '__return_false');
 
 		$start = 0;
 
 		// We do the import in batches.
-		while ( $rows = $this->get_next_user_points_batch( $start ) ) {
+		while ($rows = $this->get_next_user_points_batch($start)) {
 
-			$start += count( $rows );
+			$start += count($rows);
 
-			foreach ( $rows as $row ) {
+			foreach ($rows as $row) {
 
 				wordpoints_alter_points(
 					$row->user_id
@@ -435,12 +435,12 @@ 
 				);
 			}
 
-			unset( $rows );
+			unset($rows);
 		}
 
-		remove_filter( 'wordpoints_points_log', '__return_false' );
+		remove_filter('wordpoints_points_log', '__return_false');
 
-		$this->feedback->success( sprintf( __( 'Imported points for %s users…', 'wordpoints-importer' ), $start ) );
+		$this->feedback->success(sprintf(__('Imported points for %s users…', 'wordpoints-importer'), $start));
 	}
 
 	/**
@@ -452,7 +452,7 @@ 
 	 *
 	 * @return object[]|false The rows, or false.
 	 */
-	protected function get_next_user_points_batch( $start ) {
+	protected function get_next_user_points_batch($start) {
 
 		global $wpdb;
 
@@ -469,7 +469,7 @@ 
 			)
 		); // WPCS: cache OK.
 
-		if ( ! is_array( $rows ) ) {
+		if (!is_array($rows)) {
 			return false;
 		}
 
@@ -485,11 +485,11 @@ 
 	 */
 	public function can_import_points_logs() {
 
-		if ( ! $this->is_cubepoints_active() ) {
+		if (!$this->is_cubepoints_active()) {
 
 			return new WP_Error(
 				'wordpoints_import_points_logs_cubepoints_inactive'
-				, __( 'CubePoints must be active.', 'wordpoints-importer' )
+				, __('CubePoints must be active.', 'wordpoints-importer')
 			);
 		}
 
@@ -503,17 +503,17 @@ 
 	 *
 	 * @param array $settings The import settings for the points component.
 	 */
-	protected function import_points_logs( $settings ) {
+	protected function import_points_logs($settings) {
 
-		$this->feedback->info( __( 'Importing points logs…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing points logs…', 'wordpoints-importer'));
 
 		$start = 0;
 
-		while ( $logs = $this->get_next_points_logs_batch( $start ) ) {
+		while ($logs = $this->get_next_points_logs_batch($start)) {
 
-			$start += count( $logs );
+			$start += count($logs);
 
-			foreach ( $logs as $log ) {
+			foreach ($logs as $log) {
 
 				$this->import_points_log(
 					$log->uid
@@ -524,14 +524,14 @@ 
 						'cubepoints_type' => $log->type,
 						'cubepoints_data' => $log->data,
 					)
-					, date( 'Y-m-d H:i:s', $log->timestamp )
+					, date('Y-m-d H:i:s', $log->timestamp)
 				);
 			}
 
-			unset( $logs );
+			unset($logs);
 		}
 
-		$this->feedback->success( sprintf( __( 'Imported %s points log entries.', 'wordpoints-importer' ), $start ) );
+		$this->feedback->success(sprintf(__('Imported %s points log entries.', 'wordpoints-importer'), $start));
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 * @param array  $meta        The metadata for this log.
 	 * @param int    $date        The date the transaction took place.
 	 */
-	protected function import_points_log( $user_id, $points, $points_type, $log_type, $meta, $date ) {
+	protected function import_points_log($user_id, $points, $points_type, $log_type, $meta, $date) {
 
 		global $wpdb;
 
@@ -557,54 +557,54 @@ 
 				'points'      => $points,
 				'points_type' => $points_type,
 				'log_type'    => $log_type,
-				'text'        => $this->render_points_log_text( '', $user_id, $points, $points_type, $log_type, $meta ),
+				'text'        => $this->render_points_log_text('', $user_id, $points, $points_type, $log_type, $meta),
 				'date'        => $date,
 				'site_id'     => $wpdb->siteid,
 				'blog_id'     => $wpdb->blogid,
 			),
-			array( '%d', '%d', '%s', '%s', '%s', '%s', '%d', '%d' )
+			array('%d', '%d', '%s', '%s', '%s', '%s', '%d', '%d')
 		);
 
-		if ( false !== $result ) {
+		if (false !== $result) {
 
 			$log_id = (int) $wpdb->insert_id;
 
 			// Set auto_reversed and original_log_id metadata for reversed logs.
-			foreach ( $this->reversible_log_types as $reverse_type => $type ) {
+			foreach ($this->reversible_log_types as $reverse_type => $type) {
 
-				if ( $meta['cubepoints_type'] === $type ) {
+				if ($meta['cubepoints_type'] === $type) {
 
 					// Save this log ID for later, in case this log was reversed.
 					// cubepoints_data will contain the entity ID.
-					$this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] = $log_id;
+					$this->reversible_log_ids[$type][$meta['cubepoints_data']] = $log_id;
 
 				} elseif (
 					$meta['cubepoints_type'] === $reverse_type
-					&& isset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] )
+					&& isset($this->reversible_log_ids[$type][$meta['cubepoints_data']])
 				) {
 
 					// This log was reverses another one. Set the original log ID.
-					$meta['original_log_id'] = $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ];
+					$meta['original_log_id'] = $this->reversible_log_ids[$type][$meta['cubepoints_data']];
 
 					// And mark the original as auto_reversed.
-					wordpoints_add_points_log_meta( $meta['original_log_id'], 'auto_reversed', $log_id );
+					wordpoints_add_points_log_meta($meta['original_log_id'], 'auto_reversed', $log_id);
 
 					// No need to keep this info anymore.
-					unset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] );
+					unset($this->reversible_log_ids[$type][$meta['cubepoints_data']]);
 				}
 			}
 
 			// Set the entity IDs to their own meta keys, for the sake of reversals.
-			if ( isset( $this->log_type_entities[ $meta['cubepoints_type'] ] ) ) {
-				$meta[ $this->log_type_entities[ $meta['cubepoints_type'] ] ] = $meta['cubepoints_data'];
+			if (isset($this->log_type_entities[$meta['cubepoints_type']])) {
+				$meta[$this->log_type_entities[$meta['cubepoints_type']]] = $meta['cubepoints_data'];
 			}
 
-			foreach ( $meta as $meta_key => $meta_value ) {
+			foreach ($meta as $meta_key => $meta_value) {
 
-				wordpoints_add_points_log_meta( $log_id, $meta_key, $meta_value );
+				wordpoints_add_points_log_meta($log_id, $meta_key, $meta_value);
 			}
 
-			do_action( 'wordpoints_points_log', $user_id, $points, $points_type, $log_type, $meta, $log_id );
+			do_action('wordpoints_points_log', $user_id, $points, $points_type, $log_type, $meta, $log_id);
 
 		} // End if ( inserted successfully ).
 	}
@@ -614,10 +614,10 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function render_points_log_text( $text, $user_id, $points, $points_type, $log_type, $meta ) {
+	public function render_points_log_text($text, $user_id, $points, $points_type, $log_type, $meta) {
 
 		ob_start();
-		do_action( 'cp_logs_description', $meta['cubepoints_type'], $user_id, $points, $meta['cubepoints_data'] );
+		do_action('cp_logs_description', $meta['cubepoints_type'], $user_id, $points, $meta['cubepoints_data']);
 		return ob_get_clean();
 	}
 
@@ -630,7 +630,7 @@ 
 	 *
 	 * @return object[]|false The rows from the database.
 	 */
-	protected function get_next_points_logs_batch( $start ) {
+	protected function get_next_points_logs_batch($start) {
 
 		global $wpdb;
 
@@ -638,7 +638,7 @@ 
 			$wpdb->prepare( // WPCS: unprepared SQL OK.
 				'
 					SELECT *
-					FROM `' . CP_DB . '`
+					FROM `' . CP_DB.'`
 					ORDER BY `id`
 					LIMIT %d,500
 				'
@@ -646,8 +646,8 @@ 
 			)
 		); // WPCS: cache OK.
 
-		if ( ! is_array( $logs ) ) {
-			$this->feedback->error( __( 'Unable to retrieve the logs from CubePoints…', 'wordpoints-importer' ) );
+		if (!is_array($logs)) {
+			$this->feedback->error(__('Unable to retrieve the logs from CubePoints…', 'wordpoints-importer'));
 			return false;
 		}
 
@@ -661,24 +661,24 @@ 
 	 *
 	 * @param array $settings The import settings for the ranks component.
 	 */
-	public function import_ranks( $settings ) {
+	public function import_ranks($settings) {
 
-		$this->feedback->info( __( 'Importing ranks…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing ranks…', 'wordpoints-importer'));
 
-		$ranks_data = get_option( 'cp_module_ranks_data' );
+		$ranks_data = get_option('cp_module_ranks_data');
 
-		if ( empty( $ranks_data ) || ! is_array( $ranks_data ) ) {
-			$this->feedback->error( __( 'No ranks found.', 'wordpoints-importer' ) );
+		if (empty($ranks_data) || !is_array($ranks_data)) {
+			$this->feedback->error(__('No ranks found.', 'wordpoints-importer'));
 			return;
 		}
 
 		$i = 0;
 
 		// The base rank already exists, so we just update it.
-		if ( isset( $ranks_data[0] ) ) {
+		if (isset($ranks_data[0])) {
 
 			wordpoints_update_rank(
-				WordPoints_Rank_Groups::get_group( $settings['rank_group'] )->get_rank( 0 )
+				WordPoints_Rank_Groups::get_group($settings['rank_group'])->get_rank(0)
 				, $ranks_data[0]
 				, 'base'
 				, $settings['rank_group']
@@ -687,28 +687,28 @@ 
 
 			$i++;
 
-			unset( $ranks_data[0] );
+			unset($ranks_data[0]);
 		}
 
-		$points_type = substr( $settings['rank_group'], strlen( 'points_type-' ) );
-		$rank_type = 'points-' . $points_type;
+		$points_type = substr($settings['rank_group'], strlen('points_type-'));
+		$rank_type = 'points-'.$points_type;
 
-		ksort( $ranks_data );
+		ksort($ranks_data);
 
-		foreach ( $ranks_data as $points => $rank_name ) {
+		foreach ($ranks_data as $points => $rank_name) {
 
 			wordpoints_add_rank(
 				$rank_name
 				, $rank_type
 				, $settings['rank_group']
 				, $i
-				, array( 'points' => $points, 'points_type' => $points_type )
+				, array('points' => $points, 'points_type' => $points_type)
 			);
 
 			$i++;
 		}
 
-		$this->feedback->success( sprintf( __( 'Imported %s ranks.', 'wordpoints-importer' ), $i ) );
+		$this->feedback->success(sprintf(__('Imported %s ranks.', 'wordpoints-importer'), $i));
 	}
 }
 

tests/phpunit/tests/admin-functions.php

Indentation +175 added lines, -175 removed lines

@@ -14,181 +14,181 @@
  */
 class WordPoints_Importer_Admin_Test extends WordPoints_Points_UnitTestCase {
 
-	/**
-	 * Test that a points type must be supplied.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers ::wordpoints_importer_validate_points_type_setting
-	 */
-	public function test_validate_points_type_setting_not_set() {
-
-		$feedback = new WordPoints_Importer_Tests_Feedback;
-
-		$valid = wordpoints_importer_validate_points_type_setting(
-			true
-			, array()
-			, $feedback
-		);
-
-		$this->assertFalse( $valid );
-		$this->assertCount( 1, $feedback->messages['warning'] );
-	}
-
-	/**
-	 * Test that the points type supplied must be valid.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers ::wordpoints_importer_validate_points_type_setting
-	 */
-	public function test_validate_points_type_setting_invalid() {
-
-		$feedback = new WordPoints_Importer_Tests_Feedback;
-
-		$valid = wordpoints_importer_validate_points_type_setting(
-			true
-			, array( 'points_type' => 'invalid' )
-			, $feedback
-		);
-
-		$this->assertFalse( $valid );
-		$this->assertCount( 1, $feedback->messages['warning'] );
-	}
-
-	/**
-	 * Test that it returns true when supplied a valid points type.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers ::wordpoints_importer_validate_points_type_setting
-	 */
-	public function test_validate_points_type_setting_valid() {
-
-		$feedback = new WordPoints_Importer_Tests_Feedback;
-
-		$valid = wordpoints_importer_validate_points_type_setting(
-			true
-			, array( 'points_type' => 'points' )
-			, $feedback
-		);
-
-		$this->assertTrue( $valid );
-		$this->assertEmpty( $feedback->messages );
-	}
-
-	/**
-	 * Test that it returns false when supplied a valid points type if $valid is false.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers ::wordpoints_importer_validate_points_type_setting
-	 */
-	public function test_validate_points_type_setting_valid_false() {
-
-		$feedback = new WordPoints_Importer_Tests_Feedback;
-
-		$valid = wordpoints_importer_validate_points_type_setting(
-			false
-			, array( 'points_type' => 'points' )
-			, $feedback
-		);
-
-		$this->assertFalse( $valid );
-		$this->assertEmpty( $feedback->messages );
-	}
-
-	/**
-	 * Test that a rank group must be supplied.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @covers ::wordpoints_importer_validate_rank_group_setting
-	 */
-	public function test_validate_rank_group_setting_not_set() {
-
-		wordpoints_register_points_ranks();
-
-		$feedback = new WordPoints_Importer_Tests_Feedback;
-
-		$valid = wordpoints_importer_validate_rank_group_setting(
-			true
-			, array()
-			, $feedback
-		);
-
-		$this->assertFalse( $valid );
-		$this->assertCount( 1, $feedback->messages['warning'] );
-	}
-
-	/**
-	 * Test that the rank group supplied must be valid.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @covers ::wordpoints_importer_validate_rank_group_setting
-	 */
-	public function test_validate_rank_group_setting_invalid() {
-
-		wordpoints_register_points_ranks();
-
-		$feedback = new WordPoints_Importer_Tests_Feedback;
-
-		$valid = wordpoints_importer_validate_rank_group_setting(
-			true
-			, array( 'rank_group' => 'invalid' )
-			, $feedback
-		);
-
-		$this->assertFalse( $valid );
-		$this->assertCount( 1, $feedback->messages['warning'] );
-	}
-
-	/**
-	 * Test that it returns true when supplied a valid rank group.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @covers ::wordpoints_importer_validate_rank_group_setting
-	 */
-	public function test_validate_rank_group_setting_valid() {
-
-		wordpoints_register_points_ranks();
-
-		$feedback = new WordPoints_Importer_Tests_Feedback;
-
-		$valid = wordpoints_importer_validate_rank_group_setting(
-			true
-			, array( 'rank_group' => 'points_type-points' )
-			, $feedback
-		);
-
-		$this->assertTrue( $valid );
-		$this->assertEmpty( $feedback->messages );
-	}
-
-	/**
-	 * Test that it returns false when supplied a valid rank group if $valid is false.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @covers ::wordpoints_importer_validate_rank_group_setting
-	 */
-	public function test_validate_rank_group_setting_valid_false() {
-
-		wordpoints_register_points_ranks();
-
-		$feedback = new WordPoints_Importer_Tests_Feedback;
-
-		$valid = wordpoints_importer_validate_rank_group_setting(
-			false
-			, array( 'rank_group' => 'points_type-points' )
-			, $feedback
-		);
-
-		$this->assertFalse( $valid );
-		$this->assertEmpty( $feedback->messages );
-	}
+    /**
+     * Test that a points type must be supplied.
+     *
+     * @since 1.0.0
+     *
+     * @covers ::wordpoints_importer_validate_points_type_setting
+     */
+    public function test_validate_points_type_setting_not_set() {
+
+        $feedback = new WordPoints_Importer_Tests_Feedback;
+
+        $valid = wordpoints_importer_validate_points_type_setting(
+            true
+            , array()
+            , $feedback
+        );
+
+        $this->assertFalse( $valid );
+        $this->assertCount( 1, $feedback->messages['warning'] );
+    }
+
+    /**
+     * Test that the points type supplied must be valid.
+     *
+     * @since 1.0.0
+     *
+     * @covers ::wordpoints_importer_validate_points_type_setting
+     */
+    public function test_validate_points_type_setting_invalid() {
+
+        $feedback = new WordPoints_Importer_Tests_Feedback;
+
+        $valid = wordpoints_importer_validate_points_type_setting(
+            true
+            , array( 'points_type' => 'invalid' )
+            , $feedback
+        );
+
+        $this->assertFalse( $valid );
+        $this->assertCount( 1, $feedback->messages['warning'] );
+    }
+
+    /**
+     * Test that it returns true when supplied a valid points type.
+     *
+     * @since 1.0.0
+     *
+     * @covers ::wordpoints_importer_validate_points_type_setting
+     */
+    public function test_validate_points_type_setting_valid() {
+
+        $feedback = new WordPoints_Importer_Tests_Feedback;
+
+        $valid = wordpoints_importer_validate_points_type_setting(
+            true
+            , array( 'points_type' => 'points' )
+            , $feedback
+        );
+
+        $this->assertTrue( $valid );
+        $this->assertEmpty( $feedback->messages );
+    }
+
+    /**
+     * Test that it returns false when supplied a valid points type if $valid is false.
+     *
+     * @since 1.0.0
+     *
+     * @covers ::wordpoints_importer_validate_points_type_setting
+     */
+    public function test_validate_points_type_setting_valid_false() {
+
+        $feedback = new WordPoints_Importer_Tests_Feedback;
+
+        $valid = wordpoints_importer_validate_points_type_setting(
+            false
+            , array( 'points_type' => 'points' )
+            , $feedback
+        );
+
+        $this->assertFalse( $valid );
+        $this->assertEmpty( $feedback->messages );
+    }
+
+    /**
+     * Test that a rank group must be supplied.
+     *
+     * @since 1.1.0
+     *
+     * @covers ::wordpoints_importer_validate_rank_group_setting
+     */
+    public function test_validate_rank_group_setting_not_set() {
+
+        wordpoints_register_points_ranks();
+
+        $feedback = new WordPoints_Importer_Tests_Feedback;
+
+        $valid = wordpoints_importer_validate_rank_group_setting(
+            true
+            , array()
+            , $feedback
+        );
+
+        $this->assertFalse( $valid );
+        $this->assertCount( 1, $feedback->messages['warning'] );
+    }
+
+    /**
+     * Test that the rank group supplied must be valid.
+     *
+     * @since 1.1.0
+     *
+     * @covers ::wordpoints_importer_validate_rank_group_setting
+     */
+    public function test_validate_rank_group_setting_invalid() {
+
+        wordpoints_register_points_ranks();
+
+        $feedback = new WordPoints_Importer_Tests_Feedback;
+
+        $valid = wordpoints_importer_validate_rank_group_setting(
+            true
+            , array( 'rank_group' => 'invalid' )
+            , $feedback
+        );
+
+        $this->assertFalse( $valid );
+        $this->assertCount( 1, $feedback->messages['warning'] );
+    }
+
+    /**
+     * Test that it returns true when supplied a valid rank group.
+     *
+     * @since 1.1.0
+     *
+     * @covers ::wordpoints_importer_validate_rank_group_setting
+     */
+    public function test_validate_rank_group_setting_valid() {
+
+        wordpoints_register_points_ranks();
+
+        $feedback = new WordPoints_Importer_Tests_Feedback;
+
+        $valid = wordpoints_importer_validate_rank_group_setting(
+            true
+            , array( 'rank_group' => 'points_type-points' )
+            , $feedback
+        );
+
+        $this->assertTrue( $valid );
+        $this->assertEmpty( $feedback->messages );
+    }
+
+    /**
+     * Test that it returns false when supplied a valid rank group if $valid is false.
+     *
+     * @since 1.1.0
+     *
+     * @covers ::wordpoints_importer_validate_rank_group_setting
+     */
+    public function test_validate_rank_group_setting_valid_false() {
+
+        wordpoints_register_points_ranks();
+
+        $feedback = new WordPoints_Importer_Tests_Feedback;
+
+        $valid = wordpoints_importer_validate_rank_group_setting(
+            false
+            , array( 'rank_group' => 'points_type-points' )
+            , $feedback
+        );
+
+        $this->assertFalse( $valid );
+        $this->assertEmpty( $feedback->messages );
+    }
 }
 
 // EOF

Spacing +22 added lines, -22 removed lines

@@ -31,8 +31,8 @@ 
 			, $feedback
 		);
 
-		$this->assertFalse( $valid );
-		$this->assertCount( 1, $feedback->messages['warning'] );
+		$this->assertFalse($valid);
+		$this->assertCount(1, $feedback->messages['warning']);
 	}
 
 	/**
@@ -48,12 +48,12 @@ 
 
 		$valid = wordpoints_importer_validate_points_type_setting(
 			true
-			, array( 'points_type' => 'invalid' )
+			, array('points_type' => 'invalid')
 			, $feedback
 		);
 
-		$this->assertFalse( $valid );
-		$this->assertCount( 1, $feedback->messages['warning'] );
+		$this->assertFalse($valid);
+		$this->assertCount(1, $feedback->messages['warning']);
 	}
 
 	/**
@@ -69,12 +69,12 @@ 
 
 		$valid = wordpoints_importer_validate_points_type_setting(
 			true
-			, array( 'points_type' => 'points' )
+			, array('points_type' => 'points')
 			, $feedback
 		);
 
-		$this->assertTrue( $valid );
-		$this->assertEmpty( $feedback->messages );
+		$this->assertTrue($valid);
+		$this->assertEmpty($feedback->messages);
 	}
 
 	/**
@@ -90,12 +90,12 @@ 
 
 		$valid = wordpoints_importer_validate_points_type_setting(
 			false
-			, array( 'points_type' => 'points' )
+			, array('points_type' => 'points')
 			, $feedback
 		);
 
-		$this->assertFalse( $valid );
-		$this->assertEmpty( $feedback->messages );
+		$this->assertFalse($valid);
+		$this->assertEmpty($feedback->messages);
 	}
 
 	/**
@@ -117,8 +117,8 @@ 
 			, $feedback
 		);
 
-		$this->assertFalse( $valid );
-		$this->assertCount( 1, $feedback->messages['warning'] );
+		$this->assertFalse($valid);
+		$this->assertCount(1, $feedback->messages['warning']);
 	}
 
 	/**
@@ -136,12 +136,12 @@ 
 
 		$valid = wordpoints_importer_validate_rank_group_setting(
 			true
-			, array( 'rank_group' => 'invalid' )
+			, array('rank_group' => 'invalid')
 			, $feedback
 		);
 
-		$this->assertFalse( $valid );
-		$this->assertCount( 1, $feedback->messages['warning'] );
+		$this->assertFalse($valid);
+		$this->assertCount(1, $feedback->messages['warning']);
 	}
 
 	/**
@@ -159,12 +159,12 @@ 
 
 		$valid = wordpoints_importer_validate_rank_group_setting(
 			true
-			, array( 'rank_group' => 'points_type-points' )
+			, array('rank_group' => 'points_type-points')
 			, $feedback
 		);
 
-		$this->assertTrue( $valid );
-		$this->assertEmpty( $feedback->messages );
+		$this->assertTrue($valid);
+		$this->assertEmpty($feedback->messages);
 	}
 
 	/**
@@ -182,12 +182,12 @@ 
 
 		$valid = wordpoints_importer_validate_rank_group_setting(
 			false
-			, array( 'rank_group' => 'points_type-points' )
+			, array('rank_group' => 'points_type-points')
 			, $feedback
 		);
 
-		$this->assertFalse( $valid );
-		$this->assertEmpty( $feedback->messages );
+		$this->assertFalse($valid);
+		$this->assertEmpty($feedback->messages);
 	}
 }
 

tests/phpunit/tests/importers/cubepoints/hooks/post-publish.php

Indentation +22 added lines, -22 removed lines

@@ -18,37 +18,37 @@
  * @coversNothing
  */
 class WordPoints_CubePoints_Importer_Post_Publish_Hook_Test
-	extends WordPoints_Importer_Hook_UnitTestCase {
+    extends WordPoints_Importer_Hook_UnitTestCase {
 
-	/**
-	 * @since 1.2.0
-	 */
-	protected $cubepoints_option = 'cp_post_points';
+    /**
+     * @since 1.2.0
+     */
+    protected $cubepoints_option = 'cp_post_points';
 
-	/**
-	 * @since 1.2.0
-	 *
-	 * @dataProvider data_provider_types
-	 */
-	public function test( $type ) {
+    /**
+     * @since 1.2.0
+     *
+     * @dataProvider data_provider_types
+     */
+    public function test( $type ) {
 
-		$this->before( $type );
+        $this->before( $type );
 
-		$user_id = $this->factory->user->create();
-		$post_id = $this->factory->post->create(
-			array( 'post_author' => $user_id, 'post_status' => 'publish' )
-		);
+        $user_id = $this->factory->user->create();
+        $post_id = $this->factory->post->create(
+            array( 'post_author' => $user_id, 'post_status' => 'publish' )
+        );
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+        $this->assertEquals( 10, $this->get_user_points( $user_id ) );
 
-		wp_update_post( array( 'ID' => $post_id, 'post_status' => 'draft' ) );
+        wp_update_post( array( 'ID' => $post_id, 'post_status' => 'draft' ) );
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+        $this->assertEquals( 10, $this->get_user_points( $user_id ) );
 
-		wp_delete_post( $post_id, true );
+        wp_delete_post( $post_id, true );
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
-	}
+        $this->assertEquals( 10, $this->get_user_points( $user_id ) );
+    }
 }
 
 // EOF

Spacing +8 added lines, -8 removed lines

@@ -30,24 +30,24 @@
 	 *
 	 * @dataProvider data_provider_types
 	 */
-	public function test( $type ) {
+	public function test($type) {
 
-		$this->before( $type );
+		$this->before($type);
 
 		$user_id = $this->factory->user->create();
 		$post_id = $this->factory->post->create(
-			array( 'post_author' => $user_id, 'post_status' => 'publish' )
+			array('post_author' => $user_id, 'post_status' => 'publish')
 		);
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+		$this->assertEquals(10, $this->get_user_points($user_id));
 
-		wp_update_post( array( 'ID' => $post_id, 'post_status' => 'draft' ) );
+		wp_update_post(array('ID' => $post_id, 'post_status' => 'draft'));
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+		$this->assertEquals(10, $this->get_user_points($user_id));
 
-		wp_delete_post( $post_id, true );
+		wp_delete_post($post_id, true);
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+		$this->assertEquals(10, $this->get_user_points($user_id));
 	}
 }
 

tests/phpunit/tests/importers/cubepoints/hooks/comment-leave.php

Indentation +34 added lines, -34 removed lines

@@ -18,51 +18,51 @@
  * @coversNothing
  */
 class WordPoints_CubePoints_Importer_Comment_Leave_Hook_Test
-	extends WordPoints_Importer_Hook_UnitTestCase {
+    extends WordPoints_Importer_Hook_UnitTestCase {
 
-	/**
-	 * @since 1.2.0
-	 */
-	protected $cubepoints_option = 'cp_comment_points';
+    /**
+     * @since 1.2.0
+     */
+    protected $cubepoints_option = 'cp_comment_points';
 
-	/**
-	 * @since 1.2.0
-	 *
-	 * @dataProvider data_provider_types
-	 */
-	public function test( $type ) {
+    /**
+     * @since 1.2.0
+     *
+     * @dataProvider data_provider_types
+     */
+    public function test( $type ) {
 
-		$this->before( $type );
+        $this->before( $type );
 
-		update_option( 'cp_del_comment_points', 10 );
+        update_option( 'cp_del_comment_points', 10 );
 
-		$user_id = $this->factory->user->create();
-		$post_id = $this->factory->post->create(
-			array( 'post_author' => $this->factory->user->create() )
-		);
+        $user_id = $this->factory->user->create();
+        $post_id = $this->factory->post->create(
+            array( 'post_author' => $this->factory->user->create() )
+        );
 
-		$comment_id = $this->factory->comment->create(
-			array(
-				'comment_post_ID' => $post_id,
-				'comment_approved' => 0,
-				'user_id' => $user_id,
-			)
-		);
+        $comment_id = $this->factory->comment->create(
+            array(
+                'comment_post_ID' => $post_id,
+                'comment_approved' => 0,
+                'user_id' => $user_id,
+            )
+        );
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
+        $this->assertEquals( 0, $this->get_user_points( $user_id ) );
 
-		wp_update_comment(
-			array( 'comment_ID' => $comment_id, 'comment_approved' => 1 )
-		);
+        wp_update_comment(
+            array( 'comment_ID' => $comment_id, 'comment_approved' => 1 )
+        );
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+        $this->assertEquals( 10, $this->get_user_points( $user_id ) );
 
-		wp_update_comment(
-			array( 'comment_ID' => $comment_id, 'comment_approved' => 0 )
-		);
+        wp_update_comment(
+            array( 'comment_ID' => $comment_id, 'comment_approved' => 0 )
+        );
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
-	}
+        $this->assertEquals( 0, $this->get_user_points( $user_id ) );
+    }
 }
 
 // EOF

Spacing +9 added lines, -9 removed lines

@@ -30,15 +30,15 @@ 
 	 *
 	 * @dataProvider data_provider_types
 	 */
-	public function test( $type ) {
+	public function test($type) {
 
-		$this->before( $type );
+		$this->before($type);
 
-		update_option( 'cp_del_comment_points', 10 );
+		update_option('cp_del_comment_points', 10);
 
 		$user_id = $this->factory->user->create();
 		$post_id = $this->factory->post->create(
-			array( 'post_author' => $this->factory->user->create() )
+			array('post_author' => $this->factory->user->create())
 		);
 
 		$comment_id = $this->factory->comment->create(
@@ -49,19 +49,19 @@ 
 			)
 		);
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
+		$this->assertEquals(0, $this->get_user_points($user_id));
 
 		wp_update_comment(
-			array( 'comment_ID' => $comment_id, 'comment_approved' => 1 )
+			array('comment_ID' => $comment_id, 'comment_approved' => 1)
 		);
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+		$this->assertEquals(10, $this->get_user_points($user_id));
 
 		wp_update_comment(
-			array( 'comment_ID' => $comment_id, 'comment_approved' => 0 )
+			array('comment_ID' => $comment_id, 'comment_approved' => 0)
 		);
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
+		$this->assertEquals(0, $this->get_user_points($user_id));
 	}
 }
 

tests/phpunit/tests/importers/cubepoints/hooks/comment-receive.php

Indentation +35 added lines, -35 removed lines

@@ -18,53 +18,53 @@
  * @coversNothing
  */
 class WordPoints_CubePoints_Importer_Comment_Receive_Hook_Test
-	extends WordPoints_Importer_Hook_UnitTestCase {
+    extends WordPoints_Importer_Hook_UnitTestCase {
 
-	/**
-	 * @since 1.2.0
-	 */
-	protected $cubepoints_option = 'cp_post_author_points';
+    /**
+     * @since 1.2.0
+     */
+    protected $cubepoints_option = 'cp_post_author_points';
 
-	/**
-	 * @since 1.2.0
-	 *
-	 * @dataProvider data_provider_types
-	 */
-	public function test( $type ) {
+    /**
+     * @since 1.2.0
+     *
+     * @dataProvider data_provider_types
+     */
+    public function test( $type ) {
 
-		cp_module_activation_set( 'post_author_points', 'active' );
+        cp_module_activation_set( 'post_author_points', 'active' );
 
-		update_option( 'cp_post_points', 0 );
+        update_option( 'cp_post_points', 0 );
 
-		$this->before( $type );
+        $this->before( $type );
 
-		$user_id = $this->factory->user->create();
-		$post_id = $this->factory->post->create(
-			array( 'post_author' => $user_id )
-		);
+        $user_id = $this->factory->user->create();
+        $post_id = $this->factory->post->create(
+            array( 'post_author' => $user_id )
+        );
 
-		$comment_id = $this->factory->comment->create(
-			array(
-				'comment_post_ID' => $post_id,
-				'comment_approved' => 0,
-				'user_id' => $this->factory->user->create(),
-			)
-		);
+        $comment_id = $this->factory->comment->create(
+            array(
+                'comment_post_ID' => $post_id,
+                'comment_approved' => 0,
+                'user_id' => $this->factory->user->create(),
+            )
+        );
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
+        $this->assertEquals( 0, $this->get_user_points( $user_id ) );
 
-		wp_update_comment(
-			array( 'comment_ID' => $comment_id, 'comment_approved' => 1 )
-		);
+        wp_update_comment(
+            array( 'comment_ID' => $comment_id, 'comment_approved' => 1 )
+        );
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+        $this->assertEquals( 10, $this->get_user_points( $user_id ) );
 
-		wp_update_comment(
-			array( 'comment_ID' => $comment_id, 'comment_approved' => 0 )
-		);
+        wp_update_comment(
+            array( 'comment_ID' => $comment_id, 'comment_approved' => 0 )
+        );
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
-	}
+        $this->assertEquals( 0, $this->get_user_points( $user_id ) );
+    }
 }
 
 // EOF

Spacing +10 added lines, -10 removed lines

@@ -30,17 +30,17 @@ 
 	 *
 	 * @dataProvider data_provider_types
 	 */
-	public function test( $type ) {
+	public function test($type) {
 
-		cp_module_activation_set( 'post_author_points', 'active' );
+		cp_module_activation_set('post_author_points', 'active');
 
-		update_option( 'cp_post_points', 0 );
+		update_option('cp_post_points', 0);
 
-		$this->before( $type );
+		$this->before($type);
 
 		$user_id = $this->factory->user->create();
 		$post_id = $this->factory->post->create(
-			array( 'post_author' => $user_id )
+			array('post_author' => $user_id)
 		);
 
 		$comment_id = $this->factory->comment->create(
@@ -51,19 +51,19 @@ 
 			)
 		);
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
+		$this->assertEquals(0, $this->get_user_points($user_id));
 
 		wp_update_comment(
-			array( 'comment_ID' => $comment_id, 'comment_approved' => 1 )
+			array('comment_ID' => $comment_id, 'comment_approved' => 1)
 		);
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+		$this->assertEquals(10, $this->get_user_points($user_id));
 
 		wp_update_comment(
-			array( 'comment_ID' => $comment_id, 'comment_approved' => 0 )
+			array('comment_ID' => $comment_id, 'comment_approved' => 0)
 		);
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
+		$this->assertEquals(0, $this->get_user_points($user_id));
 	}
 }
 

tests/phpunit/tests/importers/cubepoints/hooks/user-register.php

Indentation +17 added lines, -17 removed lines

@@ -18,30 +18,30 @@
  * @coversNothing
  */
 class WordPoints_CubePoints_Importer_User_Register_Hook_Test
-	extends WordPoints_Importer_Hook_UnitTestCase {
+    extends WordPoints_Importer_Hook_UnitTestCase {
 
-	/**
-	 * @since 1.2.0
-	 */
-	protected $cubepoints_option = 'cp_reg_points';
+    /**
+     * @since 1.2.0
+     */
+    protected $cubepoints_option = 'cp_reg_points';
 
-	/**
-	 * @since 1.2.0
-	 *
-	 * @dataProvider data_provider_types
-	 */
-	public function test( $type ) {
+    /**
+     * @since 1.2.0
+     *
+     * @dataProvider data_provider_types
+     */
+    public function test( $type ) {
 
-		$this->before( $type );
+        $this->before( $type );
 
-		$user_id = $this->factory->user->create();
+        $user_id = $this->factory->user->create();
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+        $this->assertEquals( 10, $this->get_user_points( $user_id ) );
 
-		self::delete_user( $user_id );
+        self::delete_user( $user_id );
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
-	}
+        $this->assertEquals( 0, $this->get_user_points( $user_id ) );
+    }
 }
 
 // EOF

Spacing +5 added lines, -5 removed lines

@@ -30,17 +30,17 @@
 	 *
 	 * @dataProvider data_provider_types
 	 */
-	public function test( $type ) {
+	public function test($type) {
 
-		$this->before( $type );
+		$this->before($type);
 
 		$user_id = $this->factory->user->create();
 
-		$this->assertEquals( 10, $this->get_user_points( $user_id ) );
+		$this->assertEquals(10, $this->get_user_points($user_id));
 
-		self::delete_user( $user_id );
+		self::delete_user($user_id);
 
-		$this->assertEquals( 0, $this->get_user_points( $user_id ) );
+		$this->assertEquals(0, $this->get_user_points($user_id));
 	}
 }
 

tests/phpunit/tests/importer.php

Indentation +289 added lines, -289 removed lines

@@ -16,295 +16,295 @@
  */
 class WordPoints_Importer_Importer_Test extends WordPoints_UnitTestCase {
 
-	/**
-	 * The mock importer used in the tests.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var WordPoints_Importer_Mock
-	 */
-	protected $importer;
-
-	/**
-	 * The components assigned to the mock importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var array[]
-	 */
-	protected $importer_components;
-
-	/**
-	 * @since 1.0.0
-	 */
-	public function setUp() {
-
-		parent::setUp();
-
-		$this->importer = new WordPoints_Importer_Mock( 'Mock' );
-		$this->importer->components = array(
-			'points' => array(
-				'user_points' => array(
-					'label' => 'User points',
-					'function' => array( $this->importer, 'do_an_import' ),
-					'can_import' => array( $this->importer, 'can_import' ),
-				),
-			),
-		);
-
-		$this->importer_components = $this->importer->components;
-
-		remove_action(
-			'wordpoints_import_settings_valid-points'
-			, 'wordpoints_importer_validate_points_type_setting'
-		);
-	}
-
-	/**
-	 * Test that it returns true when a component is supported.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::supports_component
-	 */
-	public function test_supports_supported_component() {
-
-		$this->assertTrue( $this->importer->supports_component( 'points' ) );
-	}
-
-	/**
-	 * Test that it returns false when a component isn't supported.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::supports_component
-	 */
-	public function test_supports_unsupported_component() {
-
-		$this->assertFalse( $this->importer->supports_component( 'unsupported' ) );
-	}
-
-	/**
-	 * Test that it returns the settings for a component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::get_options_for_component
-	 */
-	public function test_get_options_for_component() {
-
-		$this->assertEquals(
-			$this->importer_components['points']
-			, $this->importer->get_options_for_component( 'points' )
-		);
-	}
-
-	/**
-	 * Test that it returns the settings for an unsupported component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::get_options_for_component
-	 */
-	public function test_get_options_for_unsupported_component() {
-
-		$this->assertEquals(
-			array()
-			, $this->importer->get_options_for_component( 'unsupported' )
-		);
-	}
-
-	/**
-	 * Test that it gives a warning for uninstalled components.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::do_import
-	 */
-	public function test_do_import_not_installed() {
-
-		$this->importer->components = array(
-			'uninstalled' => array( 'method' => 'do_an_import' ),
-		);
-
-		$feedback = new WordPoints_Importer_Tests_Feedback();
-		$this->importer->do_import(
-			array( 'uninstalled' => array( 'do' => 'yes' ) )
-			, $feedback
-		);
-
-		$this->assertCount( 1, $feedback->messages['warning'] );
-
-		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
-	}
-
-	/**
-	 * Test that it gives a warning for unsupported components.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::do_import
-	 */
-	public function test_do_import_not_supported() {
-
-		$this->importer->components = array();
-
-		$feedback = new WordPoints_Importer_Tests_Feedback();
-		$this->importer->do_import(
-			array( 'points' => array( 'do' => 'yes' ) )
-			, $feedback
-		);
-
-		$this->assertCount( 1, $feedback->messages['warning'] );
-
-		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
-	}
-
-	/**
-	 * Test that it skips a component if validation fails.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::do_import
-	 */
-	public function test_do_import_validates_settings() {
-
-		$this->listen_for_filter( 'wordpoints_import_settings_valid-points' );
-
-		add_filter( 'wordpoints_import_settings_valid-points', '__return_false' );
-
-		$this->importer->do_import(
-			array( 'points' => array( 'do' => 'yes' ) )
-			, new WordPoints_Importer_Tests_Feedback()
-		);
-
-		$this->assertEquals(
-			1
-			, $this->filter_was_called( 'wordpoints_import_settings_valid-points' )
-		);
-
-		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
-	}
-
-	/**
-	 * Test that it skips an unsupported option.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::do_import
-	 */
-	public function test_do_import_invalid_option() {
-
-		$feedback = new WordPoints_Importer_Tests_Feedback();
-
-		$this->importer->do_import(
-			array( 'points' => array( 'do' => 'yes' ) )
-			, $feedback
-		);
-
-		$this->assertCount( 1, $feedback->messages['warning'] );
-
-		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
-	}
-
-	/**
-	 * Test that it skips a disabled option.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::do_import
-	 */
-	public function test_do_import_disabled_option() {
-
-		$feedback = new WordPoints_Importer_Tests_Feedback();
-
-		$this->importer->components['points']['user_points']['can_import'] =
-			array( $this->importer, 'cant_import' );
-
-		$this->importer->do_import(
-			array( 'points' => array( 'user_points' => '1' ) )
-			, $feedback
-		);
-
-		$this->assertCount( 1, $this->importer->can_imports );
-		$this->assertCount( 1, $feedback->messages['warning'] );
-
-		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
-	}
-
-	/**
-	 * Test that the can_import function is passed any settings.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::do_import
-	 */
-	public function test_do_import_can_import_passed_settings() {
-
-		$this->importer->do_import(
-			array(
-				'points' => array(
-					'user_points' => '1',
-					'_data' => array( 'testing' => 1 ),
-				),
-			)
-			, new WordPoints_Importer_Tests_Feedback()
-		);
-
-		$this->assertCount( 1, $this->importer->can_imports );
-		$this->assertEquals(
-			array( 'testing' => 1 )
-			, $this->importer->can_imports[0]
-		);
-	}
-
-	/**
-	 * Test that it calls the importer function.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::do_import
-	 */
-	public function test_do_import() {
-
-		$this->importer->do_import(
-			array( 'points' => array( 'user_points' => '1' ) )
-			, new WordPoints_Importer_Tests_Feedback()
-		);
-
-		$this->assertCount( 1, $this->importer->imports );
-	}
-
-	/**
-	 * Test that the import function is passed any settings.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importer::do_import
-	 */
-	public function test_do_import_passed_settings() {
-
-		$this->importer->do_import(
-			array(
-				'points' => array(
-					'user_points' => '1',
-					'_data' => array( 'testing' => 1 ),
-				),
-			)
-			, new WordPoints_Importer_Tests_Feedback()
-		);
-
-		$this->assertCount( 1, $this->importer->imports );
-		$this->assertEquals(
-			array( 'testing' => 1 )
-			, $this->importer->imports[0]
-		);
-	}
+    /**
+     * The mock importer used in the tests.
+     *
+     * @since 1.0.0
+     *
+     * @var WordPoints_Importer_Mock
+     */
+    protected $importer;
+
+    /**
+     * The components assigned to the mock importer.
+     *
+     * @since 1.0.0
+     *
+     * @var array[]
+     */
+    protected $importer_components;
+
+    /**
+     * @since 1.0.0
+     */
+    public function setUp() {
+
+        parent::setUp();
+
+        $this->importer = new WordPoints_Importer_Mock( 'Mock' );
+        $this->importer->components = array(
+            'points' => array(
+                'user_points' => array(
+                    'label' => 'User points',
+                    'function' => array( $this->importer, 'do_an_import' ),
+                    'can_import' => array( $this->importer, 'can_import' ),
+                ),
+            ),
+        );
+
+        $this->importer_components = $this->importer->components;
+
+        remove_action(
+            'wordpoints_import_settings_valid-points'
+            , 'wordpoints_importer_validate_points_type_setting'
+        );
+    }
+
+    /**
+     * Test that it returns true when a component is supported.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::supports_component
+     */
+    public function test_supports_supported_component() {
+
+        $this->assertTrue( $this->importer->supports_component( 'points' ) );
+    }
+
+    /**
+     * Test that it returns false when a component isn't supported.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::supports_component
+     */
+    public function test_supports_unsupported_component() {
+
+        $this->assertFalse( $this->importer->supports_component( 'unsupported' ) );
+    }
+
+    /**
+     * Test that it returns the settings for a component.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::get_options_for_component
+     */
+    public function test_get_options_for_component() {
+
+        $this->assertEquals(
+            $this->importer_components['points']
+            , $this->importer->get_options_for_component( 'points' )
+        );
+    }
+
+    /**
+     * Test that it returns the settings for an unsupported component.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::get_options_for_component
+     */
+    public function test_get_options_for_unsupported_component() {
+
+        $this->assertEquals(
+            array()
+            , $this->importer->get_options_for_component( 'unsupported' )
+        );
+    }
+
+    /**
+     * Test that it gives a warning for uninstalled components.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::do_import
+     */
+    public function test_do_import_not_installed() {
+
+        $this->importer->components = array(
+            'uninstalled' => array( 'method' => 'do_an_import' ),
+        );
+
+        $feedback = new WordPoints_Importer_Tests_Feedback();
+        $this->importer->do_import(
+            array( 'uninstalled' => array( 'do' => 'yes' ) )
+            , $feedback
+        );
+
+        $this->assertCount( 1, $feedback->messages['warning'] );
+
+        // The import shouldn't have been performed.
+        $this->assertEmpty( $this->importer->imports );
+    }
+
+    /**
+     * Test that it gives a warning for unsupported components.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::do_import
+     */
+    public function test_do_import_not_supported() {
+
+        $this->importer->components = array();
+
+        $feedback = new WordPoints_Importer_Tests_Feedback();
+        $this->importer->do_import(
+            array( 'points' => array( 'do' => 'yes' ) )
+            , $feedback
+        );
+
+        $this->assertCount( 1, $feedback->messages['warning'] );
+
+        // The import shouldn't have been performed.
+        $this->assertEmpty( $this->importer->imports );
+    }
+
+    /**
+     * Test that it skips a component if validation fails.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::do_import
+     */
+    public function test_do_import_validates_settings() {
+
+        $this->listen_for_filter( 'wordpoints_import_settings_valid-points' );
+
+        add_filter( 'wordpoints_import_settings_valid-points', '__return_false' );
+
+        $this->importer->do_import(
+            array( 'points' => array( 'do' => 'yes' ) )
+            , new WordPoints_Importer_Tests_Feedback()
+        );
+
+        $this->assertEquals(
+            1
+            , $this->filter_was_called( 'wordpoints_import_settings_valid-points' )
+        );
+
+        // The import shouldn't have been performed.
+        $this->assertEmpty( $this->importer->imports );
+    }
+
+    /**
+     * Test that it skips an unsupported option.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::do_import
+     */
+    public function test_do_import_invalid_option() {
+
+        $feedback = new WordPoints_Importer_Tests_Feedback();
+
+        $this->importer->do_import(
+            array( 'points' => array( 'do' => 'yes' ) )
+            , $feedback
+        );
+
+        $this->assertCount( 1, $feedback->messages['warning'] );
+
+        // The import shouldn't have been performed.
+        $this->assertEmpty( $this->importer->imports );
+    }
+
+    /**
+     * Test that it skips a disabled option.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::do_import
+     */
+    public function test_do_import_disabled_option() {
+
+        $feedback = new WordPoints_Importer_Tests_Feedback();
+
+        $this->importer->components['points']['user_points']['can_import'] =
+            array( $this->importer, 'cant_import' );
+
+        $this->importer->do_import(
+            array( 'points' => array( 'user_points' => '1' ) )
+            , $feedback
+        );
+
+        $this->assertCount( 1, $this->importer->can_imports );
+        $this->assertCount( 1, $feedback->messages['warning'] );
+
+        // The import shouldn't have been performed.
+        $this->assertEmpty( $this->importer->imports );
+    }
+
+    /**
+     * Test that the can_import function is passed any settings.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::do_import
+     */
+    public function test_do_import_can_import_passed_settings() {
+
+        $this->importer->do_import(
+            array(
+                'points' => array(
+                    'user_points' => '1',
+                    '_data' => array( 'testing' => 1 ),
+                ),
+            )
+            , new WordPoints_Importer_Tests_Feedback()
+        );
+
+        $this->assertCount( 1, $this->importer->can_imports );
+        $this->assertEquals(
+            array( 'testing' => 1 )
+            , $this->importer->can_imports[0]
+        );
+    }
+
+    /**
+     * Test that it calls the importer function.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::do_import
+     */
+    public function test_do_import() {
+
+        $this->importer->do_import(
+            array( 'points' => array( 'user_points' => '1' ) )
+            , new WordPoints_Importer_Tests_Feedback()
+        );
+
+        $this->assertCount( 1, $this->importer->imports );
+    }
+
+    /**
+     * Test that the import function is passed any settings.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importer::do_import
+     */
+    public function test_do_import_passed_settings() {
+
+        $this->importer->do_import(
+            array(
+                'points' => array(
+                    'user_points' => '1',
+                    '_data' => array( 'testing' => 1 ),
+                ),
+            )
+            , new WordPoints_Importer_Tests_Feedback()
+        );
+
+        $this->assertCount( 1, $this->importer->imports );
+        $this->assertEquals(
+            array( 'testing' => 1 )
+            , $this->importer->imports[0]
+        );
+    }
 }
 
 // EOF

Spacing +35 added lines, -35 removed lines

@@ -41,13 +41,13 @@ 
 
 		parent::setUp();
 
-		$this->importer = new WordPoints_Importer_Mock( 'Mock' );
+		$this->importer = new WordPoints_Importer_Mock('Mock');
 		$this->importer->components = array(
 			'points' => array(
 				'user_points' => array(
 					'label' => 'User points',
-					'function' => array( $this->importer, 'do_an_import' ),
-					'can_import' => array( $this->importer, 'can_import' ),
+					'function' => array($this->importer, 'do_an_import'),
+					'can_import' => array($this->importer, 'can_import'),
 				),
 			),
 		);
@@ -69,7 +69,7 @@ 
 	 */
 	public function test_supports_supported_component() {
 
-		$this->assertTrue( $this->importer->supports_component( 'points' ) );
+		$this->assertTrue($this->importer->supports_component('points'));
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	public function test_supports_unsupported_component() {
 
-		$this->assertFalse( $this->importer->supports_component( 'unsupported' ) );
+		$this->assertFalse($this->importer->supports_component('unsupported'));
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 
 		$this->assertEquals(
 			$this->importer_components['points']
-			, $this->importer->get_options_for_component( 'points' )
+			, $this->importer->get_options_for_component('points')
 		);
 	}
 
@@ -110,7 +110,7 @@ 
 
 		$this->assertEquals(
 			array()
-			, $this->importer->get_options_for_component( 'unsupported' )
+			, $this->importer->get_options_for_component('unsupported')
 		);
 	}
 
@@ -124,19 +124,19 @@ 
 	public function test_do_import_not_installed() {
 
 		$this->importer->components = array(
-			'uninstalled' => array( 'method' => 'do_an_import' ),
+			'uninstalled' => array('method' => 'do_an_import'),
 		);
 
 		$feedback = new WordPoints_Importer_Tests_Feedback();
 		$this->importer->do_import(
-			array( 'uninstalled' => array( 'do' => 'yes' ) )
+			array('uninstalled' => array('do' => 'yes'))
 			, $feedback
 		);
 
-		$this->assertCount( 1, $feedback->messages['warning'] );
+		$this->assertCount(1, $feedback->messages['warning']);
 
 		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
+		$this->assertEmpty($this->importer->imports);
 	}
 
 	/**
@@ -152,14 +152,14 @@ 
 
 		$feedback = new WordPoints_Importer_Tests_Feedback();
 		$this->importer->do_import(
-			array( 'points' => array( 'do' => 'yes' ) )
+			array('points' => array('do' => 'yes'))
 			, $feedback
 		);
 
-		$this->assertCount( 1, $feedback->messages['warning'] );
+		$this->assertCount(1, $feedback->messages['warning']);
 
 		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
+		$this->assertEmpty($this->importer->imports);
 	}
 
 	/**
@@ -171,22 +171,22 @@ 
 	 */
 	public function test_do_import_validates_settings() {
 
-		$this->listen_for_filter( 'wordpoints_import_settings_valid-points' );
+		$this->listen_for_filter('wordpoints_import_settings_valid-points');
 
-		add_filter( 'wordpoints_import_settings_valid-points', '__return_false' );
+		add_filter('wordpoints_import_settings_valid-points', '__return_false');
 
 		$this->importer->do_import(
-			array( 'points' => array( 'do' => 'yes' ) )
+			array('points' => array('do' => 'yes'))
 			, new WordPoints_Importer_Tests_Feedback()
 		);
 
 		$this->assertEquals(
 			1
-			, $this->filter_was_called( 'wordpoints_import_settings_valid-points' )
+			, $this->filter_was_called('wordpoints_import_settings_valid-points')
 		);
 
 		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
+		$this->assertEmpty($this->importer->imports);
 	}
 
 	/**
@@ -201,14 +201,14 @@ 
 		$feedback = new WordPoints_Importer_Tests_Feedback();
 
 		$this->importer->do_import(
-			array( 'points' => array( 'do' => 'yes' ) )
+			array('points' => array('do' => 'yes'))
 			, $feedback
 		);
 
-		$this->assertCount( 1, $feedback->messages['warning'] );
+		$this->assertCount(1, $feedback->messages['warning']);
 
 		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
+		$this->assertEmpty($this->importer->imports);
 	}
 
 	/**
@@ -223,18 +223,18 @@ 
 		$feedback = new WordPoints_Importer_Tests_Feedback();
 
 		$this->importer->components['points']['user_points']['can_import'] =
-			array( $this->importer, 'cant_import' );
+			array($this->importer, 'cant_import');
 
 		$this->importer->do_import(
-			array( 'points' => array( 'user_points' => '1' ) )
+			array('points' => array('user_points' => '1'))
 			, $feedback
 		);
 
-		$this->assertCount( 1, $this->importer->can_imports );
-		$this->assertCount( 1, $feedback->messages['warning'] );
+		$this->assertCount(1, $this->importer->can_imports);
+		$this->assertCount(1, $feedback->messages['warning']);
 
 		// The import shouldn't have been performed.
-		$this->assertEmpty( $this->importer->imports );
+		$this->assertEmpty($this->importer->imports);
 	}
 
 	/**
@@ -250,15 +250,15 @@ 
 			array(
 				'points' => array(
 					'user_points' => '1',
-					'_data' => array( 'testing' => 1 ),
+					'_data' => array('testing' => 1),
 				),
 			)
 			, new WordPoints_Importer_Tests_Feedback()
 		);
 
-		$this->assertCount( 1, $this->importer->can_imports );
+		$this->assertCount(1, $this->importer->can_imports);
 		$this->assertEquals(
-			array( 'testing' => 1 )
+			array('testing' => 1)
 			, $this->importer->can_imports[0]
 		);
 	}
@@ -273,11 +273,11 @@ 
 	public function test_do_import() {
 
 		$this->importer->do_import(
-			array( 'points' => array( 'user_points' => '1' ) )
+			array('points' => array('user_points' => '1'))
 			, new WordPoints_Importer_Tests_Feedback()
 		);
 
-		$this->assertCount( 1, $this->importer->imports );
+		$this->assertCount(1, $this->importer->imports);
 	}
 
 	/**
@@ -293,15 +293,15 @@ 
 			array(
 				'points' => array(
 					'user_points' => '1',
-					'_data' => array( 'testing' => 1 ),
+					'_data' => array('testing' => 1),
 				),
 			)
 			, new WordPoints_Importer_Tests_Feedback()
 		);
 
-		$this->assertCount( 1, $this->importer->imports );
+		$this->assertCount(1, $this->importer->imports);
 		$this->assertEquals(
-			array( 'testing' => 1 )
+			array('testing' => 1)
 			, $this->importer->imports[0]
 		);
 	}

tests/phpunit/tests/importers.php

Indentation +143 added lines, -143 removed lines

@@ -16,149 +16,149 @@
  */
 class WordPoints_Importers_Test extends WP_UnitTestCase {
 
-	/**
-	 * Backup of the importers when the test begins.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var array[]
-	 */
-	protected $_backup_importers;
-
-	/**
-	 * @since 1.0.0
-	 */
-	public function setUp() {
-
-		parent::setUp();
-
-		$this->_backup_importers = WordPoints_Importers::get();
-
-		WordPoints_Importers::register(
-			'test'
-			, array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
-		);
-
-	}
-
-	/**
-	 * @since 1.0.0
-	 */
-	public function tearDown() {
-
-		$importers = WordPoints_Importers::get();
-
-		foreach ( $this->_backup_importers as $slug => $args ) {
-
-			if ( ! isset( $importers[ $slug ] ) ) {
-				WordPoints_Importers::register( $slug, $args );
-			}
-
-			unset( $importers[ $slug ] );
-		}
-
-		foreach ( $importers as $slug => $args ) {
-			WordPoints_Importers::deregister( $slug );
-		}
-
-		parent::tearDown();
-	}
-
-	/**
-	 * Test registration.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importers::register
-	 * @covers WordPoints_Importers::get
-	 */
-	public function test_register() {
-
-		WordPoints_Importers::register(
-			__METHOD__
-			, array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
-		);
-
-		$importers = WordPoints_Importers::get();
-
-		$this->assertArrayHasKey( 'test', $importers );
-		$this->assertEquals(
-			array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
-			, $importers['test']
-		);
-	}
-
-	/**
-	 * Test that deregister() deregisters the importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importers::register
-	 * @covers WordPoints_Importers::get
-	 */
-	public function test_deregister() {
-
-		WordPoints_Importers::deregister( 'test' );
-
-		$importers = WordPoints_Importers::get();
-
-		$this->assertArrayNotHasKey( 'test', $importers );
-	}
-
-	/**
-	 * Test that is_registered() returns true for a registered importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importers::is_registered
-	 */
-	public function test_is_registered() {
-
-		$this->assertTrue( WordPoints_Importers::is_registered( 'test' ) );
-	}
-
-	/**
-	 * Test that is_registered() returns false for an unregistered importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importers::is_registered
-	 */
-	public function test_is_registered_unregistered() {
-
-		WordPoints_Importers::deregister( 'test' );
-
-		$this->assertFalse( WordPoints_Importers::is_registered( 'test' ) );
-	}
-
-	/**
-	 * Test that get_importer() returns false for an unregistered importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importers::get_importer
-	 */
-	public function test_get_unregistered_importer() {
-
-		WordPoints_Importers::deregister( 'test' );
-
-		$this->assertFalse( WordPoints_Importers::get_importer( 'test' ) );
-	}
-
-	/**
-	 * Test that get_importer() returns an importer object.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @covers WordPoints_Importers::get_importer
-	 */
-	public function test_get_importer() {
-
-		$this->assertInstanceOf(
-			'WordPoints_Importer_Mock'
-			, WordPoints_Importers::get_importer( 'test' )
-		);
-	}
+    /**
+     * Backup of the importers when the test begins.
+     *
+     * @since 1.0.0
+     *
+     * @var array[]
+     */
+    protected $_backup_importers;
+
+    /**
+     * @since 1.0.0
+     */
+    public function setUp() {
+
+        parent::setUp();
+
+        $this->_backup_importers = WordPoints_Importers::get();
+
+        WordPoints_Importers::register(
+            'test'
+            , array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
+        );
+
+    }
+
+    /**
+     * @since 1.0.0
+     */
+    public function tearDown() {
+
+        $importers = WordPoints_Importers::get();
+
+        foreach ( $this->_backup_importers as $slug => $args ) {
+
+            if ( ! isset( $importers[ $slug ] ) ) {
+                WordPoints_Importers::register( $slug, $args );
+            }
+
+            unset( $importers[ $slug ] );
+        }
+
+        foreach ( $importers as $slug => $args ) {
+            WordPoints_Importers::deregister( $slug );
+        }
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test registration.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importers::register
+     * @covers WordPoints_Importers::get
+     */
+    public function test_register() {
+
+        WordPoints_Importers::register(
+            __METHOD__
+            , array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
+        );
+
+        $importers = WordPoints_Importers::get();
+
+        $this->assertArrayHasKey( 'test', $importers );
+        $this->assertEquals(
+            array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
+            , $importers['test']
+        );
+    }
+
+    /**
+     * Test that deregister() deregisters the importer.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importers::register
+     * @covers WordPoints_Importers::get
+     */
+    public function test_deregister() {
+
+        WordPoints_Importers::deregister( 'test' );
+
+        $importers = WordPoints_Importers::get();
+
+        $this->assertArrayNotHasKey( 'test', $importers );
+    }
+
+    /**
+     * Test that is_registered() returns true for a registered importer.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importers::is_registered
+     */
+    public function test_is_registered() {
+
+        $this->assertTrue( WordPoints_Importers::is_registered( 'test' ) );
+    }
+
+    /**
+     * Test that is_registered() returns false for an unregistered importer.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importers::is_registered
+     */
+    public function test_is_registered_unregistered() {
+
+        WordPoints_Importers::deregister( 'test' );
+
+        $this->assertFalse( WordPoints_Importers::is_registered( 'test' ) );
+    }
+
+    /**
+     * Test that get_importer() returns false for an unregistered importer.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importers::get_importer
+     */
+    public function test_get_unregistered_importer() {
+
+        WordPoints_Importers::deregister( 'test' );
+
+        $this->assertFalse( WordPoints_Importers::get_importer( 'test' ) );
+    }
+
+    /**
+     * Test that get_importer() returns an importer object.
+     *
+     * @since 1.0.0
+     *
+     * @covers WordPoints_Importers::get_importer
+     */
+    public function test_get_importer() {
+
+        $this->assertInstanceOf(
+            'WordPoints_Importer_Mock'
+            , WordPoints_Importers::get_importer( 'test' )
+        );
+    }
 
 }
 

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
 
 		WordPoints_Importers::register(
 			'test'
-			, array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
+			, array('class' => 'WordPoints_Importer_Mock', 'name' => 'Test')
 		);
 
 	}
@@ -48,17 +48,17 @@ 
 
 		$importers = WordPoints_Importers::get();
 
-		foreach ( $this->_backup_importers as $slug => $args ) {
+		foreach ($this->_backup_importers as $slug => $args) {
 
-			if ( ! isset( $importers[ $slug ] ) ) {
-				WordPoints_Importers::register( $slug, $args );
+			if (!isset($importers[$slug])) {
+				WordPoints_Importers::register($slug, $args);
 			}
 
-			unset( $importers[ $slug ] );
+			unset($importers[$slug]);
 		}
 
-		foreach ( $importers as $slug => $args ) {
-			WordPoints_Importers::deregister( $slug );
+		foreach ($importers as $slug => $args) {
+			WordPoints_Importers::deregister($slug);
 		}
 
 		parent::tearDown();
@@ -76,14 +76,14 @@ 
 
 		WordPoints_Importers::register(
 			__METHOD__
-			, array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
+			, array('class' => 'WordPoints_Importer_Mock', 'name' => 'Test')
 		);
 
 		$importers = WordPoints_Importers::get();
 
-		$this->assertArrayHasKey( 'test', $importers );
+		$this->assertArrayHasKey('test', $importers);
 		$this->assertEquals(
-			array( 'class' => 'WordPoints_Importer_Mock', 'name' => 'Test' )
+			array('class' => 'WordPoints_Importer_Mock', 'name' => 'Test')
 			, $importers['test']
 		);
 	}
@@ -98,11 +98,11 @@ 
 	 */
 	public function test_deregister() {
 
-		WordPoints_Importers::deregister( 'test' );
+		WordPoints_Importers::deregister('test');
 
 		$importers = WordPoints_Importers::get();
 
-		$this->assertArrayNotHasKey( 'test', $importers );
+		$this->assertArrayNotHasKey('test', $importers);
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	public function test_is_registered() {
 
-		$this->assertTrue( WordPoints_Importers::is_registered( 'test' ) );
+		$this->assertTrue(WordPoints_Importers::is_registered('test'));
 	}
 
 	/**
@@ -126,9 +126,9 @@ 
 	 */
 	public function test_is_registered_unregistered() {
 
-		WordPoints_Importers::deregister( 'test' );
+		WordPoints_Importers::deregister('test');
 
-		$this->assertFalse( WordPoints_Importers::is_registered( 'test' ) );
+		$this->assertFalse(WordPoints_Importers::is_registered('test'));
 	}
 
 	/**
@@ -140,9 +140,9 @@ 
 	 */
 	public function test_get_unregistered_importer() {
 
-		WordPoints_Importers::deregister( 'test' );
+		WordPoints_Importers::deregister('test');
 
-		$this->assertFalse( WordPoints_Importers::get_importer( 'test' ) );
+		$this->assertFalse(WordPoints_Importers::get_importer('test'));
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 
 		$this->assertInstanceOf(
 			'WordPoints_Importer_Mock'
-			, WordPoints_Importers::get_importer( 'test' )
+			, WordPoints_Importers::get_importer('test')
 		);
 	}
 

tests/phpunit/includes/mocks.php

Indentation +82 added lines, -82 removed lines

@@ -14,88 +14,88 @@
  */
 class WordPoints_Importer_Mock extends WordPoints_Importer {
 
-	/**
-	 * @since 1.0.0
-	 */
-	public $components;
-
-	/**
-	 * The "imports" performed.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var array
-	 */
-	public $imports;
-
-	/**
-	 * The "imports" for that were checked for possible performance.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var array
-	 */
-	public $can_imports;
-
-	/**
-	 * Whether this importer is available.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var true|WP_Error
-	 */
-	public $is_available = true;
-
-	/**
-	 * @since 1.0.0
-	 */
-	public function is_available() {
-		return $this->is_available;
-	}
-
-	/**
-	 * Mock an import method.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array $settings The settings for this "component".
-	 */
-	public function do_an_import( $settings ) {
-
-		$this->imports[] = $settings;
-	}
-
-	/**
-	 * Mock a can_import method.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array $settings The settings for this "component".
-	 *
-	 * @return true
-	 */
-	public function can_import( $settings ) {
-
-		$this->can_imports[] = $settings;
-
-		return true;
-	}
-
-	/**
-	 * Return a WP_Error because we can't do the import for an option.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array $settings The settings for this "component".
-	 *
-	 * @return WP_Error An error.
-	 */
-	public function cant_import( $settings ) {
-
-		$this->can_imports[] = $settings;
-
-		return new WP_Error();
-	}
+    /**
+     * @since 1.0.0
+     */
+    public $components;
+
+    /**
+     * The "imports" performed.
+     *
+     * @since 1.0.0
+     *
+     * @var array
+     */
+    public $imports;
+
+    /**
+     * The "imports" for that were checked for possible performance.
+     *
+     * @since 1.0.0
+     *
+     * @var array
+     */
+    public $can_imports;
+
+    /**
+     * Whether this importer is available.
+     *
+     * @since 1.0.0
+     *
+     * @var true|WP_Error
+     */
+    public $is_available = true;
+
+    /**
+     * @since 1.0.0
+     */
+    public function is_available() {
+        return $this->is_available;
+    }
+
+    /**
+     * Mock an import method.
+     *
+     * @since 1.0.0
+     *
+     * @param array $settings The settings for this "component".
+     */
+    public function do_an_import( $settings ) {
+
+        $this->imports[] = $settings;
+    }
+
+    /**
+     * Mock a can_import method.
+     *
+     * @since 1.0.0
+     *
+     * @param array $settings The settings for this "component".
+     *
+     * @return true
+     */
+    public function can_import( $settings ) {
+
+        $this->can_imports[] = $settings;
+
+        return true;
+    }
+
+    /**
+     * Return a WP_Error because we can't do the import for an option.
+     *
+     * @since 1.0.0
+     *
+     * @param array $settings The settings for this "component".
+     *
+     * @return WP_Error An error.
+     */
+    public function cant_import( $settings ) {
+
+        $this->can_imports[] = $settings;
+
+        return new WP_Error();
+    }
 }
 
 // EOF

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
 	 *
 	 * @param array $settings The settings for this "component".
 	 */
-	public function do_an_import( $settings ) {
+	public function do_an_import($settings) {
 
 		$this->imports[] = $settings;
 	}
@@ -74,7 +74,7 @@ 
 	 *
 	 * @return true
 	 */
-	public function can_import( $settings ) {
+	public function can_import($settings) {
 
 		$this->can_imports[] = $settings;
 
@@ -90,7 +90,7 @@ 
 	 *
 	 * @return WP_Error An error.
 	 */
-	public function cant_import( $settings ) {
+	public function cant_import($settings) {
 
 		$this->can_imports[] = $settings;