mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-30 03:30:17 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2023-10-01 14:00:51 +02:00
parent 4cd895e456 42bf5778d5
commit 2ff409ae4d
5 changed files with 188 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
tests/content_visibility/delete_post_test.php
View File

@@ -44,6 +44,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 2,
)),
false, 'harddelete',
3, // expected next post id
array(
array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
//array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@@ -73,6 +74,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 1,
)),
false, 'harddelete',
2, // expected next post id
array(
//array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@@ -102,6 +104,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 3,
)),
false, 'harddelete',
2, // expected next post id
array(
array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@@ -131,6 +134,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 2,
)),
true, 'soft delete',
3, // expected next post id
array(
array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 2, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'soft delete'),
@@ -160,6 +164,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 1,
)),
true, 'soft delete',
2, // expected next post id
array(
array('post_id' => 1, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'soft delete'),
array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@@ -189,6 +194,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 3,
)),
true, 'soft delete',
3, // expected next post id
array(
array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@@ -229,6 +235,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_reported' => false,
),
false, 'harddelete',
false, // expected next post id
array(
),
array(
@@ -257,6 +264,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_reported' => false,
),
true, 'soft delete',
false, // expected next post id
array(
array('post_id' => 4, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => ''),
),
@@ -278,13 +286,93 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
array('user_posts' => 3),
),
),
// Delete actual last post that is unapproved
array(
3, 3, 6,
array(
'topic_first_post_id' => 5,
'topic_last_post_id' => 5,
'topic_posts_approved' => 1,
'topic_posts_unapproved' => 1,
'topic_posts_softdeleted' => 0,
'topic_visibility' => ITEM_APPROVED,
'post_time' => 4,
'post_visibility' => ITEM_UNAPPROVED,
'post_postcount' => true,
'poster_id' => 1,
'post_reported' => false,
),
false, 'harddelete',
5, // expected next post id
array(
array('post_id' => 5, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
// array('post_id' => 6, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''),
),
array(
array(
'topic_visibility' => ITEM_APPROVED,
'topic_first_post_id' => 5,
'topic_last_post_id' => 5,
'topic_posts_approved' => 1,
'topic_posts_unapproved' => 0,
'topic_posts_softdeleted' => 0,
'topic_delete_reason' => '',
),
),
array(
array('forum_posts_approved' => 1, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 5),
),
array(
array('user_posts' => 4),
),
),
// Hard delete last approved post
array(
3, 3, 5,
array(
'topic_first_post_id' => 5,
'topic_last_post_id' => 5,
'topic_posts_approved' => 1,
'topic_posts_unapproved' => 1,
'topic_posts_softdeleted' => 0,
'topic_visibility' => ITEM_APPROVED,
'post_time' => 4,
'post_visibility' => ITEM_APPROVED,
'post_postcount' => true,
'poster_id' => 1,
'post_reported' => false,
),
false, 'harddelete',
6, // expected next post id
array(
//array('post_id' => 5, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 6, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''),
),
array(
array(
'topic_visibility' => ITEM_APPROVED,
'topic_first_post_id' => 6,
'topic_last_post_id' => 5, // can't be updated with no valid data
'topic_posts_approved' => 0,
'topic_posts_unapproved' => 1,
'topic_posts_softdeleted' => 0,
'topic_delete_reason' => '',
),
),
array(
array('forum_posts_approved' => 0, 'forum_posts_unapproved' => 1, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 5),
),
array(
array('user_posts' => 3),
),
),
);
}
/**
* @dataProvider delete_post_data
*/
public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_posts, $expected_topic, $expected_forum, $expected_user)
public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_next_post_id, $expected_posts, $expected_topic, $expected_forum, $expected_user)
{
global $auth, $cache, $config, $db, $user, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
@@ -327,8 +415,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
$search_backend_factory->method('get_active')->willReturn($search_backend);
$phpbb_container->set('search.backend_factory', $search_backend_factory);
delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason);
$this->assertSame($expected_next_post_id, delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason));
$result = $db->sql_query('SELECT post_id, post_visibility, post_delete_reason
FROM phpbb_posts
WHERE topic_id = ' . $topic_id . '