From f4043aaeeb74d47f43aff9d7f49907170e1cff8b Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Fri, 25 May 2018 13:08:24 +0100
Subject: [PATCH] Remove non namespaced TimestampException

Change-Id: I6d5cc227cacc6a24e92002e589e439a3bbd033a7
---
 RELEASE-NOTES-1.32            |  2 ++
 composer.json                 |  5 +----
 includes/compat/Timestamp.php | 18 ------------------
 3 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 includes/compat/Timestamp.php

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 1d185efec6..146bcc6e73 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -111,6 +111,8 @@ because of Phabricator reports.
   style URLs in OutputPage, deprecated in 1.31, was removed.
 * The hooks 'PreferencesFormPreSave' and 'PreferencesGetLegend' may provide
   any HTMLForm object rather than PreferencesForm.
+* The non namespaced TimestampException class, deprecated in 1.29, was removed.
+  Use Wikimedia\Timestamp\TimestampException instead.
 
 === Deprecations in 1.32 ===
 * Use of a StartProfiler.php file is deprecated in favour of placing
diff --git a/composer.json b/composer.json
index d32a207538..ce137d1971 100644
--- a/composer.json
+++ b/composer.json
@@ -83,10 +83,7 @@
 		"psr-0": {
 			"ComposerHookHandler": "includes/composer",
 			"ComposerVendorHtaccessCreator": "includes/composer"
-		},
-		"files": [
-			"includes/compat/Timestamp.php"
-		]
+		}
 	},
 	"autoload-dev": {
 		"files": [
diff --git a/includes/compat/Timestamp.php b/includes/compat/Timestamp.php
deleted file mode 100644
index 63b87ae12b..0000000000
--- a/includes/compat/Timestamp.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-// This file is loaded by composer.json#autoload.files instead of autoload.php,
-// because PHP's class loader does not support autoloading an alias for a class that
-// isn't already loaded. See also AutoLoaderTest and ClassCollector.
-
-// By using an autoload file, this will trigger directly at runtime outside any class
-// loading context. This file will then register the alias and, as class_alias() does
-// by default, it will trigger a plain autoload for the destination class.
-
-// The below uses a namespaced class reference, to to avoid being seen by ClassCollector,
-// which would otherwise add it to autoload.php, after which AutoLoaderTest will
-// complain about class_alias() not being in the target class file.
-
-/**
- * @deprecated since 1.29
- * @since 1.20
- */
-class_alias( Wikimedia\Timestamp\TimestampException::class, 'TimestampException' );
-- 
2.20.1