Correct import of Psalm types for Service Manager

Signed-off-by: George Steel <[email protected]>
mezzio · Mar 4, 2024 · 35545f7 · 35545f7
1 parent 63f2788
commit 35545f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -4,20 +4,20 @@
 
 namespace Mezzio\Authorization\Rbac;
 
-use Laminas\ServiceManager\ConfigInterface;
+use Laminas\ServiceManager\ServiceManager;
 
-/** @psalm-import-type ServiceManagerConfigurationType from ConfigInterface */
+/** @psalm-import-type ServiceManagerConfiguration from ServiceManager */
 class ConfigProvider
 {
-    /** @return array{dependencies: ServiceManagerConfigurationType} */
+    /** @return array{dependencies: ServiceManagerConfiguration} */
     public function __invoke(): array
     {
         return [
             'dependencies' => $this->getDependencies(),
         ];
     }
 
-    /** @return ServiceManagerConfigurationType */
+    /** @return ServiceManagerConfiguration */
     public function getDependencies(): array
     {
         return [

diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -4,7 +4,6 @@
 
 namespace MezzioTest\Authorization\Rbac;
 
-use Laminas\ServiceManager\ConfigInterface;
 use Laminas\ServiceManager\ServiceManager;
 use Mezzio\Authorization\Rbac\ConfigProvider;
 use Mezzio\Authorization\Rbac\LaminasRbac;
@@ -16,7 +15,7 @@
 use function json_decode;
 use function sprintf;
 
-/** @psalm-import-type ServiceManagerConfigurationType from ConfigInterface */
+/** @psalm-import-type ServiceManagerConfiguration from ServiceManager */
 class ConfigProviderTest extends TestCase
 {
     /** @var ConfigProvider */
@@ -27,7 +26,7 @@ protected function setUp(): void
         $this->provider = new ConfigProvider();
     }
 
-    /** @return array{dependencies: ServiceManagerConfigurationType} */
+    /** @return array{dependencies: ServiceManagerConfiguration} */
     public function testInvocationReturnsArray(): array
     {
         $config = ($this->provider)();
@@ -37,7 +36,7 @@ public function testInvocationReturnsArray(): array
     }
 
     /**
-     * @param array{dependencies: ServiceManagerConfigurationType} $config
+     * @param array{dependencies: ServiceManagerConfiguration} $config
      * @psalm-suppress RedundantConditionGivenDocblockType
      */
     #[Depends('testInvocationReturnsArray')]
@@ -89,7 +88,7 @@ public function testServicesDefinedInConfigProvider(): void
         }
     }
 
-    /** @param ServiceManagerConfigurationType $dependencies */
+    /** @param ServiceManagerConfiguration $dependencies */
     private function getContainer(array $dependencies): ServiceManager
     {
         return new ServiceManager($dependencies);