Skip to content

Commit 2f04a0e

Browse files
MauricioFauthMauricioFauth
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents 8e7de77 + eee2349 commit 2f04a0e

12 files changed

Lines changed: 54 additions & 18 deletions

‎.github/workflows/daily-snapshots.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ jobs:
4040
coverage: none
4141

4242
- name: Set up Node ${{ matrix.node-version }}
43-
uses: actions/setup-node@v3
43+
uses: actions/setup-node@v4
4444
with:
4545
node-version: ${{ matrix.node-version }}
4646
cache: 'yarn'
4747

4848
- name: Set up Python ${{ matrix.python-version }}
49-
uses: actions/setup-python@v4
49+
uses: actions/setup-python@v5
5050
with:
5151
python-version: ${{ matrix.python-version }}
5252

@@ -78,7 +78,7 @@ jobs:
7878
continue-on-error: true
7979

8080
- name: Upload snapshots
81-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@v4
8282
with:
8383
name: phpMyAdmin-${{ matrix.version }}-snapshots
8484
path: release/*

‎.github/workflows/frontend-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@v4
2727

2828
- name: Set up Node
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: '16'
3232
cache: 'yarn'
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/checkout@v4
4646

4747
- name: Set up Node
48-
uses: actions/setup-node@v3
48+
uses: actions/setup-node@v4
4949
with:
5050
node-version: '16'
5151
cache: 'yarn'
@@ -64,7 +64,7 @@ jobs:
6464
uses: actions/checkout@v4
6565

6666
- name: Set up Node
67-
uses: actions/setup-node@v3
67+
uses: actions/setup-node@v4
6868
with:
6969
node-version: '16'
7070
cache: 'yarn'

‎.github/workflows/lint-and-analyse-php.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Cache coding-standard
4141
# Allow the previous check to fail but not abort
4242
if: always()
43-
uses: actions/cache@v3
43+
uses: actions/cache@v4
4444
with:
4545
path: .phpcs-cache
4646
key: phpcs-cache

‎.github/workflows/lock.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
issues: write # for dessant/lock-threads to lock issues
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: dessant/lock-threads@v2
16+
- uses: dessant/lock-threads@v5
1717
with:
1818
github-token: ${{ github.token }}
1919
process-only: 'issues'
20-
issue-lock-inactive-days: 365
20+
issue-inactive-days: 365

‎.github/workflows/other-tools.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v4
2020

2121
- name: Set up Python
22-
uses: actions/setup-python@v4
22+
uses: actions/setup-python@v5
2323
with:
2424
python-version: '3.7'
2525

@@ -52,13 +52,13 @@ jobs:
5252
uses: ramsey/composer-install@v2
5353

5454
- name: Set up Node
55-
uses: actions/setup-node@v3
55+
uses: actions/setup-node@v4
5656
with:
5757
node-version: '16'
5858
cache: 'yarn'
5959

6060
- name: Set up Python
61-
uses: actions/setup-python@v4
61+
uses: actions/setup-python@v5
6262
with:
6363
python-version: '3.7'
6464

‎.github/workflows/test-selenium.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
uses: ramsey/composer-install@v2
105105

106106
- name: Set up Node
107-
uses: actions/setup-node@v3
107+
uses: actions/setup-node@v4
108108
with:
109109
node-version: '16'
110110
cache: 'yarn'
@@ -149,7 +149,7 @@ jobs:
149149
./tests/stop-local-server
150150
151151
- name: Upload screenshots
152-
uses: actions/upload-artifact@v3
152+
uses: actions/upload-artifact@v4
153153
if: ${{ failure() }}
154154
with:
155155
name: selenium-screenshots

‎phpstan-baseline.neon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9357,7 +9357,7 @@ parameters:
93579357

93589358
-
93599359
message: "#^Parameter \\#1 \\$haystack of function str_contains expects string, mixed given\\.$#"
9360-
count: 1
9360+
count: 2
93619361
path: src/InsertEdit.php
93629362

93639363
-

‎psalm-baseline.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14216,6 +14216,7 @@
1421614216
<code>Config::getInstance()</code>
1421714217
<code>Config::getInstance()</code>
1421814218
<code>Config::getInstance()</code>
14219+
<code>Config::getInstance()</code>
1421914220
<code>DatabaseInterface::getInstance()</code>
1422014221
<code>DatabaseInterface::getInstance()</code>
1422114222
</DeprecatedMethod>

‎src/DatabaseInterface.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
use function __;
3232
use function array_column;
33+
use function array_combine;
3334
use function array_diff;
3435
use function array_keys;
3536
use function array_map;
@@ -577,11 +578,15 @@ static function (array $a, array $b): int {
577578
}
578579

579580
if ($sortValues !== []) {
581+
// See https://stackoverflow.com/a/32461188 for the explanation of below hack
582+
$keys = array_keys($eachTables);
580583
if ($sortOrder === 'DESC') {
581-
array_multisort($sortValues, SORT_DESC, $eachTables);
584+
array_multisort($sortValues, SORT_DESC, $eachTables, $keys);
582585
} else {
583-
array_multisort($sortValues, SORT_ASC, $eachTables);
586+
array_multisort($sortValues, SORT_ASC, $eachTables, $keys);
584587
}
588+
589+
$eachTables = array_combine($keys, $eachTables);
585590
}
586591

587592
// cleanup the temporary sort array

‎src/InsertEdit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ public function getGotoInclude(string|false $gotoInclude): string
883883
if (! preg_match('@^[a-z_]+\.php$@', $GLOBALS['goto'])) {
884884
// this should NOT happen
885885
//$GLOBALS['goto'] = false;
886-
$gotoInclude = $GLOBALS['goto'] === 'index.php?route=/sql' ? '/sql' : false;
886+
$gotoInclude = str_contains($GLOBALS['goto'], 'index.php?route=/sql') ? '/sql' : false;
887887
} else {
888888
$gotoInclude = $GLOBALS['goto'];
889889
}

0 commit comments

Comments
 (0)