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 +50 added lines, -50 removed lines

@@ -14,7 +14,7 @@ 
 		'meta-box/meta-box.php' => 'Meta Box|4.11|https://wordpress.org/plugins/meta-box/',
 	];
 
-	public $errors = [];
+	public $errors = [ ];
 
 	/**
 	 * @var Notice
@@ -29,17 +29,17 @@ 
 	public function __construct( $plugin )
 	{
 		$this->plugin = $plugin;
-		add_action( 'admin_init', [$this, 'init'] );
+		add_action( 'admin_init', [ $this, 'init' ] );
 	}
 
 	public function init()
 	{
 		$this->notice = pollux_app()->make( 'Notice' );
 
-		add_action( 'current_screen',                         [$this, 'activatePlugin'] );
-		add_action( 'wp_ajax_pollux/dependency/activate_url', [$this, 'ajaxActivatePluginLink'] );
-		add_action( 'admin_notices',                          [$this, 'printNotices'] );
-		add_action( 'current_screen',                         [$this, 'setDependencyNotice'] );
+		add_action( 'current_screen', [ $this, 'activatePlugin' ] );
+		add_action( 'wp_ajax_pollux/dependency/activate_url', [ $this, 'ajaxActivatePluginLink' ] );
+		add_action( 'admin_notices', [ $this, 'printNotices' ] );
+		add_action( 'current_screen', [ $this, 'setDependencyNotice' ] );
 	}
 
 	/**
@@ -53,7 +53,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() );
@@ -67,19 +67,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' => pollux_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,
-		]);
+		] );
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function hasDependency( $plugin )
 	{
-		if( !$this->isPluginDependency( $plugin )) {
+		if( !$this->isPluginDependency( $plugin ) ) {
 			return true;
 		}
 		return $this->isPluginInstalled( $plugin ) && $this->isPluginValid( $plugin );
@@ -99,7 +99,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 );
 		}
@@ -147,17 +147,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' ],
 			'<='
-		));
+		) );
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 			__( 'Pollux requires the latest version of the following plugins', 'pollux' ),
 			$this->getDependencyLinks()
 		);
-		$this->notice->addWarning( [$message, $this->getDependencyActions()] );
+		$this->notice->addWarning( [ $message, $this->getDependencyActions() ] );
 	}
 
 	/**
@@ -194,13 +194,13 @@ 
 	 */
 	protected function catchError( $plugin, $error, $isValid )
 	{
-		if( !$isValid && $this->isPluginDependency( $plugin )) {
-			if( !isset( $this->errors[$plugin] )) {
-				$this->errors[$plugin] = [];
+		if( !$isValid && $this->isPluginDependency( $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;
 	}
@@ -221,14 +221,14 @@ 
 	{
 		$actions = '';
 		foreach( $this->errors as $plugin => $errors ) {
-			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 ) );
 			}
 		}
 		return $actions;
@@ -250,10 +250,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;
@@ -264,8 +264,8 @@ 
 	 */
 	protected function getPlugin( $plugin )
 	{
-		if( $this->isPluginInstalled( $plugin )) {
-			return $this->getAllPlugins()[$plugin];
+		if( $this->isPluginInstalled( $plugin ) ) {
+			return $this->getAllPlugins()[ $plugin ];
 		}
 		return false;
 	}
@@ -275,18 +275,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 ]
 			: '';
 	}
 
@@ -310,9 +310,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' ]
 		);
 	}
 
@@ -321,9 +321,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 );
 	}
@@ -333,6 +333,6 @@ 
 	 */
 	protected function getPluginSlug( $plugin )
 	{
-		return substr( $plugin, 0, strrpos( $plugin, '/' ));
+		return substr( $plugin, 0, strrpos( $plugin, '/' ) );
 	}
 }

Braces +11 added lines, -4 removed lines

@@ -49,7 +49,9 @@ 
 	{
 		if( get_current_screen()->id != sprintf( 'settings_page_%s', pollux_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 );
@@ -99,7 +101,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 );
 		}
@@ -178,7 +182,9 @@ 
 		if( get_current_screen()->id != 'settings_page_pollux'
 			|| pollux_app()->config->disable_config
 			|| !$this->hasPendingDependencies()
-		)return;
+		) {
+			return;
+		}
 		$message = sprintf( '<strong>%s:</strong> %s',
 			__( 'Pollux requires the latest version of the following plugins', 'pollux' ),
 			$this->getDependencyLinks()
@@ -239,7 +245,8 @@ 
 	 */
 	protected function getDependencyLinks()
 	{
-		return array_reduce( array_keys( $this->errors ), function( $carry, $plugin ) {
+		return array_reduce( array_keys( $this->errors ), function( $carry, $plugin )
+		{
 			return $carry . $this->getPluginLink( $plugin );
 		});
 	}

pollux.php

Spacing +6 added lines, -6 removed lines

@@ -18,18 +18,18 @@
 
 defined( 'WPINC' ) || die;
 
-require_once __DIR__.'/activate.php';
+require_once __DIR__ . '/activate.php';
 
 if( \Pollux_Activate::shouldDeactivate() )return;
 
-require_once __DIR__.'/autoload.php';
-require_once __DIR__.'/helpers.php';
-require_once __DIR__.'/thirdparty.php';
+require_once __DIR__ . '/autoload.php';
+require_once __DIR__ . '/helpers.php';
+require_once __DIR__ . '/thirdparty.php';
 
 $app = \GeminiLabs\Pollux\Application::getInstance();
 
-register_activation_hook( __FILE__, array( $app, 'onActivation' ));
-register_deactivation_hook( __FILE__, array( $app, 'onDeactivation' ));
+register_activation_hook( __FILE__, array( $app, 'onActivation' ) );
+register_deactivation_hook( __FILE__, array( $app, 'onDeactivation' ) );
 
 $app->register( new \GeminiLabs\Pollux\Provider );
 $app->init();

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 
 require_once __DIR__.'/activate.php';
 
-if( \Pollux_Activate::shouldDeactivate() )return;
+if( \Pollux_Activate::shouldDeactivate() ) {
+	return;
+}
 
 require_once __DIR__.'/autoload.php';
 require_once __DIR__.'/helpers.php';

activate.php

Spacing +13 added lines, -13 removed lines

@@ -43,12 +43,12 @@ 
 	 */
 	public static function shouldDeactivate()
 	{
-		if( empty( static::$instance )) {
+		if( empty( static::$instance ) ) {
 			static::$instance = new static;
 		}
 		if( !static::isValid() ) {
-			add_action( 'activated_plugin', array( static::$instance, 'deactivate' ));
-			add_action( 'admin_notices', array( static::$instance, 'deactivate' ));
+			add_action( 'activated_plugin', array( static::$instance, 'deactivate' ) );
+			add_action( 'admin_notices', array( static::$instance, 'deactivate' ) );
 			return true;
 		}
 		return false;
@@ -60,7 +60,7 @@ 
 	public function deactivate( $plugin )
 	{
 		if( static::isValid() )return;
-		$pluginName = plugin_basename( dirname( realpath( __FILE__ )).'/'.static::BASENAME );
+		$pluginName = plugin_basename( dirname( realpath( __FILE__ ) ) . '/' . static::BASENAME );
 		if( $plugin == $pluginName ) {
 			$this->redirect(); //exit
 		}
@@ -77,7 +77,7 @@ 
 			filter_input( INPUT_GET, 'plugin_status' ),
 			filter_input( INPUT_GET, 'paged' ),
 			filter_input( INPUT_GET, 's' )
-		)));
+		) ) );
 		exit;
 	}
 
@@ -91,22 +91,22 @@ 
 			__( 'The Pollux plugin was deactivated.', 'pollux' ),
 			__( 'Sorry, this plugin requires %s or greater in order to work properly.', 'pollux' ),
 			__( 'Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'pollux' ),
-			__( 'PHP version', 'pollux' ).' '.static::MIN_PHP_VERSION,
-			__( 'WordPress version', 'pollux' ).' '.static::MIN_WORDPRESS_VERSION,
+			__( 'PHP version', 'pollux' ) . ' ' . static::MIN_PHP_VERSION,
+			__( 'WordPress version', 'pollux' ) . ' ' . static::MIN_WORDPRESS_VERSION,
 			__( 'Update WordPress', 'pollux' ),
 		);
 		if( !static::isPhpValid() ) {
 			printf( $noticeTemplate,
-				$messages[0],
-				sprintf( $messages[1], $messages[3] ),
-				sprintf( $messages[2], PHP_VERSION )
+				$messages[ 0 ],
+				sprintf( $messages[ 1 ], $messages[ 3 ] ),
+				sprintf( $messages[ 2 ], PHP_VERSION )
 			);
 		}
 		else if( !static::isWpValid() ) {
 			printf( $noticeTemplate,
-				$messages[0],
-				sprintf( $messages[1], $messages[4] ),
-				sprintf( '<a href="%s">%s</a>', admin_url( 'update-core.php' ), $messages[5] )
+				$messages[ 0 ],
+				sprintf( $messages[ 1 ], $messages[ 4 ] ),
+				sprintf( '<a href="%s">%s</a>', admin_url( 'update-core.php' ), $messages[ 5 ] )
 			);
 		}
 	}

Braces +3 added lines, -1 removed lines

@@ -59,7 +59,9 @@
 	 */
 	public function deactivate( $plugin )
 	{
-		if( static::isValid() )return;
+		if( static::isValid() ) {
+			return;
+		}
 		$pluginName = plugin_basename( dirname( realpath( __FILE__ )).'/'.static::BASENAME );
 		if( $plugin == $pluginName ) {
 			$this->redirect(); //exit