From 568e3e43d9fadd2c184b6a404175d40f1f0f89ad Mon Sep 17 00:00:00 2001 From: Ori Livneh Date: Wed, 13 Jul 2016 15:43:08 -0700 Subject: [PATCH] resourceloader: Update expected length of module version hash It's 7, not 8, as of I1e4fb08d179. Change-Id: I882bf7075292ff849f2bc3af61217f7e38a4ec5f --- includes/resourceloader/ResourceLoaderStartUpModule.php | 2 +- .../includes/resourceloader/ResourceLoaderStartUpModuleTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 34866f3635..7b2d532d13 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -217,7 +217,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { } $versionHash = $module->getVersionHash( $context ); - if ( strlen( $versionHash ) !== 8 ) { + if ( strlen( $versionHash ) !== 7 ) { $context->getLogger()->warning( "Module '{module}' produced an invalid version hash: '{version}'.", [ diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php index ea775ae43c..9b62b82dee 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php @@ -5,7 +5,7 @@ class ResourceLoaderStartUpModuleTest extends ResourceLoaderTestCase { // Version hash for a blank file module. // Result of ResourceLoader::makeHash(), ResourceLoaderTestModule // and ResourceLoaderFileModule::getDefinitionSummary(). - protected static $blankVersion = '0a56zyi'; + protected static $blankVersion = '09p30q0'; protected static function expandPlaceholders( $text ) { return strtr( $text, [ -- 2.20.1