Merge branch '5.2-dev' of github.com:joomla/joomla-cms into 5.2-dev

Author: Hackwar

tests/Unit/Libraries/Cms/Environment/BrowserTest.php

@@ -17,20 +17,11 @@
  * Test class for JBrowser.
  *
  * @since   4.0.0
+ *
+ * @backupGlobals enabled
  */
 class BrowserTest extends UnitTestCase
 {
-    /**
-     * Backup of the SERVER superglobal
-     *
-     * @var  array
-     *
-     * @return  void
-     *
-     * @since   4.0.0
-     */
-    protected $backupServer;
-
     /**
      * Object being tested
      *

tests/Unit/Libraries/Cms/Uri/UriTest.php

@@ -19,6 +19,8 @@
  * @package     Joomla.UnitTest
  * @subpackage  Uri
  * @since       1.7.0
+ *
+ * @backupGlobals enabled
  */
 class UriTest extends UnitTestCase
 {
@@ -27,14 +29,6 @@ class UriTest extends UnitTestCase
      */
     protected $object;
 
-    /**
-     * Backup of the SERVER superglobal
-     *
-     * @var    array
-     * @since  3.6
-     */
-    protected $backupServer;
-
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
@@ -46,7 +40,6 @@ class UriTest extends UnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->backupServer = $_SERVER;
         Uri::reset();
 
         $_SERVER['HTTP_HOST']   = 'www.example.com:80';
@@ -68,8 +61,6 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
-        $_SERVER = $this->backupServer;
-        unset($this->backupServer);
         unset($this->object);
         parent::tearDown();
     }