Merge "Introduce MediaHandlerFactory to create MediaHandler objects"

diff --combined autoload.php
index 2587add,f9b0f64..76c4cea
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -514,41 -514,41 +514,41 @@@ $wgAutoloadLocalClasses = 
        'GitInfo' => __DIR__ . '/includes/GitInfo.php',
        'GlobalDependency' => __DIR__ . '/includes/cache/CacheDependency.php',
        'GlobalVarConfig' => __DIR__ . '/includes/config/GlobalVarConfig.php',
 -      'HTMLApiField' => __DIR__ . '/includes/htmlform/HTMLApiField.php',
 -      'HTMLAutoCompleteSelectField' => __DIR__ . '/includes/htmlform/HTMLAutoCompleteSelectField.php',
 -      'HTMLButtonField' => __DIR__ . '/includes/htmlform/HTMLButtonField.php',
 +      'HTMLApiField' => __DIR__ . '/includes/htmlform/fields/HTMLApiField.php',
 +      'HTMLAutoCompleteSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLAutoCompleteSelectField.php',
 +      'HTMLButtonField' => __DIR__ . '/includes/htmlform/fields/HTMLButtonField.php',
        'HTMLCacheUpdate' => __DIR__ . '/includes/deferred/HTMLCacheUpdate.php',
        'HTMLCacheUpdateJob' => __DIR__ . '/includes/jobqueue/jobs/HTMLCacheUpdateJob.php',
 -      'HTMLCheckField' => __DIR__ . '/includes/htmlform/HTMLCheckField.php',
 -      'HTMLCheckMatrix' => __DIR__ . '/includes/htmlform/HTMLCheckMatrix.php',
 -      'HTMLComboboxField' => __DIR__ . '/includes/htmlform/HTMLComboboxField.php',
 -      'HTMLEditTools' => __DIR__ . '/includes/htmlform/HTMLEditTools.php',
 +      'HTMLCheckField' => __DIR__ . '/includes/htmlform/fields/HTMLCheckField.php',
 +      'HTMLCheckMatrix' => __DIR__ . '/includes/htmlform/fields/HTMLCheckMatrix.php',
 +      'HTMLComboboxField' => __DIR__ . '/includes/htmlform/fields/HTMLComboboxField.php',
 +      'HTMLEditTools' => __DIR__ . '/includes/htmlform/fields/HTMLEditTools.php',
        'HTMLFileCache' => __DIR__ . '/includes/cache/HTMLFileCache.php',
 -      'HTMLFloatField' => __DIR__ . '/includes/htmlform/HTMLFloatField.php',
 +      'HTMLFloatField' => __DIR__ . '/includes/htmlform/fields/HTMLFloatField.php',
        'HTMLForm' => __DIR__ . '/includes/htmlform/HTMLForm.php',
        'HTMLFormField' => __DIR__ . '/includes/htmlform/HTMLFormField.php',
 -      'HTMLFormFieldCloner' => __DIR__ . '/includes/htmlform/HTMLFormFieldCloner.php',
 +      'HTMLFormFieldCloner' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldCloner.php',
        'HTMLFormFieldRequiredOptionsException' => __DIR__ . '/includes/htmlform/HTMLFormFieldRequiredOptionsException.php',
 -      'HTMLFormFieldWithButton' => __DIR__ . '/includes/htmlform/HTMLFormFieldWithButton.php',
 -      'HTMLHiddenField' => __DIR__ . '/includes/htmlform/HTMLHiddenField.php',
 -      'HTMLInfoField' => __DIR__ . '/includes/htmlform/HTMLInfoField.php',
 -      'HTMLIntField' => __DIR__ . '/includes/htmlform/HTMLIntField.php',
 -      'HTMLMultiSelectField' => __DIR__ . '/includes/htmlform/HTMLMultiSelectField.php',
 +      'HTMLFormFieldWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldWithButton.php',
 +      'HTMLHiddenField' => __DIR__ . '/includes/htmlform/fields/HTMLHiddenField.php',
 +      'HTMLInfoField' => __DIR__ . '/includes/htmlform/fields/HTMLInfoField.php',
 +      'HTMLIntField' => __DIR__ . '/includes/htmlform/fields/HTMLIntField.php',
 +      'HTMLMultiSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLMultiSelectField.php',
        'HTMLNestedFilterable' => __DIR__ . '/includes/htmlform/HTMLNestedFilterable.php',
 -      'HTMLRadioField' => __DIR__ . '/includes/htmlform/HTMLRadioField.php',
 -      'HTMLSelectAndOtherField' => __DIR__ . '/includes/htmlform/HTMLSelectAndOtherField.php',
 -      'HTMLSelectField' => __DIR__ . '/includes/htmlform/HTMLSelectField.php',
 -      'HTMLSelectLimitField' => __DIR__ . '/includes/htmlform/HTMLSelectLimitField.php',
 -      'HTMLSelectNamespace' => __DIR__ . '/includes/htmlform/HTMLSelectNamespace.php',
 -      'HTMLSelectNamespaceWithButton' => __DIR__ . '/includes/htmlform/HTMLSelectNamespaceWithButton.php',
 -      'HTMLSelectOrOtherField' => __DIR__ . '/includes/htmlform/HTMLSelectOrOtherField.php',
 -      'HTMLSubmitField' => __DIR__ . '/includes/htmlform/HTMLSubmitField.php',
 -      'HTMLTagFilter' => __DIR__ . '/includes/htmlform/HTMLTagFilter.php',
 -      'HTMLTextAreaField' => __DIR__ . '/includes/htmlform/HTMLTextAreaField.php',
 -      'HTMLTextField' => __DIR__ . '/includes/htmlform/HTMLTextField.php',
 -      'HTMLTextFieldWithButton' => __DIR__ . '/includes/htmlform/HTMLTextFieldWithButton.php',
 -      'HTMLTitleTextField' => __DIR__ . '/includes/htmlform/HTMLTitleTextField.php',
 -      'HTMLUserTextField' => __DIR__ . '/includes/htmlform/HTMLUserTextField.php',
 +      'HTMLRadioField' => __DIR__ . '/includes/htmlform/fields/HTMLRadioField.php',
 +      'HTMLSelectAndOtherField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectAndOtherField.php',
 +      'HTMLSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectField.php',
 +      'HTMLSelectLimitField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectLimitField.php',
 +      'HTMLSelectNamespace' => __DIR__ . '/includes/htmlform/fields/HTMLSelectNamespace.php',
 +      'HTMLSelectNamespaceWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php',
 +      'HTMLSelectOrOtherField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectOrOtherField.php',
 +      'HTMLSubmitField' => __DIR__ . '/includes/htmlform/fields/HTMLSubmitField.php',
 +      'HTMLTagFilter' => __DIR__ . '/includes/htmlform/fields/HTMLTagFilter.php',
 +      'HTMLTextAreaField' => __DIR__ . '/includes/htmlform/fields/HTMLTextAreaField.php',
 +      'HTMLTextField' => __DIR__ . '/includes/htmlform/fields/HTMLTextField.php',
 +      'HTMLTextFieldWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLTextFieldWithButton.php',
 +      'HTMLTitleTextField' => __DIR__ . '/includes/htmlform/fields/HTMLTitleTextField.php',
 +      'HTMLUserTextField' => __DIR__ . '/includes/htmlform/fields/HTMLUserTextField.php',
        'HWLDFWordAccumulator' => __DIR__ . '/includes/diff/DairikiDiff.php',
        'HashBagOStuff' => __DIR__ . '/includes/libs/objectcache/HashBagOStuff.php',
        'HashConfig' => __DIR__ . '/includes/config/HashConfig.php',
@@@ -755,7 -755,7 +755,7 @@@
        'LonelyPagesPage' => __DIR__ . '/includes/specials/SpecialLonelypages.php',
        'LongPagesPage' => __DIR__ . '/includes/specials/SpecialLongpages.php',
        'MIMEsearchPage' => __DIR__ . '/includes/specials/SpecialMIMEsearch.php',
 -      'MWCallableUpdate' => __DIR__ . '/includes/deferred/CallableUpdate.php',
 +      'MWCallableUpdate' => __DIR__ . '/includes/deferred/MWCallableUpdate.php',
        'MWContentSerializationException' => __DIR__ . '/includes/content/ContentHandler.php',
        'MWCryptHKDF' => __DIR__ . '/includes/utils/MWCryptHKDF.php',
        'MWCryptHash' => __DIR__ . '/includes/utils/MWCryptHash.php',
@@@ -790,6 -790,7 +790,7 @@@
        'MarkpatrolledAction' => __DIR__ . '/includes/actions/MarkpatrolledAction.php',
        'McTest' => __DIR__ . '/maintenance/mctest.php',
        'MediaHandler' => __DIR__ . '/includes/media/MediaHandler.php',
+       'MediaHandlerFactory' => __DIR__ . '/includes/media/MediaHandlerFactory.php',
        'MediaStatisticsPage' => __DIR__ . '/includes/specials/SpecialMediaStatistics.php',
        'MediaTransformError' => __DIR__ . '/includes/media/MediaTransformOutput.php',
        'MediaTransformInvalidParametersException' => __DIR__ . '/includes/media/MediaTransformInvalidParametersException.php',
@@@ -1169,7 -1170,6 +1170,7 @@@
        'ResourceLoaderUserDefaultsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserDefaultsModule.php',
        'ResourceLoaderUserModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserModule.php',
        'ResourceLoaderUserOptionsModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserOptionsModule.php',
 +      'ResourceLoaderUserStylesModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserStylesModule.php',
        'ResourceLoaderUserTokensModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderUserTokensModule.php',
        'ResourceLoaderWikiModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderWikiModule.php',
        'RestbaseVirtualRESTService' => __DIR__ . '/includes/libs/virtualrest/RestbaseVirtualRESTService.php',