mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00
Code Issues Releases Wiki Activity

[ticket/13961] Move service_collection to di/service_collection namespace

Browse Source 
PHPBB3-13961
This commit is contained in:
Mate Bartus 2015-06-23 14:31:18 +02:00
parent 8213f24b35
commit 98cb70f5d2
22 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/config/default/container/services_auth.yml
View File

@ -69,7 +69,7 @@ services:
# ----- OAuth services providers ----- # ----- OAuth services providers -----
auth.provider.oauth.service_collection: auth.provider.oauth.service_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_avatar.yml
View File

@ -7,7 +7,7 @@ services:
# ----- Avatar drivers ----- # ----- Avatar drivers -----
avatar.driver_collection: avatar.driver_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_captcha.yml
View File

@ -8,7 +8,7 @@ services:
# ----- Captcha plugins ----- # ----- Captcha plugins -----
# Scope MUST be prototype for all the plugins to work. # Scope MUST be prototype for all the plugins to work.
captcha.plugins.service_collection: captcha.plugins.service_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_console.yml
View File

@ -1,6 +1,6 @@
services: services:
console.command_collection: console.command_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_cron.yml
View File

@ -15,7 +15,7 @@ services:
# ----- Cron tasks ----- # ----- Cron tasks -----
cron.task_collection: cron.task_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_migrator.yml
View File

@ -19,7 +19,7 @@ services:
# ----- Migrator's tools ----- # ----- Migrator's tools -----
migrator.tool_collection: migrator.tool_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_mimetype_guesser.yml
View File

@ -1,6 +1,6 @@
services: services:
mimetype.guesser_collection: mimetype.guesser_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

4
phpBB/config/default/container/services_notification.yml
View File

@ -20,7 +20,7 @@ services:
# ----- Notification's types ----- # ----- Notification's types -----
# Scope MUST be prototype for all the plugins to work. # Scope MUST be prototype for all the plugins to work.
notification.type_collection: notification.type_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:
@ -355,7 +355,7 @@ services:
# ----- Notification's methods ----- # ----- Notification's methods -----
# Scope MUST be prototype for all the plugins to work. # Scope MUST be prototype for all the plugins to work.
notification.method_collection: notification.method_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_password.yml
View File

@ -18,7 +18,7 @@ services:
# ----- Password's drivers ----- # ----- Password's drivers -----
passwords.driver_collection: passwords.driver_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_profilefield.yml
View File

@ -21,7 +21,7 @@ services:
# ----- Profile fields types ----- # ----- Profile fields types -----
profilefields.type_collection: profilefields.type_collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/config/default/container/services_twig.yml
View File

@ -25,7 +25,7 @@ services:
- @filesystem - @filesystem
template.twig.extensions.collection: template.twig.extensions.collection:
class: phpbb\di\service_collection class: phpbb\di\service_collection\service_collection
arguments: arguments:
- @service_container - @service_container
tags: tags:

2
phpBB/includes/acp/acp_profile.php
View File

@ -27,7 +27,7 @@ class acp_profile
var $lang_defs; var $lang_defs;
/** /**
* @var \phpbb\di\service_collection * @var \phpbb\di\service_collection\service_collection
*/ */
protected $type_collection; protected $type_collection;

6
phpBB/phpbb/auth/provider/oauth/oauth.php
View File

@ -72,7 +72,7 @@ class oauth extends \phpbb\auth\provider\base
/** /**
* All OAuth service providers * All OAuth service providers
* *
* @var \phpbb\di\service_collection Contains \phpbb\auth\provider\oauth\service_interface * @var \phpbb\di\service_collection\service_collection Contains \phpbb\auth\provider\oauth\service_interface
*/ */
protected $service_providers; protected $service_providers;
@ -121,13 +121,13 @@ class oauth extends \phpbb\auth\provider\base
* @param \phpbb\user $user * @param \phpbb\user $user
* @param string $auth_provider_oauth_token_storage_table * @param string $auth_provider_oauth_token_storage_table
* @param string $auth_provider_oauth_token_account_assoc * @param string $auth_provider_oauth_token_account_assoc
* @param \phpbb\di\service_collection $service_providers Contains \phpbb\auth\provider\oauth\service_interface * @param \phpbb\di\service_collection\service_collection $service_providers Contains \phpbb\auth\provider\oauth\service_interface
* @param string $users_table * @param string $users_table
* @param \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container DI container * @param \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container DI container
* @param string $phpbb_root_path * @param string $phpbb_root_path
* @param string $php_ext * @param string $php_ext
*/ */
public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection $service_providers, $users_table, \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container, $phpbb_root_path, $php_ext) public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection\service_collection $service_providers, $users_table, \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container, $phpbb_root_path, $php_ext)
{ {
$this->db = $db; $this->db = $db;
$this->config = $config; $this->config = $config;

2
phpBB/phpbb/auth/provider_collection.php
View File

@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/** /**
* Collection of auth providers to be configured at container compile time. * Collection of auth providers to be configured at container compile time.
*/ */
class provider_collection extends \phpbb\di\service_collection class provider_collection extends \phpbb\di\service_collection\service_collection
{ {
/** @var \phpbb\config\config phpBB Config */ /** @var \phpbb\config\config phpBB Config */
protected $config; protected $config;

6
phpBB/phpbb/captcha/factory.php
View File

@ -21,7 +21,7 @@ class factory
private $container; private $container;
/** /**
* @var \phpbb\di\service_collection * @var \phpbb\di\service_collection\service_collection
*/ */
private $plugins; private $plugins;
@ -29,9 +29,9 @@ class factory
* Constructor * Constructor
* *
* @param \Symfony\Component\DependencyInjection\ContainerInterface $container * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
* @param \phpbb\di\service_collection $plugins * @param \phpbb\di\service_collection\service_collection $plugins
*/ */
public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, \phpbb\di\service_collection $plugins) public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, \phpbb\di\service_collection\service_collection $plugins)
{ {
$this->container = $container; $this->container = $container;
$this->plugins = $plugins; $this->plugins = $plugins;

4
phpBB/phpbb/console/application.php
View File

@ -89,9 +89,9 @@ class application extends \Symfony\Component\Console\Application
/** /**
* Register a set of commands from the container * Register a set of commands from the container
* *
* @param \phpbb\di\service_collection $command_collection The console service collection * @param \phpbb\di\service_collection\service_collection $command_collection The console service collection
*/ */
public function register_container_commands(\phpbb\di\service_collection $command_collection) public function register_container_commands(\phpbb\di\service_collection\service_collection $command_collection)
{ {
foreach ($command_collection as $service_command) foreach ($command_collection as $service_command)
{ {

2
phpBB/phpbb/di/service_collection.php → phpBB/phpbb/di/service_collection/service_collection.php
View File

@ -11,7 +11,7 @@
* *
*/ */
namespace phpbb\di; namespace phpbb\di\service_collection;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;

6
phpBB/phpbb/di/service_collection_iterator.php → phpBB/phpbb/di/service_collection/service_collection_iterator.php
View File

@ -11,7 +11,7 @@
* *
*/ */
namespace phpbb\di; namespace phpbb\di\service_collection;
/** /**
* Iterator which loads the services when they are requested * Iterator which loads the services when they are requested
@ -19,14 +19,14 @@ namespace phpbb\di;
class service_collection_iterator extends \ArrayIterator class service_collection_iterator extends \ArrayIterator
{ {
/** /**
* @var \phpbb\di\service_collection * @var \phpbb\di\service_collection\service_collection
*/ */
protected $collection; protected $collection;
/** /**
* Construct an ArrayIterator for service_collection * Construct an ArrayIterator for service_collection
* *
* @param \phpbb\di\service_collection $collection The collection to iterate over * @param \phpbb\di\service_collection\service_collection $collection The collection to iterate over
* @param int $flags Flags to control the behaviour of the ArrayObject object. * @param int $flags Flags to control the behaviour of the ArrayObject object.
* @see ArrayObject::setFlags() * @see ArrayObject::setFlags()
*/ */

2
phpBB/phpbb/passwords/manager.php
View File

@ -89,7 +89,7 @@ class manager
/** /**
* Fill algorithm type map * Fill algorithm type map
* *
* @param \phpbb\di\service_collection $hashing_algorithms * @param \phpbb\di\service_collection\service_collection $hashing_algorithms
*/ */
protected function fill_type_map($hashing_algorithms) protected function fill_type_map($hashing_algorithms)
{ {

6
phpBB/phpbb/profilefields/manager.php
View File

@ -50,7 +50,7 @@ class manager
/** /**
* Service Collection object * Service Collection object
* @var \phpbb\di\service_collection * @var \phpbb\di\service_collection\service_collection
*/ */
protected $type_collection; protected $type_collection;
@ -76,13 +76,13 @@ class manager
* @param \phpbb\event\dispatcher_interface $dispatcher Event dispatcher object * @param \phpbb\event\dispatcher_interface $dispatcher Event dispatcher object
* @param \phpbb\request\request $request Request object * @param \phpbb\request\request $request Request object
* @param \phpbb\template\template $template Template object * @param \phpbb\template\template $template Template object
* @param \phpbb\di\service_collection $type_collection * @param \phpbb\di\service_collection\service_collection $type_collection
* @param \phpbb\user $user User object * @param \phpbb\user $user User object
* @param string $fields_table * @param string $fields_table
* @param string $fields_language_table * @param string $fields_language_table
* @param string $fields_data_table * @param string $fields_data_table
*/ */
public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table) public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
{ {
$this->auth = $auth; $this->auth = $auth;
$this->db = $db; $this->db = $db;

2
tests/functions/user_delete_test.php
View File

@ -46,7 +46,7 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
$notification_manager = new phpbb_mock_notification_manager(); $notification_manager = new phpbb_mock_notification_manager();
$provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config); $provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config);
$oauth_provider_google = new \phpbb\auth\provider\oauth\service\google($config, $request); $oauth_provider_google = new \phpbb\auth\provider\oauth\service\google($config, $request);
$oauth_provider_collection = new \phpbb\di\service_collection($phpbb_container); $oauth_provider_collection = new \phpbb\di\service_collection\service_collection($phpbb_container);
$oauth_provider_collection->offsetSet('auth.provider.oauth.service.google', $oauth_provider_google); $oauth_provider_collection->offsetSet('auth.provider.oauth.service.google', $oauth_provider_google);
$driver_helper = new \phpbb\passwords\driver\helper($config); $driver_helper = new \phpbb\passwords\driver\helper($config);

2
tests/session/garbage_collection_test.php
View File

@ -30,7 +30,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
global $phpbb_container; global $phpbb_container;
$plugins = new \phpbb\di\service_collection($phpbb_container); $plugins = new \phpbb\di\service_collection\service_collection($phpbb_container);
$plugins->add('core.captcha.plugins.nogd'); $plugins->add('core.captcha.plugins.nogd');
$phpbb_container->set( $phpbb_container->set(
'captcha.factory', 'captcha.factory',