Visitar URL original
Merge branch 'QA_5_2' · phpmyadmin/phpmyadmin@47f1d67 · GitHub
Skip to content

Commit 47f1d67

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents 687d4db + 7ec4ea0 commit 47f1d67

5 files changed

Lines changed: 15 additions & 5 deletions

File tree

‎test/bootstrap-dist.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
// phpcs:enable
99
}
1010

11+
if (! defined('TEST_PATH')) {
12+
// This is used at Debian because tests
13+
// can be in a different place than the source code
14+
// phpcs:disable PSR1.Files.SideEffects
15+
define('TEST_PATH', ROOT_PATH);
16+
// phpcs:enable
17+
}
18+
1119
/**
1220
* Set precision to sane value, with higher values
1321
* things behave slightly unexpectedly, for example

‎test/classes/ConfigTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,11 +933,11 @@ public function configPaths(): array
933933
{
934934
return [
935935
[
936-
ROOT_PATH . 'test/test_data/config.inc.php',
936+
TEST_PATH . 'test/test_data/config.inc.php',
937937
true,
938938
],
939939
[
940-
ROOT_PATH . 'test/test_data/config-nonexisting.inc.php',
940+
TEST_PATH . 'test/test_data/config-nonexisting.inc.php',
941941
false,
942942
],
943943
];

‎test/classes/CoreTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,7 @@ public function providerForTestPopulateRequestWithEncryptedQueryParamsWithInvali
949949
* @runInSeparateProcess
950950
* @preserveGlobalState disabled
951951
* @requires extension xdebug
952+
* @group ext-xdebug
952953
*/
953954
public function testDownloadHeader(): void
954955
{
@@ -975,6 +976,7 @@ public function testDownloadHeader(): void
975976
* @runInSeparateProcess
976977
* @preserveGlobalState disabled
977978
* @requires extension xdebug
979+
* @group ext-xdebug
978980
*/
979981
public function testDownloadHeader2(): void
980982
{

‎test/classes/FileListingTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testGetDirContent(): void
2828
{
2929
$this->assertFalse($this->fileListing->getDirContent('nonexistent directory'));
3030

31-
$fixturesDir = ROOT_PATH . 'test/classes/_data/file_listing';
31+
$fixturesDir = TEST_PATH . 'test/classes/_data/file_listing';
3232

3333
$dirContent = $this->fileListing->getDirContent($fixturesDir);
3434
if (is_bool($dirContent)) {
@@ -46,7 +46,7 @@ public function testGetDirContent(): void
4646

4747
public function testGetFileSelectOptions(): void
4848
{
49-
$fixturesDir = ROOT_PATH . 'test/classes/_data/file_listing';
49+
$fixturesDir = TEST_PATH . 'test/classes/_data/file_listing';
5050

5151
$this->assertFalse($this->fileListing->getFileSelectOptions('nonexistent directory'));
5252

‎test/classes/ThemeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function testCheckImgPathIncorrect(): void
7676
*/
7777
public function testCheckImgPathFull(): void
7878
{
79-
$this->object->setFsPath(ROOT_PATH . 'test/classes/_data/gen_version_info/');
79+
$this->object->setFsPath(TEST_PATH . 'test/classes/_data/gen_version_info/');
8080
$this->assertTrue($this->object->loadInfo());
8181
$this->assertEquals('Test Theme', $this->object->getName());
8282
$this->assertEquals('5.3', $this->object->getVersion());

0 commit comments

Comments
 (0)