Merge pull request #57509 from nextcloud/fix/use-strict-array-search

susnux · web-flow · commit 0fa396d0b8f3 · 2026-01-13T15:22:20.000+01:00
Use strict array search
diff --git a/apps/dav/lib/Connector/Sabre/TagsPlugin.php b/apps/dav/lib/Connector/Sabre/TagsPlugin.php
@@ -123,7 +123,7 @@ private function getTagsAndFav($fileId) {
 		$isFav = false;
 		$tags = $this->getTags($fileId);
 		if ($tags) {
-			$favPos = array_search(self::TAG_FAVORITE, $tags);
+			$favPos = array_search(self::TAG_FAVORITE, $tags, true);
 			if ($favPos !== false) {
 				$isFav = true;
 				unset($tags[$favPos]);
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -242,11 +242,11 @@ private function getLanguageMap(IUser $user): array {
 		$languages = $this->l10nFactory->getLanguages();
 
 		// associate the user language with the proper array
-		$userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'));
+		$userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'), true);
 		$userLang = $languages['commonLanguages'][$userLangIndex];
 		// search in the other languages
 		if ($userLangIndex === false) {
-			$userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code'));
+			$userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code'), true);
 			$userLang = $languages['otherLanguages'][$userLangIndex];
 		}
 		// if user language is not available but set somehow: show the actual code as name
diff --git a/apps/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php
@@ -141,7 +141,7 @@ private function getServersConfig(string $value): array {
 	 */
 	public function deleteServerConfiguration($prefix) {
 		$prefixes = $this->getServerConfigurationPrefixes();
-		$index = array_search($prefix, $prefixes);
+		$index = array_search($prefix, $prefixes, true);
 		if ($index === false) {
 			return false;
 		}
diff --git a/apps/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php
@@ -447,7 +447,7 @@ public function unmap($name) {
 			DELETE FROM `' . $this->getTableName() . '`
 			WHERE `owncloud_name` = ?');
 
-		$dn = array_search($name, $this->cache);
+		$dn = array_search($name, $this->cache, true);
 		if ($dn !== false) {
 			unset($this->cache[$dn]);
 		}
diff --git a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php
@@ -71,7 +71,7 @@ public function testMarkAndFetchUser(): void {
 		// ensure the different uids were used
 		foreach ($deletedUsers as $deletedUser) {
 			$this->assertTrue(in_array($deletedUser->getOCName(), $uids));
-			$i = array_search($deletedUser->getOCName(), $uids);
+			$i = array_search($deletedUser->getOCName(), $uids, true);
 			$this->assertNotFalse($i);
 			unset($uids[$i]);
 		}
diff --git a/apps/user_status/lib/Listener/UserLiveStatusListener.php b/apps/user_status/lib/Listener/UserLiveStatusListener.php
@@ -82,7 +82,7 @@ public function handle(Event $event): void {
 
 		// If the emitted status is more important than the current status
 		// treat it as outdated and update
-		if (array_search($event->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES) < array_search($userStatus->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES)) {
+		if (array_search($event->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES, true) < array_search($userStatus->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES, true)) {
 			$needsUpdate = true;
 		}
 
diff --git a/build/integration/features/bootstrap/Trashbin.php b/build/integration/features/bootstrap/Trashbin.php
@@ -97,7 +97,7 @@ public function checkTrashContents($user, $folder, $expectedElements) {
 			$elementsSimplified = $this->simplifyArray($elementRows);
 			foreach ($elementsSimplified as $expectedElement) {
 				$expectedElement = ltrim($expectedElement, '/');
-				if (array_search($expectedElement, $trashContent) === false) {
+				if (array_search($expectedElement, $trashContent, true) === false) {
 					Assert::fail("$expectedElement" . ' is not in trash listing');
 				}
 			}
@@ -121,7 +121,7 @@ public function checkTrashContains($user, $type, $file) {
 			return $item['{http://nextcloud.org/ns}trashbin-filename'];
 		}, $elementList));
 
-		if (array_search($name, array_values($trashContent)) === false) {
+		if (array_search($name, array_values($trashContent), true) === false) {
 			Assert::fail("$name" . ' is not in trash listing');
 		}
 	}
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
@@ -438,7 +438,7 @@ public function theResponseShouldContainAShareTypesPropertyWith($table) {
 		}
 
 		foreach ($table->getRows() as $row) {
-			$key = array_search($row[0], $foundTypes);
+			$key = array_search($row[0], $foundTypes, true);
 			if ($key === false) {
 				throw new \Exception('Expected type ' . $row[0] . ' not found');
 			}
diff --git a/lib/base.php b/lib/base.php
@@ -970,7 +970,7 @@ private static function registerAppRestrictionsHooks(): void {
 				if (empty($restrictions)) {
 					continue;
 				}
-				$key = array_search($group->getGID(), $restrictions);
+				$key = array_search($group->getGID(), $restrictions, true);
 				unset($restrictions[$key]);
 				$restrictions = array_values($restrictions);
 				if (empty($restrictions)) {
diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
@@ -354,7 +354,7 @@ protected function sendEmailVerificationEmail(IUser $user, string $email): bool
 	protected function addMissingDefaultValues(array $userData, array $defaultUserData): array {
 		foreach ($defaultUserData as $defaultDataItem) {
 			// If property does not exist, initialize it
-			$userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'));
+			$userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'), true);
 			if ($userDataIndex === false) {
 				$userData[] = $defaultDataItem;
 				continue;
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
@@ -250,7 +250,7 @@ public function file_exists(string $path): bool {
 				return false;
 			}
 			$content = scandir($parentPath, SCANDIR_SORT_NONE);
-			return is_array($content) && array_search(basename($fullPath), $content) !== false;
+			return is_array($content) && array_search(basename($fullPath), $content, true) !== false;
 		} else {
 			return file_exists($this->getSourcePath($path));
 		}
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
@@ -654,7 +654,7 @@ public function getLanguages(): array {
 			// put appropriate languages into appropriate arrays, to print them sorted
 			// common languages -> divider -> other languages
 			if (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
-				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)] = $ln;
+				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES, true)] = $ln;
 			} else {
 				$otherLanguages[] = $ln;
 			}
diff --git a/lib/private/Tags.php b/lib/private/Tags.php
@@ -645,7 +645,8 @@ protected function array_searchi($needle, $haystack, $mem = 'getName') {
 		return array_search(strtolower($needle), array_map(
 			function ($tag) use ($mem) {
 				return strtolower(call_user_func([$tag, $mem]));
-			}, $haystack)
+			}, $haystack),
+			true
 		);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private function getServersConfig(string $value): array {`
`141`	`141`	`*/`
`142`	`142`	`public function deleteServerConfiguration($prefix) {`
`143`	`143`	`$prefixes = $this->getServerConfigurationPrefixes();`
`144`		`- $index = array_search($prefix, $prefixes);`
	`144`	`+ $index = array_search($prefix, $prefixes, true);`
`145`	`145`	`if ($index === false) {`
`146`	`146`	`return false;`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ public function unmap($name) {`
`447`	`447`	DELETE FROM `' . $this->getTableName() . '`
`448`	`448`	WHERE `owncloud_name` = ?');
`449`	`449`
`450`		`- $dn = array_search($name, $this->cache);`
	`450`	`+ $dn = array_search($name, $this->cache, true);`
`451`	`451`	`if ($dn !== false) {`
`452`	`452`	`unset($this->cache[$dn]);`
`453`	`453`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function testMarkAndFetchUser(): void {`
`71`	`71`	`// ensure the different uids were used`
`72`	`72`	`foreach ($deletedUsers as $deletedUser) {`
`73`	`73`	`$this->assertTrue(in_array($deletedUser->getOCName(), $uids));`
`74`		`- $i = array_search($deletedUser->getOCName(), $uids);`
	`74`	`+ $i = array_search($deletedUser->getOCName(), $uids, true);`
`75`	`75`	`$this->assertNotFalse($i);`
`76`	`76`	`unset($uids[$i]);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function handle(Event $event): void {`
`82`	`82`
`83`	`83`	`// If the emitted status is more important than the current status`
`84`	`84`	`// treat it as outdated and update`
`85`		`- if (array_search($event->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES) < array_search($userStatus->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES)) {`
	`85`	`+ if (array_search($event->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES, true) < array_search($userStatus->getStatus(), StatusService::PRIORITY_ORDERED_STATUSES, true)) {`
`86`	`86`	`$needsUpdate = true;`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function checkTrashContents($user, $folder, $expectedElements) {`
`97`	`97`	`$elementsSimplified = $this->simplifyArray($elementRows);`
`98`	`98`	`foreach ($elementsSimplified as $expectedElement) {`
`99`	`99`	`$expectedElement = ltrim($expectedElement, '/');`
`100`		`- if (array_search($expectedElement, $trashContent) === false) {`
	`100`	`+ if (array_search($expectedElement, $trashContent, true) === false) {`
`101`	`101`	`Assert::fail("$expectedElement" . ' is not in trash listing');`
`102`	`102`	`}`
`103`	`103`	`}`
`@@ -121,7 +121,7 @@ public function checkTrashContains($user, $type, $file) {`
`121`	`121`	`return $item['{http://nextcloud.org/ns}trashbin-filename'];`
`122`	`122`	`}, $elementList));`
`123`	`123`
`124`		`- if (array_search($name, array_values($trashContent)) === false) {`
	`124`	`+ if (array_search($name, array_values($trashContent), true) === false) {`
`125`	`125`	`Assert::fail("$name" . ' is not in trash listing');`
`126`	`126`	`}`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ public function theResponseShouldContainAShareTypesPropertyWith($table) {`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`foreach ($table->getRows() as $row) {`
`441`		`- $key = array_search($row[0], $foundTypes);`
	`441`	`+ $key = array_search($row[0], $foundTypes, true);`
`442`	`442`	`if ($key === false) {`
`443`	`443`	`throw new \Exception('Expected type ' . $row[0] . ' not found');`
`444`	`444`	`}`
Original file line number	Diff line number	Diff line change
`@@ -970,7 +970,7 @@ private static function registerAppRestrictionsHooks(): void {`
`970`	`970`	`if (empty($restrictions)) {`
`971`	`971`	`continue;`
`972`	`972`	`}`
`973`		`- $key = array_search($group->getGID(), $restrictions);`
	`973`	`+ $key = array_search($group->getGID(), $restrictions, true);`
`974`	`974`	`unset($restrictions[$key]);`
`975`	`975`	`$restrictions = array_values($restrictions);`
`976`	`976`	`if (empty($restrictions)) {`