diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-07-09 23:23:40 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-07-09 23:23:40 +0200 |
| commit | e46689a0cdbb418673741234f55e843f1bdd8016 (patch) | |
| tree | 091fb73f3f600fc4661177082807e4b86b4baa6d | |
| parent | 4d2212a3c2c8528e6d2adde6c57090bf8e26ba7d (diff) | |
| download | forums-e46689a0cdbb418673741234f55e843f1bdd8016.tar forums-e46689a0cdbb418673741234f55e843f1bdd8016.tar.gz forums-e46689a0cdbb418673741234f55e843f1bdd8016.tar.bz2 forums-e46689a0cdbb418673741234f55e843f1bdd8016.tar.xz forums-e46689a0cdbb418673741234f55e843f1bdd8016.zip | |
[ticket/13740] Remove service container from modules
PHPBB3-13740
| -rw-r--r-- | phpBB/config/installer/container/services_installer.yml | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/install/installer.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module_base.php | 9 |
3 files changed, 5 insertions, 11 deletions
diff --git a/phpBB/config/installer/container/services_installer.yml b/phpBB/config/installer/container/services_installer.yml index 4403a1ee51..8e19be5c0c 100644 --- a/phpBB/config/installer/container/services_installer.yml +++ b/phpBB/config/installer/container/services_installer.yml @@ -60,14 +60,13 @@ services: installer.module_base: abstract: true calls: - - [setup, [@service_container, @installer.helper.config, @installer.helper.iohandler]] + - [setup, [@installer.helper.config, @installer.helper.iohandler]] installer.installer.abstract: class: phpbb\install\installer abstract: true arguments: - @installer.helper.config - - @service_container installer.install.module_collection: class: phpbb\di\ordered_service_collection diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php index 33b9214cfa..f69b48ce3b 100644 --- a/phpBB/phpbb/install/installer.php +++ b/phpBB/phpbb/install/installer.php @@ -55,12 +55,10 @@ class installer * Constructor * * @param config $config Installer config handler - * @param ContainerInterface $container Dependency injection container */ - public function __construct(config $config, ContainerInterface $container) + public function __construct(config $config) { $this->install_config = $config; - $this->container = $container; $this->installer_modules = null; } diff --git a/phpBB/phpbb/install/module_base.php b/phpBB/phpbb/install/module_base.php index eb04379f8e..60eaa79139 100644 --- a/phpBB/phpbb/install/module_base.php +++ b/phpBB/phpbb/install/module_base.php @@ -17,7 +17,6 @@ use phpbb\di\ordered_service_collection; use phpbb\install\exception\resource_limit_reached_exception; use phpbb\install\helper\config; use phpbb\install\helper\iohandler\iohandler_interface; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * Base class for installer module @@ -78,13 +77,11 @@ abstract class module_base implements module_interface /** * Dependency getter * - * @param ContainerInterface $container * @param config $config * @param iohandler_interface $iohandler */ - public function setup(ContainerInterface $container, config $config, iohandler_interface $iohandler) + public function setup(config $config, iohandler_interface $iohandler) { - $this->container = $container; $this->install_config = $config; $this->iohandler = $iohandler; } @@ -196,9 +193,9 @@ abstract class module_base implements module_interface } /** - * Returns the next task's index + * Returns the next task's name * - * @return string index of the array element of the next task + * @return string Index of the array element of the next task */ protected function recover_progress() { |