Merge pull request #19859 from civicrm/5.36

5.36

diff --cc ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php
index e80108d7074131a56c8f4b28474af29b934bdf5d,20055f6d367cd5e8807c43727d591c8be892d3d5..0db6f7d44b0c31eba497dd60ada0d48500522a81
--- 1/ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php
--- 2/ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php
+++ b/ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php
@@@ -60,9 -60,11 +60,11 @@@ class AllFlowsTest extends \PHPUnit\Fra
          $this->settingsBackup[$setting] = \Civi::settings()->get($setting);
        }
      }
+ 
+     \Civi::settings()->set('authx_guards', []);
    }
  
 -  public function tearDown() {
 +  public function tearDown(): void {
      foreach ($this->settingsBackup as $setting => $value) {
        \Civi::settings()->set($setting, $value);
      }