From 95b8b3a4ded1564b0b42d1cefde62348938f0325 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Sun, 14 Apr 2019 14:55:23 +0100
Subject: [PATCH] Remove XMPReader back compat

Change-Id: I4e3ecbf6c13a7e7cfed88253eb6820e78e49e9c3
---
 .phpcs.xml                    |  2 --
 RELEASE-NOTES-1.34            |  1 +
 autoload.php                  |  3 ---
 includes/compat/XMPReader.php | 40 -----------------------------------
 4 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 includes/compat/XMPReader.php

diff --git a/.phpcs.xml b/.phpcs.xml
index 7037ea7fdc..7eac427ebf 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -72,7 +72,6 @@
 		-->
 		<exclude-pattern>*/includes/installer/PhpBugTests\.php</exclude-pattern>
 		<exclude-pattern>*/includes/specials/SpecialMostinterwikis\.php</exclude-pattern>
-		<exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
 		<exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
 		<exclude-pattern>*/includes/specials/SpecialAncientpages\.php</exclude-pattern>
 		<exclude-pattern>*/includes/specials/SpecialBrokenRedirects\.php</exclude-pattern>
@@ -205,7 +204,6 @@
 			any new occurrences.
 		-->
 		<exclude-pattern>*/includes/api/ApiErrorFormatter\.php</exclude-pattern>
-		<exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
 		<exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
 		<exclude-pattern>*/includes/htmlform/HTMLFormElement\.php</exclude-pattern>
 		<exclude-pattern>*/includes/libs/filebackend/FileBackendStore\.php</exclude-pattern>
diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 576d60e402..83da30135c 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -88,6 +88,7 @@ because of Phabricator reports.
   been removed.
 * ObjectFactory class, deprecated in 1.31, has been removed.
 * HWLDFWordAccumudlator class, deprecated in 1.28, has been removed.
+* XMPInfo, XMPReader and XMPValidate, deprecated in 1.32, have been removed.
 
 === Deprecations in 1.34 ===
 * The MWNamespace class is deprecated. Use MediaWikiServices::getNamespaceInfo.
diff --git a/autoload.php b/autoload.php
index 14bdca264a..4aaf7b5a8f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1691,9 +1691,6 @@ $wgAutoloadLocalClasses = [
 	'WrapOldPasswords' => __DIR__ . '/maintenance/wrapOldPasswords.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',
-	'XMPValidate' => __DIR__ . '/includes/compat/XMPReader.php',
 	'Xhprof' => __DIR__ . '/includes/libs/Xhprof.php',
 	'XhprofData' => __DIR__ . '/includes/libs/XhprofData.php',
 	'Xml' => __DIR__ . '/includes/Xml.php',
diff --git a/includes/compat/XMPReader.php b/includes/compat/XMPReader.php
deleted file mode 100644
index 5854842784..0000000000
--- a/includes/compat/XMPReader.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Back-compat for pre-librarized XMP classes
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-use Wikimedia\XMPReader\Info;
-use Wikimedia\XMPReader\Reader;
-use Wikimedia\XMPReader\Validate;
-
-/**
- * @deprecated since 1.32
- */
-class XMPInfo extends Info {
-}
-
-/**
- * @deprecated since 1.32
- */
-class XMPReader extends Reader {
-}
-
-/**
- * @deprecated since 1.32
- */
-class XMPValidate extends Validate {
-}
-- 
2.20.1