From 7f0486b18e77f2539317ac3fa4729c650beaeecc Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Mon, 21 Aug 2017 21:29:00 -0700
Subject: [PATCH] Remove Cdb compat class names

Deprecated since 1.25, and unused in Wikimedia Git.

Change-Id: I05bdefe2e2bf5ffcadb9846651af7367e8e7a814
---
 RELEASE-NOTES-1.30            |  2 ++
 autoload.php                  |  3 ---
 includes/compat/CdbCompat.php | 45 -----------------------------------
 3 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 includes/compat/CdbCompat.php

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index dd39561d22..2d50abb5df 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -171,6 +171,8 @@ changes to languages because of Phabricator reports.
 * Removed 'jquery.mwExtension' module. (deprecated since 1.26)
 * mediawiki.ui: Deprecate greys, which are not part of WikimediaUI color palette
   any more.
+* CdbReader, CdbWriter, CdbException classes (deprecated in 1.25) were removed.
+  The namespaced classes in the Cdb namespace should be used instead.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/autoload.php b/autoload.php
index d9e85bd39d..759a5014f9 100644
--- a/autoload.php
+++ b/autoload.php
@@ -226,9 +226,6 @@ $wgAutoloadLocalClasses = [
 	'CategoryPage' => __DIR__ . '/includes/page/CategoryPage.php',
 	'CategoryPager' => __DIR__ . '/includes/specials/pagers/CategoryPager.php',
 	'CategoryViewer' => __DIR__ . '/includes/CategoryViewer.php',
-	'CdbException' => __DIR__ . '/includes/compat/CdbCompat.php',
-	'CdbReader' => __DIR__ . '/includes/compat/CdbCompat.php',
-	'CdbWriter' => __DIR__ . '/includes/compat/CdbCompat.php',
 	'CdnCacheUpdate' => __DIR__ . '/includes/deferred/CdnCacheUpdate.php',
 	'CdnPurgeJob' => __DIR__ . '/includes/jobqueue/jobs/CdnPurgeJob.php',
 	'CentralIdLookup' => __DIR__ . '/includes/user/CentralIdLookup.php',
diff --git a/includes/compat/CdbCompat.php b/includes/compat/CdbCompat.php
deleted file mode 100644
index 0074cc96b0..0000000000
--- a/includes/compat/CdbCompat.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * 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.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- */
-
-/***
- * This file contains a set of backwards-compatability class names
- * after the cdb functions were moved out into a separate library
- * and put under a proper namespace
- *
- * @since 1.25
- */
-
-/**
- * @deprecated since 1.25
- */
-abstract class CdbReader extends \Cdb\Reader {
-}
-
-/**
- * @deprecated since 1.25
- */
-abstract class CdbWriter extends \Cdb\Writer {
-}
-
-/**
- * @deprecated since 1.25
- */
-class CdbException extends \Cdb\Exception {
-}
-- 
2.20.1