Skip to content

Commit f448358

Browse files
MauricioFauthMauricioFauth
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents 16ba005 + 846381b commit f448358

4 files changed

Lines changed: 7 additions & 22 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
continue-on-error: ${{ matrix.experimental }}
6767
strategy:
6868
matrix:
69-
php-version: ["8.1", "8.2"]
69+
php-version: ["8.1", "8.2", "8.3"]
7070
experimental: [false]
7171
os: [ubuntu-latest]
7272
php-extensions: ['mbstring, iconv, mysqli, zip, gd, bz2']

‎libraries/classes/Table.php‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,8 +1396,9 @@ public function rename(string $newName, string|null $newDb = null): bool
13961396
RENAME TABLE ' . $this->getFullName(true) . '
13971397
TO ' . $newTable->getFullName(true) . ';';
13981398
// I don't think a specific error message for views is necessary
1399-
if (! $this->dbi->query($GLOBALS['sql_query'])) {
1400-
// TODO: this is dead code, should it be removed?
1399+
if ($this->dbi->tryQuery($GLOBALS['sql_query']) === false) {
1400+
$this->errors[] = $this->dbi->getError();
1401+
14011402
// Restore triggers in the old database
14021403
if ($handleTriggers) {
14031404
$this->dbi->selectDb($this->getDbName());
@@ -1406,12 +1407,6 @@ public function rename(string $newName, string|null $newDb = null): bool
14061407
}
14071408
}
14081409

1409-
$this->errors[] = sprintf(
1410-
__('Failed to rename table %1$s to %2$s!'),
1411-
$this->getFullName(),
1412-
$newTable->getFullName(),
1413-
);
1414-
14151410
return false;
14161411
}
14171412

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18515,11 +18515,6 @@ parameters:
1851518515
count: 1
1851618516
path: libraries/classes/Table.php
1851718517

18518-
-
18519-
message: "#^Negated boolean expression is always false\\.$#"
18520-
count: 1
18521-
path: libraries/classes/Table.php
18522-
1852318518
-
1852418519
message: "#^Only booleans are allowed in &&, int\\|false given on the right side\\.$#"
1852518520
count: 3
@@ -18530,11 +18525,6 @@ parameters:
1853018525
count: 2
1853118526
path: libraries/classes/Table.php
1853218527

18533-
-
18534-
message: "#^Only booleans are allowed in a negated boolean, PhpMyAdmin\\\\Dbal\\\\ResultInterface given\\.$#"
18535-
count: 1
18536-
path: libraries/classes/Table.php
18537-
1853818528
-
1853918529
message: "#^Only booleans are allowed in a negated boolean, PhpMyAdmin\\\\Dbal\\\\ResultInterface\\|false given\\.$#"
1854018530
count: 2

‎psalm-baseline.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11722,9 +11722,6 @@
1172211722
<ReferenceConstraintViolation>
1172311723
<code>return $sqlQuery;</code>
1172411724
</ReferenceConstraintViolation>
11725-
<TypeDoesNotContainType>
11726-
<code><![CDATA[! $this->dbi->query($GLOBALS['sql_query'])]]></code>
11727-
</TypeDoesNotContainType>
1172811725
<UnsupportedPropertyReferenceUsage>
1172911726
<code><![CDATA[$this->uiprefs =& $_SESSION['tmpval']['table_uiprefs'][$serverId][$this->dbName][$this->name]]]></code>
1173011727
</UnsupportedPropertyReferenceUsage>
@@ -15210,6 +15207,9 @@
1521015207
</PossiblyUnusedMethod>
1521115208
</file>
1521215209
<file src="test/selenium/TestBase.php">
15210+
<DeprecatedConstant>
15211+
<code>ChromeOptions::CAPABILITY_W3C</code>
15212+
</DeprecatedConstant>
1521315213
<DocblockTypeContradiction>
1521415214
<code><![CDATA['']]></code>
1521515215
<code><![CDATA['']]></code>

0 commit comments

Comments
 (0)