Some fixes

examples/Subscriptions/get_subscription.php

@@ -7,8 +7,6 @@
  */
 $params = array(
 	'subscription_id'=>'1',
-	//'name'=>'example.com',
-	//'username'=>'',
 );
 
 $request = new \pmill\Plesk\GetSubscription($config, $params);

src/pmill/Plesk/ApiRequestException.php

@@ -16,7 +16,6 @@ public function __construct($errorNode, $code = 0)
             $message = isset($errorNode->errtext) ? (string)$errorNode->errtext : '';
             $code = isset($errorNode->errcode) ? (int)$errorNode->errcode : '';
         }
-
         parent::__construct($message, $code);
     }
 }

src/pmill/Plesk/BaseRequest.php

@@ -178,7 +178,6 @@ public function process()
             $this->error = $e;
             throw new ApiRequestException($e->getMessage(), $e->getCode());
         }
-
     }
 
     /**

src/pmill/Plesk/CreateDatabase.php

@@ -49,4 +49,4 @@ protected function processResponse($xml)
         $this->id = (int)$xml->database->{'add-db'}->result->id;
         return true;
     }
-}
+}

src/pmill/Plesk/DeleteDatabaseUser.php

@@ -12,8 +12,7 @@ class DeleteDatabaseUser extends BaseRequest
     <database>
         <del-db-user>
             <filter>
-                <id>{ID}</id>
-                <db-id>{DATABASE_ID}</db-id>
+                {FILTER}
             </filter>
         </del-db-user>
     </database>
@@ -24,10 +23,25 @@ class DeleteDatabaseUser extends BaseRequest
      * @var array
      */
     protected $default_params = [
-        'id' => null,
-        'database_id' => null,
+        'filter' => null,
     ];
 
+    /**
+     * @param array $config
+     * @param array $params
+     * @throws ApiRequestException
+     */
+    public function __construct($config, $params = [])
+    {
+        if (isset($params['id'])) {
+            $params['filter'] = new Node('id', $params['id']);
+        }
+        else if (isset($params['database_id'])) {
+            $params['filter'] = new Node('db-id', $params['database_id']);
+        }
+        parent::__construct($config, $params);
+    }
+
     /**
      * @param $xml
      * @return bool

src/pmill/Plesk/GetDatabase.php

@@ -12,7 +12,7 @@ class GetDatabase extends BaseRequest
 <database>
 	<get-db>
 		<filter>
-			<id>{ID}</id>
+			<webspace-id>{SUBSCRIPTION_ID}</webspace-id>
 		</filter>
 	</get-db>
 </database>
@@ -32,20 +32,23 @@ class GetDatabase extends BaseRequest
      */
     protected function processResponse($xml)
     {
-       $db = $xml->db->{'get-db'}->result;
-       if ((string)$db->status == 'error') {
-           throw new ApiRequestException($db);
-                                                }
-       if ((string)$db->result->status == 'error') {
-           throw new ApiRequestException($db->result);
-                                                }
-       return [
+
+        $db = $xml->database->{'get-db'}->result;
+        if ((string)$db->status == 'error') {
+            throw new ApiRequestException($db);
+        }
+        if ((string)$db->result->status == 'error') {
+            throw new ApiRequestException($db->result);
+        }
+
+        return [
                 'status' => (string)$node->status,
                 'id' => (int)$node->id,
                 'name' => (string)$node->name,
                 'subscription_id' => (int)$node->{'webspace-id'},
                 'db_server_id' => (int)$node->{'db-server-id'},
                 'default_user_id' => (int)$node->{'default-user-id'},
             ];
+
     }
 }

src/pmill/Plesk/GetDatabaseServer.php

@@ -55,9 +55,9 @@ protected function processResponse($xml)
 
         $db_server = $xml->db_server->{'get-local'}->result;
         return [
-            'id' => (int)$db_sever->id,
-            'status' => (string)$db_sever->status,
-            'type' => (string)$db_server->type,
+             'id' => (int)$db_server->id,
+             'status' => (string)$db_server->status,
+             'type' => (string)$db_server->type,
         ];
     }
 

src/pmill/Plesk/GetDatabaseUser.php

@@ -8,7 +8,7 @@ class GetDatabaseUser extends BaseRequest
      */
     public $xml_packet = <<<EOT
 <?xml version="1.0"?>
-<packet version="1.4.2.0">
+<packet version="1.6.7.0">
 <database>
    <get-db-users>
       <filter>
@@ -19,11 +19,6 @@ class GetDatabaseUser extends BaseRequest
 </packet>
 EOT;
 
-    /**
-     * @var int
-     */
-    public $id;
-
     /**
      * @var array
      */

src/pmill/Plesk/GetDefaultDatabaseUser.php

@@ -19,11 +19,6 @@ class GetDefaultDatabaseUser extends BaseRequest
 </packet>
 EOT;
 
-    /**
-     * @var int
-     */
-    public $id;
-
     /**
      * @var array
      */

src/pmill/Plesk/GetSubscription.php

@@ -70,7 +70,7 @@ protected function processResponse($xml)
             $webspace = $xml->webspace->get->result[$i];
 
             if ($webspace->status == 'error') {
-                throw new ApiRequestException($webspace);
+                 throw new ApiRequestException($webspace);
             }
 
             $hosting = [];

src/pmill/Plesk/GetUser.php

@@ -10,16 +10,16 @@ class GetUser extends BaseRequest
 <?xml version="1.0"?>
 <packet version="1.6.7.0">
 <user>
-	<get>
-		<filter>
-			<guid>{GUID}</guid>
-		</filter>
-		<dataset>
-			<gen-info/>
-			<roles/>
-		</dataset>
-	</get>
-</customer>
+  <get>
+    <filter>
+      <guid>{GUID}</guid>
+    </filter>
+    <dataset>
+      <gen-info/>
+      <roles/>
+    </dataset>
+  </get>
+</user>
 </packet>
 EOT;
 
@@ -35,7 +35,7 @@ class GetUser extends BaseRequest
      * @param array $config
      * @param array $params
      */
-    public function __construct(array $config, $params = [])
+    public function __construct(array $config, $params)
     {
         if (isset($params['username'])) {
             $request = new ListUsers($config);

src/pmill/Plesk/ListDatabases.php

@@ -28,20 +28,20 @@ class ListDatabases extends BaseRequest
      * @param array $config
      * @param array $params
      * @throws ApiRequestException
-     * */
-     public function __construct(array $config, $params = [])
-     {
-         $this->default_params['filter'] = new Node('filter');
-         if (isset($params['subscription_id'])) {
-             $webspaceIdNode = new Node('webspace-id', $params['subscription_id']);
-             $params['filter'] = new Node('filter', $webspaceIdNode);
-         }
-         if (isset($params['subscription_id'])) {
-             $webspaceNameNode = new Node('webspace-name', $params['subscription_name']);
-             $params['filter'] = new Node('filter', $webspaceNameNode);
-         }
-         parent::__construct($config, $params);
-     }
+     */
+    public function __construct(array $config, $params = [])
+    {
+        $this->default_params['filter'] = new Node('filter');
+        if (isset($params['subscription_id'])) {
+            $webspaceIdNode = new Node('webspace-id', $params['subscription_id']);
+            $params['filter'] = new Node('filter', $webspaceIdNode);
+        }
+        if (isset($params['subscription_id'])) {
+            $webspaceNameNode = new Node('webspace-name', $params['subscription_name']);
+            $params['filter'] = new Node('filter', $webspaceNameNode);
+        }
+        parent::__construct($config, $params);
+    }
 
     /**
      * @param $xml
@@ -50,7 +50,6 @@ public function __construct(array $config, $params = [])
     protected function processResponse($xml)
     {
         $result = [];
-
         foreach ($xml->database->{'get-db'}->children() as $node) {
             if (isset($node->id)){
                 $result[] = [

src/pmill/Plesk/ListSubdomains.php

@@ -57,17 +57,17 @@ protected function processResponse($xml)
         $result = [];
 
         foreach ($xml->subdomain->get->result as $node) {
-            if (isset($node->id)){
-                $result[] = [
-                    'id' => (int)$node->id,
-                    'status' => (string)$node->status,
-                    'parent' => (string)$node->data->parent,
-                    'name' => (string)$node->data->name,
-                    'php' => (string)Xml::findProperty($node->data, 'php'),
-                    'php_handler_type' => (string)Xml::findProperty($node->data, 'php_handler_type'),
-                    'www_root' => (string)Xml::findProperty($node->data, 'www_root'),
-                ];
-            }
+          if (isset($node->id)){
+            $result[] = [
+                'id' => (int)$node->id,
+                'status' => (string)$node->status,
+                'parent' => (string)$node->data->parent,
+                'name' => (string)$node->data->name,
+                'php' => (string)Xml::findProperty($node->data, 'php'),
+                'php_handler_type' => (string)Xml::findProperty($node->data, 'php_handler_type'),
+                'www_root' => (string)Xml::findProperty($node->data, 'www_root'),
+            ];
+          }
         }
 
         return $result;