From fdf7079c765e7591c102d0af6720ae2caa758305 Mon Sep 17 00:00:00 2001 From: George Steel Date: Tue, 2 Jul 2024 12:20:48 +0100 Subject: [PATCH 1/2] Alias `Laminas\Translator\TranslatorInterface` Closes #129 Signed-off-by: George Steel --- src/ConfigProvider.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php index c42d5d39..86906cc1 100644 --- a/src/ConfigProvider.php +++ b/src/ConfigProvider.php @@ -4,6 +4,7 @@ use Laminas\ServiceManager\ConfigInterface; use Laminas\ServiceManager\Factory\InvokableFactory; +use Laminas\Translator\TranslatorInterface; /** * @see ConfigInterface @@ -50,6 +51,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, From e1deac95923763220cb1d42ad4f0b2441536f0d9 Mon Sep 17 00:00:00 2001 From: George Steel Date: Tue, 2 Jul 2024 12:21:15 +0100 Subject: [PATCH 2/2] Remove references to deprecated `ConfigInterface` Signed-off-by: George Steel --- src/ConfigProvider.php | 22 ++++++++++------------ src/Module.php | 14 ++++++-------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php index 86906cc1..7199cad7 100644 --- a/src/ConfigProvider.php +++ b/src/ConfigProvider.php @@ -2,14 +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 @@ -18,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, * } */ @@ -39,7 +37,7 @@ public function __invoke() /** * Return application-level dependency configuration. * - * @return ServiceManagerConfigurationType + * @return ServiceManagerConfiguration */ public function getDependencyConfig() { @@ -64,7 +62,7 @@ public function getDependencyConfig() /** * Return laminas-filter configuration. * - * @return ServiceManagerConfigurationType + * @return ServiceManagerConfiguration */ public function getFilterConfig() { @@ -99,7 +97,7 @@ public function getFilterConfig() /** * Return laminas-validator configuration. * - * @return ServiceManagerConfigurationType + * @return ServiceManagerConfiguration */ public function getValidatorConfig() { @@ -155,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 index 1a780941..7b3564a7 100644 --- a/src/Module.php +++ b/src/Module.php @@ -3,12 +3,10 @@ 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 { @@ -16,10 +14,10 @@ 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()