gidkom / php-openfire-restapi

src/Gidkom/OpenFireRestApi/OpenFireRestApi.php

Doc Comments -2 removed lines

@@ -119,7 +119,6 @@ 
      * Add user to a group
      *
      * @param   string          $username   Username
-     * @param   string           $groups   Groups to add user
      * @return  json|false                 Json with data or error, or False when something went fully wrong
      */
     public function addToGroup($username, $groupName)
@@ -133,7 +132,6 @@ 
      * Delete user from a group
      *
      * @param   string          $username   Username
-     * @param   string           $groups   Groups to add user
      * @return  json|false                 Json with data or error, or False when something went fully wrong
      */
     public function deleteFromGroup($username, $groupName)

Indentation +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
         
         if(isset($opts['search'])) $query .= '?search='.$opts['search'];
         
-    	$endpoint = '/users'.$query;        
-    	return $this->doRequest('GET', $endpoint);
+        $endpoint = '/users'.$query;        
+        return $this->doRequest('GET', $endpoint);
     }
 
 

Spacing +16 added lines, -16 removed lines

@@ -21,11 +21,11 @@ 
      *
      * @return json|false       Json with data or error, or False when something went fully wrong
      */
-    public function getUsers($opts = [])
+    public function getUsers($opts = [ ])
     {
         $query = '';
         
-        if(isset($opts['search'])) $query .= '?search='.$opts['search'];
+        if (isset($opts[ 'search' ])) $query .= '?search='.$opts[ 'search' ];
         
     	$endpoint = '/users'.$query;        
     	return $this->doRequest('GET', $endpoint);
@@ -54,10 +54,10 @@ 
      * @param   string[]|false  $groups     Groups  (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, $groups=false)
+    public function addUser($username, $password, $name = false, $email = false, $groups = false)
     {
         $endpoint = '/users'; 
-        return $this->doRequest('POST', $endpoint, compact('username', 'password','name','email', 'groups'));
+        return $this->doRequest('POST', $endpoint, compact('username', 'password', 'name', 'email', 'groups'));
     }
 
 
@@ -83,10 +83,10 @@ 
      * @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 = false, $email = false, $groups = false)
     {
         $endpoint = '/users/'.$username; 
-        return $this->doRequest('PUT', $endpoint, compact('username', 'password','name','email', 'groups'));
+        return $this->doRequest('PUT', $endpoint, compact('username', 'password', 'name', 'email', 'groups'));
     }
 
 
@@ -125,7 +125,7 @@ 
     public function addToGroup($username, $groupName)
     {
         $endpoint = '/users/'.$username.'/groups/'.$groupName; 
-        return $this->doRequest('POST', $endpoint );
+        return $this->doRequest('POST', $endpoint);
     }
 
 
@@ -139,7 +139,7 @@ 
     public function deleteFromGroup($username, $groupName)
     {
         $endpoint = '/users/'.$username.'/groups/'.$groupName; 
-        return $this->doRequest('DELETE', $endpoint );
+        return $this->doRequest('DELETE', $endpoint);
     }
 
 
@@ -178,7 +178,7 @@ 
     public function userRosters($username)
     {
         $endpoint = '/users/'.$username.'/roster';
-        return $this->doRequest('GET', $endpoint, compact('jid','name','subscriptionType'));
+        return $this->doRequest('GET', $endpoint, compact('jid', 'name', 'subscriptionType'));
     }
 
 
@@ -191,10 +191,10 @@ 
      * @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, $name = false, $subscriptionType = false)
     {
         $endpoint = '/users/'.$username.'/roster';
-        return $this->doRequest('POST', $endpoint, compact('jid','name','subscriptionType'));
+        return $this->doRequest('POST', $endpoint, compact('jid', 'name', 'subscriptionType'));
     }
 
 
@@ -220,10 +220,10 @@ 
      * @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 = false, $subscriptionType = false)
     {
         $endpoint = '/users/'.$username.'/roster/'.$jid;
-        return $this->doRequest('PUT', $endpoint, $jid, compact('jid','username','subscriptionType'));     
+        return $this->doRequest('PUT', $endpoint, $jid, compact('jid', 'username', 'subscriptionType'));     
     }
 
     /**
@@ -260,7 +260,7 @@ 
     public function createGroup($name, $description = false)
     {
         $endpoint = '/groups/';
-        return $this->doRequest('POST', $endpoint, compact('name','description'));
+        return $this->doRequest('POST', $endpoint, compact('name', 'description'));
     }
 
     /**
@@ -282,10 +282,10 @@ 
      * @param   string      $description        Some description of the group
      *
      */
-    public function updateGroup($name,  $description)
+    public function updateGroup($name, $description)
     {
         $endpoint = '/groups/'.$name;
-        return $this->doRequest('PUT', $endpoint, compact('name','description'));
+        return $this->doRequest('PUT', $endpoint, compact('name', 'description'));
     }
 
     /**

Braces +3 added lines, -1 removed lines

@@ -25,7 +25,9 @@
     {
         $query = '';
         
-        if(isset($opts['search'])) $query .= '?search='.$opts['search'];
+        if(isset($opts['search'])) {
+            $query .= '?search='.$opts['search'];
+        }
         
     	$endpoint = '/users'.$query;        
     	return $this->doRequest('GET', $endpoint);

src/Gidkom/OpenFireRestApi/RestClient.php

Indentation +19 added lines, -19 removed lines

@@ -8,7 +8,7 @@ 
 */
 class RestClient
 {
-	public $host = 'localhost';
+    public $host = 'localhost';
     public $port = '9090';
     public $plugin = '/plugins/restapi/v1';
     public $secret = 'SuperSecret';
@@ -20,15 +20,15 @@ 
     public $basicUser = 'admin';
     public $basicPwd = '1234';
 
-	function __construct()
-	{
-		$this->client = new Client();
-	}
+    function __construct()
+    {
+        $this->client = new Client();
+    }
 
-	public function geti()
-	{
-		return $this->host. '  '. $this->secret;
-	}
+    public function geti()
+    {
+        return $this->host. '  '. $this->secret;
+    }
 
 
 
@@ -40,29 +40,29 @@ 
      * @param   array           $params         Parameters
      * @return  array|false                     Array with data or error, or False when something went fully wrong
      */
-	protected function doRequest($type, $endpoint, $params=[])
+    protected function doRequest($type, $endpoint, $params=[])
     {
-    	$base = ($this->useSSL) ? "https" : "http";
-    	$url = $base . "://" . $this->host . ":" .$this->port.$this->plugin.$endpoint;
+        $base = ($this->useSSL) ? "https" : "http";
+        $url = $base . "://" . $this->host . ":" .$this->port.$this->plugin.$endpoint;
 	    
-		if ($this->useBasicAuth)
+        if ($this->useBasicAuth)
             $auth = 'Basic ' . base64_encode($this->basicUser . ':' . $this->basicPwd);
         else
             $auth = $this->secret;
 	    
-    	$headers = array(
-  			'Accept' => 'application/json',
-  			'Authorization' => $auth
-  		);
+        $headers = array(
+                'Accept' => 'application/json',
+                'Authorization' => $auth
+            );
 
         $body = json_encode($params);
         // $headers += ['Content-Type'=>'application/json'];
         
 
         try {
-        	$result = $this->client->request($type, $url, compact('headers','body'));
+            $result = $this->client->request($type, $url, compact('headers','body'));
         } catch (Exception $e) {
-        	$result = $e->message;
+            $result = $e->message;
         }
 	        
 

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 
 	public function geti()
 	{
-		return $this->host. '  '. $this->secret;
+		return $this->host.'  '.$this->secret;
 	}
 
 
@@ -40,13 +40,13 @@ 
      * @param   array           $params         Parameters
      * @return  array|false                     Array with data or error, or False when something went fully wrong
      */
-	protected function doRequest($type, $endpoint, $params=[])
+	protected function doRequest($type, $endpoint, $params = [ ])
     {
     	$base = ($this->useSSL) ? "https" : "http";
-    	$url = $base . "://" . $this->host . ":" .$this->port.$this->plugin.$endpoint;
+    	$url = $base."://".$this->host.":".$this->port.$this->plugin.$endpoint;
 	    
 		if ($this->useBasicAuth)
-            $auth = 'Basic ' . base64_encode($this->basicUser . ':' . $this->basicPwd);
+            $auth = 'Basic '.base64_encode($this->basicUser.':'.$this->basicPwd);
         else
             $auth = $this->secret;
 	    
@@ -60,7 +60,7 @@ 
         
 
         try {
-        	$result = $this->client->request($type, $url, compact('headers','body'));
+        	$result = $this->client->request($type, $url, compact('headers', 'body'));
         } catch (Exception $e) {
         	$result = $e->message;
         }

Braces +5 added lines, -4 removed lines

@@ -45,10 +45,11 @@
     	$base = ($this->useSSL) ? "https" : "http";
     	$url = $base . "://" . $this->host . ":" .$this->port.$this->plugin.$endpoint;
 	    
-		if ($this->useBasicAuth)
-            $auth = 'Basic ' . base64_encode($this->basicUser . ':' . $this->basicPwd);
-        else
-            $auth = $this->secret;
+		if ($this->useBasicAuth) {
+		            $auth = 'Basic ' . base64_encode($this->basicUser . ':' . $this->basicPwd);
+		} else {
+                    $auth = $this->secret;
+        }
 	    
     	$headers = array(
   			'Accept' => 'application/json',