diff options
author | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-12 10:59:29 +0300 |
---|---|---|
committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-25 17:04:56 +0300 |
commit | 4ac283ecd364829d7d4c8a631182770c49dfbd6f (patch) | |
tree | 9cc10854101862a9d6d056cc0f7b001b12414d4d | |
parent | 9d61acb27d11c5a892670ed9e803d3723635fa55 (diff) |
Move Command namespace to PSR-4
-rw-r--r-- | apps/user_ldap/appinfo/register_command.php | 16 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/CheckUser.php (renamed from apps/user_ldap/command/checkuser.php) | 11 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/CreateEmptyConfig.php (renamed from apps/user_ldap/command/createemptyconfig.php) | 4 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/DeleteConfig.php (renamed from apps/user_ldap/command/deleteconfig.php) | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/Search.php (renamed from apps/user_ldap/command/search.php) | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/SetConfig.php (renamed from apps/user_ldap/command/setconfig.php) | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/ShowConfig.php (renamed from apps/user_ldap/command/showconfig.php) | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/ShowRemnants.php (renamed from apps/user_ldap/command/showremnants.php) | 8 | ||||
-rw-r--r-- | apps/user_ldap/lib/Command/TestConfig.php (renamed from apps/user_ldap/command/testconfig.php) | 3 |
9 files changed, 23 insertions, 27 deletions
diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php index f356f635023..637669dbaa4 100644 --- a/apps/user_ldap/appinfo/register_command.php +++ b/apps/user_ldap/appinfo/register_command.php @@ -40,15 +40,15 @@ $deletedUsersIndex = new DeletedUsersIndex( $ocConfig, $dbConnection, $userMapping ); -$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($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( +$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($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()) ); -$application->add(new OCA\user_ldap\Command\CheckUser( +$application->add(new OCA\User_LDAP\Command\CheckUser( $uBackend, $helper, $deletedUsersIndex, $userMapping) ); diff --git a/apps/user_ldap/command/checkuser.php b/apps/user_ldap/lib/Command/CheckUser.php index eb1a7e494d5..b984c9fa5c1 100644 --- a/apps/user_ldap/command/checkuser.php +++ b/apps/user_ldap/lib/Command/CheckUser.php @@ -20,7 +20,7 @@ * */ -namespace OCA\user_ldap\Command; +namespace OCA\User_LDAP\Command; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; @@ -28,7 +28,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use OCA\user_ldap\lib\user\User; use OCA\User_LDAP\lib\User\DeletedUsersIndex; use OCA\User_LDAP\Mapping\UserMapping; use OCA\user_ldap\lib\Helper as LDAPHelper; @@ -48,10 +47,10 @@ class CheckUser extends Command { protected $mapping; /** - * @param OCA\user_ldap\User_Proxy $uBackend - * @param OCA\user_ldap\lib\Helper $helper - * @param OCA\User_LDAP\lib\User\DeletedUsersIndex $dui - * @param OCA\User_LDAP\Mapping\UserMapping $mapping + * @param User_Proxy $uBackend + * @param LDAPHelper $helper + * @param DeletedUsersIndex $dui + * @param UserMapping $mapping */ public function __construct(User_Proxy $uBackend, LDAPHelper $helper, DeletedUsersIndex $dui, UserMapping $mapping) { $this->backend = $uBackend; diff --git a/apps/user_ldap/command/createemptyconfig.php b/apps/user_ldap/lib/Command/CreateEmptyConfig.php index f1c94704415..9ce665e049c 100644 --- a/apps/user_ldap/command/createemptyconfig.php +++ b/apps/user_ldap/lib/Command/CreateEmptyConfig.php @@ -21,12 +21,10 @@ * */ -namespace OCA\user_ldap\Command; +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; use \OCA\user_ldap\lib\Configuration; diff --git a/apps/user_ldap/command/deleteconfig.php b/apps/user_ldap/lib/Command/DeleteConfig.php index 4dfef9c18da..5a7986d1303 100644 --- a/apps/user_ldap/command/deleteconfig.php +++ b/apps/user_ldap/lib/Command/DeleteConfig.php @@ -21,7 +21,7 @@ * */ -namespace OCA\user_ldap\Command; +namespace OCA\User_LDAP\Command; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; diff --git a/apps/user_ldap/command/search.php b/apps/user_ldap/lib/Command/Search.php index 8d43d15649a..f5352ae482a 100644 --- a/apps/user_ldap/command/search.php +++ b/apps/user_ldap/lib/Command/Search.php @@ -20,7 +20,7 @@ * */ -namespace OCA\user_ldap\Command; +namespace OCA\User_LDAP\Command; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; diff --git a/apps/user_ldap/command/setconfig.php b/apps/user_ldap/lib/Command/SetConfig.php index 575d429241b..7e2e2f19f66 100644 --- a/apps/user_ldap/command/setconfig.php +++ b/apps/user_ldap/lib/Command/SetConfig.php @@ -21,7 +21,7 @@ * */ -namespace OCA\user_ldap\Command; +namespace OCA\User_LDAP\Command; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; diff --git a/apps/user_ldap/command/showconfig.php b/apps/user_ldap/lib/Command/ShowConfig.php index 164cdada100..ea0ad3fed05 100644 --- a/apps/user_ldap/command/showconfig.php +++ b/apps/user_ldap/lib/Command/ShowConfig.php @@ -21,7 +21,7 @@ * */ -namespace OCA\user_ldap\Command; +namespace OCA\User_LDAP\Command; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; diff --git a/apps/user_ldap/command/showremnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php index 83bb5eaefd3..de435ec4327 100644 --- a/apps/user_ldap/command/showremnants.php +++ b/apps/user_ldap/lib/Command/ShowRemnants.php @@ -21,7 +21,7 @@ * */ -namespace OCA\user_ldap\Command; +namespace OCA\User_LDAP\Command; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; @@ -39,8 +39,8 @@ class ShowRemnants extends Command { protected $dateFormatter; /** - * @param OCA\user_ldap\lib\user\DeletedUsersIndex $dui - * @param OCP\IDateTimeFormatter $dateFormatter + * @param DeletedUsersIndex $dui + * @param IDateTimeFormatter $dateFormatter */ public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) { $this->dui = $dui; @@ -74,7 +74,7 @@ class ShowRemnants extends Command { $this->dateFormatter->formatDate($user->getLastLogin()) : '-'; $rows[] = array('ocName' => $user->getOCName(), 'displayName' => $user->getDisplayName(), - 'uid' => $user->getUid(), + 'uid' => $user->getUID(), 'dn' => $user->getDN(), 'lastLogin' => $lastLogin, 'homePath' => $user->getHomePath(), diff --git a/apps/user_ldap/command/testconfig.php b/apps/user_ldap/lib/Command/TestConfig.php index 62d40265777..790b9df6637 100644 --- a/apps/user_ldap/command/testconfig.php +++ b/apps/user_ldap/lib/Command/TestConfig.php @@ -21,12 +21,11 @@ * */ -namespace OCA\user_ldap\Command; +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; use \OCA\user_ldap\lib\Connection; |