Merge pull request #98 from SemanticMediaWiki/fix-lingo-cache-type-typo

Fix the wgexLingoCacheType setting being ignored due to a typo

Author: paladox

RELEASE-NOTES.md

@@ -7,6 +7,7 @@ This file contains the RELEASE-NOTES of the Semantic Glossary (a.k.a. SG) extens
 * Fixed glossary cache invalidation on page edits, which stopped working after Semantic MediaWiki renamed the data-update hook
 * Fixed the `rebuildGlossaryCache.php` maintenance script against Semantic MediaWiki 7.0
 * Moved hook registration into `extension.json` and removed the procedural extension entry point; the Lingo backend registration no longer overwrites a custom `$wgexLingoBackend` set in `LocalSettings.php`
+* Fixed `$wgexLingoCacheType` being ignored due to a `$GLOBAL`/`$GLOBALS` typo; a custom cache type configured for the glossary cache is now honored
 
 ### 6.0.0
 

src/Cache/GlossaryCache.php

@@ -72,8 +72,8 @@ public function getKeyForLingo() {
 	 * @return string
 	 */
 	public function getCacheType() {
-		if ( isset( $GLOBAL['wgexLingoCacheType'] ) && $GLOBAL['wgexLingoCacheType'] !== null ) {
-			return $GLOBAL['wgexLingoCacheType'];
+		if ( isset( $GLOBALS['wgexLingoCacheType'] ) && $GLOBALS['wgexLingoCacheType'] !== null ) {
+			return $GLOBALS['wgexLingoCacheType'];
 		}
 
 		return $GLOBALS['wgMainCacheType'];

tests/phpunit/Unit/Cache/GlossaryCacheTest.php

@@ -39,6 +39,29 @@ public function testGetCacheType() {
 		);
 	}
 
+	public function testGetCacheTypeRespectsLingoCacheType() {
+		$instance = new GlossaryCache();
+
+		$previousLingo = $GLOBALS['wgexLingoCacheType'] ?? null;
+		$previousMain = $GLOBALS['wgMainCacheType'];
+
+		// Pick a Lingo cache type distinct from the main cache type so the
+		// assertion fails if the (formerly mistyped) override is ignored and
+		// the main cache type is returned instead.
+		$GLOBALS['wgexLingoCacheType'] = CACHE_DB;
+		$GLOBALS['wgMainCacheType'] = CACHE_NONE;
+
+		try {
+			$this->assertSame(
+				CACHE_DB,
+				$instance->getCacheType()
+			);
+		} finally {
+			$GLOBALS['wgexLingoCacheType'] = $previousLingo;
+			$GLOBALS['wgMainCacheType'] = $previousMain;
+		}
+	}
+
 	public function testGetKeys() {
 		$instance = new GlossaryCache();
 

tests/phpunit/Unit/ConfigurationIntegrityTest.php

@@ -20,8 +20,8 @@ class ConfigurationIntegrityTest extends \PHPUnit\Framework\TestCase {
 	public function testValidityOfCacheTypeSetting() {
 		$instance = new GlossaryCache();
 
-		if ( isset( $GLOBAL['wgexLingoCacheType'] ) ) {
-			$this->assertCacheType( $GLOBAL['wgexLingoCacheType'] );
+		if ( isset( $GLOBALS['wgexLingoCacheType'] ) ) {
+			$this->assertCacheType( $GLOBALS['wgexLingoCacheType'] );
 		}
 
 		$this->assertCacheType( $instance->getCacheType() );