From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Tue, 14 Apr 2015 19:31:19 +0000 (+0200)
Subject: ResourceLoaderImageModule: Implement cache invalidation
X-Git-Tag: 1.31.0-rc.0~11700^2
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=807c08295aa8cf914907db5d1084d9fa5077d501;p=lhc%2Fweb%2Fwiklou.git

ResourceLoaderImageModule: Implement cache invalidation

Bug: T94733
Change-Id: I6ac2ef8d897813e560daa133b89a7932f8c1a362
---

diff --git a/includes/resourceloader/ResourceLoaderImage.php b/includes/resourceloader/ResourceLoaderImage.php
index 12d1e8279e..bf68fdda94 100644
--- a/includes/resourceloader/ResourceLoaderImage.php
+++ b/includes/resourceloader/ResourceLoaderImage.php
@@ -117,7 +117,7 @@ class ResourceLoaderImage {
 	 * @param ResourceLoaderContext $context Any context
 	 * @return string
 	 */
-	protected function getPath( ResourceLoaderContext $context ) {
+	public function getPath( ResourceLoaderContext $context ) {
 		$desc = $this->descriptor;
 		if ( is_string( $desc ) ) {
 			return $this->basePath . '/' . $desc;
diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index bf6a7dd2ac..7efdb26e3a 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -303,6 +303,49 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 		return false;
 	}
 
+	/**
+	 * Get the definition summary for this module.
+	 *
+	 * @param ResourceLoaderContext $context
+	 * @return array
+	 */
+	public function getDefinitionSummary( ResourceLoaderContext $context ) {
+		$summary = parent::getDefinitionSummary( $context );
+		foreach ( array(
+			'localBasePath',
+			'images',
+			'variants',
+			'prefix',
+			'selectorWithoutVariant',
+			'selectorWithVariant',
+		) as $member ) {
+			$summary[$member] = $this->{$member};
+		};
+		return $summary;
+	}
+
+	/**
+	 * Get the last modified timestamp of this module.
+	 *
+	 * @param ResourceLoaderContext $context Context in which to calculate
+	 *     the modified time
+	 * @return int UNIX timestamp
+	 */
+	public function getModifiedTime( ResourceLoaderContext $context ) {
+		$files = array();
+		foreach ( $this->getImages() as $name => $image ) {
+			$files[] = $image->getPath( $context );
+		}
+
+		$files = array_values( array_unique( $files ) );
+		$filesMtime = max( array_map( array( __CLASS__, 'safeFilemtime' ), $files ) );
+
+		return max(
+			$filesMtime,
+			$this->getDefinitionMtime( $context )
+		);
+	}
+
 	/**
 	 * Extract a local base path from module definition information.
 	 *
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
index 758cfe190a..cc121ba3c3 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
@@ -109,9 +109,6 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 
 class ResourceLoaderImageTestable extends ResourceLoaderImage {
 	// Make some protected methods public
-	public function getPath( ResourceLoaderContext $context ) {
-		return parent::getPath( $context );
-	}
 	public function massageSvgPathdata( $svg ) {
 		return parent::massageSvgPathdata( $svg );
 	}