symfony replaced table helper by class, fixes two broken LDAP occ commands

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index 96b6bae64bda77337e345863b084b24338a5d6bf..40bae8d7b4128e57310662a978f410dde716a5fa 100644 (file)
--- 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 ac70468b1c4f7d025d67d5d98f18fa827a5c4950..7a24889eb096709ff6ab130ce929c89e9e5525b7 100644 (file)
--- 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 df38d6f650dd9c6716f7623fd2cec3f41c840db8..0e6aea6a5ab1268764b4515b76ccec323939a8eb 100644 (file)
--- 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'));