Skip to content

Commit f72491a

Browse files
williamdeswilliamdes
committed
Merge branch 'QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents 7c559aa + b78182d commit f72491a

9 files changed

Lines changed: 10 additions & 13 deletions

File tree

‎docs/import_export.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Sample output:
194194
195195
[
196196
{
197-
"comment": "Export to JSON plugin for PHPMyAdmin",
197+
"comment": "Export to JSON plugin for phpMyAdmin",
198198
"type": "header",
199199
"version": "4.7.0-dev"
200200
},

‎phpstan-baseline.neon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8847,7 +8847,7 @@ parameters:
88478847
-
88488848
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
88498849
identifier: empty.notAllowed
8850-
count: 2
8850+
count: 3
88518851
path: src/Partitioning/Partition.php
88528852

88538853
-

‎public/themes/bootstrap/scss/_codemirror.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ $textarea-rows: 15;
33

44
.CodeMirror {
55
height: 20rem;
6-
direction: ltr;
76
border: $card-border-width solid $card-border-color;
87
background-color: var(--#{$prefix}body-bg);
98
color: var(--#{$prefix}body-color);

‎public/themes/metro/scss/_codemirror.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $textarea-rows: 15 !default;
77
font-family: $font-family-monospace !important;
88
height: 20rem;
99
border: 1px solid #ccc;
10-
direction: ltr;
1110
}
1211

1312
// Code mirror default style (do not affect the console style)

‎public/themes/pmahomme/scss/_codemirror.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ $textarea-rows: 15;
33

44
.CodeMirror {
55
height: 20rem;
6-
direction: ltr;
76
}
87

98
// Code mirror default style (do not affect the console style)

‎src/Partitioning/Partition.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ public static function getPartitions(string $db, string $table): array
151151
if ($result !== []) {
152152
$partitionMap = [];
153153
foreach ($result as $row) {
154-
if (isset($partitionMap[$row['PARTITION_NAME']])) {
155-
$partition = $partitionMap[$row['PARTITION_NAME']];
156-
} else {
157-
$partition = new Partition($row);
158-
$partitionMap[$row['PARTITION_NAME']] = $partition;
154+
if (empty($row['PARTITION_NAME'])) {
155+
continue;
159156
}
160157

158+
$partition = $partitionMap[$row['PARTITION_NAME']] ?? new Partition($row);
159+
$partitionMap[$row['PARTITION_NAME']] = $partition;
160+
161161
if (empty($row['SUBPARTITION_NAME'])) {
162162
continue;
163163
}

‎src/Plugins/Export/ExportJson.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function exportHeader(): bool
110110
$data = $this->encode([
111111
'type' => 'header',
112112
'version' => Version::VERSION,
113-
'comment' => 'Export to JSON plugin for PHPMyAdmin',
113+
'comment' => 'Export to JSON plugin for phpMyAdmin',
114114
]);
115115
if ($data === false) {
116116
return false;

‎src/Plugins/Export/ExportPhparray.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function exportHeader(): bool
8181
$this->export->outputHandler(
8282
'<?php' . "\n"
8383
. '/**' . "\n"
84-
. ' * Export to PHP Array plugin for PHPMyAdmin' . "\n"
84+
. ' * Export to PHP Array plugin for phpMyAdmin' . "\n"
8585
. ' * @version ' . Version::VERSION . "\n"
8686
. ' */' . "\n\n",
8787
);

‎tests/unit/Plugins/Export/ExportJsonTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function testExportHeader(): void
120120
$this->expectOutputString(
121121
"[\n"
122122
. '{"type":"header","version":"' . Version::VERSION
123-
. '","comment":"Export to JSON plugin for PHPMyAdmin"},'
123+
. '","comment":"Export to JSON plugin for phpMyAdmin"},'
124124
. "\n",
125125
);
126126

0 commit comments

Comments
 (0)