makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'marc1706/ticket/11857' into develop

Browse source 
* marc1706/ticket/11857:
  [ticket/11857] Use passed service collection instead of container in manager
This commit is contained in:
Andreas Fischer 2013-10-27 17:56:25 +01:00
commit 77ee81c2f6
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/services.yml
View file

@ -22,7 +22,6 @@ services:
arguments: arguments:
- @config - @config
- @avatar.driver_collection - @avatar.driver_collection
- @service_container
cache: cache:
class: phpbb\cache\service class: phpbb\cache\service

30
phpBB/phpbb/avatar/manager.php
View file

@ -41,12 +41,6 @@ class manager
*/ */
protected $avatar_drivers; protected $avatar_drivers;
/**
* Service container object
* @var object
*/
protected $container;
/** /**
* Default avatar data row * Default avatar data row
* @var array * @var array
@ -63,13 +57,27 @@ class manager
* *
* @param \phpbb\config\config $config phpBB configuration * @param \phpbb\config\config $config phpBB configuration
* @param array $avatar_drivers Avatar drivers passed via the service container * @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->config = $config;
$this->avatar_drivers = $avatar_drivers; $this->register_avatar_drivers($avatar_drivers);
$this->container = $container; }
/**
* 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 * There is no need to handle invalid avatar types as the following code
* will cause a ServiceNotFoundException if the type does not exist * will cause a ServiceNotFoundException if the type does not exist
*/ */
$driver = $this->container->get($avatar_type); $driver = $this->avatar_drivers[$avatar_type];
return $driver; return $driver;
} }

4
tests/avatar/manager_test.php
View file

@ -112,7 +112,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
public function test_get_driver_enabled($driver_name, $expected) public function test_get_driver_enabled($driver_name, $expected)
{ {
$driver = $this->manager->get_driver($driver_name); $driver = $this->manager->get_driver($driver_name);
$this->assertEquals($expected, $driver); $this->assertEquals($expected, ($driver === null) ? null : $driver->get_name());
} }
public function get_driver_data_all() public function get_driver_data_all()
@ -133,7 +133,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
public function test_get_driver_all($driver_name, $expected) public function test_get_driver_all($driver_name, $expected)
{ {
$driver = $this->manager->get_driver($driver_name, false); $driver = $this->manager->get_driver($driver_name, false);
$this->assertEquals($expected, $driver); $this->assertEquals($expected, ($driver === null) ? $driver : $driver->get_name());
} }
public function test_get_avatar_settings() public function test_get_avatar_settings()