Fix typo in tests/phpunit/includes/Revision/MainSlotRoleHandlerTest.php

[lhc/web/wiklou.git] / tests / phpunit / includes / CommentStoreTest.php

diff --git a/tests/phpunit/includes/CommentStoreTest.php b/tests/phpunit/includes/CommentStoreTest.php
index bc1f101..4360343 100644 (file)
--- a/tests/phpunit/includes/CommentStoreTest.php
+++ b/tests/phpunit/includes/CommentStoreTest.php
@@ -117,7 +117,6 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                                MIGRATION_WRITE_BOTH, 'img_description',
                                [
                                        'img_description_old' => 'img_description',
-                                       'img_description_pk' => 'img_name',
                                        'img_description_id' => 'img_description_id'
                                ],
                        ],
@@ -125,14 +124,12 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                                MIGRATION_WRITE_NEW, 'img_description',
                                [
                                        'img_description_old' => 'img_description',
-                                       'img_description_pk' => 'img_name',
                                        'img_description_id' => 'img_description_id'
                                ],
                        ],
                        'Image, new' => [
                                MIGRATION_NEW, 'img_description',
                                [
-                                       'img_description_pk' => 'img_name',
                                        'img_description_id' => 'img_description_id'
                                ],
                        ],
@@ -296,7 +293,6 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                        'Image, write-both' => [
                                MIGRATION_WRITE_BOTH, 'img_description', [
                                        'tables' => [
-                                               'temp_img_description' => 'image_comment_temp',
                                                'comment_img_description' => 'comment',
                                        ],
                                        'fields' => [
@@ -305,10 +301,8 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                                                'img_description_cid' => 'comment_img_description.comment_id',
                                        ],
                                        'joins' => [
-                                               'temp_img_description' => [ 'LEFT JOIN', 'temp_img_description.imgcomment_name = img_name' ],
                                                'comment_img_description' => [ 'LEFT JOIN',
-                                                       // phpcs:ignore Generic.Files.LineLength
-                                                       'comment_img_description.comment_id = (CASE WHEN img_description_id != 0 THEN img_description_id ELSE temp_img_description.imgcomment_description_id END)',
+                                                       'comment_img_description.comment_id = img_description_id',
                                                ],
                                        ],
                                ],
@@ -316,7 +310,6 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                        'Image, write-new' => [
                                MIGRATION_WRITE_NEW, 'img_description', [
                                        'tables' => [
-                                               'temp_img_description' => 'image_comment_temp',
                                                'comment_img_description' => 'comment',
                                        ],
                                        'fields' => [
@@ -325,10 +318,8 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                                                'img_description_cid' => 'comment_img_description.comment_id',
                                        ],
                                        'joins' => [
-                                               'temp_img_description' => [ 'LEFT JOIN', 'temp_img_description.imgcomment_name = img_name' ],
                                                'comment_img_description' => [ 'LEFT JOIN',
-                                                       // phpcs:ignore Generic.Files.LineLength
-                                                       'comment_img_description.comment_id = (CASE WHEN img_description_id != 0 THEN img_description_id ELSE temp_img_description.imgcomment_description_id END)',
+                                                       'comment_img_description.comment_id = img_description_id',
                                                ],
                                        ],
                                ],
@@ -336,7 +327,6 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                        'Image, new' => [
                                MIGRATION_NEW, 'img_description', [
                                        'tables' => [
-                                               'temp_img_description' => 'image_comment_temp',
                                                'comment_img_description' => 'comment',
                                        ],
                                        'fields' => [
@@ -345,10 +335,8 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                                                'img_description_cid' => 'comment_img_description.comment_id',
                                        ],
                                        'joins' => [
-                                               'temp_img_description' => [ 'LEFT JOIN', 'temp_img_description.imgcomment_name = img_name' ],
                                                'comment_img_description' => [ 'JOIN',
-                                                       // phpcs:ignore Generic.Files.LineLength
-                                                       'comment_img_description.comment_id = (CASE WHEN img_description_id != 0 THEN img_description_id ELSE temp_img_description.imgcomment_description_id END)',
+                                                       'comment_img_description.comment_id = img_description_id',
                                                ],
                                        ],
                                ],