phpmyadmin
diff --git a/‎libraries/classes/Plugins.php‎
Lines changed: 16 additions & 13 deletions b/‎libraries/classes/Plugins.php‎
Lines changed: 16 additions & 13 deletions
diff --git a/‎phpstan-baseline.neon‎
Lines changed: 0 additions & 15 deletions b/‎phpstan-baseline.neon‎
Lines changed: 0 additions & 15 deletions
@@ -83,8 +83,10 @@ public static function getPlugin(string $type, string $format, $param = null): ?
 
     /**
      * @param string $type server|database|table|raw
+     * @psalm-param 'server'|'database'|'table'|'raw' $type
      *
      * @return ExportPlugin[]
+     * @psalm-return list<ExportPlugin>
      */
     public static function getExport(string $type, bool $singleTable): array
     {
@@ -95,8 +97,10 @@ public static function getExport(string $type, bool $singleTable): array
 
     /**
      * @param string $type server|database|table
+     * @psalm-param 'server'|'database'|'table' $type
      *
      * @return ImportPlugin[]
+     * @psalm-return list<ImportPlugin>
      */
     public static function getImport(string $type): array
     {
@@ -107,6 +111,7 @@ public static function getImport(string $type): array
 
     /**
      * @return SchemaPlugin[]
+     * @psalm-return list<SchemaPlugin>
      */
     public static function getSchema(): array
     {
@@ -120,6 +125,11 @@ public static function getSchema(): array
      * @psalm-param 'Export'|'Import'|'Schema' $type
      *
      * @return Plugin[] list of plugin instances
+     * @psalm-return (
+     *   $type is 'Export'
+     *   ? list<ExportPlugin>
+     *   : ($type is 'Import' ? list<ImportPlugin> : list<SchemaPlugin>)
+     * )
      */
     private static function getPlugins(string $type): array
     {
@@ -146,24 +156,17 @@ private static function getPlugins(string $type): array
                 continue;
             }
 
-            if ($type === 'Export') {
-                /**
-                 * @psalm-suppress InvalidArrayOffset, MixedAssignment, MixedMethodCall
-                 */
-                $plugin = new $class(
+            if ($type === 'Export' && is_subclass_of($class, ExportPlugin::class)) {
+                $plugins[] = new $class(
                     $GLOBALS['containerBuilder']->get('relation'),
                     $GLOBALS['containerBuilder']->get('export'),
                     $GLOBALS['containerBuilder']->get('transformations')
                 );
-            } else {
-                $plugin = new $class();
+            } elseif ($type === 'Import' && is_subclass_of($class, ImportPlugin::class)) {
+                $plugins[] = new $class();
+            } elseif ($type === 'Schema' && is_subclass_of($class, SchemaPlugin::class)) {
+                $plugins[] = new $class();
             }
-
-            if (! ($plugin instanceof Plugin) || ! $plugin->isAvailable()) {
-                continue;
-            }
-
-            $plugins[] = $plugin;
         }
 
         usort($plugins, static function (Plugin $plugin1, Plugin $plugin2): int {
 
@@ -5470,21 +5470,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Plugins.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Plugins\\:\\:getExport\\(\\) should return array\\<PhpMyAdmin\\\\Plugins\\\\ExportPlugin\\> but returns array\\<PhpMyAdmin\\\\Plugins\\\\Plugin\\>\\.$#"
-			count: 1
-			path: libraries/classes/Plugins.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Plugins\\:\\:getImport\\(\\) should return array\\<PhpMyAdmin\\\\Plugins\\\\ImportPlugin\\> but returns array\\<PhpMyAdmin\\\\Plugins\\\\Plugin\\>\\.$#"
-			count: 1
-			path: libraries/classes/Plugins.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Plugins\\:\\:getSchema\\(\\) should return array\\<PhpMyAdmin\\\\Plugins\\\\SchemaPlugin\\> but returns array\\<PhpMyAdmin\\\\Plugins\\\\Plugin\\>\\.$#"
-			count: 1
-			path: libraries/classes/Plugins.php
-
 		-
 			message: "#^Parameter \\#2 \\$str2 of function strcmp expects string, class\\-string\\|false given\\.$#"
 			count: 1