pryley / pollux

src/Settings.php

Spacing +36 added lines, -36 removed lines

@@ -28,18 +28,18 @@ 
 	public function init()
 	{
 		// @todo: run GateKeeper here instead to check dependencies and capability
-		if( !is_plugin_active( 'meta-box/meta-box.php' ))return;
+		if( !is_plugin_active( 'meta-box/meta-box.php' ) )return;
 
 		$this->normalize();
 
-		add_action( 'admin_menu',                               [$this, 'addPage'] );
-		add_action( 'pollux/settings/init',                     [$this, 'addSubmitMetaBox'] );
-		add_filter( 'pollux/settings/instruction',              [$this, 'filterInstruction'], 10, 3 );
-		add_filter( 'wp_redirect',                              [$this, 'filterRedirectOnSave'] );
-		add_action( 'current_screen',                           [$this, 'register'] );
-		add_action( 'admin_menu',                               [$this, 'registerSetting'] );
-		add_action( 'pollux/settings/init',                     [$this, 'reset'] );
-		add_action( 'admin_footer-toplevel_page_' . static::ID, [$this, 'renderFooterScript'] );
+		add_action( 'admin_menu', [ $this, 'addPage' ] );
+		add_action( 'pollux/settings/init', [ $this, 'addSubmitMetaBox' ] );
+		add_filter( 'pollux/settings/instruction', [ $this, 'filterInstruction' ], 10, 3 );
+		add_filter( 'wp_redirect', [ $this, 'filterRedirectOnSave' ] );
+		add_action( 'current_screen', [ $this, 'register' ] );
+		add_action( 'admin_menu', [ $this, 'registerSetting' ] );
+		add_action( 'pollux/settings/init', [ $this, 'reset' ] );
+		add_action( 'admin_footer-toplevel_page_' . static::ID, [ $this, 'renderFooterScript' ] );
 	}
 
 	/**
@@ -52,10 +52,10 @@ 
 			__( 'Site Settings', 'pollux' ),
 			'edit_theme_options',
 			static::ID,
-			[$this, 'renderPage'],
+			[ $this, 'renderPage' ],
 			'dashicons-screenoptions',
 			1313
-		]));
+		] ) );
 	}
 
 	/**
@@ -66,11 +66,11 @@ 
 		call_user_func_array( 'add_meta_box', apply_filters( 'pollux/settings/metabox/submit', [
 			'submitdiv',
 			__( 'Save Settings', 'pollux' ),
-			[ $this, 'renderSubmitMetaBox'],
+			[ $this, 'renderSubmitMetaBox' ],
 			$this->hook,
 			'side',
 			'high',
-		]));
+		] ) );
 	}
 
 	/**
@@ -91,19 +91,19 @@ 
 	public function filterRedirectOnSave( $location )
 	{
 		if( strpos( $location, 'settings-updated=true' ) === false
-			|| strpos( $location, sprintf( 'page=%s', static::ID )) === false ) {
+			|| strpos( $location, sprintf( 'page=%s', static::ID ) ) === false ) {
 			return $location;
 		}
-		return add_query_arg([
+		return add_query_arg( [
 			'page' => static::ID,
 			'settings-updated' => 'true',
-		], admin_url( 'admin.php' ));
+		], admin_url( 'admin.php' ) );
 	}
 
 	/**
 	 * @return void
 	 */
-	public function register( $metaboxes = [] )
+	public function register( $metaboxes = [ ] )
 	{
 		if( get_current_screen()->id != $this->hook )return;
 		foreach( parent::register() as $metabox ) {
@@ -112,7 +112,7 @@ 
 		add_screen_option( 'layout_columns', [
 			'max' => 2,
 			'default' => 2,
-		]);
+		] );
 		do_action( 'pollux/settings/init' );
 	}
 
@@ -133,7 +133,7 @@ 
 			'confirm' => __( 'Are you sure want to do this?', 'pollux' ),
 			'hook' => $this->hook,
 			'id' => static::ID,
-		]);
+		] );
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 			'columns' => get_current_screen()->get_columns(),
 			'id' => static::ID,
 			'title' => __( 'Site Settings', 'pollux' ),
-		]);
+		] );
 	}
 
 	/**
@@ -160,9 +160,9 @@ 
 		];
 		$this->render( 'settings/submit', [
 			'reset' => __( 'Reset Settings', 'pollux' ),
-			'reset_url' => esc_url( add_query_arg( $query, admin_url( 'admin.php' ))),
+			'reset_url' => esc_url( add_query_arg( $query, admin_url( 'admin.php' ) ) ),
 			'submit' => get_submit_button( __( 'Save', 'pollux' ), 'primary', 'submit', false ),
-		]);
+		] );
 	}
 
 	/**
@@ -173,11 +173,11 @@ 
 		if( filter_input( INPUT_GET, 'page' ) !== static::ID
 			|| filter_input( INPUT_GET, 'action' ) !== 'reset'
 		)return;
-		if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook )) {
+		if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook ) ) {
 			update_option( static::ID, $this->getDefaults() );
 			return add_settings_error( static::ID, 'reset', __( 'Settings reset to defaults.', 'pollux' ), 'updated' );
 		}
-		add_settings_error( static::ID, 'reset', __( 'Failed to reset settings. Please refresh the page and try again.', 'pollux' ));
+		add_settings_error( static::ID, 'reset', __( 'Failed to reset settings. Please refresh the page and try again.', 'pollux' ) );
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	protected function filterArrayByKey( array $array, $key )
 	{
 		return array_filter( $array, function( $value ) use( $key ) {
-			return !empty( $value[$key] );
+			return !empty( $value[ $key ] );
 		});
 	}
 
@@ -200,11 +200,11 @@ 
 
 		array_walk( $metaboxes, function( &$metabox ) {
 			$fields = array_map( function( $field ) {
-				$field = wp_parse_args( $field, ['std' => ''] );
-				return [$field['slug'] => $field['std']];
-			}, $this->filterArrayByKey( $metabox['fields'], 'slug' ));
+				$field = wp_parse_args( $field, [ 'std' => '' ] );
+				return [ $field[ 'slug' ] => $field[ 'std' ] ];
+			}, $this->filterArrayByKey( $metabox[ 'fields' ], 'slug' ) );
 			$metabox = [
-				$metabox['slug'] => call_user_func_array( 'array_merge', $fields ),
+				$metabox[ 'slug' ] => call_user_func_array( 'array_merge', $fields ),
 			];
 		});
 		return call_user_func_array( 'array_merge', $metaboxes );
@@ -215,15 +215,15 @@ 
 	 */
 	protected function normalize()
 	{
-		$this->metaboxes = [];
-		foreach( $this->app->config['settings'] as $id => $metabox ) {
+		$this->metaboxes = [ ];
+		foreach( $this->app->config[ 'settings' ] as $id => $metabox ) {
 			$defaults = [
-				'condition' => [],
-				'fields' => [],
+				'condition' => [ ],
+				'fields' => [ ],
 				'id' => $id,
 				'slug' => $id,
 			];
-			$this->metaboxes[] = $this->normalizeThis( $metabox, $defaults, $id );
+			$this->metaboxes[ ] = $this->normalizeThis( $metabox, $defaults, $id );
 		}
 	}
 
@@ -234,10 +234,10 @@ 
 	 */
 	protected function normalizeFieldName( $name, array $data, $parentId )
 	{
-		if( !empty( $name )) {
+		if( !empty( $name ) ) {
 			return $name;
 		}
-		$name = str_replace( sprintf( '%s-%s-', static::ID, $parentId ), '', $data['id'] );
+		$name = str_replace( sprintf( '%s-%s-', static::ID, $parentId ), '', $data[ 'id' ] );
 		return sprintf( '%s[%s][%s]', static::ID, $parentId, $name );
 	}
 

Braces +15 added lines, -6 removed lines

@@ -28,7 +28,9 @@ 
 	public function init()
 	{
 		// @todo: run GateKeeper here instead to check dependencies and capability
-		if( !is_plugin_active( 'meta-box/meta-box.php' ))return;
+		if( !is_plugin_active( 'meta-box/meta-box.php' )) {
+			return;
+		}
 
 		$this->normalize();
 
@@ -105,7 +107,9 @@ 
 	 */
 	public function register( $metaboxes = [] )
 	{
-		if( get_current_screen()->id != $this->hook )return;
+		if( get_current_screen()->id != $this->hook ) {
+			return;
+		}
 		foreach( parent::register() as $metabox ) {
 			new SettingsMetaBox( $metabox );
 		}
@@ -172,7 +176,9 @@ 
 	{
 		if( filter_input( INPUT_GET, 'page' ) !== static::ID
 			|| filter_input( INPUT_GET, 'action' ) !== 'reset'
-		)return;
+		) {
+			return;
+		}
 		if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook )) {
 			update_option( static::ID, $this->getDefaults() );
 			return add_settings_error( static::ID, 'reset', __( 'Settings reset to defaults.', 'pollux' ), 'updated' );
@@ -186,7 +192,8 @@ 
 	 */
 	protected function filterArrayByKey( array $array, $key )
 	{
-		return array_filter( $array, function( $value ) use( $key ) {
+		return array_filter( $array, function( $value ) use( $key )
+		{
 			return !empty( $value[$key] );
 		});
 	}
@@ -198,8 +205,10 @@ 
 	{
 		$metaboxes = $this->filterArrayByKey( $this->metaboxes, 'slug' );
 
-		array_walk( $metaboxes, function( &$metabox ) {
-			$fields = array_map( function( $field ) {
+		array_walk( $metaboxes, function( &$metabox )
+		{
+			$fields = array_map( function( $field )
+			{
 				$field = wp_parse_args( $field, ['std' => ''] );
 				return [$field['slug'] => $field['std']];
 			}, $this->filterArrayByKey( $metabox['fields'], 'slug' ));