Merge pull request #130 from gsteel/factory-alias-for-laminas-translator

Add service manager alias for `Laminas\Translator\TranslatorInterface`
laminas · Jul 2, 2024 · 419894b · 419894b
2 parents d6c05e1 + e1deac9
commit 419894b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -2,13 +2,12 @@
 
 namespace Laminas\I18n;
 
-use Laminas\ServiceManager\ConfigInterface;
 use Laminas\ServiceManager\Factory\InvokableFactory;
+use Laminas\ServiceManager\ServiceManager;
+use Laminas\Translator\TranslatorInterface;
 
 /**
- * @see ConfigInterface
- *
- * @psalm-import-type ServiceManagerConfigurationType from ConfigInterface
+ * @psalm-import-type ServiceManagerConfiguration from ServiceManager
  * @final
  */
 class ConfigProvider
@@ -17,10 +16,10 @@ class ConfigProvider
      * Return general-purpose laminas-i18n configuration.
      *
      * @return array{
-     *     dependencies: ServiceManagerConfigurationType,
-     *     filters: ServiceManagerConfigurationType,
-     *     validators: ServiceManagerConfigurationType,
-     *     view_helpers: ServiceManagerConfigurationType,
+     *     dependencies: ServiceManagerConfiguration,
+     *     filters: ServiceManagerConfiguration,
+     *     validators: ServiceManagerConfiguration,
+     *     view_helpers: ServiceManagerConfiguration,
      *     locale: string|null,
      * }
      */
@@ -38,7 +37,7 @@ public function __invoke()
     /**
      * Return application-level dependency configuration.
      *
-     * @return ServiceManagerConfigurationType
+     * @return ServiceManagerConfiguration
      */
     public function getDependencyConfig()
     {
@@ -50,6 +49,7 @@ public function getDependencyConfig()
                 'Zend\I18n\Translator\TranslatorInterface' => Translator\TranslatorInterface::class,
                 'Zend\I18n\Translator\LoaderPluginManager' => Translator\LoaderPluginManager::class,
                 Geography\CountryCodeListInterface::class  => Geography\DefaultCountryCodeList::class,
+                TranslatorInterface::class                 => Translator\TranslatorInterface::class,
             ],
             'factories' => [
                 Translator\TranslatorInterface::class   => Translator\TranslatorServiceFactory::class,
@@ -62,7 +62,7 @@ public function getDependencyConfig()
     /**
      * Return laminas-filter configuration.
      *
-     * @return ServiceManagerConfigurationType
+     * @return ServiceManagerConfiguration
      */
     public function getFilterConfig()
     {
@@ -97,7 +97,7 @@ public function getFilterConfig()
     /**
      * Return laminas-validator configuration.
      *
-     * @return ServiceManagerConfigurationType
+     * @return ServiceManagerConfiguration
      */
     public function getValidatorConfig()
     {
@@ -153,7 +153,7 @@ public function getValidatorConfig()
      *
      * Obsoletes View\HelperConfig.
      *
-     * @return ServiceManagerConfigurationType
+     * @return ServiceManagerConfiguration
      */
     public function getViewHelperConfig()
     {

diff --git a/src/Module.php b/src/Module.php
@@ -3,23 +3,21 @@
 namespace Laminas\I18n;
 
 use Laminas\ModuleManager\ModuleManager;
-use Laminas\ServiceManager\ConfigInterface;
+use Laminas\ServiceManager\ServiceManager;
 
 /**
- * @see ConfigInterface
- *
- * @psalm-import-type ServiceManagerConfigurationType from ConfigInterface
+ * @psalm-import-type ServiceManagerConfiguration from ServiceManager
  */
 class Module
 {
     /**
      * Return laminas-i18n configuration for laminas-mvc application.
      *
      * @return array{
-     *     filters: ServiceManagerConfigurationType,
-     *     service_manager: ServiceManagerConfigurationType,
-     *     validators: ServiceManagerConfigurationType,
-     *     view_helpers: ServiceManagerConfigurationType,
+     *     filters: ServiceManagerConfiguration,
+     *     service_manager: ServiceManagerConfiguration,
+     *     validators: ServiceManagerConfiguration,
+     *     view_helpers: ServiceManagerConfiguration,
      * }
      */
     public function getConfig()