From dad735ed09bb4cd686c9ef97b6238bae1876c043 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Sun, 14 Apr 2019 14:48:08 +0100
Subject: [PATCH] Remove ObjectFactory

Change-Id: Ibfdb55101c893a6724e1f999eba85f2f8eabb79b
---
 RELEASE-NOTES-1.34                |  1 +
 autoload.php                      |  1 -
 includes/compat/ObjectFactory.php | 27 ---------------------------
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 includes/compat/ObjectFactory.php

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index da765c3b27..635152b167 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -86,6 +86,7 @@ because of Phabricator reports.
 * The ill-defined "DatabaseOraclePostInit" hook has been removed.
 * PreferencesFormLegacy and PreferencesForm classes, deprecated in 1.32, have
   been removed.
+* ObjectFactory class, deprecated in 1.31, has been removed.
 
 === Deprecations in 1.34 ===
 * The MWNamespace class is deprecated. Use MediaWikiServices::getNamespaceInfo.
diff --git a/autoload.php b/autoload.php
index be4a1de25c..9bbb13f37a 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1037,7 +1037,6 @@ $wgAutoloadLocalClasses = [
 	'ORAField' => __DIR__ . '/includes/db/ORAField.php',
 	'ORAResult' => __DIR__ . '/includes/db/ORAResult.php',
 	'ObjectCache' => __DIR__ . '/includes/objectcache/ObjectCache.php',
-	'ObjectFactory' => __DIR__ . '/includes/compat/ObjectFactory.php',
 	'OldChangesList' => __DIR__ . '/includes/changes/OldChangesList.php',
 	'OldLocalFile' => __DIR__ . '/includes/filerepo/file/OldLocalFile.php',
 	'OldRevisionImporter' => __DIR__ . '/includes/import/OldRevisionImporter.php',
diff --git a/includes/compat/ObjectFactory.php b/includes/compat/ObjectFactory.php
deleted file mode 100644
index 7646238018..0000000000
--- a/includes/compat/ObjectFactory.php
+++ /dev/null
@@ -1,27 +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
- */
-
-/**
- * Construct objects from configuration instructions.
- *
- * @deprecated since 1.31, use \Wikimedia\ObjectFactory instead
- */
-class ObjectFactory extends \Wikimedia\ObjectFactory {
-}
-- 
2.20.1