From 5a516732eddc47bd8c4ee178693f4c6dc675e781 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Sun, 31 May 2015 11:13:16 +0200 Subject: [PATCH] Move process controlll initialization in config. --- PHPCI/Command/DaemonCommand.php | 7 ++++--- services.yml | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/PHPCI/Command/DaemonCommand.php b/PHPCI/Command/DaemonCommand.php index cb303eff..8bf26de2 100644 --- a/PHPCI/Command/DaemonCommand.php +++ b/PHPCI/Command/DaemonCommand.php @@ -48,11 +48,12 @@ class DaemonCommand extends Command */ protected $processControl; - public function __construct(Logger $logger, ProcessControlInterface $processControl = null, $name = null) + public function __construct(Logger $logger, ProcessControlInterface $processControl) { - parent::__construct($name); + parent::__construct(); + $this->logger = $logger; - $this->processControl = $processControl ?: Factory::getInstance(); + $this->processControl = $processControl; } protected function configure() diff --git a/services.yml b/services.yml index 8fe0bda6..01ad0eb6 100644 --- a/services.yml +++ b/services.yml @@ -43,7 +43,8 @@ services: service.user: class: PHPCI\Service\UserService arguments: [@storage.user] - + process_control: + factory: [PHPCI\ProcessControl\Factory, getInstance] console.application: class: Symfony\Component\Console\Application arguments: @@ -79,6 +80,7 @@ services: class: PHPCI\Command\DaemonCommand arguments: - @console.logger + - @process_control console.command.poll: class: PHPCI\Command\PollCommand arguments: