pryley / pollux

src/GateKeeper.php

Doc Comments +2 added lines

@@ -124,6 +124,7 @@ 
 	}
 
 	/**
+	 * @param string $plugin
 	 * @return bool
 	 */
 	public function hasDependency( $plugin )
@@ -384,6 +385,7 @@ 
 	}
 
 	/**
+	 * @param string $key
 	 * @return array|string
 	 */
 	protected function getPluginRequirements( $plugin, $key = null )

Spacing +60 added lines, -60 removed lines

@@ -17,7 +17,7 @@ 
 	const MIN_PHP_VERSION = '5.6.0';
 	const MIN_WORDPRESS_VERSION = '4.7';
 
-	public $errors = [];
+	public $errors = [ ];
 
 	/**
 	 * @var Application
@@ -39,11 +39,11 @@ 
 		$this->plugin = $plugin;
 
 		if( $this->canActivate() ) {
-			add_action( 'admin_init', array( $this, 'init' ));
+			add_action( 'admin_init', array( $this, 'init' ) );
 		}
 		else {
-			add_action( 'activated_plugin', array( $this, 'deactivate' ));
-			add_action( 'admin_notices',    array( $this, 'deactivate' ));
+			add_action( 'activated_plugin', array( $this, 'deactivate' ) );
+			add_action( 'admin_notices', array( $this, 'deactivate' ) );
 		}
 	}
 
@@ -52,10 +52,10 @@ 
 		$this->app = pollux_app();
 		$this->notice = pollux_app()->make( 'Notice' );
 
-		add_action( 'current_screen',                         array( $this, 'activatePlugin' ));
-		add_action( 'wp_ajax_pollux/dependency/activate_url', array( $this, 'ajaxActivatePluginLink' ));
-		add_action( 'admin_notices',                          array( $this, 'printNotices' ));
-		add_action( 'current_screen',                         array( $this, 'setDependencyNotice' ));
+		add_action( 'current_screen', array( $this, 'activatePlugin' ) );
+		add_action( 'wp_ajax_pollux/dependency/activate_url', array( $this, 'ajaxActivatePluginLink' ) );
+		add_action( 'admin_notices', array( $this, 'printNotices' ) );
+		add_action( 'current_screen', array( $this, 'setDependencyNotice' ) );
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 		$plugin = filter_input( INPUT_GET, 'plugin' );
 		check_admin_referer( 'activate-plugin_' . $plugin );
 		$result = activate_plugin( $plugin, null, is_network_admin(), true );
-		if( is_wp_error( $result )) {
+		if( is_wp_error( $result ) ) {
 			wp_die( $result->get_error_message() );
 		}
 		wp_safe_redirect( wp_get_referer() );
@@ -83,19 +83,19 @@ 
 	{
 		check_ajax_referer( 'updates' );
 		$plugin = filter_input( INPUT_POST, 'plugin' );
-		if( !$this->isPluginDependency( $plugin )) {
+		if( !$this->isPluginDependency( $plugin ) ) {
 			wp_send_json_error();
 		}
-		$activateUrl = add_query_arg([
-			'_wpnonce' => wp_create_nonce( sprintf( 'activate-plugin_%s', $plugin )),
+		$activateUrl = add_query_arg( [
+			'_wpnonce' => wp_create_nonce( sprintf( 'activate-plugin_%s', $plugin ) ),
 			'action' => 'activate',
 			'page' => $this->app->id,
 			'plugin' => $plugin,
-		], self_admin_url( 'options-general.php' ));
-		wp_send_json_success([
+		], self_admin_url( 'options-general.php' ) );
+		wp_send_json_success( [
 			'activate_url' => $activateUrl,
 			filter_input( INPUT_POST, 'type' ) => $plugin,
-		]);
+		] );
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function hasDependency( $plugin )
 	{
-		if( !$this->isPluginDependency( $plugin )) {
+		if( !$this->isPluginDependency( $plugin ) ) {
 			return true;
 		}
 		return $this->isPluginInstalled( $plugin ) && $this->isPluginValid( $plugin );
@@ -192,17 +192,17 @@ 
 	 */
 	public function isPluginVersionValid( $plugin )
 	{
-		if( !$this->isPluginDependency( $plugin )) {
+		if( !$this->isPluginDependency( $plugin ) ) {
 			return true;
 		}
-		if( !$this->isPluginInstalled( $plugin )) {
+		if( !$this->isPluginInstalled( $plugin ) ) {
 			return false;
 		}
 		return $this->catchError( $plugin, 'wrong_version', version_compare(
 			$this->getPluginRequirements( $plugin, 'version' ),
-			$this->getAllPlugins()[$plugin]['Version'],
+			$this->getAllPlugins()[ $plugin ][ 'Version' ],
 			'<='
-		));
+		) );
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	public function hasPendingDependencies()
 	{
 		foreach( static::DEPENDENCIES as $plugin => $data ) {
-			if( !$this->isPluginDependency( $plugin ))continue;
+			if( !$this->isPluginDependency( $plugin ) )continue;
 			$this->isPluginActive( $plugin );
 			$this->isPluginVersionValid( $plugin );
 		}
@@ -243,20 +243,20 @@ 
 
 		foreach( $this->errors as $plugin => $errors ) {
 			$plugins .= $this->getPluginLink( $plugin );
-			if( in_array( 'not_found', $errors ) && current_user_can( 'install_plugins' )) {
-				$actions .= $this->notice->installButton( $this->getPluginRequirements( $plugin ));
+			if( in_array( 'not_found', $errors ) && current_user_can( 'install_plugins' ) ) {
+				$actions .= $this->notice->installButton( $this->getPluginRequirements( $plugin ) );
 			}
-			else if( in_array( 'wrong_version', $errors ) && current_user_can( 'update_plugins' )) {
-				$actions .= $this->notice->updateButton( $this->getPluginInformation( $plugin ));
+			else if( in_array( 'wrong_version', $errors ) && current_user_can( 'update_plugins' ) ) {
+				$actions .= $this->notice->updateButton( $this->getPluginInformation( $plugin ) );
 			}
-			else if( in_array( 'inactive', $errors ) && current_user_can( 'activate_plugins' )) {
-				$actions .= $this->notice->activateButton( $this->getPluginInformation( $plugin ));
+			else if( in_array( 'inactive', $errors ) && current_user_can( 'activate_plugins' ) ) {
+				$actions .= $this->notice->activateButton( $this->getPluginInformation( $plugin ) );
 			}
 		}
-		$this->notice->addWarning([
+		$this->notice->addWarning( [
 			sprintf( '<strong>%s</strong> %s', __( 'Pollux requires the latest version of the following plugins:', 'pollux' ), $plugins ),
 			$actions,
-		]);
+		] );
 	}
 
 	/**
@@ -264,11 +264,11 @@ 
 	 */
 	protected function addInvalidPHPVersionNotice()
 	{
-		$this->notice->addError([
-			$this->notice->title( __( 'The Pollux plugin was deactivated.', 'pollux' )),
+		$this->notice->addError( [
+			$this->notice->title( __( 'The Pollux plugin was deactivated.', 'pollux' ) ),
 			sprintf( __( 'Sorry, Pollux requires PHP %s or greater in order to work properly (your server is running PHP %s).', 'pollux' ), self::MIN_PHP_VERSION, PHP_VERSION ),
 			__( 'Please contact your hosting provider or server administrator to upgrade the version of PHP running on your server, or find an alternate plugin.', 'pollux' ),
-		]);
+		] );
 	}
 
 	/**
@@ -276,11 +276,11 @@ 
 	 */
 	protected function addInvalidWPVersionNotice()
 	{
-		$this->notice->addError([
-			$this->notice->title( __( 'The Pollux plugin was deactivated.', 'pollux' )),
+		$this->notice->addError( [
+			$this->notice->title( __( 'The Pollux plugin was deactivated.', 'pollux' ) ),
 			sprintf( __( 'Sorry, Pollux requires WordPress %s or greater in order to work properly.', 'pollux' ), self::MIN_WORDPRESS_VERSION ),
-			$this->notice->button( __( 'Update WordPress', 'pollux' ), self_admin_url( 'update-core.php' )),
-		]);
+			$this->notice->button( __( 'Update WordPress', 'pollux' ), self_admin_url( 'update-core.php' ) ),
+		] );
 	}
 
 	/**
@@ -292,12 +292,12 @@ 
 	protected function catchError( $plugin, $error, $isValid )
 	{
 		if( !$isValid ) {
-			if( !isset( $this->errors[$plugin] )) {
-				$this->errors[$plugin] = [];
+			if( !isset( $this->errors[ $plugin ] ) ) {
+				$this->errors[ $plugin ] = [ ];
 			}
-			$this->errors[$plugin] = array_keys( array_flip(
-				array_merge( $this->errors[$plugin], [$error] )
-			));
+			$this->errors[ $plugin ] = array_keys( array_flip(
+				array_merge( $this->errors[ $plugin ], [ $error ] )
+			) );
 		}
 		return $isValid;
 	}
@@ -317,10 +317,10 @@ 
 	protected function getMustUsePlugins()
 	{
 		$plugins = get_mu_plugins();
-		if( in_array( 'Bedrock Autoloader', array_column( $plugins, 'Name' ))) {
+		if( in_array( 'Bedrock Autoloader', array_column( $plugins, 'Name' ) ) ) {
 			$autoloadedPlugins = get_site_option( 'bedrock_autoloader' );
-			if( !empty( $autoloadedPlugins['plugins'] )) {
-				return array_merge( $plugins, $autoloadedPlugins['plugins'] );
+			if( !empty( $autoloadedPlugins[ 'plugins' ] ) ) {
+				return array_merge( $plugins, $autoloadedPlugins[ 'plugins' ] );
 			}
 		}
 		return $plugins;
@@ -331,8 +331,8 @@ 
 	 */
 	protected function getPlugin( $plugin )
 	{
-		if( $this->isPluginInstalled( $plugin )) {
-			return $this->getAllPlugins()[$plugin];
+		if( $this->isPluginInstalled( $plugin ) ) {
+			return $this->getAllPlugins()[ $plugin ];
 		}
 		return false;
 	}
@@ -342,18 +342,18 @@ 
 	 */
 	protected function getPluginData( $plugin, $data, $key = null )
 	{
-		if( !is_array( $data )) {
-			throw new Exception( sprintf( 'Plugin information not found for: %s', $plugin ));
+		if( !is_array( $data ) ) {
+			throw new Exception( sprintf( 'Plugin information not found for: %s', $plugin ) );
 		}
-		$data['plugin'] = $plugin;
-		$data['slug'] = $this->getPluginSlug( $plugin );
+		$data[ 'plugin' ] = $plugin;
+		$data[ 'slug' ] = $this->getPluginSlug( $plugin );
 		$data = array_change_key_case( $data );
-		if( is_null( $key )) {
+		if( is_null( $key ) ) {
 			return $data;
 		}
 		$key = strtolower( $key );
-		return isset( $data[$key] )
-			? $data[$key]
+		return isset( $data[ $key ] )
+			? $data[ $key ]
 			: '';
 	}
 
@@ -377,9 +377,9 @@ 
 			$data = $this->getPluginRequirements( $plugin );
 		}
 		return sprintf( '<span class="plugin-%s"><a href="%s">%s</a></span>',
-			$data['slug'],
-			$data['pluginuri'],
-			$data['name']
+			$data[ 'slug' ],
+			$data[ 'pluginuri' ],
+			$data[ 'name' ]
 		);
 	}
 
@@ -388,9 +388,9 @@ 
 	 */
 	protected function getPluginRequirements( $plugin, $key = null )
 	{
-		$keys = ['Name', 'Version', 'PluginURI'];
+		$keys = [ 'Name', 'Version', 'PluginURI' ];
 		$requirements = $this->isPluginDependency( $plugin )
-			? array_pad( explode( '|', static::DEPENDENCIES[$plugin] ), 3, '' )
+			? array_pad( explode( '|', static::DEPENDENCIES[ $plugin ] ), 3, '' )
 			: array_fill( 0, 3, '' );
 		return $this->getPluginData( $plugin, array_combine( $keys, $requirements ), $key );
 	}
@@ -400,7 +400,7 @@ 
 	 */
 	protected function getPluginSlug( $plugin )
 	{
-		return substr( $plugin, 0, strrpos( $plugin, '/' ));
+		return substr( $plugin, 0, strrpos( $plugin, '/' ) );
 	}
 
 	/**
@@ -412,7 +412,7 @@ 
 			filter_input( INPUT_GET, 'plugin_status' ),
 			filter_input( INPUT_GET, 'paged' ),
 			filter_input( INPUT_GET, 's' )
-		)));
+		) ) );
 		exit;
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -65,7 +65,9 @@ 
 	{
 		if( get_current_screen()->id != sprintf( 'settings_page_%s', $this->app->id )
 			|| filter_input( INPUT_GET, 'action' ) != 'activate'
-		)return;
+		) {
+			return;
+		}
 		$plugin = filter_input( INPUT_GET, 'plugin' );
 		check_admin_referer( 'activate-plugin_' . $plugin );
 		$result = activate_plugin( $plugin, null, is_network_admin(), true );
@@ -221,7 +223,9 @@ 
 	public function hasPendingDependencies()
 	{
 		foreach( static::DEPENDENCIES as $plugin => $data ) {
-			if( !$this->isPluginDependency( $plugin ))continue;
+			if( !$this->isPluginDependency( $plugin )) {
+				continue;
+			}
 			$this->isPluginActive( $plugin );
 			$this->isPluginVersionValid( $plugin );
 		}
@@ -236,7 +240,9 @@ 
 		if( get_current_screen()->id != 'settings_page_pollux'
 			|| $this->app->config->disable_config
 			|| !$this->hasPendingDependencies()
-		)return;
+		) {
+			return;
+		}
 
 		$plugins = '';
 		$actions = '';

src/Notice.php

Spacing +37 added lines, -37 removed lines

@@ -29,10 +29,10 @@ 
 	{
 		$method = strtolower( $name );
 		$status = substr( $method, 3 );
-		if( 'add' == substr( $method, 0, 3 ) && in_array( $status, ['error', 'info', 'success', 'warning'] )) {
-			return call_user_func_array( [$this, 'addNotice'], array_merge( [$status], $args ));
+		if( 'add' == substr( $method, 0, 3 ) && in_array( $status, [ 'error', 'info', 'success', 'warning' ] ) ) {
+			return call_user_func_array( [ $this, 'addNotice' ], array_merge( [ $status ], $args ) );
 		}
-		throw new BadMethodCallException( sprintf( 'Not a valid method: %s', $name ));
+		throw new BadMethodCallException( sprintf( 'Not a valid method: %s', $name ) );
 	}
 
 	public function __get( $property )
@@ -40,7 +40,7 @@ 
 		if( $property == 'all' ) {
 			return $this->app->notices;
 		}
-		throw new Exception( sprintf( 'Not a valid property: %s', $property ));
+		throw new Exception( sprintf( 'Not a valid property: %s', $property ) );
 	}
 
 	/**
@@ -48,28 +48,28 @@ 
 	 */
 	public function activateButton( array $plugin )
 	{
-		$actionUrl = self_admin_url( sprintf( 'options-general.php?page=%s&action=activate&plugin=%s', $this->app->id, $plugin['plugin'] ));
-		return $this->button( sprintf( '%s %s', __( 'Activate', 'pollux' ), $plugin['name'] ), [
-			'data-name' => $plugin['name'],
-			'data-plugin' => $plugin['plugin'],
-			'data-slug' => $plugin['slug'],
-			'href' => wp_nonce_url( $actionUrl, sprintf( 'activate-plugin_%s', $plugin['plugin'] )),
-		]);
+		$actionUrl = self_admin_url( sprintf( 'options-general.php?page=%s&action=activate&plugin=%s', $this->app->id, $plugin[ 'plugin' ] ) );
+		return $this->button( sprintf( '%s %s', __( 'Activate', 'pollux' ), $plugin[ 'name' ] ), [
+			'data-name' => $plugin[ 'name' ],
+			'data-plugin' => $plugin[ 'plugin' ],
+			'data-slug' => $plugin[ 'slug' ],
+			'href' => wp_nonce_url( $actionUrl, sprintf( 'activate-plugin_%s', $plugin[ 'plugin' ] ) ),
+		] );
 	}
 
 	/**
 	 * @param string $title
 	 * @return string
 	 */
-	public function button( $title, array $atts = [] )
+	public function button( $title, array $atts = [ ] )
 	{
 		$atts = wp_parse_args( $atts, [
 			'class' => '',
 			'href' => '',
-		]);
-		$atts['class'] = trim( $atts['class'] . ' button button-small' );
+		] );
+		$atts[ 'class' ] = trim( $atts[ 'class' ] . ' button button-small' );
 		$attributes = array_reduce( array_keys( $atts ), function( $carry, $key ) use( $atts ) {
-			return $carry . sprintf( ' %s="%s"', $key, $atts[$key] );
+			return $carry . sprintf( ' %s="%s"', $key, $atts[ $key ] );
 		});
 		return sprintf( '<a%s>%s</a>', $attributes, $title );
 	}
@@ -82,7 +82,7 @@ 
 		if( $unset ) {
 			$index = array_search( $notice, $this->app->notices );
 			if( $index !== false ) {
-				unset( $this->app->notices[$index] );
+				unset( $this->app->notices[ $index ] );
 			}
 		}
 		return $this->buildNotice( $notice );
@@ -93,13 +93,13 @@ 
 	 */
 	public function installButton( array $plugin )
 	{
-		$actionUrl = self_admin_url( sprintf( 'update.php?action=install-plugin&plugin=%s', $plugin['slug'] ));
-		return $this->button( sprintf( '%s %s', __( 'Install', 'pollux' ), $plugin['name'] ), [
-			'data-name' => $plugin['name'],
-			'data-plugin' => $plugin['plugin'],
-			'data-slug' => $plugin['slug'],
-			'href' => wp_nonce_url( $actionUrl, sprintf( 'install-plugin_%s', $plugin['slug'] )),
-		]);
+		$actionUrl = self_admin_url( sprintf( 'update.php?action=install-plugin&plugin=%s', $plugin[ 'slug' ] ) );
+		return $this->button( sprintf( '%s %s', __( 'Install', 'pollux' ), $plugin[ 'name' ] ), [
+			'data-name' => $plugin[ 'name' ],
+			'data-plugin' => $plugin[ 'plugin' ],
+			'data-slug' => $plugin[ 'slug' ],
+			'href' => wp_nonce_url( $actionUrl, sprintf( 'install-plugin_%s', $plugin[ 'slug' ] ) ),
+		] );
 	}
 
 	/**
@@ -107,13 +107,13 @@ 
 	 */
 	public function updateButton( array $plugin )
 	{
-		$actionUrl = self_admin_url( sprintf( 'update.php?action=upgrade-plugin&plugin=%s', $plugin['plugin'] ));
-		return $this->button( sprintf( '%s %s', __( 'Update', 'pollux' ), $plugin['name'] ), [
-			'data-name' => $plugin['name'],
-			'data-plugin' => $plugin['plugin'],
-			'data-slug' => $plugin['slug'],
-			'href' => wp_nonce_url( $actionUrl, sprintf( 'upgrade-plugin_%s', $plugin['plugin'] )),
-		]);
+		$actionUrl = self_admin_url( sprintf( 'update.php?action=upgrade-plugin&plugin=%s', $plugin[ 'plugin' ] ) );
+		return $this->button( sprintf( '%s %s', __( 'Update', 'pollux' ), $plugin[ 'name' ] ), [
+			'data-name' => $plugin[ 'name' ],
+			'data-plugin' => $plugin[ 'plugin' ],
+			'data-slug' => $plugin[ 'slug' ],
+			'href' => wp_nonce_url( $actionUrl, sprintf( 'upgrade-plugin_%s', $plugin[ 'plugin' ] ) ),
+		] );
 	}
 
 	/**
@@ -133,9 +133,9 @@ 
 	 */
 	protected function addNotice( $type, $messages, $dismissible = true )
 	{
-		$this->app->notices[] = [
+		$this->app->notices[ ] = [
 			'dismissible' => $dismissible,
-			'message' => $this->buildMessage( array_filter( (array) $messages )),
+			'message' => $this->buildMessage( array_filter( (array) $messages ) ),
 			'type' => $type,
 		];
 		$this->app->notices = array_unique( $this->app->notices, SORT_REGULAR );
@@ -147,10 +147,10 @@ 
 	protected function buildMessage( array $messages )
 	{
 		foreach( $messages as $key => &$message ) {
-			if( !is_wp_error( $message ))continue;
+			if( !is_wp_error( $message ) )continue;
 			$message = $message->get_error_message();
 		}
-		return wpautop( implode( PHP_EOL . PHP_EOL, $messages ));
+		return wpautop( implode( PHP_EOL . PHP_EOL, $messages ) );
 	}
 
 	/**
@@ -158,10 +158,10 @@ 
 	 */
 	protected function buildNotice( array $notice )
 	{
-		$class = sprintf( 'notice notice-%s', $notice['type'] );
-		if( $notice['dismissible'] ) {
+		$class = sprintf( 'notice notice-%s', $notice[ 'type' ] );
+		if( $notice[ 'dismissible' ] ) {
 			$class .= ' is-dismissible';
 		}
-		return sprintf( '<div class="pollux-notice %s">%s</div>', $class, $notice['message'] );
+		return sprintf( '<div class="pollux-notice %s">%s</div>', $class, $notice[ 'message' ] );
 	}
 }