diff --git a/libraries/config/PageSettings.php b/libraries/config/PageSettings.php
index 862cb29983..ff7784a69f 100644
--- a/libraries/config/PageSettings.php
+++ b/libraries/config/PageSettings.php
@@ -102,6 +102,8 @@ class PageSettings
      * @param FormDisplay  &$form_display Form
      * @param ConfigFile   &$cf           Configuration file
      * @param Message|null &$error        Error message
+     * @param FormDisplay $form_display
+     * @param ConfigFile $cf
      *
      * @return void
      */
diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php
index 1d2fd4515e..c5c29c796a 100644
--- a/libraries/controllers/table/TableStructureController.php
+++ b/libraries/controllers/table/TableStructureController.php
@@ -17,7 +17,6 @@ use PMA\libraries\Util;
 use PMA\Util as Util_lib;
 use SqlParser;
 use SqlParser\Statements\CreateStatement;
-use SqlParser\Utils\Table as SqlTable;
 use PMA\libraries\Table;
 use PMA\libraries\controllers\TableController;
 use PMA\libraries\URL;
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 431ca0a1c9..5f8643ef33 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -248,7 +248,7 @@ function PMA_getMemoryLimitForExport()
  * @param string       $compression       compression asked
  * @param string       $filename_template the filename template
  *
- * @return array the filename template and mime type
+ * @return string[] the filename template and mime type
  */
 function PMA_getExportFilenameAndMimetype(
     $export_type, $remember_template, $export_plugin, $compression,
@@ -366,7 +366,7 @@ function PMA_openExportFile($filename, $quick_export)
  * @param string   $dump_buffer   the current dump buffer
  * @param string   $save_filename the export filename
  *
- * @return object $message a message object (or empty string)
+ * @return Message $message a message object (or empty string)
  */
 function PMA_closeExportFile($file_handle, $dump_buffer, $save_filename)
 {
@@ -465,7 +465,7 @@ function PMA_saveObjectInBuffer($object_name, $append = false)
  * @param string $db          the database name
  * @param string $table       the table name
  *
- * @return array the generated HTML and back button
+ * @return string[] the generated HTML and back button
  */
 function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
 {
@@ -1021,7 +1021,7 @@ function PMA_unlockTables()
 /**
  * Returns all the metadata types that can be exported with a database or a table
  *
- * @return array metadata types.
+ * @return string[] metadata types.
  */
 function PMA_getMetadataTypesToExport()
 {
diff --git a/libraries/gis/GISPoint.php b/libraries/gis/GISPoint.php
index 7992e6c2ea..b92beb9899 100644
--- a/libraries/gis/GISPoint.php
+++ b/libraries/gis/GISPoint.php
@@ -75,7 +75,7 @@ class GISPoint extends GISGeometry
      * @param array    $scale_data  Array containing data related to scaling
      * @param resource $image       Image object
      *
-     * @return object the modified image object
+     * @return resource the modified image object
      * @access public
      */
     public function prepareRowAsPng(