From b2585a95b27fc196bcded4c146d1251d9d7740b9 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 6 Sep 2016 17:09:50 -0700
Subject: [PATCH] filecache: Remove unused ObjectFileCache class

This was originally intended for use by ResourceLoader but it was
incomplete and not actually used by ResourceLoader at first.

Then 93d358cd added support for FileCache to ResourceLoader with
a separate ResourceFileCache class.

Also fixed typo in HTMLFileCache from 6559b8bf.

ObjectFileCache is not mentioned anywhere else in Wikimedia Git.

Change-Id: I69cca27ee7cd922da12f1793660432709c273be6
---
 autoload.php                       |  1 -
 includes/cache/HTMLFileCache.php   |  6 ++--
 includes/cache/ObjectFileCache.php | 52 ------------------------------
 3 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 includes/cache/ObjectFileCache.php

diff --git a/autoload.php b/autoload.php
index 0c63ba5cd9..71f1809db9 100644
--- a/autoload.php
+++ b/autoload.php
@@ -981,7 +981,6 @@ $wgAutoloadLocalClasses = [
 	'ORAResult' => __DIR__ . '/includes/db/DatabaseOracle.php',
 	'ObjectCache' => __DIR__ . '/includes/objectcache/ObjectCache.php',
 	'ObjectFactory' => __DIR__ . '/includes/libs/ObjectFactory.php',
-	'ObjectFileCache' => __DIR__ . '/includes/cache/ObjectFileCache.php',
 	'OldChangesList' => __DIR__ . '/includes/changes/OldChangesList.php',
 	'OldLocalFile' => __DIR__ . '/includes/filerepo/file/OldLocalFile.php',
 	'OracleInstaller' => __DIR__ . '/includes/installer/OracleInstaller.php',
diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index ea2e20b1cd..1bab0f5a8e 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -30,13 +30,13 @@
  */
 class HTMLFileCache extends FileCacheBase {
 	/**
-	 * Construct an ObjectFileCache from a Title and an action
+	 * Construct an HTMLFileCache object from a Title and an action
+	 *
+	 * @deprecated since 1.24, instantiate this class directly
 	 * @param Title|string $title Title object or prefixed DB key string
 	 * @param string $action
 	 * @throws MWException
 	 * @return HTMLFileCache
-	 *
-	 * @deprecated Since 1.24, instantiate this class directly
 	 */
 	public static function newFromTitle( $title, $action ) {
 		return new self( $title, $action );
diff --git a/includes/cache/ObjectFileCache.php b/includes/cache/ObjectFileCache.php
deleted file mode 100644
index c7ef044380..0000000000
--- a/includes/cache/ObjectFileCache.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Object cache in the file system.
- *
- * 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
- * @ingroup Cache
- */
-
-/**
- * Object cache in the file system.
- *
- * @ingroup Cache
- */
-class ObjectFileCache extends FileCacheBase {
-	/**
-	 * Construct an ObjectFileCache from a key and a type
-	 * @param string $key
-	 * @param string $type
-	 * @return ObjectFileCache
-	 */
-	public static function newFromKey( $key, $type ) {
-		$cache = new self();
-
-		$cache->mKey = (string)$key;
-		$cache->mType = (string)$type;
-
-		return $cache;
-	}
-
-	/**
-	 * Get the base file cache directory
-	 * @return string
-	 */
-	protected function cacheDirectory() {
-		return $this->baseCacheDirectory() . '/object';
-	}
-}
-- 
2.20.1