From 7ed4c5e6b7fcada7ccec037389a1e4c07fa94d3c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gerg=C5=91=20Tisza?= <tgr.huwiki@gmail.com>
Date: Thu, 20 Apr 2017 14:34:28 +0200
Subject: [PATCH] Remove TestingAccessWrapper class (now available via
 composer)

If your extension depended on this, replace \TestingAccessWrapper
with \Wikimedia\TestingAccessWrapper.

Bug: T163434
Change-Id: Ice1e8aae258b4c6ae7ab1b2a4815fe682335cc3a
---
 RELEASE-NOTES-1.30                              |  3 ++-
 tests/common/TestsAutoLoader.php                |  3 +--
 tests/phpunit/includes/TestingAccessWrapper.php | 11 -----------
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 tests/phpunit/includes/TestingAccessWrapper.php

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index fffa109bb5..0c2621e00b 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -17,7 +17,8 @@ production.
 * …
 
 ==== New external libraries ====
-* …
+* The class \TestingAccessWrapper has been moved to the external library
+  wikimedia/testing-access-wrapper and renamed \Wikimedia\TestingAccessWrapper.
 
 ==== Removed and replaced external libraries ====
 * …
diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index 2a4c43fffb..3de3ba7063 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -64,7 +64,6 @@ $wgAutoloadClasses += [
 
 	# tests/phpunit/includes
 	'RevisionStorageTest' => "$testDir/phpunit/includes/RevisionStorageTest.php",
-	'TestingAccessWrapper' => "$testDir/phpunit/includes/TestingAccessWrapper.php",
 	'TestLogger' => "$testDir/phpunit/includes/TestLogger.php",
 
 	# tests/phpunit/includes/api
@@ -171,4 +170,4 @@ $wgAutoloadClasses += [
 	'ParserTestFileSuite' => "$testDir/phpunit/suites/ParserTestFileSuite.php",
 	'ParserTestTopLevelSuite' => "$testDir/phpunit/suites/ParserTestTopLevelSuite.php",
 ];
-// @codingStandardsIgnoreEnd
\ No newline at end of file
+// @codingStandardsIgnoreEnd
diff --git a/tests/phpunit/includes/TestingAccessWrapper.php b/tests/phpunit/includes/TestingAccessWrapper.php
deleted file mode 100644
index 76a426692d..0000000000
--- a/tests/phpunit/includes/TestingAccessWrapper.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Circumvent access restrictions on object internals
- *
- * Kept around for backwards compatibility.
- *
- * @deprecated Use \Wikimedia\TestingAccessWrapper (proveded by the
- *   wikimedia/testing-access-wrapper Composer library)
- */
-class TestingAccessWrapper extends \Wikimedia\TestingAccessWrapper {
-}
-- 
2.20.1