Merge "ResourceLoaderULSModule::getModifiedTime updates continuously"

includes/ResourceLoaderULSModule.php

@@ -23,21 +23,19 @@
  * Resource loader module for providing MediaWiki language names.
  */
 class ResourceLoaderULSModule extends ResourceLoaderModule {
-	/**
-	 * @var Language
-	 */
-	protected $language;
 	protected $targets = array( 'desktop', 'mobile' );
 
 	/**
-	 * Get all the dynamic data for the content language to an array
+	 * Get all the dynamic data for the content language to an array.
 	 *
+	 * @param string $languageCode Language code
 	 * @return array
 	 */
-	protected function getData() {
+	protected function getData( $languageCode ) {
 		$vars = array();
 		$vars['wgULSLanguages'] = Language::fetchLanguageNames(
-			$this->language->getCode(), 'mwfile'
+			$languageCode,
+			'mwfile'
 		);
 
 		return $vars;
@@ -45,12 +43,12 @@ class ResourceLoaderULSModule extends ResourceLoaderModule {
 
 	/**
 	 * @param $context ResourceLoaderContext
-	 * @return string: JavaScript code
+	 * @return string JavaScript code
 	 */
 	public function getScript( ResourceLoaderContext $context ) {
-		$this->language = Language::factory( $context->getLanguage() );
+		$languageCode = $context->getLanguage();
 		$out = '';
-		foreach ( $this->getData() as $key => $value ) {
+		foreach ( $this->getData( $languageCode ) as $key => $value ) {
 			$out .= Xml::encodeJsCall( 'mw.config.set', array( $key, $value ) );
 		}
 
@@ -58,15 +56,28 @@ class ResourceLoaderULSModule extends ResourceLoaderModule {
 	}
 
 	/**
+	 * Gets the last modified time for this module depending on the given
+	 * context.
+	 *
 	 * @param $context ResourceLoaderContext
-	 * @return array|int|Mixed
+	 * @return int Unix timestamp
 	 */
 	public function getModifiedTime( ResourceLoaderContext $context ) {
-		$this->language = Language::factory( $context->getLanguage() );
+		$languageCode = $context->getLanguage();
-		$cache = wfGetCache( CACHE_ANYTHING );
-		$key = wfMemcKey( 'resourceloader', 'ulsmodule', 'changeinfo' );
 
-		$data = $this->getData();
+		$cache = wfGetCache( CACHE_ANYTHING );
+
+		// Since we are updating the timestamp on hash change, we need to
+		// cache the hash per language to avoid updating the timestamp when
+		// different languages are being requested.
+		$key = wfMemcKey(
+			'resourceloader',
+			'modulemodifiedhash',
+			$this->getName(),
+			$languageCode
+		);
+
+		$data = $this->getData( $languageCode );
 		$hash = md5( serialize( $data ) );
 
 		$result = $cache->get( $key );

tests/phpunit/ResourceLoaderULSTest.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * PHP Unit tests for ResourceLoaderULSModule class.
+ *
+ * @file
+ * @ingroup Extensions
+ *
+ * @author Santhosh Thottingal
+ */
+
+/**
+ * @covers ResourceLoaderULSModule
+ */
+class ResourceLoaderULSModuleMemcachedTest extends MediaWikiTestCase {
+	/**
+	 * Test whether the modified time of the RL module varies
+	 * correctly with language code.
+	 * @covers ResourceLoaderSchemaModule::getModifiedTime
+	 */
+	function testModifiedTime() {
+		$request = new WebRequest();
+		$module = new ResourceLoaderULSModule();
+
+		$request->setVal( 'lang', 'he' );
+		$context = new ResourceLoaderContext(
+			new ResourceLoader(), $request );
+		$mtimeHebrew = $module->getModifiedTime( $context );
+		// sleep for 1 second
+		sleep( 1 );
+		$request->setVal( 'lang', 'hi' );
+		$context = new ResourceLoaderContext( new ResourceLoader(), $request );
+		$mtimeHindi = $module->getModifiedTime( $context );
+		$this->assertGreaterThan( $mtimeHebrew, $mtimeHindi, "Hindi has recent timestamp than Hebrew" );
+
+		// sleep for 1 second
+		sleep( 1 );
+		$request->setVal( 'lang', 'he' );
+		$context = new ResourceLoaderContext( new ResourceLoader(), $request );
+		$mtimeHebrewNew = $module->getModifiedTime( $context );
+		$this->assertEquals( $mtimeHebrewNew, $mtimeHebrew, "Hebrew timestamp remained same" );
+
+		// sleep for 1 second
+		sleep( 1 );
+		$request->setVal( 'lang', 'hi' );
+		$context = new ResourceLoaderContext( new ResourceLoader(), $request );
+		$mtimeHindiNew = $module->getModifiedTime( $context );
+		$this->assertEquals( $mtimeHindi, $mtimeHindiNew, "Hindi timestamp remained same" );
+	}
+}