From 02d5b75fb44340e82c2694e99c5cd01a53dab6d9 Mon Sep 17 00:00:00 2001 From: Joas Schilling <nickvergessen@owncloud.com> Date: Thu, 12 May 2016 16:38:51 +0200 Subject: Move BackendUtility to PSR-4 --- apps/user_ldap/lib/BackendUtility.php | 39 +++++++++++++++++++++++++++++++++++ apps/user_ldap/lib/Group_LDAP.php | 1 - apps/user_ldap/lib/User_LDAP.php | 1 - apps/user_ldap/lib/backendutility.php | 37 --------------------------------- 4 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 apps/user_ldap/lib/BackendUtility.php delete mode 100644 apps/user_ldap/lib/backendutility.php (limited to 'apps') diff --git a/apps/user_ldap/lib/BackendUtility.php b/apps/user_ldap/lib/BackendUtility.php new file mode 100644 index 00000000000..e00a0e8888a --- /dev/null +++ b/apps/user_ldap/lib/BackendUtility.php @@ -0,0 +1,39 @@ +<?php +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\User_LDAP; + + +use OCA\user_ldap\lib\Access; + +abstract class BackendUtility { + protected $access; + + /** + * constructor, make sure the subclasses call this one! + * @param Access $access an instance of Access for LDAP interaction + */ + public function __construct(Access $access) { + $this->access = $access; + } +} diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 163590ad03a..d389610b641 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -35,7 +35,6 @@ namespace OCA\User_LDAP; use OCA\user_ldap\lib\Access; -use OCA\user_ldap\lib\BackendUtility; class Group_LDAP extends BackendUtility implements \OCP\GroupInterface { protected $enabled = false; diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index 1098a30a501..185e522b529 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -32,7 +32,6 @@ namespace OCA\User_LDAP; use OC\User\NoUserException; -use OCA\user_ldap\lib\BackendUtility; use OCA\user_ldap\lib\Access; use OCA\User_LDAP\User\OfflineUser; use OCA\User_LDAP\User\User; diff --git a/apps/user_ldap/lib/backendutility.php b/apps/user_ldap/lib/backendutility.php deleted file mode 100644 index 87c1649cada..00000000000 --- a/apps/user_ldap/lib/backendutility.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php -/** - * @author Arthur Schiwon <blizzz@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -namespace OCA\user_ldap\lib; - - -abstract class BackendUtility { - protected $access; - - /** - * constructor, make sure the subclasses call this one! - * @param Access $access an instance of Access for LDAP interaction - */ - public function __construct(Access $access) { - $this->access = $access; - } -} -- cgit v1.2.3