From 16591ea2c361e7775c617c41bb44a58d44c5a729 Mon Sep 17 00:00:00 2001 From: Nino Mihovilic Date: Mon, 25 Aug 2025 15:07:20 +0200 Subject: [PATCH 1/8] Update custom tax permalinks --- .../inc/classes/class-rewrite.php | 53 +++++++++++++++++++ .../class-taxonomy-license-category.php | 11 ++-- .../taxonomies/class-taxonomy-publication.php | 11 ++-- .../taxonomies/class-taxonomy-seat-type.php | 11 ++-- .../taxonomies/class-taxonomy-status.php | 11 ++-- .../taxonomies/class-taxonomy-steward.php | 11 ++-- 6 files changed, 88 insertions(+), 20 deletions(-) diff --git a/plugins/osi-features/inc/classes/class-rewrite.php b/plugins/osi-features/inc/classes/class-rewrite.php index 675852d..1151114 100644 --- a/plugins/osi-features/inc/classes/class-rewrite.php +++ b/plugins/osi-features/inc/classes/class-rewrite.php @@ -8,6 +8,14 @@ namespace Osi\Features\Inc; use Osi\Features\Inc\Traits\Singleton; +use Osi\Features\Inc\Post_Types\Post_Type_Board_Member; +use Osi\Features\Inc\Taxonomies\Taxonomy_Status; +use Osi\Features\Inc\Post_Types\Post_Type_License; +use Osi\Features\Inc\Taxonomies\Taxonomy_License_Category; +use Osi\Features\Inc\Post_Types\Post_Type_Press_Mentions; +use Osi\Features\Inc\Taxonomies\Taxonomy_Publication; +use Osi\Features\Inc\Taxonomies\Taxonomy_Seat_Type; +use Osi\Features\Inc\Taxonomies\Taxonomy_Steward; /** * Class Rewrite @@ -32,6 +40,7 @@ protected function __construct() { */ protected function setup_hooks() { add_filter( 'query_vars', array( $this, 'add_query_vars' ), 10 ); + add_action( 'init', [ $this, 'add_custom_rewrite_rules' ], 20 ); } public function add_query_vars( $vars ) { @@ -40,4 +49,48 @@ public function add_query_vars( $vars ) { return $vars; } + /** + * Add custom rewrite rules for custom post types and taxonomies. + * + * @return void + */ + public function add_custom_rewrite_rules() { + $base = Post_Type_License::get_instance()->get_slug(); + add_rewrite_rule( + '^' . $base . '/steward/([^/]+)/?$', + 'index.php?taxonomy=' . Taxonomy_Steward::SLUG . '&term=$matches[1]', + 'top' + ); + + $base = Post_Type_Board_Member::get_instance()->get_slug(); + add_rewrite_rule( + '^' . $base . '/status/([^/]+)/?$', + 'index.php?taxonomy=' . Taxonomy_Status::SLUG . '&term=$matches[1]', + 'top' + ); + + $base = Post_Type_Board_Member::get_instance()->get_slug(); + add_rewrite_rule( + '^' . $base . '/seat-type/([^/]+)/?$', + 'index.php?taxonomy=' . Taxonomy_Seat_Type::SLUG . '&term=$matches[1]', + 'top' + ); + + $base = Post_Type_License::get_instance()->get_slug(); + add_rewrite_rule( + '^' . $base . '/category/([^/]+)/?$', + 'index.php?taxonomy=' . Taxonomy_License_Category::SLUG . '&term=$matches[1]', + 'top' + ); + + $base = Post_Type_Press_Mentions::get_instance()->get_slug(); + add_rewrite_rule( + '^' . $base . '/publication/([^/]+)/?$', + 'index.php?taxonomy=' . Taxonomy_Publication::SLUG . '&term=$matches[1]', + 'top' + ); + + + } + } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php index b30eb4a..71663ba 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php @@ -68,11 +68,14 @@ public function get_post_types() { * @return array */ public function get_args() { - - return wp_parse_args( + + return wp_parse_args( [ - 'rewrite' => array( 'slug' => 'license-category' ), - ], + 'rewrite' => [ + 'slug' => Post_Type_License::get_instance()->get_slug() . '/category', + 'with_front' => false, + ], + ], parent::get_args() ); } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php index 2b18071..d02cf35 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php @@ -68,12 +68,15 @@ public function get_post_types() { * @return array */ public function get_args() { - - return wp_parse_args( + + return wp_parse_args( [ 'hierarchical' => true, - 'rewrite' => array( 'slug' => 'publication' ), - ], + 'rewrite' => [ + 'slug' => Post_Type_Press_Mentions::get_instance()->get_slug() . '/publication', + 'with_front' => false, + ], + ], parent::get_args() ); } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php index faa701a..dd3ef95 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php @@ -68,12 +68,15 @@ public function get_post_types() { * @return array */ public function get_args() { - - return wp_parse_args( + + return wp_parse_args( [ 'hierarchical' => false, - 'rewrite' => array( 'slug' => 'seat-type' ), - ], + 'rewrite' => [ + 'slug' => Post_Type_Board_Member::get_instance()->get_slug() . '/seat-type', + 'with_front' => false, + ], + ], parent::get_args() ); } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php index 369182d..ac3f71d 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php @@ -68,12 +68,15 @@ public function get_post_types() { * @return array */ public function get_args() { - - return wp_parse_args( + + return wp_parse_args( [ 'hierarchical' => false, - 'rewrite' => array( 'slug' => 'status' ), - ], + 'rewrite' => [ + 'slug' => Post_Type_Board_Member::get_instance()->get_slug() . '/status', + 'with_front' => false, + ], + ], parent::get_args() ); } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php index 2140780..fa13cc8 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php @@ -68,12 +68,15 @@ public function get_post_types() { * @return array */ public function get_args() { - - return wp_parse_args( + + return wp_parse_args( [ 'hierarchical' => false, - 'rewrite' => array( 'slug' => 'steward' ), - ], + 'rewrite' => [ + 'slug' => Post_Type_License::get_instance()->get_slug() . '/steward', + 'with_front' => false, + ], + ], parent::get_args() ); } From a0dd2a361cbf6e117c16a9b22630f7839589658b Mon Sep 17 00:00:00 2001 From: Nino Mihovilic Date: Mon, 25 Aug 2025 15:24:47 +0200 Subject: [PATCH 2/8] PHPCS fixes --- .../osi-features/inc/classes/class-rewrite.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/plugins/osi-features/inc/classes/class-rewrite.php b/plugins/osi-features/inc/classes/class-rewrite.php index 1151114..73b8c2c 100644 --- a/plugins/osi-features/inc/classes/class-rewrite.php +++ b/plugins/osi-features/inc/classes/class-rewrite.php @@ -28,9 +28,7 @@ class Rewrite { * Construct method. */ protected function __construct() { - $this->setup_hooks(); - } /** @@ -40,12 +38,17 @@ protected function __construct() { */ protected function setup_hooks() { add_filter( 'query_vars', array( $this, 'add_query_vars' ), 10 ); - add_action( 'init', [ $this, 'add_custom_rewrite_rules' ], 20 ); + add_action( 'init', array( $this, 'add_custom_rewrite_rules' ), 20 ); } + /** + * Add custom query vars. + * + * @param array $vars Public query vars. + * @return array + */ public function add_query_vars( $vars ) { $vars[] = 'categories'; - return $vars; } @@ -61,7 +64,7 @@ public function add_custom_rewrite_rules() { 'index.php?taxonomy=' . Taxonomy_Steward::SLUG . '&term=$matches[1]', 'top' ); - + $base = Post_Type_Board_Member::get_instance()->get_slug(); add_rewrite_rule( '^' . $base . '/status/([^/]+)/?$', @@ -89,8 +92,8 @@ public function add_custom_rewrite_rules() { 'index.php?taxonomy=' . Taxonomy_Publication::SLUG . '&term=$matches[1]', 'top' ); - - } } + +} From 9f7eea78cdf9a53346a0ab8e93e4d9e679a717b1 Mon Sep 17 00:00:00 2001 From: Nino Mihovilic Date: Mon, 25 Aug 2025 15:25:55 +0200 Subject: [PATCH 3/8] Remove extra parentheses --- plugins/osi-features/inc/classes/class-rewrite.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/osi-features/inc/classes/class-rewrite.php b/plugins/osi-features/inc/classes/class-rewrite.php index 73b8c2c..026e253 100644 --- a/plugins/osi-features/inc/classes/class-rewrite.php +++ b/plugins/osi-features/inc/classes/class-rewrite.php @@ -95,5 +95,3 @@ public function add_custom_rewrite_rules() { } } - -} From 0ef1ffdfabab06997693a047bfcb518492c8c8e2 Mon Sep 17 00:00:00 2001 From: Nino Mihovilic Date: Mon, 25 Aug 2025 15:28:40 +0200 Subject: [PATCH 4/8] Additional PHPCS fixes --- plugins/osi-features/inc/classes/class-rewrite.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/osi-features/inc/classes/class-rewrite.php b/plugins/osi-features/inc/classes/class-rewrite.php index 026e253..13116d8 100644 --- a/plugins/osi-features/inc/classes/class-rewrite.php +++ b/plugins/osi-features/inc/classes/class-rewrite.php @@ -45,9 +45,10 @@ protected function setup_hooks() { * Add custom query vars. * * @param array $vars Public query vars. + * * @return array */ - public function add_query_vars( $vars ) { + public function add_query_vars( array $vars ) { $vars[] = 'categories'; return $vars; } @@ -93,5 +94,4 @@ public function add_custom_rewrite_rules() { 'top' ); } - } From 9dbc5792130c050291a84c17c25f325928e706cc Mon Sep 17 00:00:00 2001 From: Nino Mihovilic Date: Mon, 25 Aug 2025 15:43:52 +0200 Subject: [PATCH 5/8] Fix phpcs issues --- .../inc/classes/taxonomies/class-base.php | 17 ++++++----------- .../taxonomies/class-taxonomy-example.php | 11 ++++------- .../class-taxonomy-license-category.php | 19 ++++++++----------- .../taxonomies/class-taxonomy-publication.php | 19 ++++++++----------- .../taxonomies/class-taxonomy-seat-type.php | 19 ++++++++----------- .../taxonomies/class-taxonomy-status.php | 19 ++++++++----------- .../taxonomies/class-taxonomy-steward.php | 19 ++++++++----------- 7 files changed, 50 insertions(+), 73 deletions(-) diff --git a/plugins/osi-features/inc/classes/taxonomies/class-base.php b/plugins/osi-features/inc/classes/taxonomies/class-base.php index 8b7c397..6d76459 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-base.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-base.php @@ -7,7 +7,7 @@ namespace Osi\Features\Inc\Taxonomies; -use \Osi\Features\Inc\Traits\Singleton; +use Osi\Features\Inc\Traits\Singleton; /** * Class Base @@ -22,7 +22,6 @@ abstract class Base { protected function __construct() { $this->setup_hooks(); - } /** @@ -32,8 +31,7 @@ protected function __construct() { */ protected function setup_hooks() { - add_action( 'init', [ $this, 'register_taxonomy' ] ); - + add_action( 'init', array( $this, 'register_taxonomy' ) ); } /** @@ -54,17 +52,16 @@ public function register_taxonomy() { } $args = $this->get_args(); - $args = ( ! empty( $args ) && is_array( $args ) ) ? $args : []; + $args = ( ! empty( $args ) && is_array( $args ) ) ? $args : array(); $labels = $this->get_labels(); - $labels = ( ! empty( $labels ) && is_array( $labels ) ) ? $labels : []; + $labels = ( ! empty( $labels ) && is_array( $labels ) ) ? $labels : array(); if ( ! empty( $labels ) && is_array( $labels ) ) { $args['labels'] = $labels; } register_taxonomy( static::SLUG, $post_types, $args ); - } /** @@ -74,14 +71,13 @@ public function register_taxonomy() { */ public function get_args() { - return [ + return array( 'hierarchical' => true, 'show_ui' => true, 'show_admin_column' => true, 'query_var' => true, 'show_in_rest' => true, - ]; - + ); } /** @@ -97,5 +93,4 @@ abstract public function get_labels(); * @return array */ abstract public function get_post_types(); - } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-example.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-example.php index 91a0349..b0e6cff 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-example.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-example.php @@ -26,7 +26,7 @@ class Taxonomy_Example extends Base { */ public function get_labels() { - return [ + return array( 'name' => _x( 'Taxonomy_Example', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Taxonomy_Example', 'taxonomy singular name', 'osi-features' ), 'search_items' => __( 'Search Taxonomy_Example', 'osi-features' ), @@ -43,8 +43,7 @@ public function get_labels() { 'choose_from_most_used' => __( 'Choose from the most used Taxonomy_Example', 'osi-features' ), 'not_found' => __( 'No Taxonomy_Example found.', 'osi-features' ), 'menu_name' => __( 'Taxonomy_Example', 'osi-features' ), - ]; - + ); } /** @@ -54,10 +53,8 @@ public function get_labels() { */ public function get_post_types() { - return [ + return array( 'post', - ]; - + ); } - } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php index 71663ba..2d224ed 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php @@ -28,7 +28,7 @@ class Taxonomy_License_Category extends Base { */ public function get_labels() { - return [ + return array( 'name' => _x( 'Category', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Category', 'taxonomy singular name', 'osi-features' ), 'search_items' => __( 'Search Category', 'osi-features' ), @@ -45,8 +45,7 @@ public function get_labels() { 'choose_from_most_used' => __( 'Choose from the most used Categories', 'osi-features' ), 'not_found' => __( 'No Category found.', 'osi-features' ), 'menu_name' => __( 'Categories', 'osi-features' ), - ]; - + ); } /** @@ -56,10 +55,9 @@ public function get_labels() { */ public function get_post_types() { - return [ + return array( Post_Type_License::get_instance()->get_slug(), - ]; - + ); } /** @@ -70,14 +68,13 @@ public function get_post_types() { public function get_args() { return wp_parse_args( - [ - 'rewrite' => [ + array( + 'rewrite' => array( 'slug' => Post_Type_License::get_instance()->get_slug() . '/category', 'with_front' => false, - ], - ], + ), + ), parent::get_args() ); } - } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php index d02cf35..5d48fa9 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php @@ -28,7 +28,7 @@ class Taxonomy_Publication extends Base { */ public function get_labels() { - return [ + return array( 'name' => _x( 'Publication', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Publication', 'taxonomy singular name', 'osi-features' ), 'search_items' => __( 'Search Publication', 'osi-features' ), @@ -45,8 +45,7 @@ public function get_labels() { 'choose_from_most_used' => __( 'Choose from the most used Publications', 'osi-features' ), 'not_found' => __( 'No Publication found.', 'osi-features' ), 'menu_name' => __( 'Publications', 'osi-features' ), - ]; - + ); } /** @@ -56,10 +55,9 @@ public function get_labels() { */ public function get_post_types() { - return [ + return array( Post_Type_Press_Mentions::get_instance()->get_slug(), - ]; - + ); } /** @@ -70,15 +68,14 @@ public function get_post_types() { public function get_args() { return wp_parse_args( - [ + array( 'hierarchical' => true, - 'rewrite' => [ + 'rewrite' => array( 'slug' => Post_Type_Press_Mentions::get_instance()->get_slug() . '/publication', 'with_front' => false, - ], - ], + ), + ), parent::get_args() ); } - } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php index dd3ef95..d4ea885 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php @@ -28,7 +28,7 @@ class Taxonomy_Seat_Type extends Base { */ public function get_labels() { - return [ + return array( 'name' => _x( 'Seat type', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Seat type', 'taxonomy singular name', 'osi-features' ), 'search_items' => __( 'Search Seat type', 'osi-features' ), @@ -45,8 +45,7 @@ public function get_labels() { 'choose_from_most_used' => __( 'Choose from the most used Seat types', 'osi-features' ), 'not_found' => __( 'No Seat type found.', 'osi-features' ), 'menu_name' => __( 'Seat Types', 'osi-features' ), - ]; - + ); } /** @@ -56,10 +55,9 @@ public function get_labels() { */ public function get_post_types() { - return [ + return array( Post_Type_Board_Member::get_instance()->get_slug(), - ]; - + ); } /** @@ -70,15 +68,14 @@ public function get_post_types() { public function get_args() { return wp_parse_args( - [ + array( 'hierarchical' => false, - 'rewrite' => [ + 'rewrite' => array( 'slug' => Post_Type_Board_Member::get_instance()->get_slug() . '/seat-type', 'with_front' => false, - ], - ], + ), + ), parent::get_args() ); } - } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php index ac3f71d..460bc03 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php @@ -28,7 +28,7 @@ class Taxonomy_Status extends Base { */ public function get_labels() { - return [ + return array( 'name' => _x( 'Status', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Status', 'taxonomy singular name', 'osi-features' ), 'search_items' => __( 'Search Status', 'osi-features' ), @@ -45,8 +45,7 @@ public function get_labels() { 'choose_from_most_used' => __( 'Choose from the most used Statuses', 'osi-features' ), 'not_found' => __( 'No Status found.', 'osi-features' ), 'menu_name' => __( 'Statuses', 'osi-features' ), - ]; - + ); } /** @@ -56,10 +55,9 @@ public function get_labels() { */ public function get_post_types() { - return [ + return array( Post_Type_Board_Member::get_instance()->get_slug(), - ]; - + ); } /** @@ -70,15 +68,14 @@ public function get_post_types() { public function get_args() { return wp_parse_args( - [ + array( 'hierarchical' => false, - 'rewrite' => [ + 'rewrite' => array( 'slug' => Post_Type_Board_Member::get_instance()->get_slug() . '/status', 'with_front' => false, - ], - ], + ), + ), parent::get_args() ); } - } diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php index fa13cc8..0c901a4 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php @@ -28,7 +28,7 @@ class Taxonomy_Steward extends Base { */ public function get_labels() { - return [ + return array( 'name' => _x( 'License Steward', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'License Steward', 'taxonomy singular name', 'osi-features' ), 'search_items' => __( 'Search License Steward', 'osi-features' ), @@ -45,8 +45,7 @@ public function get_labels() { 'choose_from_most_used' => __( 'Choose from the most used License Stewards', 'osi-features' ), 'not_found' => __( 'No License Steward found.', 'osi-features' ), 'menu_name' => __( 'License Stewards', 'osi-features' ), - ]; - + ); } /** @@ -56,10 +55,9 @@ public function get_labels() { */ public function get_post_types() { - return [ + return array( Post_Type_License::get_instance()->get_slug(), - ]; - + ); } /** @@ -70,15 +68,14 @@ public function get_post_types() { public function get_args() { return wp_parse_args( - [ + array( 'hierarchical' => false, - 'rewrite' => [ + 'rewrite' => array( 'slug' => Post_Type_License::get_instance()->get_slug() . '/steward', 'with_front' => false, - ], - ], + ), + ), parent::get_args() ); } - } From 7b2aca1c3c6317c0c04f626deff4e19db5cb503b Mon Sep 17 00:00:00 2001 From: Nino Mihovilic Date: Mon, 25 Aug 2025 15:47:31 +0200 Subject: [PATCH 6/8] Remove spaces --- plugins/osi-features/inc/classes/taxonomies/class-base.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/osi-features/inc/classes/taxonomies/class-base.php b/plugins/osi-features/inc/classes/taxonomies/class-base.php index 6d76459..47daaa7 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-base.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-base.php @@ -20,7 +20,6 @@ abstract class Base { * Base constructor. */ protected function __construct() { - $this->setup_hooks(); } @@ -30,7 +29,6 @@ protected function __construct() { * @return void */ protected function setup_hooks() { - add_action( 'init', array( $this, 'register_taxonomy' ) ); } @@ -40,7 +38,6 @@ protected function setup_hooks() { * @return void */ public function register_taxonomy() { - if ( empty( static::SLUG ) ) { return; } @@ -70,7 +67,6 @@ public function register_taxonomy() { * @return array */ public function get_args() { - return array( 'hierarchical' => true, 'show_ui' => true, From 3b0d9d17d49dde372f8c3287f0964d73d0060ff3 Mon Sep 17 00:00:00 2001 From: Nino Mihovilic Date: Mon, 25 Aug 2025 15:48:58 +0200 Subject: [PATCH 7/8] Remove extra spaces --- .../inc/classes/taxonomies/class-taxonomy-example.php | 2 -- .../inc/classes/taxonomies/class-taxonomy-license-category.php | 3 --- .../inc/classes/taxonomies/class-taxonomy-publication.php | 3 --- .../inc/classes/taxonomies/class-taxonomy-seat-type.php | 2 -- .../inc/classes/taxonomies/class-taxonomy-status.php | 3 --- .../inc/classes/taxonomies/class-taxonomy-steward.php | 3 --- 6 files changed, 16 deletions(-) diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-example.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-example.php index b0e6cff..edd800b 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-example.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-example.php @@ -25,7 +25,6 @@ class Taxonomy_Example extends Base { * @return array */ public function get_labels() { - return array( 'name' => _x( 'Taxonomy_Example', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Taxonomy_Example', 'taxonomy singular name', 'osi-features' ), @@ -52,7 +51,6 @@ public function get_labels() { * @return array */ public function get_post_types() { - return array( 'post', ); diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php index 2d224ed..1ce8544 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-license-category.php @@ -27,7 +27,6 @@ class Taxonomy_License_Category extends Base { * @return array */ public function get_labels() { - return array( 'name' => _x( 'Category', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Category', 'taxonomy singular name', 'osi-features' ), @@ -54,7 +53,6 @@ public function get_labels() { * @return array */ public function get_post_types() { - return array( Post_Type_License::get_instance()->get_slug(), ); @@ -66,7 +64,6 @@ public function get_post_types() { * @return array */ public function get_args() { - return wp_parse_args( array( 'rewrite' => array( diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php index 5d48fa9..6eca600 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-publication.php @@ -27,7 +27,6 @@ class Taxonomy_Publication extends Base { * @return array */ public function get_labels() { - return array( 'name' => _x( 'Publication', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Publication', 'taxonomy singular name', 'osi-features' ), @@ -54,7 +53,6 @@ public function get_labels() { * @return array */ public function get_post_types() { - return array( Post_Type_Press_Mentions::get_instance()->get_slug(), ); @@ -66,7 +64,6 @@ public function get_post_types() { * @return array */ public function get_args() { - return wp_parse_args( array( 'hierarchical' => true, diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php index d4ea885..b994104 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php @@ -27,7 +27,6 @@ class Taxonomy_Seat_Type extends Base { * @return array */ public function get_labels() { - return array( 'name' => _x( 'Seat type', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Seat type', 'taxonomy singular name', 'osi-features' ), @@ -66,7 +65,6 @@ public function get_post_types() { * @return array */ public function get_args() { - return wp_parse_args( array( 'hierarchical' => false, diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php index 460bc03..9ccfeee 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-status.php @@ -27,7 +27,6 @@ class Taxonomy_Status extends Base { * @return array */ public function get_labels() { - return array( 'name' => _x( 'Status', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'Status', 'taxonomy singular name', 'osi-features' ), @@ -54,7 +53,6 @@ public function get_labels() { * @return array */ public function get_post_types() { - return array( Post_Type_Board_Member::get_instance()->get_slug(), ); @@ -66,7 +64,6 @@ public function get_post_types() { * @return array */ public function get_args() { - return wp_parse_args( array( 'hierarchical' => false, diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php index 0c901a4..4acbff6 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-steward.php @@ -27,7 +27,6 @@ class Taxonomy_Steward extends Base { * @return array */ public function get_labels() { - return array( 'name' => _x( 'License Steward', 'taxonomy general name', 'osi-features' ), 'singular_name' => _x( 'License Steward', 'taxonomy singular name', 'osi-features' ), @@ -54,7 +53,6 @@ public function get_labels() { * @return array */ public function get_post_types() { - return array( Post_Type_License::get_instance()->get_slug(), ); @@ -66,7 +64,6 @@ public function get_post_types() { * @return array */ public function get_args() { - return wp_parse_args( array( 'hierarchical' => false, From 59346273aa1481f5dad9615593cac5ef00242a0b Mon Sep 17 00:00:00 2001 From: Nino Mihovilic Date: Mon, 25 Aug 2025 15:50:17 +0200 Subject: [PATCH 8/8] Remove spaces --- .../inc/classes/taxonomies/class-taxonomy-seat-type.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php index b994104..45e3431 100644 --- a/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php +++ b/plugins/osi-features/inc/classes/taxonomies/class-taxonomy-seat-type.php @@ -53,7 +53,6 @@ public function get_labels() { * @return array */ public function get_post_types() { - return array( Post_Type_Board_Member::get_instance()->get_slug(), );