diff options
25 files changed, 38 insertions, 38 deletions
diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml index 28b98a98b7..88a90ca2d6 100644 --- a/phpBB/config/default/container/services_auth.yml +++ b/phpBB/config/default/container/services_auth.yml @@ -69,7 +69,7 @@ services: # ----- OAuth services providers ----- auth.provider.oauth.service_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml index cd5b0756c6..c74bef3d66 100644 --- a/phpBB/config/default/container/services_avatar.yml +++ b/phpBB/config/default/container/services_avatar.yml @@ -7,7 +7,7 @@ services: # ----- Avatar drivers ----- avatar.driver_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index 9e4150b094..e3f617e909 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -8,7 +8,7 @@ services: # ----- Captcha plugins ----- # Scope MUST be prototype for all the plugins to work. captcha.plugins.service_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index 36e2bd5729..f0ae6c8ab4 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -1,6 +1,6 @@ services: console.command_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_cron.yml b/phpBB/config/default/container/services_cron.yml index cc3c70c542..c5b88df181 100644 --- a/phpBB/config/default/container/services_cron.yml +++ b/phpBB/config/default/container/services_cron.yml @@ -15,7 +15,7 @@ services: # ----- Cron tasks ----- cron.task_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_migrator.yml b/phpBB/config/default/container/services_migrator.yml index 8c81aec8b3..01bd7d3a11 100644 --- a/phpBB/config/default/container/services_migrator.yml +++ b/phpBB/config/default/container/services_migrator.yml @@ -19,7 +19,7 @@ services: # ----- Migrator's tools ----- migrator.tool_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_mimetype_guesser.yml b/phpBB/config/default/container/services_mimetype_guesser.yml index f22a41613a..2e89ed3c1f 100644 --- a/phpBB/config/default/container/services_mimetype_guesser.yml +++ b/phpBB/config/default/container/services_mimetype_guesser.yml @@ -1,6 +1,6 @@ services: mimetype.guesser_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index 896b93f75b..c3bbcddfa6 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -20,7 +20,7 @@ services: # ----- Notification's types ----- # Scope MUST be prototype for all the plugins to work. notification.type_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: @@ -351,11 +351,11 @@ services: - %tables.user_notifications% tags: - { name: notification.type } - + # ----- Notification's methods ----- # Scope MUST be prototype for all the plugins to work. notification.method_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_password.yml b/phpBB/config/default/container/services_password.yml index 22530f33d6..cb45ec3d42 100644 --- a/phpBB/config/default/container/services_password.yml +++ b/phpBB/config/default/container/services_password.yml @@ -18,7 +18,7 @@ services: # ----- Password's drivers ----- passwords.driver_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_profilefield.yml b/phpBB/config/default/container/services_profilefield.yml index 9bbc0be4c9..5ccfef9148 100644 --- a/phpBB/config/default/container/services_profilefield.yml +++ b/phpBB/config/default/container/services_profilefield.yml @@ -21,7 +21,7 @@ services: # ----- Profile fields types ----- profilefields.type_collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml index 2c5b5a8398..2799892376 100644 --- a/phpBB/config/default/container/services_twig.yml +++ b/phpBB/config/default/container/services_twig.yml @@ -25,7 +25,7 @@ services: - @filesystem template.twig.extensions.collection: - class: phpbb\di\service_collection\service_collection + class: phpbb\di\service_collection arguments: - @service_container tags: diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 79feda88f1..146e116cfd 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -27,7 +27,7 @@ class acp_profile var $lang_defs; /** - * @var \phpbb\di\service_collection\service_collection + * @var \phpbb\di\service_collection */ protected $type_collection; diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index 612446a2a8..be0fbf5831 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -72,7 +72,7 @@ class oauth extends \phpbb\auth\provider\base /** * All OAuth service providers * - * @var \phpbb\di\service_collection\service_collection Contains \phpbb\auth\provider\oauth\service_interface + * @var \phpbb\di\service_collection Contains \phpbb\auth\provider\oauth\service_interface */ protected $service_providers; @@ -121,13 +121,13 @@ class oauth extends \phpbb\auth\provider\base * @param \phpbb\user $user * @param string $auth_provider_oauth_token_storage_table * @param string $auth_provider_oauth_token_account_assoc - * @param \phpbb\di\service_collection\service_collection $service_providers Contains \phpbb\auth\provider\oauth\service_interface + * @param \phpbb\di\service_collection $service_providers Contains \phpbb\auth\provider\oauth\service_interface * @param string $users_table * @param \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container DI container * @param string $phpbb_root_path * @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_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_providers, $users_table, \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container, $phpbb_root_path, $php_ext) { $this->db = $db; $this->config = $config; diff --git a/phpBB/phpbb/auth/provider_collection.php b/phpBB/phpbb/auth/provider_collection.php index 71da30e4c4..8e7e9e2cc1 100644 --- a/phpBB/phpbb/auth/provider_collection.php +++ b/phpBB/phpbb/auth/provider_collection.php @@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; /** * Collection of auth providers to be configured at container compile time. */ -class provider_collection extends \phpbb\di\service_collection\service_collection +class provider_collection extends \phpbb\di\service_collection { /** @var \phpbb\config\config phpBB Config */ protected $config; diff --git a/phpBB/phpbb/captcha/factory.php b/phpBB/phpbb/captcha/factory.php index 1357e919bb..dd44aca8bb 100644 --- a/phpBB/phpbb/captcha/factory.php +++ b/phpBB/phpbb/captcha/factory.php @@ -21,7 +21,7 @@ class factory private $container; /** - * @var \phpbb\di\service_collection\service_collection + * @var \phpbb\di\service_collection */ private $plugins; @@ -29,9 +29,9 @@ class factory * Constructor * * @param \Symfony\Component\DependencyInjection\ContainerInterface $container - * @param \phpbb\di\service_collection\service_collection $plugins + * @param \phpbb\di\service_collection $plugins */ - public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, \phpbb\di\service_collection\service_collection $plugins) + public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, \phpbb\di\service_collection $plugins) { $this->container = $container; $this->plugins = $plugins; diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php index fa847cd64d..bc4897af18 100644 --- a/phpBB/phpbb/console/application.php +++ b/phpBB/phpbb/console/application.php @@ -89,9 +89,9 @@ class application extends \Symfony\Component\Console\Application /** * Register a set of commands from the container * - * @param \phpbb\di\service_collection\service_collection $command_collection The console service collection + * @param \phpbb\di\service_collection $command_collection The console service collection */ - public function register_container_commands(\phpbb\di\service_collection\service_collection $command_collection) + public function register_container_commands(\phpbb\di\service_collection $command_collection) { foreach ($command_collection as $service_command) { diff --git a/phpBB/phpbb/di/service_collection/ordered_service_collection.php b/phpBB/phpbb/di/ordered_service_collection.php index 8d56434504..46f397a004 100644 --- a/phpBB/phpbb/di/service_collection/ordered_service_collection.php +++ b/phpBB/phpbb/di/ordered_service_collection.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\di\service_collection; +namespace phpbb\di; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/phpBB/phpbb/di/service_collection/service_collection.php b/phpBB/phpbb/di/service_collection.php index 8085128fed..82ca9bf679 100644 --- a/phpBB/phpbb/di/service_collection/service_collection.php +++ b/phpBB/phpbb/di/service_collection.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\di\service_collection; +namespace phpbb\di; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/phpBB/phpbb/di/service_collection/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php index 76e22b048e..0d031ab52d 100644 --- a/phpBB/phpbb/di/service_collection/service_collection_iterator.php +++ b/phpBB/phpbb/di/service_collection_iterator.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\di\service_collection; +namespace phpbb\di; /** * Iterator which loads the services when they are requested @@ -19,14 +19,14 @@ namespace phpbb\di\service_collection; class service_collection_iterator extends \ArrayIterator { /** - * @var \phpbb\di\service_collection\service_collection + * @var \phpbb\di\service_collection */ protected $collection; /** * Construct an ArrayIterator for service_collection * - * @param \phpbb\di\service_collection\service_collection $collection The collection to iterate over + * @param \phpbb\di\service_collection $collection The collection to iterate over * @param int $flags Flags to control the behaviour of the ArrayObject object. * @see ArrayObject::setFlags() */ diff --git a/phpBB/phpbb/passwords/manager.php b/phpBB/phpbb/passwords/manager.php index 8974dc36d1..aa9147ecf4 100644 --- a/phpBB/phpbb/passwords/manager.php +++ b/phpBB/phpbb/passwords/manager.php @@ -89,7 +89,7 @@ class manager /** * Fill algorithm type map * - * @param \phpbb\di\service_collection\service_collection $hashing_algorithms + * @param \phpbb\di\service_collection $hashing_algorithms */ protected function fill_type_map($hashing_algorithms) { diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php index 802629a10e..4ad3214ae4 100644 --- a/phpBB/phpbb/profilefields/manager.php +++ b/phpBB/phpbb/profilefields/manager.php @@ -50,7 +50,7 @@ class manager /** * Service Collection object - * @var \phpbb\di\service_collection\service_collection + * @var \phpbb\di\service_collection */ protected $type_collection; @@ -76,13 +76,13 @@ class manager * @param \phpbb\event\dispatcher_interface $dispatcher Event dispatcher object * @param \phpbb\request\request $request Request object * @param \phpbb\template\template $template Template object - * @param \phpbb\di\service_collection\service_collection $type_collection + * @param \phpbb\di\service_collection $type_collection * @param \phpbb\user $user User object * @param string $fields_table * @param string $fields_language_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\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 $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table) { $this->auth = $auth; $this->db = $db; diff --git a/tests/di/ordered_service_collection_test.php b/tests/di/ordered_service_collection_test.php index 046cd8ccef..47e6d23744 100644 --- a/tests/di/ordered_service_collection_test.php +++ b/tests/di/ordered_service_collection_test.php @@ -14,7 +14,7 @@ class phpbb_ordered_service_collection_test extends \phpbb_test_case { /** - * @var \phpbb\di\service_collection\ordered_service_collection + * @var \phpbb\di\ordered_service_collection */ protected $service_collection; @@ -26,7 +26,7 @@ class phpbb_ordered_service_collection_test extends \phpbb_test_case $container->set('foobar', new StdClass); $container->set('barfoo', new StdClass); - $this->service_collection = new \phpbb\di\service_collection\ordered_service_collection($container); + $this->service_collection = new \phpbb\di\ordered_service_collection($container); $this->service_collection->add('foo', 7); $this->service_collection->add('bar', 3); $this->service_collection->add('barfoo', 5); diff --git a/tests/di/service_collection_test.php b/tests/di/service_collection_test.php index e78a5180b6..5b51254a4a 100644 --- a/tests/di/service_collection_test.php +++ b/tests/di/service_collection_test.php @@ -14,7 +14,7 @@ class phpbb_service_collection_test extends \phpbb_test_case { /** - * @var \phpbb\di\service_collection\service_collection + * @var \phpbb\di\service_collection */ protected $service_collection; @@ -24,7 +24,7 @@ class phpbb_service_collection_test extends \phpbb_test_case $container->set('foo', new StdClass); $container->set('bar', new StdClass); - $this->service_collection = new \phpbb\di\service_collection\service_collection($container); + $this->service_collection = new \phpbb\di\service_collection($container); $this->service_collection->add('foo'); $this->service_collection->add('bar'); diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php index 011d251167..21561492fd 100644 --- a/tests/functions/user_delete_test.php +++ b/tests/functions/user_delete_test.php @@ -46,7 +46,7 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case $notification_manager = new phpbb_mock_notification_manager(); $provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config); $oauth_provider_google = new \phpbb\auth\provider\oauth\service\google($config, $request); - $oauth_provider_collection = new \phpbb\di\service_collection\service_collection($phpbb_container); + $oauth_provider_collection = new \phpbb\di\service_collection($phpbb_container); $oauth_provider_collection->offsetSet('auth.provider.oauth.service.google', $oauth_provider_google); $driver_helper = new \phpbb\passwords\driver\helper($config); diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php index 5b337be44e..3fad81c68b 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -30,7 +30,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case global $phpbb_container; - $plugins = new \phpbb\di\service_collection\service_collection($phpbb_container); + $plugins = new \phpbb\di\service_collection($phpbb_container); $plugins->add('core.captcha.plugins.nogd'); $phpbb_container->set( 'captcha.factory', |