Skip to content

Commit 419894b

Browse files
authored
Merge pull request #130 from gsteel/factory-alias-for-laminas-translator
Add service manager alias for `Laminas\Translator\TranslatorInterface`
2 parents d6c05e1 + e1deac9 commit 419894b

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

src/ConfigProvider.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
namespace Laminas\I18n;
44

5-
use Laminas\ServiceManager\ConfigInterface;
65
use Laminas\ServiceManager\Factory\InvokableFactory;
6+
use Laminas\ServiceManager\ServiceManager;
7+
use Laminas\Translator\TranslatorInterface;
78

89
/**
9-
* @see ConfigInterface
10-
*
11-
* @psalm-import-type ServiceManagerConfigurationType from ConfigInterface
10+
* @psalm-import-type ServiceManagerConfiguration from ServiceManager
1211
* @final
1312
*/
1413
class ConfigProvider
@@ -17,10 +16,10 @@ class ConfigProvider
1716
* Return general-purpose laminas-i18n configuration.
1817
*
1918
* @return array{
20-
* dependencies: ServiceManagerConfigurationType,
21-
* filters: ServiceManagerConfigurationType,
22-
* validators: ServiceManagerConfigurationType,
23-
* view_helpers: ServiceManagerConfigurationType,
19+
* dependencies: ServiceManagerConfiguration,
20+
* filters: ServiceManagerConfiguration,
21+
* validators: ServiceManagerConfiguration,
22+
* view_helpers: ServiceManagerConfiguration,
2423
* locale: string|null,
2524
* }
2625
*/
@@ -38,7 +37,7 @@ public function __invoke()
3837
/**
3938
* Return application-level dependency configuration.
4039
*
41-
* @return ServiceManagerConfigurationType
40+
* @return ServiceManagerConfiguration
4241
*/
4342
public function getDependencyConfig()
4443
{
@@ -50,6 +49,7 @@ public function getDependencyConfig()
5049
'Zend\I18n\Translator\TranslatorInterface' => Translator\TranslatorInterface::class,
5150
'Zend\I18n\Translator\LoaderPluginManager' => Translator\LoaderPluginManager::class,
5251
Geography\CountryCodeListInterface::class => Geography\DefaultCountryCodeList::class,
52+
TranslatorInterface::class => Translator\TranslatorInterface::class,
5353
],
5454
'factories' => [
5555
Translator\TranslatorInterface::class => Translator\TranslatorServiceFactory::class,
@@ -62,7 +62,7 @@ public function getDependencyConfig()
6262
/**
6363
* Return laminas-filter configuration.
6464
*
65-
* @return ServiceManagerConfigurationType
65+
* @return ServiceManagerConfiguration
6666
*/
6767
public function getFilterConfig()
6868
{
@@ -97,7 +97,7 @@ public function getFilterConfig()
9797
/**
9898
* Return laminas-validator configuration.
9999
*
100-
* @return ServiceManagerConfigurationType
100+
* @return ServiceManagerConfiguration
101101
*/
102102
public function getValidatorConfig()
103103
{
@@ -153,7 +153,7 @@ public function getValidatorConfig()
153153
*
154154
* Obsoletes View\HelperConfig.
155155
*
156-
* @return ServiceManagerConfigurationType
156+
* @return ServiceManagerConfiguration
157157
*/
158158
public function getViewHelperConfig()
159159
{

src/Module.php

+6-8
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,21 @@
33
namespace Laminas\I18n;
44

55
use Laminas\ModuleManager\ModuleManager;
6-
use Laminas\ServiceManager\ConfigInterface;
6+
use Laminas\ServiceManager\ServiceManager;
77

88
/**
9-
* @see ConfigInterface
10-
*
11-
* @psalm-import-type ServiceManagerConfigurationType from ConfigInterface
9+
* @psalm-import-type ServiceManagerConfiguration from ServiceManager
1210
*/
1311
class Module
1412
{
1513
/**
1614
* Return laminas-i18n configuration for laminas-mvc application.
1715
*
1816
* @return array{
19-
* filters: ServiceManagerConfigurationType,
20-
* service_manager: ServiceManagerConfigurationType,
21-
* validators: ServiceManagerConfigurationType,
22-
* view_helpers: ServiceManagerConfigurationType,
17+
* filters: ServiceManagerConfiguration,
18+
* service_manager: ServiceManagerConfiguration,
19+
* validators: ServiceManagerConfiguration,
20+
* view_helpers: ServiceManagerConfiguration,
2321
* }
2422
*/
2523
public function getConfig()

0 commit comments

Comments
 (0)