9 files changed, 30 insertions, 29 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index 6744b044cdf..71994585c73 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -64,7 +64,7 @@ use OCP\IUserManager;
  * @package OCA\User_LDAP
  */
 class Access extends LDAPUtility {
-	const UUID_ATTRIBUTES = ['entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid'];
+	public const UUID_ATTRIBUTES = ['entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid'];
 
 	/** @var \OCA\User_LDAP\Connection */
 	public $connection;
diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php
index 4076a6e8a3d..81e33e6244f 100644
--- a/apps/user_ldap/lib/Configuration.php
+++ b/apps/user_ldap/lib/Configuration.php
@@ -41,9 +41,9 @@ namespace OCA\User_LDAP;
  * @property string ldapUserAvatarRule
  */
 class Configuration {
-	const AVATAR_PREFIX_DEFAULT = 'default';
-	const AVATAR_PREFIX_NONE = 'none';
-	const AVATAR_PREFIX_DATA_ATTRIBUTE = 'data:';
+	public const AVATAR_PREFIX_DEFAULT = 'default';
+	public const AVATAR_PREFIX_NONE = 'none';
+	public const AVATAR_PREFIX_DATA_ATTRIBUTE = 'data:';
 
 	protected $configPrefix = null;
 	protected $configRead = false;
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
index cec4866b0ea..0cc93a08e6f 100644
--- a/apps/user_ldap/lib/Connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -348,6 +348,7 @@ class Connection extends LDAPUtility {
 						$result[$dbkey] = implode("\n", $config[$configkey]);
 						break;
 					} //else follows default
+					// no break
 				default:
 					$result[$dbkey] = $config[$configkey];
 			}
diff --git a/apps/user_ldap/lib/Controller/RenewPasswordController.php b/apps/user_ldap/lib/Controller/RenewPasswordController.php
index 499a25e0d28..3395d10c488 100644
--- a/apps/user_ldap/lib/Controller/RenewPasswordController.php
+++ b/apps/user_ldap/lib/Controller/RenewPasswordController.php
@@ -54,7 +54,7 @@ class RenewPasswordController extends Controller {
 	 * @param IConfig $config
 	 * @param IURLGenerator $urlGenerator
 	 */
-	function __construct($appName, IRequest $request, IUserManager $userManager,
+	public function __construct($appName, IRequest $request, IUserManager $userManager,
 		IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
 		parent::__construct($appName, $request);
 		$this->userManager = $userManager;
diff --git a/apps/user_ldap/lib/Jobs/Sync.php b/apps/user_ldap/lib/Jobs/Sync.php
index 1ef2d16e7c2..053ca894902 100644
--- a/apps/user_ldap/lib/Jobs/Sync.php
+++ b/apps/user_ldap/lib/Jobs/Sync.php
@@ -43,8 +43,8 @@ use OCP\IUserManager;
 use OCP\Notification\IManager;
 
 class Sync extends TimedJob {
-	const MAX_INTERVAL = 12 * 60 * 60; // 12h
-	const MIN_INTERVAL = 30 * 60; // 30min
+	public const MAX_INTERVAL = 12 * 60 * 60; // 12h
+	public const MIN_INTERVAL = 30 * 60; // 30min
 	/** @var  Helper */
 	protected $ldapHelper;
 	/** @var  LDAP */
diff --git a/apps/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php
index 19981a69bd2..6241483cb92 100644
--- a/apps/user_ldap/lib/Jobs/UpdateGroups.php
+++ b/apps/user_ldap/lib/Jobs/UpdateGroups.php
@@ -46,9 +46,9 @@ use OCA\User_LDAP\User\Manager;
 use OCP\ILogger;
 
 class UpdateGroups extends \OC\BackgroundJob\TimedJob {
-	static private $groupsFromDB;
+	private static $groupsFromDB;
 
-	static private $groupBE;
+	private static $groupBE;
 
 	public function __construct() {
 		$this->interval = self::getRefreshInterval();
@@ -61,7 +61,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
 		self::updateGroups();
 	}
 
-	static public function updateGroups() {
+	public static function updateGroups() {
 		\OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', ILogger::DEBUG);
 
 		$knownGroups = array_keys(self::getKnownGroups());
@@ -84,7 +84,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
 	/**
 	 * @return int
 	 */
-	static private function getRefreshInterval() {
+	private static function getRefreshInterval() {
 		//defaults to every hour
 		return \OC::$server->getConfig()->getAppValue('user_ldap', 'bgjRefreshInterval', 3600);
 	}
@@ -92,7 +92,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
 	/**
 	 * @param string[] $groups
 	 */
-	static private function handleKnownGroups($groups) {
+	private static function handleKnownGroups($groups) {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', ILogger::DEBUG);
 		$query = \OC_DB::prepare('
 			UPDATE `*PREFIX*ldap_group_members`
@@ -130,7 +130,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
 	/**
 	 * @param string[] $createdGroups
 	 */
-	static private function handleCreatedGroups($createdGroups) {
+	private static function handleCreatedGroups($createdGroups) {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', ILogger::DEBUG);
 		$query = \OC_DB::prepare('
 			INSERT
@@ -152,7 +152,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
 	/**
 	 * @param string[] $removedGroups
 	 */
-	static private function handleRemovedGroups($removedGroups) {
+	private static function handleRemovedGroups($removedGroups) {
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', ILogger::DEBUG);
 		$query = \OC_DB::prepare('
 			DELETE
@@ -173,7 +173,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
 	/**
 	 * @return \OCA\User_LDAP\Group_LDAP|\OCA\User_LDAP\Group_Proxy
 	 */
-	static private function getGroupBE() {
+	private static function getGroupBE() {
 		if (!is_null(self::$groupBE)) {
 			return self::$groupBE;
 		}
@@ -209,7 +209,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
 	/**
 	 * @return array
 	 */
-	static private function getKnownGroups() {
+	private static function getKnownGroups() {
 		if (is_array(self::$groupsFromDB)) {
 			return self::$groupsFromDB;
 		}
diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
index 7698895eaf0..3cf55f8cd58 100644
--- a/apps/user_ldap/lib/Proxy.php
+++ b/apps/user_ldap/lib/Proxy.php
@@ -38,7 +38,7 @@ use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User\Manager;
 
 abstract class Proxy {
-	static private $accesses = [];
+	private static $accesses = [];
 	private $ldap = null;
 
 	/** @var \OCP\ICache|null */
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index 724db063659..7d4e6c267de 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -107,8 +107,8 @@ class User {
 	/**
 	 * DB config keys for user preferences
 	 */
-	const USER_PREFKEY_FIRSTLOGIN  = 'firstLoginAccomplished';
-	const USER_PREFKEY_LASTREFRESH = 'lastFeatureRefresh';
+	public const USER_PREFKEY_FIRSTLOGIN  = 'firstLoginAccomplished';
+	public const USER_PREFKEY_LASTREFRESH = 'lastFeatureRefresh';
 
 	/**
 	 * @brief constructor, make sure the subclasses call this one!
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index 01a9e19076d..73032bfd7f2 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -43,25 +43,25 @@ use OCP\ILogger;
 
 class Wizard extends LDAPUtility {
 	/** @var \OCP\IL10N */
-	static protected $l;
+	protected static $l;
 	protected $access;
 	protected $cr;
 	protected $configuration;
 	protected $result;
 	protected $resultCache = [];
 
-	const LRESULT_PROCESSED_OK = 2;
-	const LRESULT_PROCESSED_INVALID = 3;
-	const LRESULT_PROCESSED_SKIP = 4;
+	public const LRESULT_PROCESSED_OK = 2;
+	public const LRESULT_PROCESSED_INVALID = 3;
+	public const LRESULT_PROCESSED_SKIP = 4;
 
-	const LFILTER_LOGIN      = 2;
-	const LFILTER_USER_LIST  = 3;
-	const LFILTER_GROUP_LIST = 4;
+	public const LFILTER_LOGIN      = 2;
+	public const LFILTER_USER_LIST  = 3;
+	public const LFILTER_GROUP_LIST = 4;
 
-	const LFILTER_MODE_ASSISTED = 2;
-	const LFILTER_MODE_RAW = 1;
+	public const LFILTER_MODE_ASSISTED = 2;
+	public const LFILTER_MODE_RAW = 1;
 
-	const LDAP_NW_TIMEOUT = 4;
+	public const LDAP_NW_TIMEOUT = 4;
 
 	/**
 	 * Constructor