Skip to content

[ENH] Add support for php8 #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Domeshow wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[ENH] Add support for php8 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29760ef
[ENH] Add support for php8
Domeshow Jul 8, 2024
1ae5ebe
[FIX] Fix Rosters CRUD
Domeshow Jul 8, 2024
2462482
[FIX] Fix Users CRUD
Domeshow Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
14 changes: 7 additions & 7 deletions src/Gidkom/OpenFireRestApi/OpenFireRestApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down Expand Up @@ -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'));
}


Expand Down Expand Up @@ -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'));
}


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


Expand Down