diff --git a/tests/unit/AbstractTestCase.php b/tests/unit/AbstractTestCase.php index fd7d79546a..97636a86ba 100644 --- a/tests/unit/AbstractTestCase.php +++ b/tests/unit/AbstractTestCase.php @@ -20,7 +20,6 @@ use PhpMyAdmin\SqlParser\Translator; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tracking\Tracker; -use PhpMyAdmin\Utils\HttpRequest; use PHPUnit\Framework\TestCase; use ReflectionClass; use ReflectionProperty; @@ -106,11 +105,6 @@ abstract class AbstractTestCase extends TestCase Translator::load(); } - protected function setProxySettings(): void - { - HttpRequest::setProxySettingsFromEnv(); - } - /** * Call protected functions by setting visibility to public. * diff --git a/tests/unit/GitTest.php b/tests/unit/GitTest.php index 5fb33becd4..7ee9dc1963 100644 --- a/tests/unit/GitTest.php +++ b/tests/unit/GitTest.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Git; +use PhpMyAdmin\Utils\HttpRequest; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\Medium; @@ -36,7 +37,7 @@ class GitTest extends AbstractTestCase { parent::setUp(); - $this->setProxySettings(); + HttpRequest::setProxySettingsFromEnv(); $this->testDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'gittempdir_' . random_int(0, mt_getrandmax()) . DIRECTORY_SEPARATOR; diff --git a/tests/unit/Utils/HttpRequestTest.php b/tests/unit/Utils/HttpRequestTest.php index 7eafbd8e14..4fceae4695 100644 --- a/tests/unit/Utils/HttpRequestTest.php +++ b/tests/unit/Utils/HttpRequestTest.php @@ -31,7 +31,7 @@ class HttpRequestTest extends AbstractTestCase { parent::setUp(); - $this->setProxySettings(); + HttpRequest::setProxySettingsFromEnv(); DatabaseInterface::$instance = $this->createDatabaseInterface(); $this->httpRequest = new HttpRequest(); diff --git a/tests/unit/VersionInformationTest.php b/tests/unit/VersionInformationTest.php index 23feb0263f..e41742bbc8 100644 --- a/tests/unit/VersionInformationTest.php +++ b/tests/unit/VersionInformationTest.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\Release; +use PhpMyAdmin\Utils\HttpRequest; use PhpMyAdmin\VersionInformation; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; @@ -28,7 +29,7 @@ class VersionInformationTest extends AbstractTestCase { parent::setUp(); - $this->setProxySettings(); + HttpRequest::setProxySettingsFromEnv(); $this->releases = []; @@ -48,7 +49,7 @@ class VersionInformationTest extends AbstractTestCase #[Group('network')] public function testGetLatestVersion(): void { - $this->setProxySettings(); + HttpRequest::setProxySettingsFromEnv(); unset($_SESSION['cache']['version_check']); $versionInformation = new VersionInformation(); $version = $versionInformation->getLatestVersions();