Remove unused param (#18398)

kamil-tekiela · web-flow · commit 94eee89a60a2 · 2023-05-12T13:49:28.000-03:00
* Update phpstan-baseline.neon

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;

* Removed unused param

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;

* Narrow return type

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;

---------

Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/libraries/classes/Controllers/Export/ExportController.php b/libraries/classes/Controllers/Export/ExportController.php
@@ -429,7 +429,6 @@ public function __invoke(ServerRequest $request): void
                     $GLOBALS['errorUrl'],
                     $GLOBALS['db'],
                     $GLOBALS['sql_query'],
-                    $GLOBALS['export_type'],
                 );
             } else {
                 // We export just one table
diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php
@@ -752,7 +752,7 @@ public function exportDatabase(
                 && ! $isView
             ) {
                 $tableObj = new Table($table, $db->getName(), $this->dbi);
-                $nonGeneratedCols = $tableObj->getNonGeneratedColumns(true);
+                $nonGeneratedCols = $tableObj->getNonGeneratedColumns();
 
                 $localQuery = 'SELECT ' . implode(', ', $nonGeneratedCols)
                     . ' FROM ' . Util::backquote($db->getName())
@@ -879,15 +879,13 @@ public function exportDatabase(
      * @param string       $errorUrl        the URL in case of error
      * @param string|null  $db              the database where the query is executed
      * @param string       $sqlQuery        the query to be executed
-     * @param string       $exportType      the export type
      */
     public static function exportRaw(
         string $whatStrucOrData,
         ExportPlugin $exportPlugin,
         string $errorUrl,
         string|null $db,
         string $sqlQuery,
-        string $exportType,
     ): void {
         // In case the we need to dump just the raw query
         if ($whatStrucOrData !== 'raw') {
@@ -1013,7 +1011,7 @@ public function exportTable(
             } else {
                 // Data is exported only for Non-generated columns
                 $tableObj = new Table($table, $db, $this->dbi);
-                $nonGeneratedCols = $tableObj->getNonGeneratedColumns(true);
+                $nonGeneratedCols = $tableObj->getNonGeneratedColumns();
 
                 $localQuery = 'SELECT ' . implode(', ', $nonGeneratedCols)
                     . ' FROM ' . Util::backquote($db)
@@ -1159,10 +1157,8 @@ public function mergeAliases(array $aliases1, array $aliases2): array
      * @param DatabaseName $db       database name
      * @param mixed[]      $tables   list of table names
      * @param string       $lockType lock type; "[LOW_PRIORITY] WRITE" or "READ [LOCAL]"
-     *
-     * @return mixed result of the query
      */
-    public function lockTables(DatabaseName $db, array $tables, string $lockType = 'WRITE'): mixed
+    public function lockTables(DatabaseName $db, array $tables, string $lockType = 'WRITE'): void
     {
         $locks = [];
         foreach ($tables as $table) {
@@ -1172,17 +1168,15 @@ public function lockTables(DatabaseName $db, array $tables, string $lockType = '
 
         $sql = 'LOCK TABLES ' . implode(', ', $locks);
 
-        return $this->dbi->tryQuery($sql);
+        $this->dbi->tryQuery($sql);
     }
 
     /**
      * Releases table locks
-     *
-     * @return mixed result of the query
      */
-    public function unlockTables(): mixed
+    public function unlockTables(): void
     {
-        return $this->dbi->tryQuery('UNLOCK TABLES');
+        $this->dbi->tryQuery('UNLOCK TABLES');
     }
 
     /**
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -6680,13 +6680,6 @@
     <PossiblyNullArgument>
       <code><![CDATA[$GLOBALS['file_handle']]]></code>
     </PossiblyNullArgument>
-    <PossiblyUnusedParam>
-      <code>$exportType</code>
-    </PossiblyUnusedParam>
-    <PossiblyUnusedReturnValue>
-      <code>mixed</code>
-      <code>mixed</code>
-    </PossiblyUnusedReturnValue>
     <RedundantCondition>
       <code>mb_strtolower($userExtension) !== $requiredExtension</code>
       <code>mb_strtolower($userExtension) !== $requiredExtension</code>
