From 29760ef09b4fbd870e21dcc55ac91a8513cf9a93 Mon Sep 17 00:00:00 2001 From: Domeshow Date: Mon, 8 Jul 2024 18:03:43 +0200 Subject: [PATCH 1/3] [ENH] Add support for php8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7f2a501..cae6216 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "issues": "https://github.com/gidkom/php-openfire-restapi/issues" }, "require": { - "php": "^7.2.5", + "php": "^7.2.5 || ^8.0", "ext-curl": "*", "guzzlehttp/guzzle": "^7.0" }, From 1ae5ebe1c25288959ff69895e50336c6f51b6c04 Mon Sep 17 00:00:00 2001 From: Domeshow Date: Mon, 8 Jul 2024 18:47:43 +0200 Subject: [PATCH 2/3] [FIX] Fix Rosters CRUD --- src/Gidkom/OpenFireRestApi/OpenFireRestApi.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Gidkom/OpenFireRestApi/OpenFireRestApi.php b/src/Gidkom/OpenFireRestApi/OpenFireRestApi.php index 80e37b1..b7222ce 100644 --- a/src/Gidkom/OpenFireRestApi/OpenFireRestApi.php +++ b/src/Gidkom/OpenFireRestApi/OpenFireRestApi.php @@ -190,10 +190,10 @@ public function userRosters($username) * @param int|false $subscriptionType Subscription (Optional) * @return json|false Json with data or error, or False when something went fully wrong */ - public function addToRoster($username, $jid, $name=false, $subscriptionType=false) + public function addToRoster($username, $jid, $nickname=null, $subscriptionType=null) { $endpoint = '/users/'.$username.'/roster'; - return $this->doRequest('POST', $endpoint, compact('jid','name','subscriptionType')); + return $this->doRequest('POST', $endpoint, compact('jid','nickname','subscriptionType')); } @@ -219,10 +219,10 @@ public function deleteFromRoster($username, $jid) * @param int|false $subscriptionType Subscription (Optional) * @return json|false Json with data or error, or False when something went fully wrong */ - public function updateRoster($username, $jid, $nickname=false, $subscriptionType=false) + public function updateRoster($username, $jid, $nickname=null, $subscriptionType=null) { $endpoint = '/users/'.$username.'/roster/'.$jid; - return $this->doRequest('PUT', $endpoint, $jid, compact('jid','username','subscriptionType')); + return $this->doRequest('PUT', $endpoint, compact('jid', 'subscriptionType', 'nickname')); } From 24624822e5d79209b2f7b63654b0d169e5f70ba8 Mon Sep 17 00:00:00 2001 From: Domeshow Date: Mon, 8 Jul 2024 18:49:06 +0200 Subject: [PATCH 3/3] [FIX] Fix Users CRUD --- src/Gidkom/OpenFireRestApi/OpenFireRestApi.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Gidkom/OpenFireRestApi/OpenFireRestApi.php b/src/Gidkom/OpenFireRestApi/OpenFireRestApi.php index b7222ce..983fe96 100644 --- a/src/Gidkom/OpenFireRestApi/OpenFireRestApi.php +++ b/src/Gidkom/OpenFireRestApi/OpenFireRestApi.php @@ -53,7 +53,7 @@ public function getUser($username) * @param string|false $email Email (Optional) * @return json|false Json with data or error, or False when something went fully wrong */ - public function addUser($username, $password, $name=false, $email=false) + public function addUser($username, $password, $name=null, $email=null) { $endpoint = '/users'; return $this->doRequest('POST', $endpoint, compact('username', 'password','name','email')); @@ -82,10 +82,10 @@ public function deleteUser($username) * @param string[]|false $groups Groups (Optional) * @return json|false Json with data or error, or False when something went fully wrong */ - public function updateUser($username, $password, $name=false, $email=false, $groups=false) + public function updateUser($username, $password, $name=null, $email=null) { $endpoint = '/users/'.$username; - return $this->doRequest('PUT', $endpoint, compact('username', 'password','name','email', 'groups')); + return $this->doRequest('PUT', $endpoint, compact('username', 'password','name','email')); }