From 2f5cd86226d3e8b00fa8344c39b54b63a626144c Mon Sep 17 00:00:00 2001 From: Kartik Mehta Date: Tue, 11 Mar 2025 14:41:48 +0530 Subject: [PATCH 1/2] fix: phpcs errors --- inc/classes/class-assets.php | 2 -- inc/classes/class-custom-nav-menu-fields.php | 8 +++----- inc/classes/class-plugin.php | 4 +--- inc/helpers/autoloader.php | 3 +-- inc/traits/trait-singleton.php | 4 +--- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/inc/classes/class-assets.php b/inc/classes/class-assets.php index 8208b62..635127b 100644 --- a/inc/classes/class-assets.php +++ b/inc/classes/class-assets.php @@ -35,7 +35,6 @@ protected function setup_hooks() { */ add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); - } /** @@ -101,5 +100,4 @@ public function admin_enqueue_scripts( $hook_suffix ) { ); } } - } diff --git a/inc/classes/class-custom-nav-menu-fields.php b/inc/classes/class-custom-nav-menu-fields.php index 328905f..7ac4668 100644 --- a/inc/classes/class-custom-nav-menu-fields.php +++ b/inc/classes/class-custom-nav-menu-fields.php @@ -70,7 +70,6 @@ protected function setup_hooks() { */ add_filter( 'wp_nav_menu_objects', array( $this, 'wp_nav_menu_objects' ), 10, 2 ); add_filter( 'walker_nav_menu_start_el', array( $this, 'walker_nav_menu_start_el' ), 10, 4 ); - } /** @@ -112,7 +111,7 @@ private function get_nav_menu_meta_data( $menu_item_id, $from_cache = true ) { * * @return void */ - public function wp_nav_menu_item_custom_fields( $id, $item, $depth, $args ) { + public function wp_nav_menu_item_custom_fields( $id, $item, $depth, $args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed $data = $this->get_nav_menu_meta_data( $id, false ); $features = array( @@ -309,7 +308,7 @@ public function wp_update_nav_menu_item( $menu_id, $item_id ) { * * @return array Sorted menu items. */ - public function wp_nav_menu_objects( $sorted_items, $args ) { + public function wp_nav_menu_objects( $sorted_items, $args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed global $nav_menu_custom_fields; if ( empty( $nav_menu_custom_fields ) || ! is_array( $nav_menu_custom_fields ) ) { $nav_menu_custom_fields = array(); @@ -336,7 +335,7 @@ public function wp_nav_menu_objects( $sorted_items, $args ) { * * @return string HTML of nav menu item. */ - public function walker_nav_menu_start_el( $html, $item, $depth, $args ) { + public function walker_nav_menu_start_el( $html, $item, $depth, $args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed global $nav_menu_custom_fields; if ( empty( $nav_menu_custom_fields ) || ! is_array( $nav_menu_custom_fields ) ) { return $html; @@ -513,5 +512,4 @@ private function get_nav_menu_cached_meta_data( $item_id ) { private function cache_nav_menu_meta_data( $item_id, $data ) { set_transient( $this->meta_key . '-' . $item_id, $data, DAY_IN_SECONDS ); } - } diff --git a/inc/classes/class-plugin.php b/inc/classes/class-plugin.php index 7853090..34e3ecb 100644 --- a/inc/classes/class-plugin.php +++ b/inc/classes/class-plugin.php @@ -7,7 +7,7 @@ namespace WP_Menu_Custom_Fields\Inc; -use \WP_Menu_Custom_Fields\Inc\Traits\Singleton; +use WP_Menu_Custom_Fields\Inc\Traits\Singleton; /** * Class Plugin @@ -24,7 +24,5 @@ protected function __construct() { // Load plugin classes. Assets::get_instance(); Custom_Nav_Menu_Fields::get_instance(); - } - } diff --git a/inc/helpers/autoloader.php b/inc/helpers/autoloader.php index b579fd9..dc620d7 100644 --- a/inc/helpers/autoloader.php +++ b/inc/helpers/autoloader.php @@ -14,7 +14,7 @@ * * @return void */ -function autoloader( $resource = '' ) { +function autoloader( $resource = '' ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.resourceFound $resource_path = false; $namespace_root = 'WP_Menu_Custom_Fields\\'; @@ -81,7 +81,6 @@ function autoloader( $resource = '' ) { // We are already making sure that the file exists and it's valid. require_once( $resource_path ); // phpcs:ignore } - } spl_autoload_register( '\WP_Menu_Custom_Fields\Inc\Helpers\autoloader' ); diff --git a/inc/traits/trait-singleton.php b/inc/traits/trait-singleton.php index 1e31c3a..1c197ac 100644 --- a/inc/traits/trait-singleton.php +++ b/inc/traits/trait-singleton.php @@ -59,7 +59,7 @@ final public static function get_instance() { * * @var array */ - static $instance = []; + static $instance = array(); /** * If this trait is implemented in a class which has multiple @@ -83,7 +83,5 @@ final public static function get_instance() { } return $instance[ $called_class ]; - } - } // End trait From 91e468ed38f39984f919d2a6f0ef237fb8d513b8 Mon Sep 17 00:00:00 2001 From: Kartik Mehta Date: Tue, 11 Mar 2025 15:30:31 +0530 Subject: [PATCH 2/2] fix: remove phpcs:ignore subpression --- inc/classes/class-custom-nav-menu-fields.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/inc/classes/class-custom-nav-menu-fields.php b/inc/classes/class-custom-nav-menu-fields.php index 7ac4668..d104df7 100644 --- a/inc/classes/class-custom-nav-menu-fields.php +++ b/inc/classes/class-custom-nav-menu-fields.php @@ -104,14 +104,11 @@ private function get_nav_menu_meta_data( $menu_item_id, $from_cache = true ) { /** * Add custom fields on menu item edit screen. * - * @param int $id Current menu item ID. - * @param object $item Current menu object. - * @param int $depth Current menu children depth. - * @param array $args Current menu Arguments. + * @param int $id Current menu item ID. * * @return void */ - public function wp_nav_menu_item_custom_fields( $id, $item, $depth, $args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed + public function wp_nav_menu_item_custom_fields( $id ) { $data = $this->get_nav_menu_meta_data( $id, false ); $features = array( @@ -304,11 +301,10 @@ public function wp_update_nav_menu_item( $menu_id, $item_id ) { * Function to filter nav menu objects. * * @param array $sorted_items Menu items after being sorted. - * @param array $args Menu arguments. * * @return array Sorted menu items. */ - public function wp_nav_menu_objects( $sorted_items, $args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed + public function wp_nav_menu_objects( $sorted_items ) { global $nav_menu_custom_fields; if ( empty( $nav_menu_custom_fields ) || ! is_array( $nav_menu_custom_fields ) ) { $nav_menu_custom_fields = array(); @@ -330,12 +326,10 @@ public function wp_nav_menu_objects( $sorted_items, $args ) { // phpcs:ignore Ge * * @param string $html HTML of nav menu item. * @param object $item Menu item object. - * @param int $depth Menu item's children depth. - * @param array $args Menu item's arguments. * * @return string HTML of nav menu item. */ - public function walker_nav_menu_start_el( $html, $item, $depth, $args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed + public function walker_nav_menu_start_el( $html, $item ) { global $nav_menu_custom_fields; if ( empty( $nav_menu_custom_fields ) || ! is_array( $nav_menu_custom_fields ) ) { return $html;