WordPoints / wordpoints

src/includes/class-widget.php

Spacing +24 added lines, -24 removed lines

@@ -52,13 +52,13 @@ 
 	 * @param WP_Error|string $message The error message to display.
 	 * @param array           $args    Arguments for widget display.
 	 */
-	public function wordpoints_widget_error( $message, $args ) {
+	public function wordpoints_widget_error($message, $args) {
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			return;
 		}
 
-		if ( is_wp_error( $message ) ) {
+		if (is_wp_error($message)) {
 			$message = $message->get_error_message();
 		}
 
@@ -72,8 +72,8 @@ 
 
 				echo wp_kses(
 					sprintf(
-						esc_html__( 'The “%1$s” widget could not be displayed because of an error: %2$s', 'wordpoints' )
-						, esc_html( $this->name )
+						esc_html__('The “%1$s” widget could not be displayed because of an error: %2$s', 'wordpoints')
+						, esc_html($this->name)
 						,  $message
 					)
 					, 'wordpoints_widget_error'
@@ -103,9 +103,9 @@ 
 	 *
 	 * @return array|WP_Error The verified settings.
 	 */
-	protected function verify_settings( $instance ) {
+	protected function verify_settings($instance) {
 
-		if ( ! isset( $instance['title'] ) ) {
+		if ( ! isset($instance['title'])) {
 			$instance['title'] = '';
 		}
 
@@ -120,12 +120,12 @@ 
 	 * @param array $args     Arguments for widget display.
 	 * @param array $instance The settings for this widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
-		$instance = $this->verify_settings( $instance );
+		$instance = $this->verify_settings($instance);
 
-		if ( is_wp_error( $instance ) ) {
-			$this->wordpoints_widget_error( $instance, $args );
+		if (is_wp_error($instance)) {
+			$this->wordpoints_widget_error($instance, $args);
 			return;
 		}
 
@@ -138,9 +138,9 @@ 
 		 *
 		 * @param string $title The widget title.
 		 */
-		$title = apply_filters( 'widget_title', $instance['title'] );
+		$title = apply_filters('widget_title', $instance['title']);
 
-		if ( ! empty( $title ) ) {
+		if ( ! empty($title)) {
 
 			echo $args['before_title'] . $title . $args['after_title']; // XSS OK, WPCS.
 		}
@@ -154,9 +154,9 @@ 
 		 *
 		 * @param array $instance The settings for this widget instance.
 		 */
-		do_action( "wordpoints_{$widget_slug}_widget_before", $instance );
+		do_action("wordpoints_{$widget_slug}_widget_before", $instance);
 
-		$this->widget_body( $instance );
+		$this->widget_body($instance);
 
 		/**
 		 * After a WordPoints widget.
@@ -165,7 +165,7 @@ 
 		 *
 		 * @param array $instance The settings for this widget instance.
 		 */
-		do_action( "wordpoints_{$widget_slug}_widget_after", $instance );
+		do_action("wordpoints_{$widget_slug}_widget_after", $instance);
 
 		echo $args['after_widget']; // XSS OK here too, WPCS.
 	}
@@ -185,14 +185,14 @@ 
 	 *
 	 * @param array $instance The settings of the widget instance to display.
 	 */
-	protected function widget_body( $instance ) {}
+	protected function widget_body($instance) {}
 
 	/**
 	 * @since 2.0.0
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
-		$this->instance = array_merge( $this->defaults, $old_instance, $new_instance );
+		$this->instance = array_merge($this->defaults, $old_instance, $new_instance);
 
 		$this->update_title();
 
@@ -205,15 +205,15 @@ 
 	 * @since 2.0.0
 	 */
 	public function update_title() {
-		$this->instance['title'] = strip_tags( $this->instance['title'] );
+		$this->instance['title'] = strip_tags($this->instance['title']);
 	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		$this->instance = array_merge( $this->defaults, $instance );
+		$this->instance = array_merge($this->defaults, $instance);
 
 		$this->form_title_field();
 
@@ -230,8 +230,8 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php echo esc_html_x( 'Title', 'form label', 'wordpoints' ); ?></label>
-			<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" value="<?php echo esc_attr( $this->instance['title'] ); ?>" />
+			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php echo esc_html_x('Title', 'form label', 'wordpoints'); ?></label>
+			<input type="text" class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" name="<?php echo esc_attr($this->get_field_name('title')); ?>" value="<?php echo esc_attr($this->instance['title']); ?>" />
 		</p>
 
 		<?php

src/includes/class-breaking-updater.php

Spacing +67 added lines, -67 removed lines

@@ -23,7 +23,7 @@ 
 	 * @since 2.0.0
 	 */
 	protected $updates = array(
-		'breaking'  => array( 'single' => true, 'site' => true, 'network' => true ),
+		'breaking'  => array('single' => true, 'site' => true, 'network' => true),
 	);
 
 	/**
@@ -45,9 +45,9 @@ 
 		 *
 		 * @since 2.0.0
 		 */
-		require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		require_once(ABSPATH . 'wp-admin/includes/file.php');
 
-		if ( ! WP_Filesystem( false, ABSPATH ) ) {
+		if ( ! WP_Filesystem(false, ABSPATH)) {
 			return;
 		}
 
@@ -59,18 +59,18 @@ 
 	 */
 	protected function after_update() {
 
-		$this->maintenance_mode( false );
+		$this->maintenance_mode(false);
 
-		if ( $this->network_wide ) {
+		if ($this->network_wide) {
 
 			$deactivated_modules = array_diff(
 				$this->checked_modules
-				, array_filter( $this->checked_modules )
+				, array_filter($this->checked_modules)
 			);
 
 			update_site_option(
 				'wordpoints_breaking_deactivated_modules'
-				, array_keys( $deactivated_modules )
+				, array_keys($deactivated_modules)
 			);
 		}
 	}
@@ -89,27 +89,27 @@ 
 	 *
 	 * @param bool $enable Whether to turn maintenance mode on or off.
 	 */
-	protected function maintenance_mode( $enable = true ) {
+	protected function maintenance_mode($enable = true) {
 
 		/**
 		 * @var WP_Filesystem_Base $wp_filesystem
 		 */
 		global $wp_filesystem;
 
-		if ( ! ( $wp_filesystem instanceof WP_Filesystem_Base ) ) {
+		if ( ! ($wp_filesystem instanceof WP_Filesystem_Base)) {
 			return;
 		}
 
 		$file = $wp_filesystem->abspath() . '.maintenance';
 
-		if ( $enable ) {
+		if ($enable) {
 
 			$maintenance_string = '<?php $upgrading = ' . time() . '; include( "' . WORDPOINTS_DIR . '/includes/maintenance.php" ); ?>';
-			$wp_filesystem->delete( $file );
-			$wp_filesystem->put_contents( $file, $maintenance_string, FS_CHMOD_FILE );
+			$wp_filesystem->delete($file);
+			$wp_filesystem->put_contents($file, $maintenance_string, FS_CHMOD_FILE);
 
-		} elseif ( $wp_filesystem->exists( $file ) ) {
-			$wp_filesystem->delete( $file );
+		} elseif ($wp_filesystem->exists($file)) {
+			$wp_filesystem->delete($file);
 		}
 	}
 
@@ -120,15 +120,15 @@ 
 	 */
 	protected function update_network_to_breaking() {
 
-		if ( ! $this->network_wide ) {
+		if ( ! $this->network_wide) {
 			return;
 		}
 
 		$network_active_modules = array_keys(
-			wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' )
+			wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site')
 		);
 
-		$this->check_modules( $network_active_modules );
+		$this->check_modules($network_active_modules);
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	protected function update_single_to_breaking() {
 
 		$this->check_modules(
-			wordpoints_get_array_option( 'wordpoints_active_modules' )
+			wordpoints_get_array_option('wordpoints_active_modules')
 		);
 	}
 
@@ -159,17 +159,17 @@ 
 	 *
 	 * @param array $modules A list of basename-paths of modules to check.
 	 */
-	protected function check_modules( $modules ) {
+	protected function check_modules($modules) {
 
-		$modules = $this->validate_modules( $modules );
+		$modules = $this->validate_modules($modules);
 
-		if ( empty( $modules ) ) {
+		if (empty($modules)) {
 			return;
 		}
 
 		// First try checking all of them at once.
-		if ( count( $modules ) > 1 ) {
-			if ( $this->check_module( implode( ',', $modules ) ) ) {
+		if (count($modules) > 1) {
+			if ($this->check_module(implode(',', $modules))) {
 				return;
 			}
 		}
@@ -177,18 +177,18 @@ 
 		// If there was one or more broken, we'll have to check each to find them.
 		$incompatible_modules = array();
 
-		foreach ( $modules as $module ) {
-			if ( ! $this->check_module( $module ) ) {
+		foreach ($modules as $module) {
+			if ( ! $this->check_module($module)) {
 				$incompatible_modules[] = $module;
-				$this->checked_modules[ $module ] = false;
+				$this->checked_modules[$module] = false;
 			}
 		}
 
-		if ( empty( $incompatible_modules ) ) {
+		if (empty($incompatible_modules)) {
 			return;
 		}
 
-		$this->deactivate_modules( $incompatible_modules );
+		$this->deactivate_modules($incompatible_modules);
 	}
 
 	/**
@@ -200,32 +200,32 @@ 
 	 *
 	 * @return string[] The valid modules.
 	 */
-	protected function validate_modules( $modules ) {
+	protected function validate_modules($modules) {
 
 		$incompatible = array();
 
-		foreach ( $modules as $index => $module ) {
+		foreach ($modules as $index => $module) {
 
-			if ( isset( $this->checked_modules[ $module ] ) ) {
+			if (isset($this->checked_modules[$module])) {
 
-				unset( $modules[ $index ] );
+				unset($modules[$index]);
 
-				if ( ! $this->checked_modules[ $module ] ) {
+				if ( ! $this->checked_modules[$module]) {
 					$incompatible[] = $module;
 				}
 			}
 
-			$valid = wordpoints_validate_module( $module );
+			$valid = wordpoints_validate_module($module);
 
-			if ( is_wp_error( $valid ) ) {
-				unset( $modules[ $index ] );
+			if (is_wp_error($valid)) {
+				unset($modules[$index]);
 			}
 
-			$this->checked_modules[ $module ] = true;
+			$this->checked_modules[$module] = true;
 		}
 
-		if ( ! empty( $incompatible ) ) {
-			$this->deactivate_modules( $incompatible );
+		if ( ! empty($incompatible)) {
+			$this->deactivate_modules($incompatible);
 		}
 
 		return $modules;
@@ -241,43 +241,43 @@ 
 	 * @return bool|WP_Error Whether the page loaded correctly, or a WP_Error if
 	 *                       unable to make the request.
 	 */
-	protected function check_module( $module ) {
+	protected function check_module($module) {
 
-		$rand_str = wp_generate_password( 256, true, true );
-		$nonce = wordpoints_hash( $rand_str . 'wordpoints_check_modules-' . $module );
+		$rand_str = wp_generate_password(256, true, true);
+		$nonce = wordpoints_hash($rand_str . 'wordpoints_check_modules-' . $module);
 
-		if ( 'network' === $this->context ) {
-			update_site_option( 'wordpoints_module_check_rand_str', $rand_str );
-			update_site_option( 'wordpoints_module_check_nonce', $nonce );
+		if ('network' === $this->context) {
+			update_site_option('wordpoints_module_check_rand_str', $rand_str);
+			update_site_option('wordpoints_module_check_nonce', $nonce);
 		} else {
-			update_option( 'wordpoints_module_check_rand_str', $rand_str );
-			update_option( 'wordpoints_module_check_nonce', $nonce );
+			update_option('wordpoints_module_check_rand_str', $rand_str);
+			update_option('wordpoints_module_check_nonce', $nonce);
 		}
 
 		$response = wp_safe_remote_post(
 			add_query_arg(
 				'wordpoints_module_check'
 				, $nonce
-				, self_admin_url( 'admin-ajax.php?action=wordpoints_breaking_module_check&check_module=' . $module )
+				, self_admin_url('admin-ajax.php?action=wordpoints_breaking_module_check&check_module=' . $module)
 			)
-			, array( 'timeout' => 20 )
+			, array('timeout' => 20)
 		);
 
-		if ( 'network' === $this->context ) {
-			delete_site_option( 'wordpoints_module_check_rand_str' );
-			delete_site_option( 'wordpoints_module_check_nonce' );
+		if ('network' === $this->context) {
+			delete_site_option('wordpoints_module_check_rand_str');
+			delete_site_option('wordpoints_module_check_nonce');
 		} else {
-			delete_option( 'wordpoints_module_check_rand_str' );
-			delete_option( 'wordpoints_module_check_nonce' );
+			delete_option('wordpoints_module_check_rand_str');
+			delete_option('wordpoints_module_check_nonce');
 		}
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return $response;
 		}
 
-		$body = wp_remote_retrieve_body( $response );
+		$body = wp_remote_retrieve_body($response);
 
-		return (bool) strpos( $body, $rand_str );
+		return (bool) strpos($body, $rand_str);
 	}
 
 	/**
@@ -287,23 +287,23 @@ 
 	 *
 	 * @param array $modules A list of basename-paths of modules to deactivate.
 	 */
-	protected function deactivate_modules( $modules ) {
+	protected function deactivate_modules($modules) {
 
-		if ( 'network' === $this->context ) {
+		if ('network' === $this->context) {
 
-			$active_modules = wordpoints_get_array_option( 'wordpoints_sitewide_active_modules', 'site' );
-			$active_modules = array_diff_key( $active_modules, array_flip( $modules ) );
-			update_site_option( 'wordpoints_sitewide_active_modules', $active_modules );
+			$active_modules = wordpoints_get_array_option('wordpoints_sitewide_active_modules', 'site');
+			$active_modules = array_diff_key($active_modules, array_flip($modules));
+			update_site_option('wordpoints_sitewide_active_modules', $active_modules);
 
-			update_site_option( 'wordpoints_incompatible_modules', $modules );
+			update_site_option('wordpoints_incompatible_modules', $modules);
 
 		} else {
 
-			$active_modules = wordpoints_get_array_option( 'wordpoints_active_modules' );
-			$active_modules = array_diff( $active_modules, $modules );
-			update_option( 'wordpoints_active_modules', $active_modules );
+			$active_modules = wordpoints_get_array_option('wordpoints_active_modules');
+			$active_modules = array_diff($active_modules, $modules);
+			update_option('wordpoints_active_modules', $active_modules);
 
-			update_option( 'wordpoints_incompatible_modules', $modules );
+			update_option('wordpoints_incompatible_modules', $modules);
 		}
 	}
 }

src/includes/constants.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
  *
  * @const WORDPOINTS_VERSION
  */
-define( 'WORDPOINTS_VERSION', '2.3.0-alpha-2' );
+define('WORDPOINTS_VERSION', '2.3.0-alpha-2');
 
 /**
  * The full path to the plugin's main directory.
@@ -31,7 +31,7 @@ 
  *
  * @const WORDPOINTS_DIR
  */
-define( 'WORDPOINTS_DIR', dirname( dirname( __FILE__ ) ) . '/' );
+define('WORDPOINTS_DIR', dirname(dirname(__FILE__)) . '/');
 
 /**
  * The full URL to the plugin's main directory.
@@ -40,6 +40,6 @@ 
  *
  * @const WORDPOINTS_URL
  */
-define( 'WORDPOINTS_URL', plugins_url( '', WORDPOINTS_DIR . 'wordpoints.php' ) );
+define('WORDPOINTS_URL', plugins_url('', WORDPOINTS_DIR . 'wordpoints.php'));
 
 // EOF

src/includes/maintenance.php

Spacing +2 added lines, -2 removed lines

@@ -15,12 +15,12 @@
 $time = time();
 
 // Don't lock the user out of their site if the file fails to delete for some reason.
-if ( $time - $upgrading >= 10 * MINUTE_IN_SECONDS ) {
+if ($time - $upgrading >= 10 * MINUTE_IN_SECONDS) {
 	return;
 }
 
 // If we're not running a module check, let the maintenance message show.
-if ( ! isset( $_GET['wordpoints_module_check'], $_GET['check_module'] ) ) {
+if ( ! isset($_GET['wordpoints_module_check'], $_GET['check_module'])) {
 	return;
 }
 

src/includes/class-modules.php

Spacing +37 added lines, -37 removed lines

@@ -91,10 +91,10 @@ 
 	 *
 	 * @return string The unique slug used to identify this module.
 	 */
-	public static function get_slug( $file ) {
+	public static function get_slug($file) {
 
 		return strrev(
-			basename( strrev( wordpoints_module_basename( $file ) ) )
+			basename(strrev(wordpoints_module_basename($file)))
 		);
 	}
 
@@ -108,23 +108,23 @@ 
 	 *
 	 * @return string[]|string|false The data, or false if it isn't registered.
 	 */
-	public static function get_data( $module, $data = null ) {
+	public static function get_data($module, $data = null) {
 
-		$slug = self::get_slug( $module );
+		$slug = self::get_slug($module);
 
-		if ( ! isset( self::$registered[ $slug ] ) ) {
+		if ( ! isset(self::$registered[$slug])) {
 			return false;
 		}
 
-		if ( $data ) {
-			if ( ! isset( self::$registered[ $slug ][ $data ] ) ) {
+		if ($data) {
+			if ( ! isset(self::$registered[$slug][$data])) {
 				return false;
 			}
 
-			return self::$registered[ $slug ][ $data ];
+			return self::$registered[$slug][$data];
 		}
 
-		return self::$registered[ $slug ];
+		return self::$registered[$slug];
 	}
 
 	/**
@@ -137,21 +137,21 @@ 
 	 *
 	 * @return bool True, or false if the module has already been registered.
 	 */
-	public static function register( $data, $file ) {
+	public static function register($data, $file) {
 
-		$slug = self::get_slug( $file );
+		$slug = self::get_slug($file);
 
-		if ( isset( self::$registered[ $slug ] ) ) {
+		if (isset(self::$registered[$slug])) {
 			return false;
 		}
 
-		self::$registered[ $slug ] = self::parse_headers( $data );
+		self::$registered[$slug] = self::parse_headers($data);
 
-		self::$registered[ $slug ]['raw'] = $data;
-		self::$registered[ $slug ]['raw_file'] = wp_normalize_path( $file );
+		self::$registered[$slug]['raw'] = $data;
+		self::$registered[$slug]['raw_file'] = wp_normalize_path($file);
 
-		self::register_installable( $slug, $file );
-		self::maybe_load_textdomain( $slug, $file );
+		self::register_installable($slug, $file);
+		self::maybe_load_textdomain($slug, $file);
 
 		return true;
 	}
@@ -165,32 +165,32 @@ 
 	 *
 	 * @return array The parsed header data.
 	 */
-	private static function parse_headers( $data ) {
+	private static function parse_headers($data) {
 
 		$parsed = array();
 
-		$lines = explode( "\n", $data );
+		$lines = explode("\n", $data);
 
-		foreach ( $lines as $line ) {
+		foreach ($lines as $line) {
 
-			$line = trim( $line );
+			$line = trim($line);
 
-			if ( empty( $line ) ) {
+			if (empty($line)) {
 				continue;
 			}
 
-			$parts = explode( ':', $line, 2 );
+			$parts = explode(':', $line, 2);
 
-			$data_slug = trim( $parts[0] );
+			$data_slug = trim($parts[0]);
 
-			if ( isset( self::$default_headers[ $parts[0] ] ) ) {
-				$data_slug = self::$default_headers[ $parts[0] ];
+			if (isset(self::$default_headers[$parts[0]])) {
+				$data_slug = self::$default_headers[$parts[0]];
 			}
 
-			$parsed[ $data_slug ] = trim( $parts[1] );
+			$parsed[$data_slug] = trim($parts[1]);
 		}
 
-		return $parsed + array_fill_keys( self::$default_headers, '' );
+		return $parsed + array_fill_keys(self::$default_headers, '');
 	}
 
 	/**
@@ -201,15 +201,15 @@ 
 	 * @param string $slug The module slug.
 	 * @param string $file The main module file.
 	 */
-	private static function register_installable( $slug, $file ) {
+	private static function register_installable($slug, $file) {
 
 		WordPoints_Installables::register(
 			'module'
 			, $slug
 			, array(
-				'version'      => self::$registered[ $slug ]['version'],
-				'un_installer' => dirname( $file ) . '/includes/class-un-installer.php',
-				'network_wide' => is_wordpoints_module_active_for_network( $file ),
+				'version'      => self::$registered[$slug]['version'],
+				'un_installer' => dirname($file) . '/includes/class-un-installer.php',
+				'network_wide' => is_wordpoints_module_active_for_network($file),
 			)
 		);
 	}
@@ -222,20 +222,20 @@ 
 	 * @param string $slug The module slug.
 	 * @param string $file The main module file.
 	 */
-	private static function maybe_load_textdomain( $slug, $file ) {
+	private static function maybe_load_textdomain($slug, $file) {
 
-		if ( empty( self::$registered[ $slug ]['text_domain'] ) ) {
+		if (empty(self::$registered[$slug]['text_domain'])) {
 			return;
 		}
 
 		$path = false;
 
-		if ( ! empty( self::$registered[ $slug ]['domain_path'] ) ) {
-			$path = wordpoints_module_basename( $file ) . self::$registered[ $slug ]['domain_path'];
+		if ( ! empty(self::$registered[$slug]['domain_path'])) {
+			$path = wordpoints_module_basename($file) . self::$registered[$slug]['domain_path'];
 		}
 
 		wordpoints_load_module_textdomain(
-			self::$registered[ $slug ]['text_domain']
+			self::$registered[$slug]['text_domain']
 			, $path
 		);
 	}

src/includes/class-shortcode.php

Spacing +24 added lines, -24 removed lines

@@ -45,11 +45,11 @@ 
 	 * @param string $shortcode The shortcode to register a handler class for.
 	 * @param string $class     The handler class for this shortcode.
 	 */
-	public static function register( $shortcode, $class ) {
+	public static function register($shortcode, $class) {
 
-		self::$shortcodes[ $shortcode ] = $class;
+		self::$shortcodes[$shortcode] = $class;
 
-		add_shortcode( $shortcode, array( __CLASS__, 'do_shortcode' ) );
+		add_shortcode($shortcode, array(__CLASS__, 'do_shortcode'));
 	}
 
 	/**
@@ -71,12 +71,12 @@ 
 	 *                                          or a handler, or false if $shortcode
 	 *                                          is invalid.
 	 */
-	public static function get( $shortcode = null, $atts = null, $content = null ) {
+	public static function get($shortcode = null, $atts = null, $content = null) {
 
-		if ( isset( $shortcode ) ) {
+		if (isset($shortcode)) {
 
-			if ( isset( self::$shortcodes[ $shortcode ] ) ) {
-				return new self::$shortcodes[ $shortcode ]( $atts, $content, $shortcode );
+			if (isset(self::$shortcodes[$shortcode])) {
+				return new self::$shortcodes[$shortcode]($atts, $content, $shortcode);
 			} else {
 				return false;
 			}
@@ -103,18 +103,18 @@ 
 	 *
 	 * @return string The content generated for this shortcode.
 	 */
-	public static function do_shortcode( $atts, $content, $shortcode ) {
+	public static function do_shortcode($atts, $content, $shortcode) {
 
-		if ( ! isset( self::$shortcodes[ $shortcode ] ) ) {
+		if ( ! isset(self::$shortcodes[$shortcode])) {
 			return wordpoints_shortcode_error(
 				sprintf(
-					esc_html__( 'The %s shortcode was not registered properly.', 'wordpoints' )
-					, '<code>[' . esc_html( $shortcode ) . ']</code>'
+					esc_html__('The %s shortcode was not registered properly.', 'wordpoints')
+					, '<code>[' . esc_html($shortcode) . ']</code>'
 				)
 			);
 		}
 
-		$shortcode = new self::$shortcodes[ $shortcode ]( $atts, $content, $shortcode );
+		$shortcode = new self::$shortcodes[$shortcode]($atts, $content, $shortcode);
 		return $shortcode->expand();
 	}
 }
@@ -205,12 +205,12 @@ 
 	 * @param string $content   The shortcode's content.
 	 * @param string $shortcode The shortcode's name.
 	 */
-	public function __construct( $atts, $content, $shortcode = null ) {
+	public function __construct($atts, $content, $shortcode = null) {
 
 		$this->atts = $atts;
 		$this->content = $content;
 
-		if ( isset( $shortcode ) ) {
+		if (isset($shortcode)) {
 			$this->shortcode = $shortcode;
 		}
 	}
@@ -228,7 +228,7 @@ 
 	 */
 	public function expand() {
 
-		$this->atts = shortcode_atts( $this->pairs, $this->atts, $this->shortcode );
+		$this->atts = shortcode_atts($this->pairs, $this->atts, $this->shortcode);
 
 		/**
 		 * Filter the shortcode attribute values supplied by the user.
@@ -257,8 +257,8 @@ 
 
 		$error = $this->verify_atts();
 
-		if ( ! empty( $error ) ) {
-			return wordpoints_shortcode_error( $error );
+		if ( ! empty($error)) {
+			return wordpoints_shortcode_error($error);
 		}
 
 		return $this->generate();
@@ -283,15 +283,15 @@ 
 	protected function verify_atts() {
 
 		// If this shortcode supports the user_id attribute, verify it.
-		if ( isset( $this->pairs['user_id'] ) ) {
+		if (isset($this->pairs['user_id'])) {
 
-			if ( 'post_author' === $this->atts['user_id'] ) {
+			if ('post_author' === $this->atts['user_id']) {
 
 				$post = get_post();
 
-				if ( ! $post ) {
+				if ( ! $post) {
 					return sprintf(
-						esc_html__( 'The &#8220;%1$s&#8221; attribute of the %2$s shortcode must be used inside of a Post, Page, or other post type.', 'wordpoints' )
+						esc_html__('The &#8220;%1$s&#8221; attribute of the %2$s shortcode must be used inside of a Post, Page, or other post type.', 'wordpoints')
 						, 'user_id="post_author"'
 						, "<code>[{$this->shortcode}]</code>"
 					);
@@ -299,14 +299,14 @@ 
 
 				$this->atts['user_id'] = $post->post_author;
 
-			} elseif ( ! $this->atts['user_id'] ) {
+			} elseif ( ! $this->atts['user_id']) {
 
 				$this->atts['user_id'] = get_current_user_id();
 
-			} elseif ( ! wordpoints_posint( $this->atts['user_id'] ) ) {
+			} elseif ( ! wordpoints_posint($this->atts['user_id'])) {
 
 				return sprintf(
-					esc_html__( 'Unrecognized value for the %1$s attribute of the %2$s shortcode. Expected &#8220;%3$s&#8221; or a user ID.', 'wordpoints' )
+					esc_html__('Unrecognized value for the %1$s attribute of the %2$s shortcode. Expected &#8220;%3$s&#8221; or a user ID.', 'wordpoints')
 					, 'user_id'
 					, "<code>[{$this->shortcode}]</code>"
 					, 'post_author'

Doc Comments +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
 	 *
 	 * @since 1.8.0
 	 *
-	 * @return string|WP_Error|null An error message or object on failure.
+	 * @return string|null An error message or object on failure.
 	 */
 	protected function verify_atts() {
 

src/includes/apps.php

Spacing +80 added lines, -80 removed lines

@@ -20,8 +20,8 @@ 
  */
 function wordpoints_apps() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
-		WordPoints_App::$main = new WordPoints_App( 'apps' );
+	if ( ! isset(WordPoints_App::$main)) {
+		WordPoints_App::$main = new WordPoints_App('apps');
 	}
 
 	return WordPoints_App::$main;
@@ -36,15 +36,15 @@ 
  *
  * @param WordPoints_App $app The main apps app.
  */
-function wordpoints_apps_init( $app ) {
+function wordpoints_apps_init($app) {
 
 	$apps = $app->sub_apps();
 
-	$apps->register( 'hooks', 'WordPoints_Hooks' );
-	$apps->register( 'entities', 'WordPoints_App_Registry' );
-	$apps->register( 'data_types', 'WordPoints_Class_Registry' );
-	$apps->register( 'components', 'WordPoints_App' );
-	$apps->register( 'modules', 'WordPoints_App' );
+	$apps->register('hooks', 'WordPoints_Hooks');
+	$apps->register('entities', 'WordPoints_App_Registry');
+	$apps->register('data_types', 'WordPoints_Class_Registry');
+	$apps->register('components', 'WordPoints_App');
+	$apps->register('modules', 'WordPoints_App');
 }
 
 /**
@@ -63,13 +63,13 @@ 
  * @return array The slug parsed into the 'generic' and 'dynamic' portions. If the
  *               slug is not dynamic, the value of each of those keys will be false.
  */
-function wordpoints_parse_dynamic_slug( $slug ) {
+function wordpoints_parse_dynamic_slug($slug) {
 
-	$parsed = array( 'dynamic' => false, 'generic' => false );
+	$parsed = array('dynamic' => false, 'generic' => false);
 
-	$parts = explode( '\\', $slug, 2 );
+	$parts = explode('\\', $slug, 2);
 
-	if ( isset( $parts[1] ) ) {
+	if (isset($parts[1])) {
 		$parsed['dynamic'] = $parts[1];
 		$parsed['generic'] = $parts[0];
 	}
@@ -86,7 +86,7 @@ 
  */
 function wordpoints_get_post_types_for_auto_integration() {
 
-	$post_types = get_post_types( array( 'public' => true ) );
+	$post_types = get_post_types(array('public' => true));
 
 	/**
 	 * Filter which post types to automatically integrate with.
@@ -95,7 +95,7 @@ 
 	 *
 	 * @param string[] $post_types The post type slugs ("names").
 	 */
-	return apply_filters( 'wordpoints_post_types_for_auto_integration', $post_types );
+	return apply_filters('wordpoints_post_types_for_auto_integration', $post_types);
 }
 
 //
@@ -111,13 +111,13 @@ 
  *
  * @return false|WordPoints_App The component's app.
  */
-function wordpoints_component( $slug ) {
+function wordpoints_component($slug) {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
-	return WordPoints_App::$main->get_sub_app( 'components' )->get_sub_app( $slug );
+	return WordPoints_App::$main->get_sub_app('components')->get_sub_app($slug);
 }
 
 //
@@ -133,13 +133,13 @@ 
  *
  * @return false|WordPoints_App The module's app.
  */
-function wordpoints_module( $slug ) {
+function wordpoints_module($slug) {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
-	return WordPoints_App::$main->get_sub_app( 'modules' )->get_sub_app( $slug );
+	return WordPoints_App::$main->get_sub_app('modules')->get_sub_app($slug);
 }
 
 //
@@ -155,11 +155,11 @@ 
  */
 function wordpoints_entities() {
 
-	if ( ! isset( WordPoints_App::$main ) ) {
+	if ( ! isset(WordPoints_App::$main)) {
 		wordpoints_apps();
 	}
 
-	return WordPoints_App::$main->get_sub_app( 'entities' );
+	return WordPoints_App::$main->get_sub_app('entities');
 }
 
 /**
@@ -171,12 +171,12 @@ 
  *
  * @param WordPoints_App_Registry $entities The entities app.
  */
-function wordpoints_entities_app_init( $entities ) {
+function wordpoints_entities_app_init($entities) {
 
 	$sub_apps = $entities->sub_apps();
-	$sub_apps->register( 'children', 'WordPoints_Class_Registry_Children' );
-	$sub_apps->register( 'contexts', 'WordPoints_Entity_Contexts' );
-	$sub_apps->register( 'restrictions', 'WordPoints_Entity_Restrictions' );
+	$sub_apps->register('children', 'WordPoints_Class_Registry_Children');
+	$sub_apps->register('contexts', 'WordPoints_Entity_Contexts');
+	$sub_apps->register('restrictions', 'WordPoints_Entity_Restrictions');
 }
 
 /**
@@ -188,10 +188,10 @@ 
  *
  * @param WordPoints_Class_RegistryI $contexts The entity context registry.
  */
-function wordpoints_entity_contexts_init( $contexts ) {
+function wordpoints_entity_contexts_init($contexts) {
 
-	$contexts->register( 'network', 'WordPoints_Entity_Context_Network' );
-	$contexts->register( 'site', 'WordPoints_Entity_Context_Site' );
+	$contexts->register('network', 'WordPoints_Entity_Context_Network');
+	$contexts->register('site', 'WordPoints_Entity_Context_Site');
 }
 
 /**
@@ -203,11 +203,11 @@ 
  *
  * @param WordPoints_App $restrictions The entity restrictions app.
  */
-function wordpoints_entities_restrictions_app_init( $restrictions ) {
+function wordpoints_entities_restrictions_app_init($restrictions) {
 
 	$sub_apps = $restrictions->sub_apps();
-	$sub_apps->register( 'know', 'WordPoints_Class_Registry_Deep_Multilevel_Slugless' );
-	$sub_apps->register( 'view', 'WordPoints_Class_Registry_Deep_Multilevel_Slugless' );
+	$sub_apps->register('know', 'WordPoints_Class_Registry_Deep_Multilevel_Slugless');
+	$sub_apps->register('view', 'WordPoints_Class_Registry_Deep_Multilevel_Slugless');
 }
 
 /**
@@ -223,7 +223,7 @@ 
  * @param WordPoints_Class_Registry_Deep_Multilevel $restrictions The restrictions
  *                                                                registry.
  */
-function wordpoints_entity_restrictions_know_init( $restrictions ) {
+function wordpoints_entity_restrictions_know_init($restrictions) {
 
 	$restrictions->register(
 		'unregistered'
@@ -237,17 +237,17 @@ 
 		, 'WordPoints_Entity_Restriction_Legacy'
 	);
 
-	foreach ( wordpoints_get_post_types_for_entities() as $slug ) {
+	foreach (wordpoints_get_post_types_for_entities() as $slug) {
 
 		$restrictions->register(
 			'status_nonpublic'
-			, array( "post\\$slug" )
+			, array("post\\$slug")
 			, 'WordPoints_Entity_Restriction_Post_Status_Nonpublic'
 		);
 
 		$restrictions->register(
 			'post_status_nonpublic'
-			, array( "comment\\$slug" )
+			, array("comment\\$slug")
 			, 'WordPoints_Entity_Restriction_Comment_Post_Status_Nonpublic'
 		);
 	}
@@ -263,13 +263,13 @@ 
  * @param WordPoints_Class_Registry_Deep_Multilevel $restrictions The restrictions
  *                                                                registry.
  */
-function wordpoints_entity_restrictions_view_init( $restrictions ) {
+function wordpoints_entity_restrictions_view_init($restrictions) {
 
-	foreach ( wordpoints_get_post_types_for_entities() as $slug ) {
+	foreach (wordpoints_get_post_types_for_entities() as $slug) {
 
 		$restrictions->register(
 			'password_protected'
-			, array( "post\\$slug", 'content' )
+			, array("post\\$slug", 'content')
 			, 'WordPoints_Entity_Restriction_View_Post_Content_Password_Protected'
 		);
 	}
@@ -284,17 +284,17 @@ 
  *
  * @param WordPoints_App_Registry $entities The entities app.
  */
-function wordpoints_entities_init( $entities ) {
+function wordpoints_entities_init($entities) {
 
-	$children = $entities->get_sub_app( 'children' );
+	$children = $entities->get_sub_app('children');
 
-	$entities->register( 'user', 'WordPoints_Entity_User' );
-	$children->register( 'user', 'roles', 'WordPoints_Entity_User_Roles' );
+	$entities->register('user', 'WordPoints_Entity_User');
+	$children->register('user', 'roles', 'WordPoints_Entity_User_Roles');
 
-	$entities->register( 'user_role', 'WordPoints_Entity_User_Role' );
+	$entities->register('user_role', 'WordPoints_Entity_User_Role');
 
-	foreach ( wordpoints_get_post_types_for_entities() as $slug ) {
-		wordpoints_register_post_type_entities( $slug );
+	foreach (wordpoints_get_post_types_for_entities() as $slug) {
+		wordpoints_register_post_type_entities($slug);
 	}
 }
 
@@ -316,7 +316,7 @@ 
 	 *
 	 * @param string[] $post_types The post type slugs ("names").
 	 */
-	return apply_filters( 'wordpoints_register_entities_for_post_types', $post_types );
+	return apply_filters('wordpoints_register_entities_for_post_types', $post_types);
 }
 
 /**
@@ -326,24 +326,24 @@ 
  *
  * @param string $slug The slug of the post type.
  */
-function wordpoints_register_post_type_entities( $slug ) {
+function wordpoints_register_post_type_entities($slug) {
 
 	$entities = wordpoints_entities();
-	$children = $entities->get_sub_app( 'children' );
+	$children = $entities->get_sub_app('children');
 
-	$entities->register( "post\\{$slug}", 'WordPoints_Entity_Post' );
-	$children->register( "post\\{$slug}", 'author', 'WordPoints_Entity_Post_Author' );
+	$entities->register("post\\{$slug}", 'WordPoints_Entity_Post');
+	$children->register("post\\{$slug}", 'author', 'WordPoints_Entity_Post_Author');
 
-	$supports = get_all_post_type_supports( $slug );
+	$supports = get_all_post_type_supports($slug);
 
-	if ( isset( $supports['editor'] ) ) {
-		$children->register( "post\\{$slug}", 'content', 'WordPoints_Entity_Post_Content' );
+	if (isset($supports['editor'])) {
+		$children->register("post\\{$slug}", 'content', 'WordPoints_Entity_Post_Content');
 	}
 
-	if ( isset( $supports['comments'] ) ) {
-		$entities->register( "comment\\{$slug}", 'WordPoints_Entity_Comment' );
-		$children->register( "comment\\{$slug}", "post\\{$slug}", 'WordPoints_Entity_Comment_Post' );
-		$children->register( "comment\\{$slug}", 'author', 'WordPoints_Entity_Comment_Author' );
+	if (isset($supports['comments'])) {
+		$entities->register("comment\\{$slug}", 'WordPoints_Entity_Comment');
+		$children->register("comment\\{$slug}", "post\\{$slug}", 'WordPoints_Entity_Comment_Post');
+		$children->register("comment\\{$slug}", 'author', 'WordPoints_Entity_Comment_Author');
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 	 *
 	 * @param string $slug The slug ("name") of the post type.
 	 */
-	do_action( 'wordpoints_register_post_type_entities', $slug );
+	do_action('wordpoints_register_post_type_entities', $slug);
 }
 
 /**
@@ -368,12 +368,12 @@ 
  *
  * @return bool Whether the user can view this entity.
  */
-function wordpoints_entity_user_can_view( $user_id, $entity_slug, $entity_id ) {
+function wordpoints_entity_user_can_view($user_id, $entity_slug, $entity_id) {
 
 	/** @var WordPoints_Entity_Restrictions $restrictions */
-	$restrictions = wordpoints_entities()->get_sub_app( 'restrictions' );
-	$restriction = $restrictions->get( $entity_id, $entity_slug, 'view' );
-	return $restriction->user_can( $user_id );
+	$restrictions = wordpoints_entities()->get_sub_app('restrictions');
+	$restriction = $restrictions->get($entity_id, $entity_slug, 'view');
+	return $restriction->user_can($user_id);
 }
 
 /**
@@ -407,28 +407,28 @@ 
  *                     contexts, indexed by context slug, or false if any of the
  *                     contexts isn't current.
  */
-function wordpoints_entities_get_current_context_id( $slug ) {
+function wordpoints_entities_get_current_context_id($slug) {
 
 	$current_context = array();
 
 	/** @var WordPoints_Class_Registry $contexts */
-	$contexts = wordpoints_entities()->get_sub_app( 'contexts' );
+	$contexts = wordpoints_entities()->get_sub_app('contexts');
 
-	while ( $slug ) {
+	while ($slug) {
 
-		$context = $contexts->get( $slug );
+		$context = $contexts->get($slug);
 
-		if ( ! $context instanceof WordPoints_Entity_Context ) {
+		if ( ! $context instanceof WordPoints_Entity_Context) {
 			return false;
 		}
 
 		$id = $context->get_current_id();
 
-		if ( false === $id ) {
+		if (false === $id) {
 			return false;
 		}
 
-		$current_context[ $slug ] = $id;
+		$current_context[$slug] = $id;
 
 		$slug = $context->get_parent_slug();
 	}
@@ -449,22 +449,22 @@ 
  */
 function wordpoints_is_network_context() {
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return false;
 	}
 
-	if ( is_network_admin() ) {
+	if (is_network_admin()) {
 		return true;
 	}
 
 	// See https://core.trac.wordpress.org/ticket/22589
 	if (
-		defined( 'DOING_AJAX' )
+		defined('DOING_AJAX')
 		&& DOING_AJAX
-		&& isset( $_SERVER['HTTP_REFERER'] )
+		&& isset($_SERVER['HTTP_REFERER'])
 		&& preg_match(
-			'#^' . preg_quote( network_admin_url(), '#' ) . '#i'
-			, esc_url_raw( wp_unslash( $_SERVER['HTTP_REFERER'] ) )
+			'#^' . preg_quote(network_admin_url(), '#') . '#i'
+			, esc_url_raw(wp_unslash($_SERVER['HTTP_REFERER']))
 		)
 	) {
 		return true;
@@ -477,7 +477,7 @@ 
 	 *
 	 * @param bool $in_network_context Whether we are in network context.
 	 */
-	return apply_filters( 'wordpoints_is_network_context', false );
+	return apply_filters('wordpoints_is_network_context', false);
 }
 
 //
@@ -493,10 +493,10 @@ 
  *
  * @param WordPoints_Class_RegistryI $data_types The data types registry.
  */
-function wordpoints_data_types_init( $data_types ) {
+function wordpoints_data_types_init($data_types) {
 
-	$data_types->register( 'integer', 'WordPoints_Data_Type_Integer' );
-	$data_types->register( 'text', 'WordPoints_Data_Type_Text' );
+	$data_types->register('integer', 'WordPoints_Data_Type_Integer');
+	$data_types->register('text', 'WordPoints_Data_Type_Text');
 }
 
 // EOF

src/admin/admin.php

Spacing +4 added lines, -4 removed lines

@@ -17,14 +17,14 @@ 
  *
  * @since 2.1.0
  */
-require_once( WORDPOINTS_DIR . '/admin/includes/functions.php' );
+require_once(WORDPOINTS_DIR . '/admin/includes/functions.php');
 
 /**
  * Admin-side hooks.
  *
  * @since 2.1.0
  */
-require_once( WORDPOINTS_DIR . '/admin/includes/filters.php' );
+require_once(WORDPOINTS_DIR . '/admin/includes/filters.php');
 
 /**
  * Screen: Configuration.
@@ -33,7 +33,7 @@ 
  */
 include_once WORDPOINTS_DIR . 'admin/screens/configure.php';
 
-WordPoints_Class_Autoloader::register_dir( WORDPOINTS_DIR . 'admin/includes' );
-WordPoints_Class_Autoloader::register_dir( WORDPOINTS_DIR . 'admin/classes' );
+WordPoints_Class_Autoloader::register_dir(WORDPOINTS_DIR . 'admin/includes');
+WordPoints_Class_Autoloader::register_dir(WORDPOINTS_DIR . 'admin/classes');
 
 // EOF

src/admin/classes/screen.php

Spacing +5 added lines, -5 removed lines

@@ -62,8 +62,8 @@ 
 	public function hooks() {
 
 		/* Load the JavaScript needed for the settings screen. */
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-		add_action( 'admin_print_footer_scripts', array( $this, 'footer_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
+		add_action('admin_print_footer_scripts', array($this, 'footer_scripts'));
 	}
 
 	/**
@@ -98,12 +98,12 @@ 
 
 		<div class="wrap">
 
-			<h1><?php echo esc_html( $this->get_title() ); ?></h1>
+			<h1><?php echo esc_html($this->get_title()); ?></h1>
 
 			<?php settings_errors(); ?>
 
-			<?php if ( ! empty( $this->tabs ) ) : ?>
-				<?php wordpoints_admin_show_tabs( $this->tabs, false ); ?>
+			<?php if ( ! empty($this->tabs)) : ?>
+				<?php wordpoints_admin_show_tabs($this->tabs, false); ?>
 			<?php endif; ?>
 
 			<?php $this->display_content(); ?>