get() by alias actually returns a HelperInterface or a callable

Signed-off-by: George Steel <[email protected]>
laminas · Jul 19, 2022 · 696a4f0 · 696a4f0
1 parent 62dbaeb
commit 696a4f0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1594,7 +1594,7 @@
       <code>$container</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
-      <code>($name is class-string ? T : callable)</code>
+      <code>($name is class-string ? T : HelperInterface|callable)</code>
     </MixedInferredReturnType>
     <MixedMethodCall occurrences="8">
       <code>get</code>

diff --git a/src/HelperPluginManager.php b/src/HelperPluginManager.php
@@ -554,7 +554,7 @@ public function validatePlugin($instance)
      * @param class-string<T>|string $name Service name of plugin to retrieve.
      * @param null|array<mixed> $options Options to use when creating the instance.
      * @return HelperInterface|callable
-     * @psalm-return ($name is class-string ? T : callable)
+     * @psalm-return ($name is class-string ? T : HelperInterface|callable)
      */
     public function get($name, ?array $options = null)
     {

diff --git a/test/StaticAnalysis/PluginRetrieval.php b/test/StaticAnalysis/PluginRetrieval.php
@@ -23,12 +23,6 @@ public function retrieveHelperByClassName(string $email): string
         return ($this->pluginManager->get(GravatarImage::class))($email);
     }
 
-    public function retrievalByAliasAssumesCallable(): void
-    {
-        $helper = $this->pluginManager->get('something');
-        $helper();
-    }
-
     public function retrievalByClassNameInfersKnownMethods(): string
     {
         $helper = $this->pluginManager->get(Layout::class);