From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Fri, 22 Feb 2019 01:31:22 +0000 (-0800)
Subject: resourceloader: Remove back compat for old packageFiles format
X-Git-Tag: 1.34.0-rc.0~2740^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=b444d3ff399b8231f344516db3a8134e14e40fa7;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Remove back compat for old packageFiles format

Was introduced as a transitional measure in Ic566a1cd7efd075c3.

Depends-On: I717f03caf9ea8266e6a4d2b6daf4c543c0815931
Change-Id: I6ae615ea38572042f8ba705338067b393827153a
---

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index 66807778f1..28488712dd 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -1093,15 +1093,10 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 			if ( is_string( $fileInfo ) ) {
 				$fileInfo = [ 'name' => $fileInfo, 'file' => $fileInfo ];
 			} elseif ( !isset( $fileInfo['name'] ) ) {
-				// Backwards compatibility
-				if ( !is_numeric( $alias ) ) {
-					$fileInfo['name'] = $alias;
-				} else {
-					$msg = __METHOD__ . ": invalid package file definition for module " .
-						"\"{$this->getName()}\": 'name' key is required when value is not a string";
-					wfDebugLog( 'resourceloader', $msg );
-					throw new MWException( $msg );
-				}
+				$msg = __METHOD__ . ": invalid package file definition for module " .
+					"\"{$this->getName()}\": 'name' key is required when value is not a string";
+				wfDebugLog( 'resourceloader', $msg );
+				throw new MWException( $msg );
 			}
 
 			// Infer type from alias if needed