pryley / pollux

src/Taxonomy.php

Spacing +33 added lines, -33 removed lines

@@ -13,10 +13,10 @@ 
 
 	const TAXONOMY_DEFAULTS = [
 		'hierarchical'      => true,
-		'labels'            => [],
+		'labels'            => [ ],
 		'menu_name'         => '',
 		'plural'            => '',
-		'post_types'        => [],
+		'post_types'        => [ ],
 		'public'            => true,
 		'rewrite'           => true,
 		'show_admin_column' => true,
@@ -27,7 +27,7 @@ 
 	/**
 	 * @var array
 	 */
-	public $taxonomies = [];
+	public $taxonomies = [ ];
 
 	/**
 	 * {@inheritdoc}
@@ -36,9 +36,9 @@ 
 	{
 		$this->normalize();
 
-		add_filter( 'parse_query',           [ $this, 'filterBy'] );
-		add_action( 'restrict_manage_posts', [ $this, 'printFilters'] );
-		add_action( 'init',                  [ $this, 'register'] );
+		add_filter( 'parse_query', [ $this, 'filterBy' ] );
+		add_action( 'restrict_manage_posts', [ $this, 'printFilters' ] );
+		add_action( 'init', [ $this, 'register' ] );
 	}
 
 	/**
@@ -49,9 +49,9 @@ 
 		if( !is_admin() || $this->app->screen()->base != 'edit' )return;
 		$vars = &$query->query_vars;
 		foreach( array_keys( $this->taxonomies ) as $taxonomy ) {
-			if( !isset( $vars[$taxonomy] ))return;
-			if( $term = get_term_by( 'id', $vars[$taxonomy], $taxonomy )) {
-				$vars[$taxonomy] = $term->slug;
+			if( !isset( $vars[ $taxonomy ] ) )return;
+			if( $term = get_term_by( 'id', $vars[ $taxonomy ], $taxonomy ) ) {
+				$vars[ $taxonomy ] = $term->slug;
 			}
 		}
 		return $query;
@@ -64,18 +64,18 @@ 
 	{
 		global $wp_query;
 		foreach( $this->taxonomies as $taxonomy => $args ) {
-			if( !in_array( get_current_screen()->post_type, $args['post_types'] ))continue;
-			$selected = isset( $wp_query->query[$taxonomy] )
-				? $wp_query->query[$taxonomy]
+			if( !in_array( get_current_screen()->post_type, $args[ 'post_types' ] ) )continue;
+			$selected = isset( $wp_query->query[ $taxonomy ] )
+				? $wp_query->query[ $taxonomy ]
 				: false;
-			wp_dropdown_categories([
+			wp_dropdown_categories( [
 				'hide_if_empty' => true,
 				'name' => $taxonomy,
 				'orderby' => 'name',
 				'selected' => $selected,
-				'show_option_all' => $args['labels']['all_items'],
+				'show_option_all' => $args[ 'labels' ][ 'all_items' ],
 				'taxonomy' => $taxonomy,
-			]);
+			] );
 		}
 	}
 
@@ -85,8 +85,8 @@ 
 	public function register()
 	{
 		array_walk( $this->taxonomies, function( $args, $taxonomy ) {
-			register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( static::CUSTOM_KEYS )));
-			foreach( $args['post_types'] as $type ) {
+			register_taxonomy( $taxonomy, $args[ 'post_types' ], array_diff_key( $args, array_flip( static::CUSTOM_KEYS ) ) );
+			foreach( $args[ 'post_types' ] as $type ) {
 				register_taxonomy_for_object_type( $taxonomy, $type );
 			}
 		});
@@ -97,14 +97,14 @@ 
 	 */
 	protected function normalize()
 	{
-		foreach( $this->app->config['taxonomies'] as $taxonomy => $args ) {
-			$this->taxonomies[$taxonomy] = apply_filters( 'pollux/taxonomy/args',
+		foreach( $this->app->config[ 'taxonomies' ] as $taxonomy => $args ) {
+			$this->taxonomies[ $taxonomy ] = apply_filters( 'pollux/taxonomy/args',
 				$this->normalizeThis( $args, static::TAXONOMY_DEFAULTS, $taxonomy )
 			);
 		}
 		$this->taxonomies = array_diff_key(
 			$this->taxonomies,
-			get_taxonomies( ['_builtin' => true] )
+			get_taxonomies( [ '_builtin' => true ] )
 		);
 	}
 
@@ -114,7 +114,7 @@ 
 	 */
 	protected function normalizeLabels( $labels, array $args )
 	{
-		return wp_parse_args( $labels, $this->setLabels( $args ));
+		return wp_parse_args( $labels, $this->setLabels( $args ) );
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	protected function normalizeMenuName( $menuname, array $args )
 	{
 		return empty( $menuname )
-			? $args['plural']
+			? $args[ 'plural' ]
 			: $menuname;
 	}
 
@@ -143,17 +143,17 @@ 
 	protected function setLabels( array $args )
 	{
 		return apply_filters( 'pollux/taxonomy/labels', [
-			'add_new_item' => sprintf( _x( 'Add New %s', 'Add new taxonomy', 'pollux' ), $args['single'] ),
-			'all_items' => sprintf( _x( 'All %s', 'All taxonomies', 'pollux' ), $args['plural'] ),
-			'edit_item' => sprintf( _x( 'Edit %s', 'Edit taxonomy', 'pollux' ), $args['single'] ),
-			'menu_name' => $this->normalizeMenuName( $args['menu_name'], $args ),
-			'name' => $args['plural'],
-			'new_item_name' => sprintf( _x( 'New %s Name', 'New taxonomy name', 'pollux' ), $args['single'] ),
-			'not_found' => sprintf( _x( 'No %s found', 'No taxonomies found', 'pollux' ), $args['plural'] ),
-			'search_items' => sprintf( _x( 'Search %s', 'Search taxonomies', 'pollux' ), $args['plural'] ),
-			'singular_name' => $args['single'],
-			'update_item' => sprintf( _x( 'Update %s', 'Update taxonomy', 'pollux' ), $args['single'] ),
-			'view_item' => sprintf( _x( 'View %s', 'View taxonomy', 'pollux' ), $args['single'] ),
+			'add_new_item' => sprintf( _x( 'Add New %s', 'Add new taxonomy', 'pollux' ), $args[ 'single' ] ),
+			'all_items' => sprintf( _x( 'All %s', 'All taxonomies', 'pollux' ), $args[ 'plural' ] ),
+			'edit_item' => sprintf( _x( 'Edit %s', 'Edit taxonomy', 'pollux' ), $args[ 'single' ] ),
+			'menu_name' => $this->normalizeMenuName( $args[ 'menu_name' ], $args ),
+			'name' => $args[ 'plural' ],
+			'new_item_name' => sprintf( _x( 'New %s Name', 'New taxonomy name', 'pollux' ), $args[ 'single' ] ),
+			'not_found' => sprintf( _x( 'No %s found', 'No taxonomies found', 'pollux' ), $args[ 'plural' ] ),
+			'search_items' => sprintf( _x( 'Search %s', 'Search taxonomies', 'pollux' ), $args[ 'plural' ] ),
+			'singular_name' => $args[ 'single' ],
+			'update_item' => sprintf( _x( 'Update %s', 'Update taxonomy', 'pollux' ), $args[ 'single' ] ),
+			'view_item' => sprintf( _x( 'View %s', 'View taxonomy', 'pollux' ), $args[ 'single' ] ),
 		], $args );
 	}
 }

Braces +11 added lines, -4 removed lines

@@ -46,10 +46,14 @@ 
 	 */
 	public function filterBy( WP_Query $query )
 	{
-		if( !is_admin() || $this->app->screen()->base != 'edit' )return;
+		if( !is_admin() || $this->app->screen()->base != 'edit' ) {
+			return;
+		}
 		$vars = &$query->query_vars;
 		foreach( array_keys( $this->taxonomies ) as $taxonomy ) {
-			if( !isset( $vars[$taxonomy] ))return;
+			if( !isset( $vars[$taxonomy] )) {
+				return;
+			}
 			if( $term = get_term_by( 'id', $vars[$taxonomy], $taxonomy )) {
 				$vars[$taxonomy] = $term->slug;
 			}
@@ -64,7 +68,9 @@ 
 	{
 		global $wp_query;
 		foreach( $this->taxonomies as $taxonomy => $args ) {
-			if( !in_array( get_current_screen()->post_type, $args['post_types'] ))continue;
+			if( !in_array( get_current_screen()->post_type, $args['post_types'] )) {
+				continue;
+			}
 			$selected = isset( $wp_query->query[$taxonomy] )
 				? $wp_query->query[$taxonomy]
 				: false;
@@ -84,7 +90,8 @@ 
 	 */
 	public function register()
 	{
-		array_walk( $this->taxonomies, function( $args, $taxonomy ) {
+		array_walk( $this->taxonomies, function( $args, $taxonomy )
+		{
 			register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( static::CUSTOM_KEYS )));
 			foreach( $args['post_types'] as $type ) {
 				register_taxonomy_for_object_type( $taxonomy, $type );

src/Settings.php

Spacing +35 added lines, -35 removed lines

@@ -32,14 +32,14 @@ 
 
 		$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,13 +91,13 @@ 
 	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' ) );
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	/**
 	 * @return void
 	 */
-	public function register( $metaboxes = [] )
+	public function register( $metaboxes = [ ] )
 	{
 		if( $this->app->screen()->id != $this->hook )return;
 		foreach( parent::register() as $metabox ) {
@@ -120,7 +120,7 @@ 
 		add_screen_option( 'layout_columns', [
 			'max' => 2,
 			'default' => 2,
-		]);
+		] );
 		do_action( 'pollux/settings/init' );
 	}
 
@@ -129,7 +129,7 @@ 
 	 */
 	public function registerSetting()
 	{
-		register_setting( static::ID, static::ID, [$this, 'filterSavedSettings'] );
+		register_setting( static::ID, static::ID, [ $this, 'filterSavedSettings' ] );
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 			'confirm' => __( 'Are you sure want to do this?', 'pollux' ),
 			'hook' => $this->hook,
 			'id' => static::ID,
-		]);
+		] );
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 			'columns' => get_current_screen()->get_columns(),
 			'id' => static::ID,
 			'title' => __( 'Site Settings', 'pollux' ),
-		]);
+		] );
 	}
 
 	/**
@@ -168,9 +168,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 ),
-		]);
+		] );
 	}
 
 	/**
@@ -181,11 +181,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' ) );
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	protected function filterArrayByKey( array $array, $key )
 	{
 		return array_filter( $array, function( $value ) use( $key ) {
-			return !empty( $value[$key] );
+			return !empty( $value[ $key ] );
 		});
 	}
 
@@ -208,11 +208,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 );
@@ -223,14 +223,14 @@ 
 	 */
 	protected function normalize()
 	{
-		foreach( $this->app->config['settings'] as $id => $metabox ) {
+		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 );
 		}
 	}
 
@@ -241,10 +241,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 +12 added lines, -5 removed lines

@@ -113,7 +113,9 @@ 
 	 */
 	public function register( $metaboxes = [] )
 	{
-		if( $this->app->screen()->id != $this->hook )return;
+		if( $this->app->screen()->id != $this->hook ) {
+			return;
+		}
 		foreach( parent::register() as $metabox ) {
 			new SettingsMetaBox( $metabox );
 		}
@@ -180,7 +182,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' );
@@ -194,7 +198,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] );
 		});
 	}
@@ -206,8 +211,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' ));

src/Application.php

Spacing +13 added lines, -13 removed lines

@@ -23,8 +23,8 @@ 
 
 	public function __construct()
 	{
-		$this->file = realpath( dirname( dirname( __FILE__ )) . '/pollux.php' );
-		$this->gatekeeper = new GateKeeper( plugin_basename( $this->file ));
+		$this->file = realpath( dirname( dirname( __FILE__ ) ) . '/pollux.php' );
+		$this->gatekeeper = new GateKeeper( plugin_basename( $this->file ) );
 
 		$data = get_file_data( $this->file, array(
 			'id' => 'Text Domain',
@@ -43,7 +43,7 @@ 
 	{
 		Facade::clearResolvedInstances();
 		Facade::setFacadeApplication( $this );
-		$this->config = (new Config( $this ))->get();
+		$this->config = ( new Config( $this ) )->get();
 		$this->registerAliases();
 		$classNames = array(
 			'MetaBox', 'PostType', 'Taxonomy', 'Settings',
@@ -60,10 +60,10 @@ 
 	 */
 	public function buildClassName( $name, $path = '' )
 	{
-		$className = array_map( 'ucfirst', array_map( 'strtolower', preg_split( '/[-_]/', $name )));
+		$className = array_map( 'ucfirst', array_map( 'strtolower', preg_split( '/[-_]/', $name ) ) );
 		$className = implode( '', $className );
 		return !empty( $path )
-			? str_replace( '\\\\', '\\', sprintf( '%s\%s', $path, $className ))
+			? str_replace( '\\\\', '\\', sprintf( '%s\%s', $path, $className ) )
 			: $className;
 	}
 
@@ -74,7 +74,7 @@ 
 	 */
 	public function buildMethodName( $name, $prefix = 'get' )
 	{
-		return lcfirst( $this->buildClassName( $prefix . '-' . $name ));
+		return lcfirst( $this->buildClassName( $prefix . '-' . $name ) );
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	public function environment( $checkFor = '' )
 	{
 		$environment = defined( 'WP_ENV' ) ? WP_ENV : 'production';
-		if( !empty( $checkFor )) {
+		if( !empty( $checkFor ) ) {
 			return $environment == $checkFor;
 		}
 		return $environment;
@@ -101,10 +101,10 @@ 
 
 		$controller = $this->make( 'Controller' );
 
-		add_filter( 'admin_footer_text',          array( $controller, 'filterWordPressFooter' ));
-		add_action( 'admin_enqueue_scripts',      array( $controller, 'registerAssets' ));
-		add_action( 'admin_init',                 array( $controller, 'removeDashboardWidgets' ));
-		add_action( 'wp_before_admin_bar_render', array( $controller, 'removeWordPressMenu' ));
+		add_filter( 'admin_footer_text', array( $controller, 'filterWordPressFooter' ) );
+		add_action( 'admin_enqueue_scripts', array( $controller, 'registerAssets' ) );
+		add_action( 'admin_init', array( $controller, 'removeDashboardWidgets' ) );
+		add_action( 'wp_before_admin_bar_render', array( $controller, 'removeWordPressMenu' ) );
 
 		// Disallow indexing of the site on non-production environments
 		if( !$this->environment( 'production' ) && !is_admin() ) {
@@ -119,7 +119,7 @@ 
 	{
 		$settings = get_option( Settings::ID );
 		if( !$settings ) {
-			update_option( Settings::ID, [] );
+			update_option( Settings::ID, [ ] );
 		}
 	}
 
@@ -170,6 +170,6 @@ 
 	 */
 	public function url( $path = '' )
 	{
-		return esc_url( plugin_dir_url( $this->file ) . ltrim( trim( $path ), '/' ));
+		return esc_url( plugin_dir_url( $this->file ) . ltrim( trim( $path ), '/' ) );
 	}
 }

src/Controller.php

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	public function filterWordPressFooter( $text )
 	{
-		if( $this->app->config['remove_wordpress_footer'] )return;
+		if( $this->app->config[ 'remove_wordpress_footer' ] )return;
 		return $text;
 	}
 
@@ -33,7 +33,7 @@ 
 	 */
 	public function registerAssets()
 	{
-		if( $this->app->screen()->id == sprintf( 'toplevel_page_%s', Settings::ID )) {
+		if( $this->app->screen()->id == sprintf( 'toplevel_page_%s', Settings::ID ) ) {
 			wp_enqueue_script( 'common' );
 			wp_enqueue_script( 'wp-lists' );
 			wp_enqueue_script( 'postbox' );
@@ -64,11 +64,11 @@ 
 	 */
 	public function removeDashboardWidgets()
 	{
-		if( !$this->app->config['remove_dashboard_widgets'] )return;
+		if( !$this->app->config[ 'remove_dashboard_widgets' ] )return;
 		$widgets = apply_filters( 'pollux/dashoard/widgets', [
 			'dashboard_primary',
 			'dashboard_quick_press',
-		]);
+		] );
 		foreach( $widgets as $widget ) {
 			remove_meta_box( $widget, 'dashboard', 'normal' );
 		}
@@ -80,7 +80,7 @@ 
 	 */
 	public function removeWordPressMenu()
 	{
-		if( !$this->app->config['remove_wordpress_menu'] )return;
+		if( !$this->app->config[ 'remove_wordpress_menu' ] )return;
 		global $wp_admin_bar;
 		$wp_admin_bar->remove_menu( 'wp-logo' );
 	}