Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make PHP Quality Assurance pass #5

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Make PHP Quality Assurance pass #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"php": ">= 8.0"
},
"require-dev": {
"inpsyde/php-coding-standards": "^1",
"inpsyde/php-coding-standards": "^2.0@dev",
"vimeo/psalm": "^5.10.0",
"inpsyde/wp-stubs-versions": "dev-latest"
},
Expand Down
51 changes: 28 additions & 23 deletions src/CommentsDisabler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@

final class CommentsDisabler
{
/**
* @var int
*/
public const PRIORITY = PHP_INT_MAX - 10;

/**
* @var list<non-empty-string>
*/
Expand Down Expand Up @@ -72,14 +77,14 @@ public function init(): void
* @psalm-suppress MissingClosureParamType
* @psalm-suppress MissingClosureReturnType
*/
add_action($action, fn(...$args) => $this->{$method}(...$args), $priority);
add_action($action, fn (...$args) => $this->{$method}(...$args), $priority);
};
$addFilter = function (string $filter, string $method, int $args = 1): void {
/**
* @psalm-suppress MissingClosureParamType
* @psalm-suppress MissingClosureReturnType
*/
add_filter($filter, fn(...$args) => $this->{$method}(...$args), PHP_INT_MAX, $args);
add_filter($filter, fn (...$args) => $this->{$method}(...$args), self::PRIORITY, $args);
};

$addAction('registered_post_type', 'removePostTypeSupport');
Expand All @@ -96,7 +101,7 @@ public function init(): void
$addAction('personal_options', 'removeKeyboardShortcutsOptionFromProfile');
$addAction('admin_print_footer_scripts', 'removeDiscussionEditorPanel');
$addAction('template_redirect', 'redirectCommentFeed');
$addAction('comment_form_comments_closed', 'removeCommentsClosedActions', PHP_INT_MIN);
$addAction('comment_form_comments_closed', 'removeCommentsClosedActions', self::PRIORITY);

$addFilter('the_posts', 'closeCommentsForQueries', 2);
$addFilter('wp_insert_post_data', 'forceCommentsClosedOnSave', 2);
Expand All @@ -109,16 +114,16 @@ public function init(): void
$addFilter('comments_pre_query', 'shortCircuitCommentQuery', 2);
$addFilter('allowed_block_types_all', 'disableBlocks');

add_filter('comments_open', '__return_false', PHP_INT_MAX);
add_filter('pings_open', '__return_false', PHP_INT_MAX);
add_filter('feed_links_show_comments_feed', '__return_false', PHP_INT_MAX);
add_filter('feed_links_extra_show_post_comments_feed', '__return_false', PHP_INT_MAX);
add_filter('post_comments_feed_link', '__return_empty_string', PHP_INT_MAX);
add_filter('get_comments_number', '__return_zero', PHP_INT_MAX);
add_filter('get_comments_link', '__return_empty_string', PHP_INT_MAX);
add_filter('respond_link', '__return_empty_string', PHP_INT_MAX);
add_filter('comments_rewrite_rules', '__return_empty_array', PHP_INT_MAX);
add_filter('notify_post_author', '__return_false', PHP_INT_MAX);
add_filter('comments_open', '__return_false', self::PRIORITY);
add_filter('pings_open', '__return_false', self::PRIORITY);
add_filter('feed_links_show_comments_feed', '__return_false', self::PRIORITY);
add_filter('feed_links_extra_show_post_comments_feed', '__return_false', self::PRIORITY);
add_filter('post_comments_feed_link', '__return_empty_string', self::PRIORITY);
add_filter('get_comments_number', '__return_zero', self::PRIORITY);
add_filter('get_comments_link', '__return_empty_string', self::PRIORITY);
add_filter('respond_link', '__return_empty_string', self::PRIORITY);
add_filter('comments_rewrite_rules', '__return_empty_array', self::PRIORITY);
add_filter('notify_post_author', '__return_false', self::PRIORITY);
}

/**
Expand All @@ -136,7 +141,7 @@ static function (): void {
$wpScripts->remove('comment-reply');
$wpScripts->dequeue('comment-reply');
},
PHP_INT_MIN
self::PRIORITY
);
}

Expand Down Expand Up @@ -295,7 +300,7 @@ private function removePostTypeSupport(mixed $postType): void
*/
private function filterOptionsAndMetaboxes(): void
{
$closed = static fn(): string => 'closed';
$closed = static fn (): string => 'closed';

add_filter('pre_option_comments_notify', '__return_zero');
add_filter('default_pingback_flag', '__return_zero');
Expand Down Expand Up @@ -365,7 +370,7 @@ private function removeFromAdminBar(mixed $adminBar): void
$adminBar->remove_node('comments');

if (is_scalar($GLOBALS['blog_id'] ?? null)) {
$adminBar->remove_node(sprintf('blog-%s-c', (string)$GLOBALS['blog_id']));
$adminBar->remove_node(sprintf('blog-%s-c', (string) $GLOBALS['blog_id']));
}

if (!is_multisite()) {
Expand All @@ -385,7 +390,7 @@ private function removeFromAdminBar(mixed $adminBar): void
}
foreach ($blogs as $blog) {
if (is_object($blog) && is_scalar($blog->userblog_id ?? null)) {
$adminBar->remove_node(sprintf('blog-%s-c', (string)$blog->userblog_id));
$adminBar->remove_node(sprintf('blog-%s-c', (string) $blog->userblog_id));
}
}
}
Expand Down Expand Up @@ -433,7 +438,7 @@ private function removePingbackHeader(mixed $headers): array

$filtered = [];
foreach ($headers as $name => $value) {
if (strtolower((string)$name) !== 'x-pingback') {
if (strtolower((string) $name) !== 'x-pingback') {
$filtered[$name] = $value;
}
}
Expand Down Expand Up @@ -539,14 +544,14 @@ private function filterRewriteRules(mixed $rules): array
}

foreach ($rules as $key => $value) {
if (str_contains((string)$key, '|commentsrss2')) {
if (str_contains((string) $key, '|commentsrss2')) {
unset($rules[$key]);
$rules[str_replace('|commentsrss2', '', (string)$key)] = $value;
$rules[str_replace('|commentsrss2', '', (string) $key)] = $value;
}
}

foreach ($rules as $key => $value) {
if (str_contains((string)$key, 'comment-page-')) {
if (str_contains((string) $key, 'comment-page-')) {
unset($rules[$key]);
}
}
Expand All @@ -561,7 +566,7 @@ private function filterRewriteRules(mixed $rules): array
*/
private function filterCountComments(): object
{
return (object)[
return (object) [
'approved' => 0,
'spam' => 0,
'trash' => 0,
Expand Down Expand Up @@ -609,7 +614,7 @@ private function disableBlocks(mixed $enabled): bool|array
if ($enabled && !in_array($blockName, $enabled, true)) {
continue;
}
if (preg_match('~^core/.*?comment.*?~i', (string)$blockName) !== 1) {
if (preg_match('~^core/.*?comment.*?~i', (string) $blockName) !== 1) {
$filtered[] = $blockName;
}
}
Expand Down