From 951690c02e5e969cf7d40aa284b504ba49118eb7 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 29 Jan 2019 21:35:11 -0800 Subject: [PATCH] Rename tests/phpunit/includes/media files to match class names The classes were renamed in 9bf39163, this updates the test cases to match. Also take care of XCF while we're at it too. Change-Id: Iaaeee93e496af6cdd610df5bc75302ecfe273f64 --- .phpcs.xml | 1 - autoload.php | 2 +- includes/media/{XCF.php => XCFHandler.php} | 0 .../phpunit/includes/media/{GIFTest.php => GIFHandlerTest.php} | 0 .../phpunit/includes/media/{PNGTest.php => PNGHandlerTest.php} | 0 .../includes/media/{WebPTest.php => WebPHandlerTest.php} | 0 .../phpunit/includes/media/{XCFTest.php => XCFHandlerTest.php} | 0 7 files changed, 1 insertion(+), 2 deletions(-) rename includes/media/{XCF.php => XCFHandler.php} (100%) rename tests/phpunit/includes/media/{GIFTest.php => GIFHandlerTest.php} (100%) rename tests/phpunit/includes/media/{PNGTest.php => PNGHandlerTest.php} (100%) rename tests/phpunit/includes/media/{WebPTest.php => WebPHandlerTest.php} (100%) rename tests/phpunit/includes/media/{XCFTest.php => XCFHandlerTest.php} (100%) diff --git a/.phpcs.xml b/.phpcs.xml index c0154c7543..88a6f8cd70 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -78,7 +78,6 @@ Whitelist existing violations, but enable the sniff to prevent any new occurrences. --> - */includes/media/XCF\.php */includes/Feed\.php */includes/libs/xmp/XMP\.php */includes/jobqueue/JobSpecification\.php diff --git a/autoload.php b/autoload.php index df1c0b2505..0d17916f56 100644 --- a/autoload.php +++ b/autoload.php @@ -1699,7 +1699,7 @@ $wgAutoloadLocalClasses = [ 'WithoutInterwikiPage' => __DIR__ . '/includes/specials/SpecialWithoutinterwiki.php', 'WordLevelDiff' => __DIR__ . '/includes/diff/WordLevelDiff.php', 'WrapOldPasswords' => __DIR__ . '/maintenance/wrapOldPasswords.php', - 'XCFHandler' => __DIR__ . '/includes/media/XCF.php', + 'XCFHandler' => __DIR__ . '/includes/media/XCFHandler.php', 'XMLRCFeedFormatter' => __DIR__ . '/includes/rcfeed/XMLRCFeedFormatter.php', 'XMPInfo' => __DIR__ . '/includes/compat/XMPReader.php', 'XMPReader' => __DIR__ . '/includes/compat/XMPReader.php', diff --git a/includes/media/XCF.php b/includes/media/XCFHandler.php similarity index 100% rename from includes/media/XCF.php rename to includes/media/XCFHandler.php diff --git a/tests/phpunit/includes/media/GIFTest.php b/tests/phpunit/includes/media/GIFHandlerTest.php similarity index 100% rename from tests/phpunit/includes/media/GIFTest.php rename to tests/phpunit/includes/media/GIFHandlerTest.php diff --git a/tests/phpunit/includes/media/PNGTest.php b/tests/phpunit/includes/media/PNGHandlerTest.php similarity index 100% rename from tests/phpunit/includes/media/PNGTest.php rename to tests/phpunit/includes/media/PNGHandlerTest.php diff --git a/tests/phpunit/includes/media/WebPTest.php b/tests/phpunit/includes/media/WebPHandlerTest.php similarity index 100% rename from tests/phpunit/includes/media/WebPTest.php rename to tests/phpunit/includes/media/WebPHandlerTest.php diff --git a/tests/phpunit/includes/media/XCFTest.php b/tests/phpunit/includes/media/XCFHandlerTest.php similarity index 100% rename from tests/phpunit/includes/media/XCFTest.php rename to tests/phpunit/includes/media/XCFHandlerTest.php -- 2.20.1