@@ -3,6 +3,7 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .github export-ignore
+.phpstorm.meta.php export-ignore
 .scrutinizer.yml export-ignore
 .jshintrc export-ignore
 .stylelintrc.json export-ignore
 
@@ -0,0 +1,5 @@
+<?php
+
+namespace PHPSTORM_META {
+    override(\Psr\Container\ContainerInterface::get(0), map(['@']));
+}
@@ -99,7 +99,8 @@
             'arguments' => ['@http_request', '@relation', '@template', '@config'],
         ],
         'events' => ['class' => Events::class, 'arguments' => ['@dbi']],
-        'export' => ['class' => Export::class, 'arguments' => ['@dbi']],
+        Export::class => ['class' => Export::class, 'arguments' => ['@dbi']],
+        'export' => Export::class,
         'export_options' => [
             'class' => Options::class,
             'arguments' => ['@relation', '@export_template_model'],
@@ -239,7 +240,8 @@
             'arguments' => ['$dbi' => '@dbi'],
         ],
         AuthenticationPluginFactory::class => ['class' => AuthenticationPluginFactory::class],
-        'relation' => ['class' => Relation::class, 'arguments' => ['$dbi' => '@dbi', '$config' => '@config']],
+        Relation::class => ['class' => Relation::class, 'arguments' => ['$dbi' => '@dbi', '$config' => '@config']],
+        'relation' => Relation::class,
         'relation_cleanup' => ['class' => RelationCleanup::class, 'arguments' => ['@dbi', '@relation']],
         'replication' => ['class' => Replication::class, 'arguments' => ['$dbi' => '@dbi']],
         'replication_gui' => [
@@ -293,7 +295,8 @@
         ],
         'table_maintenance' => ['class' => PhpMyAdmin\Table\Maintenance::class, 'arguments' => ['$dbi' => '@dbi']],
         'table_search' => ['class' => Search::class, 'arguments' => ['$dbi' => '@dbi']],
-        'template' => ['class' => Template::class, 'arguments' => ['$config' => '@config']],
+        Template::class => ['class' => Template::class, 'arguments' => ['$config' => '@config']],
+        'template' => Template::class,
         ThemeManager::class => ['class' => ThemeManager::class],
         'tracking' => [
             'class' => Tracking::class,
@@ -309,8 +312,8 @@
             'class' => TrackingChecker::class,
             'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation'],
         ],
-        'transformations' => ['class' => Transformations::class, 'arguments' => ['@dbi', '@relation']],
-        Transformations::class => 'transformations',
+        Transformations::class => ['class' => Transformations::class, 'arguments' => ['@dbi', '@relation']],
+        'transformations' => Transformations::class,
         'triggers' => ['class' => Triggers::class, 'arguments' => ['@dbi']],
         'user_password' => [
             'class' => UserPassword::class,
 
@@ -13,6 +13,7 @@ parameters:
     bootstrapFiles:
         - tests/phpstan-constants.php
     stubFiles:
+        - tests/stubs/psr.stub
         - tests/stubs/uploadprogress.stub
     excludePaths:
         - app/cache/*
 
@@ -34,6 +34,7 @@
     </projectFiles>
 
     <stubs>
+        <file name="tests/stubs/psr.stub"/>
         <file name="tests/stubs/uploadprogress.stub"/>
     </stubs>
 
 
@@ -51,7 +51,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
 
-use function assert;
 use function sprintf;
 
 readonly class Application
@@ -62,10 +61,7 @@ public function __construct(private ResponseFactory $responseFactory)
 
     public static function init(): self
     {
-        $application = ContainerBuilder::getContainer()->get(self::class);
-        assert($application instanceof self);
-
-        return $application;
+        return ContainerBuilder::getContainer()->get(self::class);
     }
 
     public function run(bool $isSetupPage = false): void
 
@@ -289,7 +289,6 @@ public function __invoke(ServerRequest $request): Response
                     Current::$message = Message::error(
                         __('No tables found in database.'),
                     );
-                    /** @var DatabaseExportController $controller */
                     $controller = ContainerBuilder::getContainer()->get(DatabaseExportController::class);
 
                     return $controller($request);
 
@@ -159,7 +159,6 @@ public function __invoke(ServerRequest $request): Response
                 return $this->response->response();
             }
 
-            /** @var StructureController $controller */
             $controller = ContainerBuilder::getContainer()->get(StructureController::class);
 
             return $controller($request);
 
@@ -219,7 +219,6 @@ private function setSuccessResponse(array $view, bool $ajaxdialog, ServerRequest
 
         if ($ajaxdialog) {
             Current::$message = Message::success();
-            /** @var StructureController $controller */
             $controller = ContainerBuilder::getContainer()->get(StructureController::class);
 
             return $controller($request);
 
@@ -1117,7 +1117,6 @@ private function getFullOrPartialTextButtonOrLink(): string
             $urlParamsFullText['pftext'] = self::DISPLAY_FULL_TEXT;
         }
 
-        /** @var ThemeManager $themeManager */
         $themeManager = ContainerBuilder::getContainer()->get(ThemeManager::class);
 
         $tmpImage = '<img class="fulltext" src="'
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<?php
++
 +namespace PHPSTORM_META {
 +    override(\Psr\Container\ContainerInterface::get(0), map(['@']));
 +}
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,6 @@ public function __invoke(ServerRequest $request): Response`
`159`	`159`	`return $this->response->response();`
`160`	`160`	`}`
`161`	`161`
`162`		`- /** @var StructureController $controller */`
`163`	`162`	`$controller = ContainerBuilder::getContainer()->get(StructureController::class);`
`164`	`163`
`165`	`164`	`return $controller($request);`
Original file line number	Diff line number	Diff line change
`@@ -1117,7 +1117,6 @@ private function getFullOrPartialTextButtonOrLink(): string`
`1117`	`1117`	`$urlParamsFullText['pftext'] = self::DISPLAY_FULL_TEXT;`
`1118`	`1118`	`}`
`1119`	`1119`
`1120`		`- /** @var ThemeManager $themeManager */`
`1121`	`1120`	`$themeManager = ContainerBuilder::getContainer()->get(ThemeManager::class);`
`1122`	`1121`
`1123`	`1122`	`$tmpImage = '<img class="fulltext" src="'`