Fix some failing tests

MauricioFauth · MauricioFauth · commit 41c1d2bed8c2 · 2023-08-08T21:53:00.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/test/classes/Config/PageSettingsTest.php b/test/classes/Config/PageSettingsTest.php
@@ -5,9 +5,12 @@
 namespace PhpMyAdmin\Tests\Config;
 
 use PhpMyAdmin\Config\PageSettings;
+use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\UserPreferences;
+use PHPUnit\Framework\Attributes\BackupStaticProperties;
 use PHPUnit\Framework\Attributes\CoversClass;
+use ReflectionProperty;
 
 #[CoversClass(PageSettings::class)]
 class PageSettingsTest extends AbstractTestCase
@@ -47,8 +50,11 @@ public function testShowGroupNonExistent(): void
     /**
      * Test showGroup with a known group name
      */
+    #[BackupStaticProperties(true)]
     public function testShowGroupBrowse(): void
     {
+        (new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, null);
+
         $object = new PageSettings(new UserPreferences($GLOBALS['dbi']));
         $object->init('Browse');
 
diff --git a/test/classes/Plugins/Auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
@@ -10,6 +10,7 @@
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseRendererStub;
+use PHPUnit\Framework\Attributes\BackupStaticProperties;
 use PHPUnit\Framework\Attributes\CoversClass;
 use ReflectionProperty;
 use Throwable;
@@ -55,8 +56,10 @@ protected function tearDown(): void
         unset($this->object);
     }
 
+    #[BackupStaticProperties(true)]
     public function testAuth(): void
     {
+        (new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, null);
         $GLOBALS['cfg']['Server']['SignonURL'] = '';
         $_REQUEST = [];
         ResponseRenderer::getInstance()->setAjax(false);
@@ -76,6 +79,7 @@ public function testAuth(): void
         $this->assertStringContainsString('You must set SignonURL!', $result);
     }
 
+    #[BackupStaticProperties(true)]
     public function testAuthLogoutURL(): void
     {
         $responseStub = new ResponseRendererStub();
@@ -91,6 +95,7 @@ public function testAuthLogoutURL(): void
         $this->assertSame(302, $response->getStatusCode());
     }
 
+    #[BackupStaticProperties(true)]
     public function testAuthLogout(): void
     {
         $responseStub = new ResponseRendererStub();
@@ -139,6 +144,7 @@ public function testAuthCheckSession(): void
         $this->assertEquals('https://example.com/SignonURL', $_SESSION['LAST_SIGNON_URL']);
     }
 
+    #[BackupStaticProperties(true)]
     public function testAuthCheckToken(): void
     {
         $_SESSION = [' PMA_token ' => 'eefefef'];

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`use PhpMyAdmin\ResponseRenderer;`
`11`	`11`	`use PhpMyAdmin\Tests\AbstractTestCase;`
`12`	`12`	`use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseRendererStub;`
	`13`	`+use PHPUnit\Framework\Attributes\BackupStaticProperties;`
`13`	`14`	`use PHPUnit\Framework\Attributes\CoversClass;`
`14`	`15`	`use ReflectionProperty;`
`15`	`16`	`use Throwable;`
`@@ -55,8 +56,10 @@ protected function tearDown(): void`
`55`	`56`	`unset($this->object);`
`56`	`57`	`}`
`57`	`58`
	`59`	`+ #[BackupStaticProperties(true)]`
`58`	`60`	`public function testAuth(): void`
`59`	`61`	`{`
	`62`	`+ (new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, null);`
`60`	`63`	`$GLOBALS['cfg']['Server']['SignonURL'] = '';`
`61`	`64`	`$_REQUEST = [];`
`62`	`65`	`ResponseRenderer::getInstance()->setAjax(false);`
`@@ -76,6 +79,7 @@ public function testAuth(): void`
`76`	`79`	`$this->assertStringContainsString('You must set SignonURL!', $result);`
`77`	`80`	`}`
`78`	`81`
	`82`	`+ #[BackupStaticProperties(true)]`
`79`	`83`	`public function testAuthLogoutURL(): void`
`80`	`84`	`{`
`81`	`85`	`$responseStub = new ResponseRendererStub();`
`@@ -91,6 +95,7 @@ public function testAuthLogoutURL(): void`
`91`	`95`	`$this->assertSame(302, $response->getStatusCode());`
`92`	`96`	`}`
`93`	`97`
	`98`	`+ #[BackupStaticProperties(true)]`
`94`	`99`	`public function testAuthLogout(): void`
`95`	`100`	`{`
`96`	`101`	`$responseStub = new ResponseRendererStub();`
`@@ -139,6 +144,7 @@ public function testAuthCheckSession(): void`
`139`	`144`	`$this->assertEquals('https://example.com/SignonURL', $_SESSION['LAST_SIGNON_URL']);`
`140`	`145`	`}`
`141`	`146`
	`147`	`+ #[BackupStaticProperties(true)]`
`142`	`148`	`public function testAuthCheckToken(): void`
`143`	`149`	`{`
`144`	`150`	`$_SESSION = [' PMA_token ' => 'eefefef'];`