Reduce code duplication in delete methods.

Author: sibprogrammer

src/PleskX/Api/Operator.php

@@ -15,6 +15,12 @@ class Operator
     public function __construct($client)
     {
         $this->_client = $client;
+
+        if (is_null($this->_wrapperTag)) {
+            $classNameParts = explode('\\', get_class($this));
+            $this->_wrapperTag = end($classNameParts);
+            $this->_wrapperTag = strtolower(preg_replace('/([a-z])([A-Z])/', '\1-\2', $this->_wrapperTag));
+        }
     }
 
     /**
@@ -28,12 +34,6 @@ public function request($request, $mode = Client::RESPONSE_SHORT)
     {
         $wrapperTag = $this->_wrapperTag;
 
-        if (is_null($wrapperTag)) {
-            $classNameParts = explode('\\', get_class($this));
-            $wrapperTag = end($classNameParts);
-            $wrapperTag = strtolower(preg_replace('/([a-z])([A-Z])/', '\1-\2', $wrapperTag));
-        }
-
         if (is_array($request)) {
             $request = [$wrapperTag => $request];
         } else if (preg_match('/^[a-z]/', $request)) {
@@ -45,4 +45,16 @@ public function request($request, $mode = Client::RESPONSE_SHORT)
         return $this->_client->request($request, $mode);
     }
 
+    /**
+     * @param string $field
+     * @param integer|string $value
+     * @param string $deleteMethodName
+     * @return bool
+     */
+    public function _delete($field, $value, $deleteMethodName = 'del')
+    {
+        $response = $this->request("$deleteMethodName.filter.$field=$value");
+        return 'ok' === (string)$response->status;
+    }
+
 }

src/PleskX/Api/Operator/Customer.php

@@ -31,10 +31,7 @@ public function create($properties)
      */
     public function delete($field, $value)
     {
-        $packet = $this->_client->getPacket();
-        $packet->addChild('customer')->addChild('del')->addChild('filter')->addChild($field, $value);
-        $response = $this->_client->request($packet);
-        return 'ok' === (string)$response->status;
+        return $this->_delete($field, $value);
     }
 
     /**

src/PleskX/Api/Operator/Reseller.php

@@ -31,10 +31,7 @@ public function create($properties)
      */
     public function delete($field, $value)
     {
-        $packet = $this->_client->getPacket();
-        $packet->addChild('reseller')->addChild('del')->addChild('filter')->addChild($field, $value);
-        $response = $this->_client->request($packet);
-        return 'ok' === (string)$response->status;
+        return $this->_delete($field, $value);
     }
 
     /**

src/PleskX/Api/Operator/SecretKey.php

@@ -39,10 +39,7 @@ public function getInfo($keyId)
      */
     public function delete($keyId)
     {
-        $packet = $this->_client->getPacket();
-        $packet->addChild('secret_key')->addChild('delete')->addChild('filter')->addChild('key', $keyId);
-        $response = $this->_client->request($packet);
-        return 'ok' === (string)$response->status;
+        return $this->_delete('key', $keyId, 'delete');
     }
 
 }

src/PleskX/Api/Operator/Site.php

@@ -32,10 +32,7 @@ public function create(array $properties)
      */
     public function delete($field, $value)
     {
-        $packet = $this->_client->getPacket();
-        $packet->addChild('site')->addChild('del')->addChild('filter')->addChild($field, $value);
-        $response = $this->_client->request($packet);
-        return 'ok' === (string)$response->status;
+        return $this->_delete($field, $value);
     }
 
     /**

src/PleskX/Api/Operator/Ui.php

@@ -52,8 +52,7 @@ public function getCustomButton($id)
      */
     public function deleteCustomButton($id)
     {
-        $response = $this->request("delete-custombutton.filter.custombutton-id=$id");
-        return 'ok' === (string)$response->status;
+        return $this->_delete('custombutton-id', $id, 'delete-custombutton');
     }
 
 }

src/PleskX/Api/Operator/User.php

@@ -35,10 +35,7 @@ public function create($role, $properties)
      */
     public function delete($field, $value)
     {
-        $packet = $this->_client->getPacket();
-        $packet->addChild('user')->addChild('del')->addChild('filter')->addChild($field, $value);
-        $response = $this->_client->request($packet);
-        return 'ok' === (string)$response->status;
+        return $this->_delete($field, $value);
     }
 
     /**

src/PleskX/Api/Operator/Webspace.php

@@ -64,10 +64,7 @@ public function create(array $properties, array $hostingProperties = null)
      */
     public function delete($field, $value)
     {
-        $packet = $this->_client->getPacket();
-        $packet->addChild('webspace')->addChild('del')->addChild('filter')->addChild($field, $value);
-        $response = $this->_client->request($packet);
-        return 'ok' === (string)$response->status;
+        return $this->_delete($field, $value);
     }
 
     /**