From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 15 Mar 2022 07:44:17 +0000 (+0100)
Subject: PHP deprecation warning due wrong order of function parameters
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=12038d45d0217fd166651477894cc14fc446c33e;p=friendica.git

PHP deprecation warning due wrong order of function parameters

With PHP 8.0 I got the following PHP Deprecation message

```
PHP Deprecated:  Required parameter $limit follows optional parameter $ids in src/Worker/UpdateContacts.php on line 104
```

this PR fixes the wrong order of the parameters.
---

diff --git a/src/Worker/UpdateContacts.php b/src/Worker/UpdateContacts.php
index d7348b2586..95ac8fd23c 100644
--- a/src/Worker/UpdateContacts.php
+++ b/src/Worker/UpdateContacts.php
@@ -52,7 +52,7 @@ class UpdateContacts
 		$condition = DBA::mergeConditions($base_condition,
 			["`uid` != ? AND (`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
 			0, DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]);
-		$ids = self::getContactsToUpdate($condition, [], $limit);
+		$ids = self::getContactsToUpdate($condition, $limit, []);
 		Logger::info('Fetched federated user contacts', ['count' => count($ids)]);
 
 		$conditions = ["`id` IN (SELECT `author-id` FROM `post` WHERE `author-id` = `contact`.`id`)",
@@ -65,7 +65,7 @@ class UpdateContacts
 			$condition = DBA::mergeConditions($base_condition,
 				[$contact_condition . " AND (`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
 				DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]);
-			$ids = self::getContactsToUpdate($condition, $ids, $limit);
+			$ids = self::getContactsToUpdate($condition, $limit, $ids);
 			Logger::info('Fetched interacting federated contacts', ['count' => count($ids), 'condition' => $contact_condition]);
 		}
 
@@ -80,7 +80,7 @@ class UpdateContacts
 				["(`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
 					DateTimeFormat::utc('now - 6 month'), DateTimeFormat::utc('now - 1 month')]);
 			$previous = count($ids);
-			$ids = self::getContactsToUpdate($condition, $ids, $limit - $previous);
+			$ids = self::getContactsToUpdate($condition, $limit - $previous, $ids);
 			Logger::info('Fetched federated contacts', ['count' => count($ids) - $previous]);
 		}
 
@@ -101,7 +101,7 @@ class UpdateContacts
 	 * @param array $ids
 	 * @return array contact ids
 	 */
-	private static function getContactsToUpdate(array $condition, array $ids = [], int $limit)
+	private static function getContactsToUpdate(array $condition, int $limit, array $ids = [])
 	{
 		$contacts = DBA::select('contact', ['id'], $condition, ['limit' => $limit]);
 		while ($contact = DBA::fetch($contacts)) {