Remove unusued parameter $crlf

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
phpmyadmin · Dec 1, 2021 · a53f6cc · a53f6cc
1 parent c3223a9
commit a53f6cc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
@@ -1873,7 +1873,6 @@ public function getTableDef(
      *
      * @param string $db         database name
      * @param string $table      table name
-     * @param string $crlf       end of line sequence
      * @param bool   $doRelation whether to include relation comments
      * @param bool   $doMime     whether to include mime comments
      * @param array  $aliases    Aliases of db/table/columns
@@ -1883,7 +1882,6 @@ public function getTableDef(
     private function getTableComments(
         $db,
         $table,
-        $crlf,
         $doRelation = false,
         $doMime = false,
         array $aliases = []
@@ -2084,7 +2082,7 @@ public function exportStructure(
                 );
                 $dump .= $this->exportComment();
                 $dump .= $this->getTableDef($db, $table, $crlf, $errorUrl, $dates, true, false, true, $aliases);
-                $dump .= $this->getTableComments($db, $table, $crlf, $relation, $mime, $aliases);
+                $dump .= $this->getTableComments($db, $table, $relation, $mime, $aliases);
                 break;
             case 'triggers':
                 $dump = '';

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -10483,9 +10483,6 @@
     <UnusedForeachValue occurrences="1">
       <code>$name</code>
     </UnusedForeachValue>
-    <UnusedParam occurrences="1">
-      <code>$crlf</code>
-    </UnusedParam>
     <UnusedVariable occurrences="2">
       <code>$autoIncrement</code>
       <code>$autoIncrement</code>

diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -995,7 +995,7 @@ public function testGetTableComments(): void
 
         $method = new ReflectionMethod(ExportSql::class, 'getTableComments');
         $method->setAccessible(true);
-        $result = $method->invoke($this->object, 'db', '', "\n", true, true);
+        $result = $method->invoke($this->object, 'db', '', true, true);
 
         $this->assertStringContainsString(
             "-- MEDIA TYPES FOR TABLE :\n" .