Merge remote-tracking branch 'Joomla/5.2-dev' into 5.3-dev

Author: bembelimen

administrator/components/com_scheduler/src/Scheduler/Scheduler.php

@@ -336,7 +336,7 @@ public function fetchTaskRecords(array $filters, array $listConfig): array
      *
      * @return boolean  True if the user is authorized to run the task.
      *
-     * @since __DEPLOY_VERSION__
+     * @since 5.2.4
      */
     public static function isAuthorizedToRun(object $taskRecord, User $user): bool
     {

components/com_finder/src/Service/Router.php

@@ -52,7 +52,7 @@ public function __construct(SiteApplication $app, AbstractMenu $menu)
      *
      * @return  array  Array of URL segments
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.2.4
      */
     public function build(&$query)
     {

plugins/system/jooa11y/src/Extension/Jooa11y.php

@@ -124,7 +124,7 @@ static function (SetCachingEvent $event) {
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.2.4
      */
     public function addJooa11y(BeforeCompileHeadEvent $event)
     {

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();
     }