resourceloader: Remove back compat for old packageFiles format
authorRoan Kattouw <roan.kattouw@gmail.com>
Fri, 22 Feb 2019 01:31:22 +0000 (17:31 -0800)
committerKrinkle <krinklemail@gmail.com>
Fri, 22 Feb 2019 19:07:31 +0000 (19:07 +0000)
Was introduced as a transitional measure in Ic566a1cd7efd075c3.

Depends-On: I717f03caf9ea8266e6a4d2b6daf4c543c0815931
Change-Id: I6ae615ea38572042f8ba705338067b393827153a

includes/resourceloader/ResourceLoaderFileModule.php

index 6680777..2848871 100644 (file)
@@ -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