Skip to content

Commit 05869e4

Browse files
authored
Merge pull request #1726 from nextcloud/fix-symfony-table
symfony replaced table helper by class, fixes two broken LDAP occ com…
2 parents 9aae4a0 + 9e817e9 commit 05869e4

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

apps/user_ldap/lib/Access.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ public function username2dn($name) {
304304
}
305305

306306
/**
307-
public function ocname2dn($name, $isUser) {
308307
* returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
309308
* @param string $fdn the dn of the group object
310309
* @param string $ldapName optional, the display name of the object

apps/user_ldap/lib/Command/ShowConfig.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
namespace OCA\User_LDAP\Command;
2727

2828
use Symfony\Component\Console\Command\Command;
29+
use Symfony\Component\Console\Helper\Table;
2930
use Symfony\Component\Console\Input\InputArgument;
3031
use Symfony\Component\Console\Input\InputInterface;
3132
use Symfony\Component\Console\Input\InputOption;
@@ -91,7 +92,7 @@ protected function renderConfigs($configIDs, $output, $withPassword) {
9192
$configuration = $configHolder->getConfiguration();
9293
ksort($configuration);
9394

94-
$table = $this->getHelperSet()->get('table');
95+
$table = new Table($output);
9596
$table->setHeaders(array('Configuration', $id));
9697
$rows = array();
9798
foreach($configuration as $key => $value) {

apps/user_ldap/lib/Command/ShowRemnants.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
namespace OCA\User_LDAP\Command;
2727

2828
use Symfony\Component\Console\Command\Command;
29+
use Symfony\Component\Console\Helper\Table;
2930
use Symfony\Component\Console\Input\InputInterface;
3031
use Symfony\Component\Console\Input\InputOption;
3132
use Symfony\Component\Console\Output\OutputInterface;
@@ -64,7 +65,7 @@ protected function configure() {
6465
*/
6566
protected function execute(InputInterface $input, OutputInterface $output) {
6667
/** @var \Symfony\Component\Console\Helper\Table $table */
67-
$table = $this->getHelperSet()->get('table');
68+
$table = new Table($output);
6869
$table->setHeaders(array(
6970
'ownCloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
7071
'Dir', 'Sharer'));

0 commit comments

Comments
 (0)