qa: remove some unnecessary codepaths and add some more types

Signed-off-by: Maximilian Bösing <[email protected]>
laminas · Feb 23, 2023 · 04edafb · 04edafb
1 parent 94809b2
commit 04edafb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -64,9 +64,7 @@
     </MissingClosureReturnType>
     <MissingReturnType>
       <code>addAbstractFactory</code>
-      <code>addDelegator</code>
       <code>addInitializer</code>
-      <code>mapLazyService</code>
       <code>setInvokableClass</code>
     </MissingReturnType>
     <MixedArgument>
@@ -110,10 +108,6 @@
       <code>$name</code>
       <code>$name</code>
     </ParamNameMismatch>
-    <TypeDoesNotContainType>
-      <code>$sharedAlias</code>
-      <code>$sharedAlias</code>
-    </TypeDoesNotContainType>
   </file>
   <file src="src/Test/CommonPluginManagerTrait.php">
     <ArgumentTypeCoercion>

diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -235,11 +235,6 @@ public function get($name)
         // Cache the object for later, if it is supposed to be shared.
         if ($sharedService) {
             $this->services[$resolvedName] = $service;
-        }
-
-        // Also cache under the alias name; this allows sharing based on the
-        // service name used.
-        if ($sharedAlias) {
             $this->services[$name] = $service;
         }
 
@@ -411,7 +406,7 @@ public function setFactory(string $name, string|callable|Factory\FactoryInterfac
      * @param null|string $class Class to which to map; if not provided, $name
      *     will be used for the mapping.
      */
-    public function mapLazyService(string $name, ?string $class = null)
+    public function mapLazyService(string $name, ?string $class = null): void
     {
         $this->configure(['lazy_services' => ['class_map' => [$name => $class ?: $name]]]);
     }
@@ -434,10 +429,12 @@ public function addAbstractFactory($factory)
      * @param string $name Service name
      * @param string|callable|DelegatorFactoryInterface $factory Delegator
      *     factory to assign.
+     *
      * @psalm-param class-string<Factory\DelegatorFactoryInterface>
-     *     |callable(ContainerInterface,string,callable,array<mixed>|null) $factory
+     *     |DelegatorCallableType
+     *     |Factory\DelegatorFactoryInterface $factory
      */
-    public function addDelegator($name, $factory)
+    public function addDelegator(string $name, string|callable|Factory\DelegatorFactoryInterface $factory): void
     {
         $this->configure(['delegators' => [$name => [$factory]]]);
     }
@@ -447,10 +444,10 @@ public function addDelegator($name, $factory)
      *
      * @param string|callable|Initializer\InitializerInterface $initializer
      * @psalm-param class-string<Initializer\InitializerInterface>
-     *     |callable(ContainerInterface,mixed):void
+     *     |InitializerCallableType
      *     |Initializer\InitializerInterface $initializer
      */
-    public function addInitializer($initializer)
+    public function addInitializer(string|callable|Initializer\InitializerInterface $initializer)
     {
         $this->configure(['initializers' => [$initializer]]);
     }
@@ -959,10 +956,6 @@ private function assertCallableDelegatorFactory(mixed $delegatorFactory): void
      */
     private function resolveDelegatorFactory(mixed $delegatorFactory): callable|DelegatorFactoryInterface
     {
-        if ($delegatorFactory instanceof DelegatorFactoryInterface) {
-            return $delegatorFactory;
-        }
-
         if ($delegatorFactory === LazyServiceFactory::class) {
             return $this->createLazyServiceDelegatorFactory();
         }