From 9bf3916322494b688eecb87e445111c3e832e0a3 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 28 Apr 2018 02:05:23 +0100 Subject: [PATCH] media: Rename files to match the name of the class they define This will make jumping from file to file much easier in text editors when file name lookups will autocomplete naturally when looking for a class by name. Change-Id: I4b2e55a2e72674b619d5a592866c8a019a2b0224 --- autoload.php | 22 +++++++++---------- .../media/{Bitmap.php => BitmapHandler.php} | 0 ...tOnly.php => BitmapHandler_ClientOnly.php} | 0 includes/media/{BMP.php => BmpHandler.php} | 0 includes/media/{DjVu.php => DjVuHandler.php} | 0 .../{ExifBitmap.php => ExifBitmapHandler.php} | 0 includes/media/{GIF.php => GIFHandler.php} | 0 includes/media/{Jpeg.php => JpegHandler.php} | 0 includes/media/{PNG.php => PNGHandler.php} | 0 includes/media/{SVG.php => SvgHandler.php} | 0 includes/media/{Tiff.php => TiffHandler.php} | 0 includes/media/{WebP.php => WebPHandler.php} | 0 .../mediawiki.special.upload.js | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename includes/media/{Bitmap.php => BitmapHandler.php} (100%) rename includes/media/{Bitmap_ClientOnly.php => BitmapHandler_ClientOnly.php} (100%) rename includes/media/{BMP.php => BmpHandler.php} (100%) rename includes/media/{DjVu.php => DjVuHandler.php} (100%) rename includes/media/{ExifBitmap.php => ExifBitmapHandler.php} (100%) rename includes/media/{GIF.php => GIFHandler.php} (100%) rename includes/media/{Jpeg.php => JpegHandler.php} (100%) rename includes/media/{PNG.php => PNGHandler.php} (100%) rename includes/media/{SVG.php => SvgHandler.php} (100%) rename includes/media/{Tiff.php => TiffHandler.php} (100%) rename includes/media/{WebP.php => WebPHandler.php} (100%) diff --git a/autoload.php b/autoload.php index 12958ca089..b832863564 100644 --- a/autoload.php +++ b/autoload.php @@ -201,15 +201,15 @@ $wgAutoloadLocalClasses = [ 'BenchmarkSanitizer' => __DIR__ . '/maintenance/benchmarks/benchmarkSanitizer.php', 'BenchmarkTidy' => __DIR__ . '/maintenance/benchmarks/benchmarkTidy.php', 'Benchmarker' => __DIR__ . '/maintenance/benchmarks/Benchmarker.php', - 'BitmapHandler' => __DIR__ . '/includes/media/Bitmap.php', - 'BitmapHandler_ClientOnly' => __DIR__ . '/includes/media/Bitmap_ClientOnly.php', + 'BitmapHandler' => __DIR__ . '/includes/media/BitmapHandler.php', + 'BitmapHandler_ClientOnly' => __DIR__ . '/includes/media/BitmapHandler_ClientOnly.php', 'BitmapMetadataHandler' => __DIR__ . '/includes/media/BitmapMetadataHandler.php', 'Blob' => __DIR__ . '/includes/libs/rdbms/encasing/Blob.php', 'Block' => __DIR__ . '/includes/Block.php', 'BlockLevelPass' => __DIR__ . '/includes/parser/BlockLevelPass.php', 'BlockListPager' => __DIR__ . '/includes/specials/pagers/BlockListPager.php', 'BlockLogFormatter' => __DIR__ . '/includes/logging/BlockLogFormatter.php', - 'BmpHandler' => __DIR__ . '/includes/media/BMP.php', + 'BmpHandler' => __DIR__ . '/includes/media/BmpHandler.php', 'BotPassword' => __DIR__ . '/includes/user/BotPassword.php', 'BrokenRedirectsPage' => __DIR__ . '/includes/specials/SpecialBrokenRedirects.php', 'BufferingStatsdDataFactory' => __DIR__ . '/includes/libs/stats/BufferingStatsdDataFactory.php', @@ -396,7 +396,7 @@ $wgAutoloadLocalClasses = [ 'DiffOpDelete' => __DIR__ . '/includes/diff/DairikiDiff.php', 'DifferenceEngine' => __DIR__ . '/includes/diff/DifferenceEngine.php', 'Digit2Html' => __DIR__ . '/maintenance/language/digit2html.php', - 'DjVuHandler' => __DIR__ . '/includes/media/DjVu.php', + 'DjVuHandler' => __DIR__ . '/includes/media/DjVuHandler.php', 'DjVuImage' => __DIR__ . '/includes/media/DjVuImage.php', 'DnsSrvDiscoverer' => __DIR__ . '/includes/libs/DnsSrvDiscoverer.php', 'DoubleRedirectJob' => __DIR__ . '/includes/jobqueue/jobs/DoubleRedirectJob.php', @@ -452,7 +452,7 @@ $wgAutoloadLocalClasses = [ 'EventRelayerNull' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerNull.php', 'ExecutableFinder' => __DIR__ . '/includes/utils/ExecutableFinder.php', 'Exif' => __DIR__ . '/includes/media/Exif.php', - 'ExifBitmapHandler' => __DIR__ . '/includes/media/ExifBitmap.php', + 'ExifBitmapHandler' => __DIR__ . '/includes/media/ExifBitmapHandler.php', 'ExplodeIterator' => __DIR__ . '/includes/libs/ExplodeIterator.php', 'ExportProgressFilter' => __DIR__ . '/includes/export/ExportProgressFilter.php', 'ExportSites' => __DIR__ . '/maintenance/exportSites.php', @@ -537,7 +537,7 @@ $wgAutoloadLocalClasses = [ 'FormatMetadata' => __DIR__ . '/includes/media/FormatMetadata.php', 'FormattedRCFeed' => __DIR__ . '/includes/rcfeed/FormattedRCFeed.php', 'FormlessAction' => __DIR__ . '/includes/actions/FormlessAction.php', - 'GIFHandler' => __DIR__ . '/includes/media/GIF.php', + 'GIFHandler' => __DIR__ . '/includes/media/GIFHandler.php', 'GIFMetadataExtractor' => __DIR__ . '/includes/media/GIFMetadataExtractor.php', 'GanConverter' => __DIR__ . '/languages/classes/LanguageGan.php', 'GenderCache' => __DIR__ . '/includes/cache/GenderCache.php', @@ -699,7 +699,7 @@ $wgAutoloadLocalClasses = [ 'JobQueueSecondTestQueue' => __DIR__ . '/includes/jobqueue/JobQueueSecondTestQueue.php', 'JobRunner' => __DIR__ . '/includes/jobqueue/JobRunner.php', 'JobSpecification' => __DIR__ . '/includes/jobqueue/JobSpecification.php', - 'JpegHandler' => __DIR__ . '/includes/media/Jpeg.php', + 'JpegHandler' => __DIR__ . '/includes/media/JpegHandler.php', 'JpegMetadataExtractor' => __DIR__ . '/includes/media/JpegMetadataExtractor.php', 'JsonContent' => __DIR__ . '/includes/content/JsonContent.php', 'JsonContentHandler' => __DIR__ . '/includes/content/JsonContentHandler.php', @@ -1098,7 +1098,7 @@ $wgAutoloadLocalClasses = [ 'Orphans' => __DIR__ . '/maintenance/orphans.php', 'OutputPage' => __DIR__ . '/includes/OutputPage.php', 'PHPVersionCheck' => __DIR__ . '/includes/PHPVersionCheck.php', - 'PNGHandler' => __DIR__ . '/includes/media/PNG.php', + 'PNGHandler' => __DIR__ . '/includes/media/PNGHandler.php', 'PNGMetadataExtractor' => __DIR__ . '/includes/media/PNGMetadataExtractor.php', 'PPCustomFrame_DOM' => __DIR__ . '/includes/parser/Preprocessor_DOM.php', 'PPCustomFrame_Hash' => __DIR__ . '/includes/parser/Preprocessor_Hash.php', @@ -1506,7 +1506,7 @@ $wgAutoloadLocalClasses = [ 'StubUserLang' => __DIR__ . '/includes/StubObject.php', 'SubmitAction' => __DIR__ . '/includes/actions/SubmitAction.php', 'SubpageImportTitleFactory' => __DIR__ . '/includes/title/SubpageImportTitleFactory.php', - 'SvgHandler' => __DIR__ . '/includes/media/SVG.php', + 'SvgHandler' => __DIR__ . '/includes/media/SvgHandler.php', 'SwiftFileBackend' => __DIR__ . '/includes/libs/filebackend/SwiftFileBackend.php', 'SwiftFileBackendDirList' => __DIR__ . '/includes/libs/filebackend/SwiftFileBackend.php', 'SwiftFileBackendFileList' => __DIR__ . '/includes/libs/filebackend/SwiftFileBackend.php', @@ -1532,7 +1532,7 @@ $wgAutoloadLocalClasses = [ 'ThumbnailImage' => __DIR__ . '/includes/media/MediaTransformOutput.php', 'ThumbnailRenderJob' => __DIR__ . '/includes/jobqueue/jobs/ThumbnailRenderJob.php', 'TidyUpBug37714' => __DIR__ . '/maintenance/tidyUpBug37714.php', - 'TiffHandler' => __DIR__ . '/includes/media/Tiff.php', + 'TiffHandler' => __DIR__ . '/includes/media/TiffHandler.php', 'Timing' => __DIR__ . '/includes/libs/Timing.php', 'Title' => __DIR__ . '/includes/Title.php', 'TitleArray' => __DIR__ . '/includes/TitleArray.php', @@ -1662,7 +1662,7 @@ $wgAutoloadLocalClasses = [ 'WebInstallerUpgrade' => __DIR__ . '/includes/installer/WebInstallerUpgrade.php', 'WebInstallerUpgradeDoc' => __DIR__ . '/includes/installer/WebInstallerUpgradeDoc.php', 'WebInstallerWelcome' => __DIR__ . '/includes/installer/WebInstallerWelcome.php', - 'WebPHandler' => __DIR__ . '/includes/media/WebP.php', + 'WebPHandler' => __DIR__ . '/includes/media/WebPHandler.php', 'WebRequest' => __DIR__ . '/includes/WebRequest.php', 'WebRequestUpload' => __DIR__ . '/includes/WebRequestUpload.php', 'WebResponse' => __DIR__ . '/includes/WebResponse.php', diff --git a/includes/media/Bitmap.php b/includes/media/BitmapHandler.php similarity index 100% rename from includes/media/Bitmap.php rename to includes/media/BitmapHandler.php diff --git a/includes/media/Bitmap_ClientOnly.php b/includes/media/BitmapHandler_ClientOnly.php similarity index 100% rename from includes/media/Bitmap_ClientOnly.php rename to includes/media/BitmapHandler_ClientOnly.php diff --git a/includes/media/BMP.php b/includes/media/BmpHandler.php similarity index 100% rename from includes/media/BMP.php rename to includes/media/BmpHandler.php diff --git a/includes/media/DjVu.php b/includes/media/DjVuHandler.php similarity index 100% rename from includes/media/DjVu.php rename to includes/media/DjVuHandler.php diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmapHandler.php similarity index 100% rename from includes/media/ExifBitmap.php rename to includes/media/ExifBitmapHandler.php diff --git a/includes/media/GIF.php b/includes/media/GIFHandler.php similarity index 100% rename from includes/media/GIF.php rename to includes/media/GIFHandler.php diff --git a/includes/media/Jpeg.php b/includes/media/JpegHandler.php similarity index 100% rename from includes/media/Jpeg.php rename to includes/media/JpegHandler.php diff --git a/includes/media/PNG.php b/includes/media/PNGHandler.php similarity index 100% rename from includes/media/PNG.php rename to includes/media/PNGHandler.php diff --git a/includes/media/SVG.php b/includes/media/SvgHandler.php similarity index 100% rename from includes/media/SVG.php rename to includes/media/SvgHandler.php diff --git a/includes/media/Tiff.php b/includes/media/TiffHandler.php similarity index 100% rename from includes/media/Tiff.php rename to includes/media/TiffHandler.php diff --git a/includes/media/WebP.php b/includes/media/WebPHandler.php similarity index 100% rename from includes/media/WebP.php rename to includes/media/WebPHandler.php diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js index 9120e2ae46..144659a7fb 100644 --- a/resources/src/mediawiki.special/mediawiki.special.upload.js +++ b/resources/src/mediawiki.special/mediawiki.special.upload.js @@ -413,7 +413,7 @@ if ( meta && meta.tiff && meta.tiff.Orientation ) { rotation = ( 360 - ( function () { - // See includes/media/Bitmap.php + // See BitmapHandler class in PHP switch ( meta.tiff.Orientation.value ) { case 8: return 90; -- 2.20.1