Merge pull request #848 from nextcloud/dependabot/composer/nextcloud/…

…coding-standard-1.2.1 build(deps-dev): bump nextcloud/coding-standard from 1.1.1 to 1.2.1
nextcloud · May 13, 2024 · f0c1f24 · f0c1f24
2 parents f8c93e1 + 117a302
commit f0c1f24
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/GroupBackend.php b/lib/GroupBackend.php
@@ -176,7 +176,7 @@ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0): arra
 		return $users;
 	}
 
-	public function createGroup(string $gid, string $samlGid = null): bool {
+	public function createGroup(string $gid, ?string $samlGid = null): bool {
 		try {
 			// Add group
 			$builder = $this->dbc->getQueryBuilder();

diff --git a/lib/GroupManager.php b/lib/GroupManager.php
@@ -173,15 +173,15 @@ protected function assignUserToGroup(IUser $user, string $gid): void {
 
 	protected function createGroupInBackend(string $gid, ?string $originalGid = null): ?IGroup {
 		if ($this->groupManager instanceof PublicEmitter) {
-			$this->groupManager->emit('\OC\Group', 'preCreate', array($gid));
+			$this->groupManager->emit('\OC\Group', 'preCreate', [$gid]);
 		}
 		if (!$this->ownGroupBackend->createGroup($gid, $originalGid ?? $gid)) {
 			return null;
 		}
 
 		$group = $this->groupManager->get($gid);
 		if ($this->groupManager instanceof PublicEmitter) {
-			$this->groupManager->emit('\OC\Group', 'postCreate', array($group));
+			$this->groupManager->emit('\OC\Group', 'postCreate', [$group]);
 		}
 
 		return $group;
@@ -196,7 +196,7 @@ protected function findGroup(string $gid): IGroup {
 			GroupManager::LOCAL_GROUPS_CHECK_FOR_MIGRATION,
 			''
 		);
-		$strictBackendCheck = '' === $migrationAllowListRaw;
+		$strictBackendCheck = $migrationAllowListRaw === '';
 
 		$migrationAllowList = null;
 		if ($migrationAllowListRaw !== '') {

diff --git a/lib/SAMLSettings.php b/lib/SAMLSettings.php
@@ -221,8 +221,8 @@ public function delete(int $id): void {
 	 * @throws Exception
 	 */
 	protected function ensureConfigurationsLoaded(int $idp = -1): void {
-		if (self::LOADED_ALL === $this->configurationsLoadedState
-			|| (self::LOADED_CHOSEN === $this->configurationsLoadedState
+		if ($this->configurationsLoadedState === self::LOADED_ALL
+			|| ($this->configurationsLoadedState === self::LOADED_CHOSEN
 				&& isset($this->configurations[$idp])
 			)
 		) {

diff --git a/lib/UserBackend.php b/lib/UserBackend.php
@@ -118,9 +118,9 @@ public function createUserIfNotExists(string $uid, array $attributes = []): void
 			if ($home !== '') {
 				//if attribute's value is an absolute path take this, otherwise append it to data dir
 				//check for / at the beginning or pattern c:\ resp. c:/
-				if ('/' !== $home[0]
-				   && !(3 < strlen($home) && ctype_alpha($home[0])
-					   && $home[1] === ':' && ('\\' === $home[2] || '/' === $home[2]))
+				if ($home[0] !== '/'
+				   && !(strlen($home) > 3 && ctype_alpha($home[0])
+					   && $home[1] === ':' && ($home[2] === '\\' || $home[2] === '/'))
 				) {
 					$home = $this->config->getSystemValue('datadirectory',
 						\OC::$SERVERROOT.'/data') . '/' . $home;

diff --git a/tests/unit/GroupBackendTest.php b/tests/unit/GroupBackendTest.php
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-use \OCA\User_SAML\GroupBackend;
+use OCA\User_SAML\GroupBackend;
 use OCP\IDBConnection;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;