Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/47'
Browse files Browse the repository at this point in the history
Close #47
  • Loading branch information
weierophinney committed Jun 7, 2016
2 parents 235281f + ffb036c commit b2db0d8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ All notable changes to this project will be documented in this file, in reverse
provided, but validate based on the uppercased country value. This ensures
the same validation behavior, and prevents the value from being transformed,
potentially breaking later retrieval.
- [#47](https://github.com/zendframework/zend-i18n/pull/47) provides a
performance improvement to the `Zend\I18n\View\HelperConfig` implementation
when operating under zend-servicemanager v3.

## 2.7.2 - 2016-04-18

Expand Down
6 changes: 6 additions & 0 deletions src/View/HelperConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,18 @@ class HelperConfig implements ConfigInterface
*/
public function configureServiceManager(ServiceManager $serviceManager)
{
if (method_exists($serviceManager, 'configure')) {
$serviceManager->configure($this->toArray());
return $serviceManager;
}

foreach ($this->factories as $name => $factory) {
$serviceManager->setFactory($name, $factory);
}
foreach ($this->aliases as $alias => $target) {
$serviceManager->setAlias($alias, $target);
}

return $serviceManager;
}

Expand Down

0 comments on commit b2db0d8

Please sign in to comment.