diff --git a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php b/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
index 245c92c779f..80a002b6072 100644
--- a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
+++ b/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
@@ -2395,8 +2395,6 @@ public function getCustomTypeDeclarationSQL(array $columnDef)
      * declaration to be used in statements like CREATE TABLE.
      *
      * @param mixed[]|Index $columnsOrIndex array declaration is deprecated, prefer passing Index to this method
-     *
-     * @return string
      */
     public function getIndexFieldDeclarationListSQL($columnsOrIndex) : string
     {
@@ -2405,7 +2403,7 @@ public function getIndexFieldDeclarationListSQL($columnsOrIndex) : string
         }
 
         if (! is_array($columnsOrIndex)) {
-            throw new \InvalidArgumentException('Fields argument should be an Index or array.');
+            throw new InvalidArgumentException('Fields argument should be an Index or array.');
         }
 
         $ret = [];
@@ -3085,8 +3083,6 @@ public function supportsPartialIndexes()
 
     /**
      * Whether the platform supports indexes with column length definitions.
-     *
-     * @return bool
      */
     public function supportsColumnLengthIndexes() : bool
     {
diff --git a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
index 66c579cf9c7..e17d3736041 100644
--- a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
+++ b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
@@ -15,7 +15,6 @@
 use function array_diff_key;
 use function array_merge;
 use function array_unique;
-use function array_shift;
 use function array_values;
 use function count;
 use function func_get_args;
diff --git a/lib/Doctrine/DBAL/Schema/Index.php b/lib/Doctrine/DBAL/Schema/Index.php
index 66f0d2cfc97..bae6d218cb6 100644
--- a/lib/Doctrine/DBAL/Schema/Index.php
+++ b/lib/Doctrine/DBAL/Schema/Index.php
@@ -7,6 +7,7 @@
 use function array_keys;
 use function array_map;
 use function array_search;
+use function array_shift;
 use function count;
 use function is_string;
 use function strtolower;
diff --git a/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php b/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
index 186a837c884..d0f25cb6f79 100644
--- a/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
+++ b/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
@@ -68,6 +68,7 @@ protected function _getPortableTableIndexesList($tableIndexes, $tableName = null
                 $v['flags'] = ['SPATIAL'];
             }
             $v['length'] = $v['sub_part'] ?? null;
+
             $tableIndexes[$k] = $v;
         }