From 9e817e9e0b5d6c0b34954bfef70510b64ced11f4 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 12 Oct 2016 23:47:07 +0200 Subject: [PATCH] symfony replaced table helper by class, fixes two broken LDAP occ commands Signed-off-by: Arthur Schiwon --- apps/user_ldap/lib/Access.php | 1 - apps/user_ldap/lib/Command/ShowConfig.php | 3 ++- apps/user_ldap/lib/Command/ShowRemnants.php | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 96b6bae64b..40bae8d7b4 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -304,7 +304,6 @@ class Access extends LDAPUtility implements IUserTools { } /** - public function ocname2dn($name, $isUser) { * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure * @param string $fdn the dn of the group object * @param string $ldapName optional, the display name of the object diff --git a/apps/user_ldap/lib/Command/ShowConfig.php b/apps/user_ldap/lib/Command/ShowConfig.php index ac70468b1c..7a24889eb0 100644 --- a/apps/user_ldap/lib/Command/ShowConfig.php +++ b/apps/user_ldap/lib/Command/ShowConfig.php @@ -26,6 +26,7 @@ namespace OCA\User_LDAP\Command; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -91,7 +92,7 @@ class ShowConfig extends Command { $configuration = $configHolder->getConfiguration(); ksort($configuration); - $table = $this->getHelperSet()->get('table'); + $table = new Table($output); $table->setHeaders(array('Configuration', $id)); $rows = array(); foreach($configuration as $key => $value) { diff --git a/apps/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php index df38d6f650..0e6aea6a5a 100644 --- a/apps/user_ldap/lib/Command/ShowRemnants.php +++ b/apps/user_ldap/lib/Command/ShowRemnants.php @@ -26,6 +26,7 @@ namespace OCA\User_LDAP\Command; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -64,7 +65,7 @@ class ShowRemnants extends Command { */ protected function execute(InputInterface $input, OutputInterface $output) { /** @var \Symfony\Component\Console\Helper\Table $table */ - $table = $this->getHelperSet()->get('table'); + $table = new Table($output); $table->setHeaders(array( 'ownCloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login', 'Dir', 'Sharer'));