Replace all calls of AbstractApi::delete() with HttpClient

Author: Art4

src/Redmine/Api/Attachment.php

@@ -102,6 +102,11 @@ public function upload($attachment, $params = [])
      */
     public function remove($id)
     {
-        return $this->delete('/attachments/' . urlencode(strval($id)) . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/attachments/' . urlencode(strval($id)) . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 }

src/Redmine/Api/Group.php

@@ -207,7 +207,12 @@ public function show($id, array $params = [])
      */
     public function remove($id)
     {
-        return $this->delete('/groups/' . $id . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/groups/' . $id . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**
@@ -249,6 +254,11 @@ public function addUser($id, $userId)
      */
     public function removeUser($id, $userId)
     {
-        return $this->delete('/groups/' . $id . '/users/' . $userId . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/groups/' . $id . '/users/' . $userId . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 }

src/Redmine/Api/Issue.php

@@ -300,7 +300,12 @@ public function addWatcher($id, $watcherUserId)
      */
     public function removeWatcher($id, $watcherUserId)
     {
-        return $this->delete('/issues/' . urlencode(strval($id)) . '/watchers/' . urlencode(strval($watcherUserId)) . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/issues/' . urlencode(strval($id)) . '/watchers/' . urlencode(strval($watcherUserId)) . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**
@@ -438,7 +443,12 @@ public function attachMany($id, array $attachments)
      */
     public function remove($id)
     {
-        return $this->delete('/issues/' . urlencode(strval($id)) . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/issues/' . urlencode(strval($id)) . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

src/Redmine/Api/IssueCategory.php

@@ -234,8 +234,11 @@ public function update($id, array $params)
      */
     public function remove($id, array $params = [])
     {
-        return $this->delete(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
             PathSerializer::create('/issue_categories/' . urlencode(strval($id)) . '.xml', $params)->getPath()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 }

src/Redmine/Api/IssueRelation.php

@@ -122,7 +122,12 @@ public function show($id)
      */
     public function remove($id)
     {
-        return $this->delete('/relations/' . $id . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/relations/' . $id . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

src/Redmine/Api/Membership.php

@@ -167,7 +167,12 @@ public function update($id, array $params = [])
      */
     public function remove($id)
     {
-        return $this->delete('/memberships/' . $id . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/memberships/' . $id . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

src/Redmine/Api/Project.php

@@ -396,6 +396,11 @@ protected function prepareParamsXml($params)
      */
     public function remove($id)
     {
-        return $this->delete('/projects/' . $id . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/projects/' . $id . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 }

src/Redmine/Api/TimeEntry.php

@@ -191,6 +191,11 @@ public function update($id, array $params)
      */
     public function remove($id)
     {
-        return $this->delete('/time_entries/' . $id . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/time_entries/' . $id . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 }

src/Redmine/Api/User.php

@@ -267,6 +267,11 @@ public function update($id, array $params)
      */
     public function remove($id)
     {
-        return $this->delete('/users/' . $id . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/users/' . $id . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 }

src/Redmine/Api/Version.php

@@ -270,6 +270,11 @@ private function validateSharing(array $params = [])
      */
     public function remove($id)
     {
-        return $this->delete('/versions/' . $id . '.xml');
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'DELETE',
+            '/versions/' . $id . '.xml'
+        ));
+
+        return $this->lastResponse->getContent();
     }
 }