Merge pull request #57632 from nextcloud/backport/57517/stable30

[stable30] Use strict array search

Author: blizzz

apps/dav/lib/Connector/Sabre/TagsPlugin.php

@@ -124,7 +124,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]);

apps/settings/lib/Settings/Personal/PersonalInfo.php

@@ -273,11 +273,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

apps/user_ldap/lib/Mapping/AbstractMapping.php

@@ -116,7 +116,7 @@ protected function modify(IPreparedStatement $statement, $parameters) {
 	 * @return string|false
 	 */
 	public function getDNByName($name) {
-		$dn = array_search($name, $this->cache);
+		$dn = array_search($name, $this->cache, true);
 		if ($dn === false && ($dn = $this->getXbyY('ldap_dn', 'owncloud_name', $name)) !== false) {
 			$this->cache[$dn] = $name;
 		}
@@ -373,7 +373,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]);
 		}

apps/user_ldap/tests/User/DeletedUsersIndexTest.php

@@ -76,7 +76,7 @@ public function testMarkAndFetchUser() {
 		// 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]);
 		}

apps/user_status/lib/Listener/UserLiveStatusListener.php

@@ -87,7 +87,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;
 		}
 

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');
 				}
 			}

build/integration/features/bootstrap/WebDav.php

@@ -407,7 +407,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');
 			}

lib/base.php

@@ -892,7 +892,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)) {

lib/private/Accounts/AccountManager.php

@@ -352,7 +352,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;

lib/private/Files/Storage/Local.php

@@ -252,7 +252,7 @@ public function file_exists($path) {
 				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));
 		}