Skip to content

Commit 5c1accb

Browse files
obenlandobenland
authored
Replace remaining remove_all_* with specific hook removals (#2665)
1 parent 4dccd06 commit 5c1accb

File tree

3 files changed

+130
-161
lines changed

3 files changed

+130
-161
lines changed

‎tests/phpunit/tests/includes/class-test-sanitize.php‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -509,20 +509,19 @@ public function test_clean_html_null() {
509509
* @covers ::clean_html
510510
*/
511511
public function test_allowed_html_filter() {
512-
add_filter(
513-
'activitypub_allowed_html',
514-
function ( $allowed_html ) {
515-
// Add data-custom attribute to span.
516-
$allowed_html['span']['data-custom'] = true;
517-
return $allowed_html;
518-
}
519-
);
512+
$allowed_html_filter = static function ( $allowed_html ) {
513+
// Add data-custom attribute to span.
514+
$allowed_html['span']['data-custom'] = true;
515+
516+
return $allowed_html;
517+
};
518+
\add_filter( 'activitypub_allowed_html', $allowed_html_filter );
520519

521520
$input = '<span data-custom="allowed" data-other="removed">Content</span>';
522521
$expected = '<span data-custom="allowed">Content</span>';
523522
$this->assertSame( $expected, Sanitize::clean_html( $input ) );
524523

525-
remove_all_filters( 'activitypub_allowed_html' );
524+
\remove_filter( 'activitypub_allowed_html', $allowed_html_filter );
526525
}
527526

528527
/**

‎tests/phpunit/tests/includes/collection/class-test-interactions.php‎

Lines changed: 80 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -577,24 +577,22 @@ public function test_add_comment_disabled_post() {
577577
);
578578

579579
// Mock actor metadata.
580-
add_filter(
581-
'pre_get_remote_metadata_by_actor',
582-
function () {
583-
return array(
584-
'name' => 'Test User',
585-
'preferredUsername' => 'test',
586-
'id' => 'https://example.com/users/test',
587-
'url' => 'https://example.com/@test',
588-
);
589-
}
590-
);
580+
$metadata_filter = static function () {
581+
return array(
582+
'name' => 'Test User',
583+
'preferredUsername' => 'test',
584+
'id' => 'https://example.com/users/test',
585+
'url' => 'https://example.com/@test',
586+
);
587+
};
588+
\add_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
591589

592590
// Try to add comment.
593591
$result = Interactions::add_comment( $activity );
594592
$this->assertFalse( $result, 'Comment should not be added to disabled post' );
595593

596594
// Clean up.
597-
remove_all_filters( 'pre_get_remote_metadata_by_actor' );
595+
\remove_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
598596
}
599597

600598
/**
@@ -614,23 +612,21 @@ public function test_add_comment_outbox_post() {
614612
);
615613

616614
// Mock actor metadata.
617-
add_filter(
618-
'pre_get_remote_metadata_by_actor',
619-
function () {
620-
return array(
621-
'name' => 'Test User',
622-
'preferredUsername' => 'test',
623-
'id' => 'https://example.com/users/test',
624-
'url' => 'https://example.com/@test',
625-
);
626-
}
627-
);
615+
$metadata_filter = static function () {
616+
return array(
617+
'name' => 'Test User',
618+
'preferredUsername' => 'test',
619+
'id' => 'https://example.com/users/test',
620+
'url' => 'https://example.com/@test',
621+
);
622+
};
623+
\add_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
628624

629625
// Try to add comment.
630626
$result = Interactions::add_comment( $activity );
631627
$this->assertFalse( $result, 'Comment should not be added to disabled post' );
632628

633-
remove_all_filters( 'pre_get_remote_metadata_by_actor' );
629+
\remove_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
634630
}
635631

636632
/**
@@ -657,24 +653,22 @@ public function test_add_reaction_disabled_post() {
657653
);
658654

659655
// Mock actor metadata.
660-
add_filter(
661-
'pre_get_remote_metadata_by_actor',
662-
function () {
663-
return array(
664-
'name' => 'Test User',
665-
'preferredUsername' => 'test',
666-
'id' => 'https://example.com/users/test',
667-
'url' => 'https://example.com/@test',
668-
);
669-
}
670-
);
656+
$metadata_filter = static function () {
657+
return array(
658+
'name' => 'Test User',
659+
'preferredUsername' => 'test',
660+
'id' => 'https://example.com/users/test',
661+
'url' => 'https://example.com/@test',
662+
);
663+
};
664+
\add_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
671665

672666
// Try to add reaction.
673667
$result = Interactions::add_reaction( $activity );
674668
$this->assertFalse( $result, 'Reaction should not be added to disabled post' );
675669

676670
// Clean up.
677-
remove_all_filters( 'pre_get_remote_metadata_by_actor' );
671+
\remove_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
678672
}
679673

680674
/**
@@ -691,23 +685,21 @@ public function test_add_reaction_outbox_post() {
691685
);
692686

693687
// Mock actor metadata.
694-
add_filter(
695-
'pre_get_remote_metadata_by_actor',
696-
function () {
697-
return array(
698-
'name' => 'Test User',
699-
'preferredUsername' => 'test',
700-
'id' => 'https://example.com/users/test',
701-
'url' => 'https://example.com/@test',
702-
);
703-
}
704-
);
688+
$metadata_filter = static function () {
689+
return array(
690+
'name' => 'Test User',
691+
'preferredUsername' => 'test',
692+
'id' => 'https://example.com/users/test',
693+
'url' => 'https://example.com/@test',
694+
);
695+
};
696+
\add_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
705697

706698
// Try to add reaction.
707699
$result = Interactions::add_reaction( $activity );
708700
$this->assertFalse( $result, 'Reaction should not be added to disabled post' );
709701

710-
remove_all_filters( 'pre_get_remote_metadata_by_actor' );
702+
\remove_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
711703
}
712704

713705
/**
@@ -947,17 +939,15 @@ public function test_add_comment_to_ap_post() {
947939
);
948940

949941
// Mock actor metadata.
950-
add_filter(
951-
'pre_get_remote_metadata_by_actor',
952-
function () {
953-
return array(
954-
'name' => 'Remote Commenter',
955-
'preferredUsername' => 'commenter',
956-
'id' => 'https://example.com/users/commenter',
957-
'url' => 'https://example.com/@commenter',
958-
);
959-
}
960-
);
942+
$metadata_filter = static function () {
943+
return array(
944+
'name' => 'Remote Commenter',
945+
'preferredUsername' => 'commenter',
946+
'id' => 'https://example.com/users/commenter',
947+
'url' => 'https://example.com/@commenter',
948+
);
949+
};
950+
\add_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
961951

962952
// Add comment to ap_post.
963953
$comment_id = Interactions::add_comment( $activity );
@@ -971,7 +961,7 @@ function () {
971961
$this->assertEquals( 'Remote Commenter', $comment->comment_author );
972962

973963
// Clean up.
974-
remove_all_filters( 'pre_get_remote_metadata_by_actor' );
964+
\remove_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
975965
}
976966

977967
/**
@@ -1001,17 +991,15 @@ public function test_add_reaction_to_ap_post() {
1001991
);
1002992

1003993
// Mock actor metadata.
1004-
add_filter(
1005-
'pre_get_remote_metadata_by_actor',
1006-
function () {
1007-
return array(
1008-
'name' => 'Remote Liker',
1009-
'preferredUsername' => 'liker',
1010-
'id' => 'https://example.com/users/liker',
1011-
'url' => 'https://example.com/@liker',
1012-
);
1013-
}
1014-
);
994+
$metadata_filter = static function () {
995+
return array(
996+
'name' => 'Remote Liker',
997+
'preferredUsername' => 'liker',
998+
'id' => 'https://example.com/users/liker',
999+
'url' => 'https://example.com/@liker',
1000+
);
1001+
};
1002+
\add_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
10151003

10161004
// Add reaction to ap_post.
10171005
$comment_id = Interactions::add_reaction( $activity );
@@ -1024,7 +1012,7 @@ function () {
10241012
$this->assertEquals( 'like', $comment->comment_type );
10251013

10261014
// Clean up.
1027-
remove_all_filters( 'pre_get_remote_metadata_by_actor' );
1015+
\remove_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
10281016
}
10291017

10301018
/**
@@ -1056,17 +1044,15 @@ public function test_add_comment_to_ap_post_when_disabled() {
10561044
);
10571045

10581046
// Mock actor metadata.
1059-
add_filter(
1060-
'pre_get_remote_metadata_by_actor',
1061-
function () {
1062-
return array(
1063-
'name' => 'Remote Commenter',
1064-
'preferredUsername' => 'commenter',
1065-
'id' => 'https://example.com/users/commenter',
1066-
'url' => 'https://example.com/@commenter',
1067-
);
1068-
}
1069-
);
1047+
$metadata_filter = static function () {
1048+
return array(
1049+
'name' => 'Remote Commenter',
1050+
'preferredUsername' => 'commenter',
1051+
'id' => 'https://example.com/users/commenter',
1052+
'url' => 'https://example.com/@commenter',
1053+
);
1054+
};
1055+
\add_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
10701056

10711057
// Try to add comment - should succeed because ap_post bypasses disabled check.
10721058
$comment_id = Interactions::add_comment( $activity );
@@ -1075,7 +1061,7 @@ function () {
10751061
$this->assertIsInt( $comment_id );
10761062

10771063
// Clean up.
1078-
remove_all_filters( 'pre_get_remote_metadata_by_actor' );
1064+
\remove_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
10791065
}
10801066

10811067
/**
@@ -1096,17 +1082,15 @@ public function test_add_comment_nested_reply_to_ap_post() {
10961082
);
10971083

10981084
// Mock actor metadata.
1099-
add_filter(
1100-
'pre_get_remote_metadata_by_actor',
1101-
function () {
1102-
return array(
1103-
'name' => 'Remote Commenter',
1104-
'preferredUsername' => 'commenter',
1105-
'id' => 'https://example.com/users/commenter',
1106-
'url' => 'https://example.com/@commenter',
1107-
);
1108-
}
1109-
);
1085+
$metadata_filter = static function () {
1086+
return array(
1087+
'name' => 'Remote Commenter',
1088+
'preferredUsername' => 'commenter',
1089+
'id' => 'https://example.com/users/commenter',
1090+
'url' => 'https://example.com/@commenter',
1091+
);
1092+
};
1093+
\add_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
11101094

11111095
// Add first comment.
11121096
$activity1 = array(
@@ -1141,6 +1125,6 @@ function () {
11411125
$this->assertEquals( $parent_comment_id, $child_comment->comment_parent, 'Child should have parent comment ID' );
11421126

11431127
// Clean up.
1144-
remove_all_filters( 'pre_get_remote_metadata_by_actor' );
1128+
\remove_filter( 'pre_get_remote_metadata_by_actor', $metadata_filter );
11451129
}
11461130
}

0 commit comments

Comments
 (0)