diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php index 651e6a564e..854f21aae3 100644 --- a/apps/user_ldap/appinfo/register_command.php +++ b/apps/user_ldap/appinfo/register_command.php @@ -25,11 +25,11 @@ $deletedUsersIndex = new DeletedUsersIndex( $ocConfig, $dbConnection, $userMapping ); -$application->add(new OCA\user_ldap\Command\ShowConfig()); +$application->add(new OCA\user_ldap\Command\ShowConfig($helper)); $application->add(new OCA\user_ldap\Command\SetConfig()); $application->add(new OCA\user_ldap\Command\TestConfig()); -$application->add(new OCA\user_ldap\Command\CreateEmptyConfig()); -$application->add(new OCA\user_ldap\Command\DeleteConfig()); +$application->add(new OCA\user_ldap\Command\CreateEmptyConfig($helper)); +$application->add(new OCA\user_ldap\Command\DeleteConfig($helper)); $application->add(new OCA\user_ldap\Command\Search($ocConfig)); $application->add(new OCA\user_ldap\Command\ShowRemnants( $deletedUsersIndex, \OC::$server->getDateTimeFormatter()) diff --git a/apps/user_ldap/command/createemptyconfig.php b/apps/user_ldap/command/createemptyconfig.php index 3201082536..1f051af9d5 100644 --- a/apps/user_ldap/command/createemptyconfig.php +++ b/apps/user_ldap/command/createemptyconfig.php @@ -17,6 +17,16 @@ use \OCA\user_ldap\lib\Helper; use \OCA\user_ldap\lib\Configuration; class CreateEmptyConfig extends Command { + /** @var \OCA\User_LDAP\lib\Helper */ + protected $helper; + + /** + * @param Helper $helper + */ + public function __construct(Helper $helper) { + $this->helper = $helper; + parent::__construct(); + } protected function configure() { $this @@ -25,7 +35,6 @@ class CreateEmptyConfig extends Command { ; } - protected function execute(InputInterface $input, OutputInterface $output) { $configPrefix = $this->getNewConfigurationPrefix(); $output->writeln("Created new configuration with configID '{$configPrefix}'"); @@ -35,7 +44,7 @@ class CreateEmptyConfig extends Command { } protected function getNewConfigurationPrefix() { - $serverConnections = Helper::getServerConfigurationPrefixes(); + $serverConnections = $this->helper->getServerConfigurationPrefixes(); // first connection uses no prefix if(sizeof($serverConnections) == 0) { diff --git a/apps/user_ldap/command/deleteconfig.php b/apps/user_ldap/command/deleteconfig.php index f8b834a646..fcffc50f47 100644 --- a/apps/user_ldap/command/deleteconfig.php +++ b/apps/user_ldap/command/deleteconfig.php @@ -11,11 +11,20 @@ namespace OCA\user_ldap\Command; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use \OCA\user_ldap\lib\Helper; class DeleteConfig extends Command { + /** @var \OCA\User_LDAP\lib\Helper */ + protected $helper; + + /** + * @param Helper $helper + */ + public function __construct(Helper $helper) { + $this->helper = $helper; + parent::__construct(); + } protected function configure() { $this @@ -31,9 +40,9 @@ class DeleteConfig extends Command { protected function execute(InputInterface $input, OutputInterface $output) { - $configPrefix = $input->getArgument('configID');; + $configPrefix = $input->getArgument('configID'); - $success = Helper::deleteServerConfiguration($configPrefix); + $success = $this->helper->deleteServerConfiguration($configPrefix); if($success) { $output->writeln("Deleted configuration with configID '{$configPrefix}'"); diff --git a/apps/user_ldap/command/showconfig.php b/apps/user_ldap/command/showconfig.php index fbcf8d57de..48ab76f1b7 100644 --- a/apps/user_ldap/command/showconfig.php +++ b/apps/user_ldap/command/showconfig.php @@ -17,6 +17,16 @@ use \OCA\user_ldap\lib\Helper; use \OCA\user_ldap\lib\Configuration; class ShowConfig extends Command { + /** @var \OCA\User_LDAP\lib\Helper */ + protected $helper; + + /** + * @param Helper $helper + */ + public function __construct(Helper $helper) { + $this->helper = $helper; + parent::__construct(); + } protected function configure() { $this @@ -37,8 +47,7 @@ class ShowConfig extends Command { } protected function execute(InputInterface $input, OutputInterface $output) { - $helper = new Helper(); - $availableConfigs = $helper->getServerConfigurationPrefixes(); + $availableConfigs = $this->helper->getServerConfigurationPrefixes(); $configID = $input->getArgument('configID'); if(!is_null($configID)) { $configIDs[] = $configID;