diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-27 17:56:25 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-27 17:56:25 +0100 |
| commit | 77ee81c2f61beefe5c3166e61f712b58076fb727 (patch) | |
| tree | c4cc7e9439d480cbc53e2c2cde758739aa654349 /phpBB/phpbb | |
| parent | b0e0834637172c86f3a152034d77d558e95b2e61 (diff) | |
| parent | b2f638b79359ee6df600ca940ffa2b1657235364 (diff) | |
| download | forums-77ee81c2f61beefe5c3166e61f712b58076fb727.tar forums-77ee81c2f61beefe5c3166e61f712b58076fb727.tar.gz forums-77ee81c2f61beefe5c3166e61f712b58076fb727.tar.bz2 forums-77ee81c2f61beefe5c3166e61f712b58076fb727.tar.xz forums-77ee81c2f61beefe5c3166e61f712b58076fb727.zip | |
Merge remote-tracking branch 'marc1706/ticket/11857' into develop
* marc1706/ticket/11857:
[ticket/11857] Use passed service collection instead of container in manager
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/avatar/manager.php | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index c28380a401..7c26bce5ae 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -42,12 +42,6 @@ class manager protected $avatar_drivers; /** - * Service container object - * @var object - */ - protected $container; - - /** * Default avatar data row * @var array */ @@ -63,13 +57,27 @@ class manager * * @param \phpbb\config\config $config phpBB configuration * @param array $avatar_drivers Avatar drivers passed via the service container - * @param object $container Container object */ - public function __construct(\phpbb\config\config $config, $avatar_drivers, $container) + public function __construct(\phpbb\config\config $config, $avatar_drivers) { $this->config = $config; - $this->avatar_drivers = $avatar_drivers; - $this->container = $container; + $this->register_avatar_drivers($avatar_drivers); + } + + /** + * Register avatar drivers + * + * @param array $avatar_drivers Service collection of avatar drivers + */ + protected function register_avatar_drivers($avatar_drivers) + { + if (!empty($avatar_drivers)) + { + foreach ($avatar_drivers as $driver) + { + $this->avatar_drivers[$driver->get_name()] = $driver; + } + } } /** @@ -112,7 +120,7 @@ class manager * There is no need to handle invalid avatar types as the following code * will cause a ServiceNotFoundException if the type does not exist */ - $driver = $this->container->get($avatar_type); + $driver = $this->avatar_drivers[$avatar_type]; return $driver; } |