Merge "Remove TestingAccessWrapper class (now available via composer)"

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 42ae368..aa583b8 100644 (file)
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -38,7 +38,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 2a4c43f..3de3ba7 100644 (file)
--- 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 (file)
index 76a4266..0000000
--- 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 {
-}