From 3e41879e8683c963bd0a6949be322df2780bf0d2 Mon Sep 17 00:00:00 2001 From: Sagar Deshmukh Date: Fri, 28 Jun 2024 14:15:19 +0530 Subject: [PATCH] PLANET-7527 PHPCS fixes Ref. https://jira.greenpeace.org/browse/PLANET-7527 --- src/BlockReportSearch/Block/BlockUsage.php | 37 ++------ src/BlockReportSearch/Block/BlockUsageApi.php | 4 +- .../Block/BlockUsageTable.php | 94 +++++++++---------- .../Block/Query/Parameters.php | 33 ++----- .../Pattern/PatternUsageApi.php | 14 +-- .../Pattern/PatternUsageTable.php | 63 +++++++------ .../Pattern/Query/Parameters.php | 8 +- src/Commands/DuplicatedPostmeta.php | 2 +- .../Menu/BlocksReportController.php | 6 +- .../Menu/BlocksUsageController.php | 8 +- .../Menu/PostmetaCheckController.php | 2 + .../Menu/ReusableBlocksController.php | 8 +- 12 files changed, 118 insertions(+), 161 deletions(-) diff --git a/src/BlockReportSearch/Block/BlockUsage.php b/src/BlockReportSearch/Block/BlockUsage.php index a83e01869..5861a3acc 100644 --- a/src/BlockReportSearch/Block/BlockUsage.php +++ b/src/BlockReportSearch/Block/BlockUsage.php @@ -17,30 +17,17 @@ */ class BlockUsage { - /** - * @var BlockSearch - */ - private $search; + private BlockSearch $search; - /** - * @var WP_Block_Parser - */ - private $parser; + private WP_Block_Parser $parser; - /** - * @var int[] - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $posts_ids; - /** - * @var WP_Post[] - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $posts; - /** - * @var array - */ - private $blocks; + private array $blocks; /** * @param BlockSearch $search Search class. @@ -56,7 +43,6 @@ public function __construct( /** * @param Parameters $params Query parameters. - * @return array */ public function get_blocks(Parameters $params): array { @@ -79,9 +65,8 @@ public function get_posts(Parameters $params): array /** * @param int[] $posts_ids Posts IDs. * @param Parameters $params Query parameters. - * @return array */ - private function get_filtered_blocks($posts_ids, Parameters $params) + private function get_filtered_blocks(array $posts_ids, Parameters $params): array { $this->fetch_blocks($posts_ids, $params); $this->filter_blocks($params); @@ -173,7 +158,7 @@ function ($i) use ($text) { /** * Sort parsed blocks * - * @param null|array $sort Sort dimensions. + * @param array|null $sort Sort dimensions. * @return array */ private function sort_blocks(?array $sort = []): void @@ -201,7 +186,7 @@ private function sort_blocks(?array $sort = []): void * @param object $post WP_Post. * @return array[] */ - private function parse_post($post): array + private function parse_post(\WP_Post $post): array { $output = $this->parser->parse($post->post_content); @@ -234,7 +219,7 @@ function ($block) { * @param object $post WP_Post. * @return array[] */ - private function format_block_data(array $block, $post): array + private function format_block_data(array $block, \WP_Post $post): array { $type = $block['blockName']; $attrs = $block['attrs'] ?? []; @@ -272,8 +257,6 @@ function ($c): ?string { /** * Block count in search result. - * - * @return int */ public function block_count(): int { @@ -282,8 +265,6 @@ public function block_count(): int /** * Post count in search result. - * - * @return int */ public function post_count(): int { diff --git a/src/BlockReportSearch/Block/BlockUsageApi.php b/src/BlockReportSearch/Block/BlockUsageApi.php index e26e5bc24..676338ad9 100644 --- a/src/BlockReportSearch/Block/BlockUsageApi.php +++ b/src/BlockReportSearch/Block/BlockUsageApi.php @@ -21,9 +21,7 @@ class BlockUsageApi private Parameters $params; - /** - * @var array[] Blocks. - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $items; /** diff --git a/src/BlockReportSearch/Block/BlockUsageTable.php b/src/BlockReportSearch/Block/BlockUsageTable.php index ad91aa851..f4c3a9eaa 100644 --- a/src/BlockReportSearch/Block/BlockUsageTable.php +++ b/src/BlockReportSearch/Block/BlockUsageTable.php @@ -14,9 +14,11 @@ use P4\MasterTheme\BlockReportSearch\RowActions; use P4\MasterTheme\BlockReportSearch\Block\Query\Parameters; +// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols if (! class_exists('WP_List_Table')) { require_once ABSPATH . '/wp-admin/includes/class-wp-list-table.php'; } +// phpcs:enable PSR1.Files.SideEffects.FoundWithSymbols /** * Show block usage, using native WordPress table @@ -31,77 +33,60 @@ class BlockUsageTable extends WP_List_Table public const PLURAL = 'blocks'; - /** - * @var BlockUsage - */ - private $block_usage; + private BlockUsage $block_usage; - /** - * @var WP_Block_Type_Registry - */ - private $block_registry; + private WP_Block_Type_Registry $block_registry; - /** - * @var string[] Search filters requested. - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $search_params = []; - /** - * @var string Group column. - */ - private $group_by = self::DEFAULT_GROUP_BY; + private string $group_by = self::DEFAULT_GROUP_BY; - /** - * @var string[]|null Sort order. - */ - private $sort_by = [ 'post_title', 'post_id' ]; + private ?array $sort_by = [ 'post_title', 'post_id' ]; - /** - * @var string[] - */ - private $allowed_groups = [ 'block_type', 'post_id', 'post_title' ]; + private array $allowed_groups = [ 'block_type', 'post_id', 'post_title' ]; /** * @var string[]|null Columns name => title. */ - private $columns = null; + private ?array $columns = null; /** * @var string|null Latest row content displayed. */ - private $latest_row = null; + private ?string $latest_row = null; /** * @var string[]|null Blocks namespaces. */ - private $blocks_ns = null; + private ?array $blocks_ns = null; /** * @var string[]|null Blocks types. */ - private $blocks_types = null; + private ?array $blocks_types = null; /** * @var string[]|null Blocks registered. */ - private $blocks_registered = null; + private ?array $blocks_registered = null; /** * @var string[]|null Blocks allowed. */ - private $blocks_allowed = null; + private ?array $blocks_allowed = null; /** * @var ?string Special filter. */ - private $special = null; + private ?string $special = null; /** * @param array $args Args. * @throws InvalidArgumentException Throws on missing parameter. * @see WP_List_Table::__construct() */ - public function __construct($args = []) + public function __construct(array $args = []) { $args['plural'] = self::PLURAL; parent::__construct($args); @@ -233,7 +218,7 @@ static function (string $name) { /** * Set the registered blocks list. */ - private function set_registered_blocks() + private function set_registered_blocks(): void { $names = array_keys( $this->block_registry->get_all_registered() @@ -245,7 +230,7 @@ private function set_registered_blocks() /** * Set the allowed blocks list. */ - private function set_allowed_blocks() + private function set_allowed_blocks(): void { $post_types = array_filter( get_post_types([ 'show_in_rest' => true ]), @@ -272,7 +257,7 @@ private function set_allowed_blocks() /** * Columns list for table. */ - public function get_columns() + public function get_columns(): ?array { if (null !== $this->columns) { return $this->columns; @@ -300,7 +285,7 @@ public function get_columns() /** * All, hidden and sortable columns. */ - private function get_column_headers() + private function get_column_headers(): array { return [ $this->get_columns(), @@ -312,7 +297,7 @@ private function get_column_headers() /** * Available grouping as views. */ - protected function get_views() + protected function get_views(): array { $link_tpl = '%s'; $active_link_tpl = '%s'; @@ -338,7 +323,7 @@ protected function get_views() /** * Displays the list of views available on this table. */ - public function views() + public function views(): void { parent::views(); @@ -374,7 +359,7 @@ public function views() /** * Select blocks namespaces. */ - private function blockns_dropdown() + private function blockns_dropdown(): void { sort($this->blocks_ns); $filter = $this->search_params->namespace() ?? null; @@ -395,7 +380,7 @@ private function blockns_dropdown() /** * Select blocks types. */ - private function blocktype_dropdown() + private function blocktype_dropdown(): void { sort($this->blocks_types); $filter = $this->search_params->name() ?? null; @@ -434,8 +419,9 @@ private function blocktype_dropdown() * Add filters to table. * * @param string $which Tablenav identifier. + * @phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter, SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ - protected function extra_tablenav($which) + protected function extra_tablenav($which): void { echo '
'; $this->blockns_dropdown(); @@ -454,18 +440,20 @@ protected function extra_tablenav($which) * Add pagination information to table. * * @param string $which Tablenav identifier. + * @phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter, SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ - protected function pagination($which) + protected function pagination($which): void { echo esc_html(parent::pagination('top')); } + // @phpcs:enable SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter, SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint /** * Default column value representation. * * @param array $item Item. * @param string $column_name Column name. - * + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint * @return mixed */ public function column_default($item, $column_name) @@ -477,7 +465,7 @@ public function column_default($item, $column_name) * Block option display. * * @param array $item Item. - * @return string + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ public function column_block_attrs($item): string { @@ -486,7 +474,7 @@ public function column_block_attrs($item): string return ''; } - //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r + //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r , Squiz.PHP.DiscouragedFunctions.Discouraged $content = print_r($content, true); $content = trim(substr($content, 5, strlen($content))); @@ -505,7 +493,7 @@ public function column_block_attrs($item): string * Block styles display. * * @param array $item Item. - * @return string + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ public function column_block_styles($item): string { @@ -519,7 +507,7 @@ public function column_block_styles($item): string * Post title display. * * @param array $item Item. - * @return string + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ public function column_post_title($item): string { @@ -544,7 +532,7 @@ public function column_post_title($item): string * Post ID display. * * @param array $item Item. - * @return string + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ public function column_post_id($item): string { @@ -559,8 +547,9 @@ public function column_post_id($item): string * Full row display, edited for grouping functionality. * * @param array $item Item. + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ - public function single_row($item) + public function single_row($item): void { $cols = $this->get_columns(); $colspan = count($cols); @@ -588,7 +577,7 @@ public function single_row($item) * @param string $column_name Current column name. * @param string $primary Primary column name. * - * phpcs:disable WordPress.WP.I18n.TextDomainMismatch + * phpcs:disable WordPress.WP.I18n.TextDomainMismatch, SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint, SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint */ protected function handle_row_actions($item, $column_name, $primary) { @@ -596,13 +585,15 @@ protected function handle_row_actions($item, $column_name, $primary) ( new RowActions() )->get_post_actions($item, $column_name, $primary) ); } + // phpcs:enable SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint /** * Show only top tablenav (duplicate form post bug) * * @param string $which Tablenav identifier. + * phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ - protected function display_tablenav($which) + protected function display_tablenav($which): void { if ('bottom' === $which) { echo '
'; @@ -612,6 +603,7 @@ protected function display_tablenav($which) } parent::display_tablenav($which); } + // phpcs:enable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint /** * Search parameters @@ -637,7 +629,7 @@ public static function set_hooks(): void // Add redirection for filter action. add_action( 'admin_action_' . self::ACTION_NAME, - function () { + function (): void { $nonce = $_GET['_wpnonce'] ?? null; if (! wp_verify_nonce($nonce, 'bulk-' . self::PLURAL)) { wp_safe_redirect(self::url()); diff --git a/src/BlockReportSearch/Block/Query/Parameters.php b/src/BlockReportSearch/Block/Query/Parameters.php index f6df132e4..d3f4ef91c 100644 --- a/src/BlockReportSearch/Block/Query/Parameters.php +++ b/src/BlockReportSearch/Block/Query/Parameters.php @@ -13,45 +13,28 @@ */ class Parameters { - /** - * @var string - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $namespace; - /** - * @var string - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $name; - /** - * @var array - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $attributes; - /** - * @var string - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $content; - /** - * @var string[] - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $post_status; - /** - * @var string[] - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $post_type; - /** - * @var string[] - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $order; - /** - * @var string[] - */ - const DEFAULT_POST_STATUS = [ 'publish', 'private' ]; + private const DEFAULT_POST_STATUS = [ 'publish', 'private' ]; /** * Generate a query param object from an array. diff --git a/src/BlockReportSearch/Pattern/PatternUsageApi.php b/src/BlockReportSearch/Pattern/PatternUsageApi.php index 0f3b64153..2873601d8 100644 --- a/src/BlockReportSearch/Pattern/PatternUsageApi.php +++ b/src/BlockReportSearch/Pattern/PatternUsageApi.php @@ -19,19 +19,11 @@ class PatternUsageApi { public const DEFAULT_POST_STATUS = [ 'publish' ]; - /** - * @var PatternUsage - */ - private $usage; + private PatternUsage $usage; - /** - * @var Parameters - */ - private $params; + private Parameters $params; - /** - * @var array[] Blocks. - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $items; /** diff --git a/src/BlockReportSearch/Pattern/PatternUsageTable.php b/src/BlockReportSearch/Pattern/PatternUsageTable.php index d7bb17eb7..11ae4a401 100644 --- a/src/BlockReportSearch/Pattern/PatternUsageTable.php +++ b/src/BlockReportSearch/Pattern/PatternUsageTable.php @@ -15,9 +15,11 @@ use P4\MasterTheme\BlockReportSearch\RowActions; use P4\MasterTheme\BlockReportSearch\Pattern\Query\Parameters; +// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols if (! class_exists('WP_List_Table')) { require_once ABSPATH . '/wp-admin/includes/class-wp-list-table.php'; } +// phpcs:enable PSR1.Files.SideEffects.FoundWithSymbols /** * Show pattern usage, using native WordPress table @@ -32,45 +34,36 @@ class PatternUsageTable extends WP_List_Table public const PLURAL = 'patterns'; - /** - * @var PatternUsage - */ - private $pattern_usage; + private PatternUsage $pattern_usage; - /** - * @var array - */ - private $pattern_registry; + private WP_Block_Patterns_Registry $pattern_registry; - /** - * @var Parameters Search filters requested. - */ - private $search_params; + private Parameters $search_params; /** * @var string Group column. */ - private $group_by = self::DEFAULT_GROUP_BY; + private string $group_by = self::DEFAULT_GROUP_BY; /** * @var string[] */ - private $allowed_groups = [ 'pattern_name', 'post_id', 'post_title' ]; + private array $allowed_groups = [ 'pattern_name', 'post_id', 'post_title' ]; /** * @var string[]|null Columns name => title. */ - private $columns = null; + private ?array $columns = null; /** * @var string|null Latest row content displayed. */ - private $latest_row = null; + private ?string $latest_row = null; /** * @var string[]|null Pattern names. */ - private $pattern_names = null; + private ?array $pattern_names = null; /** @@ -78,7 +71,7 @@ class PatternUsageTable extends WP_List_Table * @throws InvalidArgumentException Throws on missing parameter. * @see WP_List_Table::__construct() */ - public function __construct($args = []) + public function __construct(array $args = []) { $args['plural'] = self::PLURAL; parent::__construct($args); @@ -107,8 +100,8 @@ public function __construct($args = []) } /** - * @param null|Parameters $search_params Search parameters. - * @param null|string $group_by Group. + * @param Parameters|null $search_params Search parameters. + * @param string|null $group_by Group. */ public function prepare_items( ?Parameters $search_params = null, @@ -170,7 +163,7 @@ private function allowed_post_types(): array /** * Pattern select */ - private function patternname_dropdown() + private function patternname_dropdown(): void { sort($this->pattern_names); $filter = $this->search_params->name() ?? []; @@ -194,8 +187,9 @@ private function patternname_dropdown() * Add filters to table. * * @param string $which Tablenav identifier. + * @phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter, SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ - protected function extra_tablenav($which) + protected function extra_tablenav($which): void { echo '
'; $this->patternname_dropdown(); @@ -213,18 +207,21 @@ protected function extra_tablenav($which) * Add pagination information to table. * * @param string $which Tablenav identifier. + * @phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter, SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ - protected function pagination($which) + protected function pagination($which): void { parent::pagination('top'); } + // @phpcs:enable SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter /** * Show only top tablenav (duplicate form post bug) * * @param string $which Tablenav identifier. + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ - protected function display_tablenav($which) + protected function display_tablenav($which): void { if ('bottom' === $which) { echo '
'; @@ -242,7 +239,7 @@ protected function display_tablenav($which) * @param string $column_name Current column name. * @param string $primary Primary column name. * - * phpcs:disable WordPress.WP.I18n.TextDomainMismatch + * phpcs:disable WordPress.WP.I18n.TextDomainMismatch, SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint, SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint */ protected function handle_row_actions($item, $column_name, $primary) { @@ -250,11 +247,12 @@ protected function handle_row_actions($item, $column_name, $primary) ( new RowActions() )->get_post_actions($item, $column_name, $primary) ); } + // phpcs:enable SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint, SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint /** * Columns list for table. */ - public function get_columns() + public function get_columns(): ?array { if (null !== $this->columns) { return $this->columns; @@ -282,7 +280,7 @@ public function get_columns() /** * Available grouping as views. */ - protected function get_views() + protected function get_views(): array { $link_tpl = '%s'; $active_link_tpl = '%s'; @@ -308,7 +306,7 @@ protected function get_views() /** * All, hidden and sortable columns. */ - private function get_column_headers() + private function get_column_headers(): array { return [ $this->get_columns(), @@ -321,7 +319,7 @@ private function get_column_headers() * Post title display. * * @param array $item Item. - * @return string + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ public function column_post_title($item): string { @@ -346,8 +344,9 @@ public function column_post_title($item): string * Full row display, edited for grouping functionality. * * @param array $item Item. + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ - public function single_row($item) + public function single_row($item): void { $cols = $this->get_columns(); $colspan = count($cols); @@ -375,11 +374,13 @@ public function single_row($item) * @param string $column_name Column name. * * @return mixed + * @phpcs:disable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint */ public function column_default($item, $column_name) { return $item[ $column_name ] ?? ''; } + // phpcs:enable SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint /** * Table URL @@ -396,7 +397,7 @@ public static function set_hooks(): void { add_action( 'admin_action_' . self::ACTION_NAME, - function () { + function (): void { $nonce = $_GET['_wpnonce'] ?? null; if (! \wp_verify_nonce($nonce, 'bulk-' . self::PLURAL)) { \wp_safe_redirect(self::url()); diff --git a/src/BlockReportSearch/Pattern/Query/Parameters.php b/src/BlockReportSearch/Pattern/Query/Parameters.php index c9a98758d..6bc4bc0ca 100644 --- a/src/BlockReportSearch/Pattern/Query/Parameters.php +++ b/src/BlockReportSearch/Pattern/Query/Parameters.php @@ -18,9 +18,7 @@ */ class Parameters { - /** - * @var string[] - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $name; /** @@ -33,9 +31,7 @@ class Parameters */ private array $post_type; - /** - * @var string[] - */ + // phpcs:ignore SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint private $order; private const DEFAULT_POST_STATUS = [ 'publish', 'private' ]; diff --git a/src/Commands/DuplicatedPostmeta.php b/src/Commands/DuplicatedPostmeta.php index 735c4bc91..6e5764e16 100644 --- a/src/Commands/DuplicatedPostmeta.php +++ b/src/Commands/DuplicatedPostmeta.php @@ -52,7 +52,7 @@ public static function remove(): int * Detect duplicate postmeta records * */ - public static function detect() + public static function detect(): ?array { global $wpdb; diff --git a/src/Controllers/Menu/BlocksReportController.php b/src/Controllers/Menu/BlocksReportController.php index 40f57d502..81720d804 100644 --- a/src/Controllers/Menu/BlocksReportController.php +++ b/src/Controllers/Menu/BlocksReportController.php @@ -20,7 +20,11 @@ public function create_admin_menu(): void { $current_user = wp_get_current_user(); - if (( !in_array('administrator', $current_user->roles, true) && !in_array('editor', $current_user->roles, true) ) || !current_user_can('edit_posts')) { + if ( + ( !in_array('administrator', $current_user->roles, true) && + !in_array('editor', $current_user->roles, true) ) || + !current_user_can('edit_posts') + ) { return; } diff --git a/src/Controllers/Menu/BlocksUsageController.php b/src/Controllers/Menu/BlocksUsageController.php index c0f39ca2a..50a458b16 100644 --- a/src/Controllers/Menu/BlocksUsageController.php +++ b/src/Controllers/Menu/BlocksUsageController.php @@ -67,7 +67,7 @@ public function plugin_blocks_report_register_rest_route(): void /** * Generates blocks/pages report. */ - public function plugin_blocks_report_rest_api() + public function plugin_blocks_report_rest_api(): ?array { global $wpdb; @@ -125,7 +125,11 @@ public function create_admin_menu(): void { $current_user = wp_get_current_user(); - if (( !in_array('administrator', $current_user->roles, true) && !in_array('editor', $current_user->roles, true) ) || !current_user_can('edit_posts')) { + if ( + ( !in_array('administrator', $current_user->roles, true) && + !in_array('editor', $current_user->roles, true) ) || + !current_user_can('edit_posts') + ) { return; } diff --git a/src/Controllers/Menu/PostmetaCheckController.php b/src/Controllers/Menu/PostmetaCheckController.php index 946ed84a3..acb88ab1a 100644 --- a/src/Controllers/Menu/PostmetaCheckController.php +++ b/src/Controllers/Menu/PostmetaCheckController.php @@ -54,8 +54,10 @@ public function handle_submit(array &$data): void } if ($deleted_rows) { + // phpcs:disable Generic.Files.LineLength.MaxExceeded // translators: %d = The duplicate postmeta count. $data['message'] = sprintf(__('Remove %d duplicate postmeta records successfully.', 'planet4-blocks-backend'), $deleted_rows); + // phpcs:enable Generic.Files.LineLength.MaxExceeded } else { $data['message'] = __('No whitelisted duplicate postmeta records found.', 'planet4-blocks-backend'); } diff --git a/src/Controllers/Menu/ReusableBlocksController.php b/src/Controllers/Menu/ReusableBlocksController.php index fb87b0319..772b50a06 100644 --- a/src/Controllers/Menu/ReusableBlocksController.php +++ b/src/Controllers/Menu/ReusableBlocksController.php @@ -16,7 +16,7 @@ class ReusableBlocksController extends Controller /** * Post type name. */ - const POST_TYPE = 'wp_block'; + private const POST_TYPE = 'wp_block'; /** * Create menu/submenu entry. @@ -26,7 +26,11 @@ public function create_admin_menu(): void $current_user = wp_get_current_user(); - if (( !in_array('administrator', $current_user->roles, true) && !in_array('editor', $current_user->roles, true) ) || !current_user_can('edit_posts')) { + if ( + ( !in_array('administrator', $current_user->roles, true) && + !in_array('editor', $current_user->roles, true) ) || + !current_user_can('edit_posts') + ) { return; }