From ec28fcb09e709015eaefe01ec2a43d88e95a6880 Mon Sep 17 00:00:00 2001 From: mainframe98 Date: Wed, 19 Jul 2023 09:22:29 +0200 Subject: [PATCH] tests: Prevent leaking $_SERVER in RequestFromGlobalsTest These tests modified $_SERVER, but did not restore it afterwards, which caused trouble for MediaWikiTest. Bug: T342192 Change-Id: If8084381b91f2a79fdaaf6d96dbf5fe625410297 --- .../phpunit/includes/Rest/RequestFromGlobalsTest.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/phpunit/includes/Rest/RequestFromGlobalsTest.php b/tests/phpunit/includes/Rest/RequestFromGlobalsTest.php index 2106551d7dc..351387bed07 100644 --- a/tests/phpunit/includes/Rest/RequestFromGlobalsTest.php +++ b/tests/phpunit/includes/Rest/RequestFromGlobalsTest.php @@ -14,9 +14,21 @@ class RequestFromGlobalsTest extends MediaWikiIntegrationTestCase { */ private $reqFromGlobals; + /** + * @var array + */ + private $oldServer; + protected function setUp(): void { parent::setUp(); $this->reqFromGlobals = new RequestFromGlobals(); + + $this->oldServer = $_SERVER; + } + + protected function tearDown(): void { + $_SERVER = $this->oldServer; + parent::tearDown(); } /**