Merge pull request #847 from nextcloud/backport/810/stable28

[stable28] fix #745 ValueError: random_int(): Argument #1 ($min) must be less than or equal to argument #2 ($max)
nextcloud · Feb 15, 2024 · 7e8e975 · 7e8e975
2 parents 05c40eb + 89c7556
commit 7e8e975
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/Service/NegativeSampleGenerator.php b/lib/Service/NegativeSampleGenerator.php
@@ -71,7 +71,7 @@ private function getUniqueIPsPerUser(Dataset $positives): array {
 	private function generateFromRealData(array $uidVec, array $uniqueIps): array {
 		return array_merge(
 			$uidVec,
-			$uniqueIps[random_int(0, count($uniqueIps) - 1)]
+			empty($uniqueIps) ? [] : $uniqueIps[random_int(0, count($uniqueIps) - 1)]
 		);
 	}
 

diff --git a/tests/Unit/Service/NegativeSampleGeneratorTest.php b/tests/Unit/Service/NegativeSampleGeneratorTest.php
@@ -131,6 +131,17 @@ public function testGenerateMultipleShuffledFromLimitedUnique(): void {
 				'sample has a unique IP'
 			);
 		}
+
+		$positives = new Unlabeled([
+			array_merge(self::decToBitArray(1, 16), self::decToBitArray(1, 32)),
+			array_merge(self::decToBitArray(2, 16), self::decToBitArray(1, 32)),
+			array_merge(self::decToBitArray(3, 16), self::decToBitArray(1, 32)),
+			array_merge(self::decToBitArray(4, 16), self::decToBitArray(1, 32)),
+		]);
+
+		$result = $this->generator->generateShuffledFromPositiveSamples($positives, 5);
+
+		self::assertCount(5, $result);
 	}
 
 	/**