pryley / pollux

src/Taxonomy.php

Spacing +31 added lines, -31 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,
@@ -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,8 +49,8 @@ 
 		if( !is_admin() || get_current_screen()->base != 'edit' )return;
 		$vars = &$query->query_vars;
 		foreach( array_keys( $this->taxonomies ) as $taxonomy ) {
-			if( !is_numeric( $vars[$taxonomy] ))continue;
-			$vars[$taxonomy] = get_term_by( 'id', $vars[$taxonomy], $taxonomy )->slug;
+			if( !is_numeric( $vars[ $taxonomy ] ) )continue;
+			$vars[ $taxonomy ] = get_term_by( 'id', $vars[ $taxonomy ], $taxonomy )->slug;
 		}
 		return $query;
 	}
@@ -62,18 +62,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,
-			]);
+			] );
 		}
 	}
 
@@ -83,8 +83,8 @@ 
 	public function register()
 	{
 		array_walk( $this->taxonomies, function( $args, $taxonomy ) {
-			register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( self::CUSTOM_KEYS )));
-			foreach( $args['post_types'] as $type ) {
+			register_taxonomy( $taxonomy, $args[ 'post_types' ], array_diff_key( $args, array_flip( self::CUSTOM_KEYS ) ) );
+			foreach( $args[ 'post_types' ] as $type ) {
 				register_taxonomy_for_object_type( $taxonomy, $type );
 			}
 		});
@@ -95,14 +95,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, self::TAXONOMY_DEFAULTS, $taxonomy )
 			);
 		}
 		$this->taxonomies = array_diff_key(
 			$this->taxonomies,
-			get_taxonomies( ['_builtin' => true] )
+			get_taxonomies( [ '_builtin' => true ] )
 		);
 	}
 
@@ -112,7 +112,7 @@ 
 	 */
 	protected function normalizeLabels( $labels, array $args )
 	{
-		return wp_parse_args( $labels, $this->setLabels( $args ));
+		return wp_parse_args( $labels, $this->setLabels( $args ) );
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	protected function normalizeMenuName( $menuname, array $args )
 	{
 		return empty( $menuname )
-			? $args['plural']
+			? $args[ 'plural' ]
 			: $menuname;
 	}
 
@@ -141,17 +141,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() || get_current_screen()->base != 'edit' )return;
+		if( !is_admin() || get_current_screen()->base != 'edit' ) {
+			return;
+		}
 		$vars = &$query->query_vars;
 		foreach( array_keys( $this->taxonomies ) as $taxonomy ) {
-			if( !is_numeric( $vars[$taxonomy] ))continue;
+			if( !is_numeric( $vars[$taxonomy] )) {
+				continue;
+			}
 			$vars[$taxonomy] = get_term_by( 'id', $vars[$taxonomy], $taxonomy )->slug;
 		}
 		return $query;
@@ -62,7 +66,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;
@@ -82,7 +88,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( self::CUSTOM_KEYS )));
 			foreach( $args['post_types'] as $type ) {
 				register_taxonomy_for_object_type( $taxonomy, $type );