Visitar URL original
Merge branch 'QA_5_2' · phpmyadmin/phpmyadmin@51aab42 · GitHub
Skip to content

Commit 51aab42

Browse files
MauricioFauthMauricioFauth
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents 4758711 + a9bbce6 commit 51aab42

3 files changed

Lines changed: 32 additions & 25 deletions

File tree

‎ChangeLog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog
5757
- issue #17420 Fix profiling chart not loading when profiling is activated
5858
- issue #18159 Fix error when changing the number of chart columns in the monitor page
5959
- issue #18403 Fix Uncaught SyntaxError: JSON.parse on makegrid conditions
60+
- issue #17528 Fix double escaping of database group names in the navigation tree
6061

6162
5.2.1 (2023-02-07)
6263
- issue #17522 Fix case where the routes cache file is invalid

‎libraries/classes/Navigation/NavigationTree.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -801,11 +801,7 @@ public function groupNode(Node $node): void
801801
$node->addChild($newChild['node']);
802802
}
803803
} else {
804-
$groups[$key] = new Node(
805-
htmlspecialchars((string) $key),
806-
Node::CONTAINER,
807-
true,
808-
);
804+
$groups[$key] = new Node((string) $key, Node::CONTAINER, true);
809805
$groups[$key]->separator = $node->separator;
810806
$groups[$key]->separatorDepth = $node->separatorDepth - 1;
811807
$groups[$key]->icon = ['image' => 'b_group', 'title' => __('Groups')];

‎phpstan-baseline.neon‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,16 @@ parameters:
240240
count: 1
241241
path: libraries/classes/Config/ConfigFile.php
242242

243+
-
244+
message: "#^Class PhpMyAdmin\\\\Config\\\\Form has an uninitialized property \\$default\\. Give it default value or assign it in the constructor\\.$#"
245+
count: 1
246+
path: libraries/classes/Config/Form.php
247+
248+
-
249+
message: "#^Class PhpMyAdmin\\\\Config\\\\Form has an uninitialized property \\$fieldsTypes\\. Give it default value or assign it in the constructor\\.$#"
250+
count: 1
251+
path: libraries/classes/Config/Form.php
252+
243253
-
244254
message: "#^Empty array passed to foreach\\.$#"
245255
count: 1
@@ -3815,6 +3825,11 @@ parameters:
38153825
count: 10
38163826
path: libraries/classes/File.php
38173827

3828+
-
3829+
message: "#^Class PhpMyAdmin\\\\File has an uninitialized property \\$zipExtension\\. Give it default value or assign it in the constructor\\.$#"
3830+
count: 1
3831+
path: libraries/classes/File.php
3832+
38183833
-
38193834
message: "#^Method PhpMyAdmin\\\\File\\:\\:getCompression\\(\\) should return string but returns string\\|false\\.$#"
38203835
count: 1
@@ -4280,6 +4295,11 @@ parameters:
42804295
count: 1
42814296
path: libraries/classes/Git.php
42824297

4298+
-
4299+
message: "#^Class PhpMyAdmin\\\\Header has an uninitialized property \\$menu\\. Give it default value or assign it in the constructor\\.$#"
4300+
count: 1
4301+
path: libraries/classes/Header.php
4302+
42834303
-
42844304
message: "#^Parameter \\#1 \\$params of static method PhpMyAdmin\\\\Url\\:\\:getCommon\\(\\) expects array\\<string, bool\\|int\\|string\\>, array\\<int\\|string, mixed\\> given\\.$#"
42854305
count: 2
@@ -4580,21 +4600,11 @@ parameters:
45804600
count: 1
45814601
path: libraries/classes/InsertEdit.php
45824602

4583-
-
4584-
message: "#^Property PhpMyAdmin\\\\InsertEditColumn\\:\\:\\$pmaType \\(string\\) does not accept string\\|null\\.$#"
4585-
count: 1
4586-
path: libraries/classes/InsertEditColumn.php
4587-
45884603
-
45894604
message: "#^Property PhpMyAdmin\\\\InsertEditColumn\\:\\:\\$trueType \\(string\\) does not accept string\\|null\\.$#"
45904605
count: 1
45914606
path: libraries/classes/InsertEditColumn.php
45924607

4593-
-
4594-
message: "#^Readonly property PhpMyAdmin\\\\InsertEditColumn\\:\\:\\$default is already assigned\\.$#"
4595-
count: 1
4596-
path: libraries/classes/InsertEditColumn.php
4597-
45984608
-
45994609
message: "#^Binary operation \"\\-\" between string and 1 results in an error\\.$#"
46004610
count: 1
@@ -7395,16 +7405,6 @@ parameters:
73957405
count: 1
73967406
path: libraries/classes/Server/Privileges.php
73977407

7398-
-
7399-
message: "#^Access to an uninitialized property PhpMyAdmin\\\\Server\\\\Status\\\\Data\\:\\:\\$config\\.$#"
7400-
count: 1
7401-
path: libraries/classes/Server/Status/Data.php
7402-
7403-
-
7404-
message: "#^Access to an uninitialized property PhpMyAdmin\\\\Server\\\\Status\\\\Data\\:\\:\\$replicationInfo\\.$#"
7405-
count: 2
7406-
path: libraries/classes/Server/Status/Data.php
7407-
74087408
-
74097409
message: "#^Cannot access offset 'Com_admin_commands' on mixed\\.$#"
74107410
count: 1
@@ -8735,6 +8735,11 @@ parameters:
87358735
count: 1
87368736
path: test/classes/Charsets/CollationTest.php
87378737

8738+
-
8739+
message: "#^Class PhpMyAdmin\\\\Tests\\\\Command\\\\SetVersionCommandTest has an uninitialized property \\$command\\. Give it default value or assign it in the constructor\\.$#"
8740+
count: 1
8741+
path: test/classes/Command/SetVersionCommandTest.php
8742+
87388743
-
87398744
message: "#^Missing call to parent\\:\\:setUp\\(\\) method\\.$#"
87408745
count: 1
@@ -9505,6 +9510,11 @@ parameters:
95059510
count: 2
95069511
path: test/selenium/TestBase.php
95079512

9513+
-
9514+
message: "#^Class PhpMyAdmin\\\\Tests\\\\Selenium\\\\TestBase has an uninitialized property \\$sessionId\\. Give it default value or assign it in the constructor\\.$#"
9515+
count: 1
9516+
path: test/selenium/TestBase.php
9517+
95089518
-
95099519
message: "#^Strict comparison using \\!\\=\\= between Facebook\\\\WebDriver\\\\Remote\\\\RemoteWebDriver and null will always evaluate to true\\.$#"
95109520
count: 1

0 commit comments

Comments
 (0)