Merge "registration: Avoid redundant LBYL check in ExtensionRegistry::queue()"

[lhc/web/wiklou.git] / includes / media / MediaHandlerFactory.php

diff --git a/includes/media/MediaHandlerFactory.php b/includes/media/MediaHandlerFactory.php
index 1deecd7..82e8d1f 100644 (file)
--- a/includes/media/MediaHandlerFactory.php
+++ b/includes/media/MediaHandlerFactory.php
@@ -49,6 +49,11 @@ class MediaHandlerFactory {
                'image/x-djvu' => DjVuHandler::class, // compat
        ];
 
+       /**
+        * @var array
+        */
+       private $registry;
+
        /**
         * Instance cache of MediaHandler objects by mimetype
         *
@@ -56,15 +61,12 @@ class MediaHandlerFactory {
         */
        private $handlers;
 
-       protected function getHandlerClass( $type ) {
-               global $wgMediaHandlers;
+       public function __construct( array $registry ) {
+               $this->registry = $registry + self::$coreHandlers;
+       }
 
-               $registry = $wgMediaHandlers + self::$coreHandlers;
-               if ( isset( $registry[$type] ) ) {
-                       return $registry[$type];
-               } else {
-                       return false;
-               }
+       protected function getHandlerClass( $type ) {
+               return $this->registry[$type] ?? false;
        }
 
        /**