pryley / pollux

src/Config/Config.php

Spacing +10 added lines, -10 removed lines

@@ -39,9 +39,9 @@ 
 	{
 		if( $this->app->config->disable_config )return;
 
-		add_action( 'admin_menu',     [$this, 'registerPage'] );
-		add_action( 'admin_menu',     [$this, 'registerSetting'] );
-		add_action( 'current_screen', [$this, 'resetPage'] );
+		add_action( 'admin_menu', [ $this, 'registerPage' ] );
+		add_action( 'admin_menu', [ $this, 'registerSetting' ] );
+		add_action( 'current_screen', [ $this, 'resetPage' ] );
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 			__( 'Pollux', 'pollux' ),
 			'manage_options',
 			$this->app->id,
-			[$this, 'renderPage']
+			[ $this, 'renderPage' ]
 		);
 	}
 
@@ -75,7 +75,7 @@ 
 	 */
 	public function registerSetting()
 	{
-		register_setting( static::id(), static::id(), [$this, 'filterSavedSettings'] );
+		register_setting( static::id(), static::id(), [ $this, 'filterSavedSettings' ] );
 	}
 
 	/**
@@ -94,9 +94,9 @@ 
 			'config' => $this->app->make( ConfigManager::class ),
 			'heading' => __( 'Pollux Settings', 'pollux' ),
 			'id' => static::id(),
-			'reset_url' => esc_url( add_query_arg( $query, admin_url( 'options-general.php' ))),
+			'reset_url' => esc_url( add_query_arg( $query, admin_url( 'options-general.php' ) ) ),
 			'has_meta_box' => $this->app->gatekeeper->hasDependency( 'meta-box/meta-box.php' ),
-		]);
+		] );
 	}
 
 	/**
@@ -108,16 +108,16 @@ 
 		if( filter_input( INPUT_GET, 'page' ) !== $this->app->id
 			|| filter_input( INPUT_GET, 'action' ) !== 'reset'
 		)return;
-		if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), static::id() )) {
+		if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), static::id() ) ) {
 			delete_option( static::id() );
 			$this->app->make( ConfigManager::class )->compile( true );
 			add_settings_error( static::id(), 'reset', __( 'Reset successful.', 'pollux' ), 'updated' );
 		}
 		else {
-			add_settings_error( static::id(), 'failed', __( 'Failed to reset. Please try again.', 'pollux' ));
+			add_settings_error( static::id(), 'failed', __( 'Failed to reset. Please try again.', 'pollux' ) );
 		}
 		set_transient( 'settings_errors', get_settings_errors(), 30 );
-		wp_safe_redirect( add_query_arg( 'settings-updated', 'true',  wp_get_referer() ));
+		wp_safe_redirect( add_query_arg( 'settings-updated', 'true', wp_get_referer() ) );
 		exit;
 	}
 }

Braces +6 added lines, -2 removed lines

@@ -37,7 +37,9 @@ 
 	 */
 	public function init()
 	{
-		if( $this->app->config->disable_config )return;
+		if( $this->app->config->disable_config ) {
+			return;
+		}
 
 		add_action( 'admin_menu',     [$this, 'registerPage'] );
 		add_action( 'admin_menu',     [$this, 'registerSetting'] );
@@ -107,7 +109,9 @@ 
 	{
 		if( filter_input( INPUT_GET, 'page' ) !== $this->app->id
 			|| filter_input( INPUT_GET, 'action' ) !== 'reset'
-		)return;
+		) {
+			return;
+		}
 		if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), static::id() )) {
 			delete_option( static::id() );
 			$this->app->make( ConfigManager::class )->compile( true );

src/Config/ConfigManager.php

Spacing +22 added lines, -22 removed lines

@@ -42,13 +42,13 @@ 
 		$yamlFile = $this->getYamlFile();
 		$yaml = $this->normalizeYamlValues( $this->normalize(
 			$this->parseYaml( file_get_contents( $yamlFile ), $yamlFile )
-		));
-		if( !$yaml['disable_config'] ) {
-			$config = array_filter( (array) get_option( Config::id(), [] ));
+		) );
+		if( !$yaml[ 'disable_config' ] ) {
+			$config = array_filter( (array) get_option( Config::id(), [ ] ) );
 		}
 		return empty( $config )
-			? $this->setTimestamp( $yaml, filemtime( $yamlFile ))
-			: $this->normalizeYamlValues( $this->normalize( $config ));
+			? $this->setTimestamp( $yaml, filemtime( $yamlFile ) )
+			: $this->normalizeYamlValues( $this->normalize( $config ) );
 	}
 
 	/**
@@ -58,15 +58,15 @@ 
 	public function compile( $force = false )
 	{
 		$configFile = $this->getCompileDestination();
-		if( $force || $this->shouldCompile( $configFile )) {
+		if( $force || $this->shouldCompile( $configFile ) ) {
 			$config = $this->normalizeArray( $this->options );
 			if( $this->parseError ) {
 				return (object) $config;
 			}
 			file_put_contents( $configFile, sprintf( '<?php // DO NOT MODIFY THIS FILE DIRECTLY!%sreturn (object) %s;',
 				PHP_EOL,
-				$this->parseRawStrings( var_export( $this->setTimestamp( $config ), true ))
-			));
+				$this->parseRawStrings( var_export( $this->setTimestamp( $config ), true ) )
+			) );
 		}
 		return include $configFile;
 	}
@@ -77,7 +77,7 @@ 
 	public function convertArrayToYaml( array $array )
 	{
 		return !empty( $array )
-			? trim( $this->parseRawStrings( $this->dumpYaml( $array )))
+			? trim( $this->parseRawStrings( $this->dumpYaml( $array ) ) )
 			: '';
 	}
 
@@ -104,11 +104,11 @@ 
 			trailingslashit( trailingslashit( $theme->theme_root ) . $theme->template ),
 			trailingslashit( WP_CONTENT_DIR ),
 			trailingslashit( ABSPATH ),
-			trailingslashit( dirname( ABSPATH )),
-			trailingslashit( dirname( dirname( ABSPATH ))),
-		]);
+			trailingslashit( dirname( ABSPATH ) ),
+			trailingslashit( dirname( dirname( ABSPATH ) ) ),
+		] );
 		foreach( (array) $configLocations as $location ) {
-			if( !file_exists( $location . $configYaml ))continue;
+			if( !file_exists( $location . $configYaml ) )continue;
 			return $location . $configYaml;
 		}
 		return $this->app->path( 'defaults.yml' );
@@ -120,10 +120,10 @@ 
 	public function normalizeArray( array $array )
 	{
 		array_walk( $array, function( &$value, $key ) {
-			if( !is_numeric( $value ) && is_string( $value )) {
+			if( !is_numeric( $value ) && is_string( $value ) ) {
 				$value = $this->parseYaml( $value, $key );
 				if( $this->parseError == $key ) {
-					$value = [];
+					$value = [ ];
 				}
 			}
 		});
@@ -148,7 +148,7 @@ 
 	public function setTimestamp( array $config, $timestamp = null )
 	{
 		$timestamp || $timestamp = time();
-		$config['updated'] = $timestamp;
+		$config[ 'updated' ] = $timestamp;
 		return $config;
 	}
 
@@ -173,7 +173,7 @@ 
 		return wp_parse_args(
 			$config,
 			$this->parseYaml(
-				file_get_contents( $this->app->path( 'defaults.yml' )),
+				file_get_contents( $this->app->path( 'defaults.yml' ) ),
 				$this->app->path( 'defaults.yml' )
 			)
 		);
@@ -187,13 +187,13 @@ 
 	protected function parseRawStrings( $configString )
 	{
 		$strings = apply_filters( 'pollux/config/raw_strings', static::RAW_STRINGS );
-		if( empty( $strings )) {
+		if( empty( $strings ) ) {
 			return $configString;
 		}
 		$pattern = '/(\')((' . implode( '|', $strings ) . ')\(?.+\))(\')/';
 		return stripslashes(
 			preg_replace_callback( $pattern, function( $matches ) {
-				return str_replace( "''", "'", $matches[2] );
+				return str_replace( "''", "'", $matches[ 2 ] );
 			}, $configString )
 		);
 	}
@@ -212,13 +212,13 @@ 
 			if( $file ) {
 				$file = sprintf( '<code>%s</code>', $file );
 			}
-			$this->app->make( 'Notice' )->addError([
+			$this->app->make( 'Notice' )->addError( [
 				sprintf( '<strong>Pollux Error:</strong> Unable to parse config at line %s (near "%s").',
 					$e->getParsedLine(),
 					$e->getSnippet()
 				),
 				$file
-			]);
+			] );
 			return $value;
 		}
 	}
@@ -229,7 +229,7 @@ 
 	 */
 	protected function shouldCompile( $configFile )
 	{
-		if( !file_exists( $configFile )) {
+		if( !file_exists( $configFile ) ) {
 			return true;
 		}
 		$config = include $configFile;