From 855988fd0e7813fa533e121dff39113c6908b6bc Mon Sep 17 00:00:00 2001
From: daniel <dkinzler@wikimedia.org>
Date: Wed, 9 Jun 2021 23:17:21 +0200
Subject: LinkCache: soft deprecate addGoodLinkObj()

addGoodLinkObj() has many optional arguments, but omitting them actually
means corrupting the cache.

Nearly all existing callers are in tests.
So LinkCacheTestTrait::addGoodLinkObject() was created only
for testing. It is better to have this method in the
trait, because building the row directly in each test
would make these tests brittle against schema changes.

The only usage in WMF production code was in WikiPage and has been
fixed.

Bug: T284955
Change-Id: I03a2bd9ed64fcc0281ee29a286c8db395a9e03d9
---
 .../includes/resourceloader/ResourceLoaderWikiModuleTest.php     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php')

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
index 3ba2152346e5..187d8d8c7a44 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageRecord;
@@ -12,6 +11,7 @@ use Wikimedia\TestingAccessWrapper;
  * @covers ResourceLoaderWikiModule
  */
 class ResourceLoaderWikiModuleTest extends ResourceLoaderTestCase {
+	use LinkCacheTestTrait;
 
 	/**
 	 * @dataProvider provideConstructor
@@ -438,12 +438,7 @@ class ResourceLoaderWikiModuleTest extends ResourceLoaderTestCase {
 		} );
 
 		// Mock away Title's db queries with LinkCache
-		MediaWikiServices::getInstance()->getLinkCache()->addGoodLinkObj(
-			1, // id
-			new TitleValue( NS_MEDIAWIKI, 'Redirect.js' ),
-			1, // len
-			1 // redirect
-		);
+		$this->addGoodLinkObject( 1, new TitleValue( NS_MEDIAWIKI, 'Redirect.js' ), 1, 1 );
 
 		$this->assertSame(
 			"/*\nMediaWiki:Redirect.js\n*/\ntarget;\n",
-- 
cgit v1.2.3