Add ChangeLog entry for #16304

> Add support for INET6 column type Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Aug 15, 2020 · 37beb12 · 37beb12
1 parent 5931d5a
commit 37beb12
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog
 - issue #16139 Use a textarea for JSON columns
 - issue #16223 Make JSON input transformation editor less narrow
 - issue #14340 Add a button on Export Page to show the SQL Query
+- issue #16304 Add support for INET6 column type
 
 5.0.3 (not yet released)
 - issue #15983 Require twig ^2.9

diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php
@@ -9,6 +9,7 @@
 
 use function array_diff;
 use function array_merge;
+use function array_push;
 use function htmlspecialchars;
 use function in_array;
 use function mb_strtoupper;
@@ -394,8 +395,7 @@ public function getTypeDescription($type)
             case 'INET6':
                 return __('Intended for storage of IPv6 addresses, as well as IPv4 '
                     . 'addresses assuming conventional mapping of IPv4 addresses '
-                    . 'into IPv6 addresses'
-                );
+                    . 'into IPv6 addresses');
         }
 
         return '';

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -2725,6 +2725,11 @@ parameters:
 			count: 3
 			path: libraries/classes/Twig/I18n/NodeTrans.php
 
+		-
+			message: "#^Parameter \\#1 \\$stack of function array_push expects array, array\\<int, string\\>\\|string given\\.$#"
+			count: 1
+			path: libraries/classes/Types.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Types\\:\\:getColumns\\(\\) should return array\\<string\\> but returns array\\<int\\|string, array\\<int, string\\>\\|string\\>\\.$#"
 			count: 1

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -2389,6 +2389,9 @@
     <InvalidReturnType occurrences="1">
       <code>string[]</code>
     </InvalidReturnType>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$ret[_pgettext('string types', 'String')]</code>
+    </PossiblyInvalidArgument>
   </file>
   <file src="libraries/classes/Util.php">
     <EmptyArrayAccess occurrences="1">