Resolve Psalm errors

wp-oop · May 31, 2023 · 8f96fbc · 8f96fbc
1 parent e6ff140
commit 8f96fbc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/modules.local/core/inc/factories.php b/modules.local/core/inc/factories.php
@@ -22,7 +22,9 @@
             return $c->get('wordpress/plugin_factory');
         },
         'wordpress/plugin_factory' => function (ContainerInterface $c): FilePathPluginFactoryInterface {
-            return new FilePathPluginFactory($c->get('package/version_factory'));
+            $factory = $c->get('package/version_factory');
+            /** @var StringVersionFactoryInterface $factory */
+            return new FilePathPluginFactory($factory);
         },
         'me/plugin/version_factory' => function (ContainerInterface $c): StringVersionFactoryInterface {
             return $c->get('package/version_factory');

diff --git a/modules.local/core/module.php b/modules.local/core/module.php
@@ -8,10 +8,16 @@
     $rootDir = dirname($mainFile);
     $moduleDir = dirname(__FILE__);
     $moduleIncDir = "$moduleDir/inc";
+
     /** @psalm-suppress UnresolvableInclude */
     $factories = (require "$moduleIncDir/factories.php")($rootDir, $mainFile);
     /** @psalm-suppress UnresolvableInclude */
     $extensions = (require "$moduleIncDir/extensions.php")($rootDir, $mainFile);
+    /**
+     * @var array<array-key, callable> $factories
+     * @var array<array-key, callable> $extensions
+     */
+
     $provider = new ServiceProvider($factories, $extensions);
     $module = new Module($provider);
 

diff --git a/src/ModularModule.php b/src/ModularModule.php
@@ -36,6 +36,7 @@ public function setup(): ServiceProviderInterface
         foreach ($this->modules as $module) {
             $providers[] = $module->setup();
         }
+        /** @var list<ServiceProviderInterface> $providers */
 
         return new CompositeCachingServiceProvider($providers);
     }