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

kbsali · Mar 11, 2024 · 9ad1b6c · 9ad1b6c
1 parent e975190
commit 9ad1b6c
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 29 deletions.
diff --git a/src/Redmine/Api/Group.php b/src/Redmine/Api/Group.php
@@ -155,10 +155,13 @@ public function update(int $id, array $params = [])
         ];
         $params = $this->sanitizeParams($defaults, $params);
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/groups/' . $id . '.xml',
             XmlSerializer::createFromArray(['group' => $params])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

diff --git a/src/Redmine/Api/Issue.php b/src/Redmine/Api/Issue.php
@@ -260,10 +260,13 @@ public function update($id, array $params)
             $sanitizedParams['assigned_to_id'] = '';
         }
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/issues/' . urlencode(strval($id)) . '.xml',
             XmlSerializer::createFromArray(['issue' => $sanitizedParams])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**
@@ -417,10 +420,13 @@ public function attachMany($id, array $attachments)
             'uploads' => $attachments,
         ];
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeJsonRequest(
+            'PUT',
             '/issues/' . urlencode(strval($id)) . '.json',
             JsonSerializer::createFromArray(['issue' => $params])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

diff --git a/src/Redmine/Api/IssueCategory.php b/src/Redmine/Api/IssueCategory.php
@@ -211,10 +211,13 @@ public function update($id, array $params)
         ];
         $params = $this->sanitizeParams($defaults, $params);
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/issue_categories/' . urlencode(strval($id)) . '.xml',
             XmlSerializer::createFromArray(['issue_category' => $params])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

diff --git a/src/Redmine/Api/Membership.php b/src/Redmine/Api/Membership.php
@@ -147,10 +147,13 @@ public function update($id, array $params = [])
             throw new MissingParameterException('Theses parameters are mandatory: `role_ids`');
         }
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/memberships/' . $id . '.xml',
             XmlSerializer::createFromArray(['membership' => $params])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

diff --git a/src/Redmine/Api/Project.php b/src/Redmine/Api/Project.php
@@ -215,10 +215,13 @@ public function update($id, array $params)
         ];
         $params = $this->sanitizeParams($defaults, $params);
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/projects/' . urlencode(strval($id)) . '.xml',
             XmlSerializer::createFromArray(['project' => $params])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**
@@ -242,10 +245,11 @@ final public function close($projectIdentifier): bool
             ));
         }
 
-        $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/projects/' . strval($projectIdentifier) . '/close.xml',
             ''
-        );
+        ));
 
         $lastResponse = $this->getLastResponse();
 
@@ -277,10 +281,11 @@ final public function reopen($projectIdentifier): bool
             ));
         }
 
-        $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/projects/' . strval($projectIdentifier) . '/reopen.xml',
             ''
-        );
+        ));
 
         $lastResponse = $this->getLastResponse();
 
@@ -312,10 +317,11 @@ final public function archive($projectIdentifier): bool
             ));
         }
 
-        $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/projects/' . strval($projectIdentifier) . '/archive.xml',
             ''
-        );
+        ));
 
         $lastResponse = $this->getLastResponse();
 
@@ -347,10 +353,11 @@ final public function unarchive($projectIdentifier): bool
             ));
         }
 
-        $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/projects/' . strval($projectIdentifier) . '/unarchive.xml',
             ''
-        );
+        ));
 
         $lastResponse = $this->getLastResponse();
 

diff --git a/src/Redmine/Api/TimeEntry.php b/src/Redmine/Api/TimeEntry.php
@@ -171,10 +171,13 @@ public function update($id, array $params)
         ];
         $params = $this->sanitizeParams($defaults, $params);
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/time_entries/' . $id . '.xml',
             XmlSerializer::createFromArray(['time_entry' => $params])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

diff --git a/src/Redmine/Api/User.php b/src/Redmine/Api/User.php
@@ -247,10 +247,13 @@ public function update($id, array $params)
         ];
         $params = $this->sanitizeParams($defaults, $params);
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/users/' . urlencode(strval($id)) . '.xml',
             XmlSerializer::createFromArray(['user' => $params])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     /**

diff --git a/src/Redmine/Api/Version.php b/src/Redmine/Api/Version.php
@@ -224,10 +224,13 @@ public function update($id, array $params)
         $this->validateStatus($params);
         $this->validateSharing($params);
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/versions/' . $id . '.xml',
             XmlSerializer::createFromArray(['version' => $params])->getEncoded()
-        );
+        ));
+
+        return $this->lastResponse->getContent();
     }
 
     private function validateStatus(array $params = [])

diff --git a/src/Redmine/Api/Wiki.php b/src/Redmine/Api/Wiki.php
@@ -145,10 +145,19 @@ public function create($project, $page, array $params = [])
         ];
         $params = $this->sanitizeParams($defaults, $params);
 
-        return $this->put(
+        $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeXmlRequest(
+            'PUT',
             '/projects/' . $project . '/wiki/' . urlencode($page) . '.xml',
             XmlSerializer::createFromArray(['wiki_page' => $params])->getEncoded()
-        );
+        ));
+
+        $body = $this->lastResponse->getContent();
+
+        if ($body !== '') {
+            return new SimpleXMLElement($body);
+        }
+
+        return $body;
     }
 
     /**
@@ -162,7 +171,9 @@ public function create($project, $page, array $params = [])
      */
     public function update($project, $page, array $params = [])
     {
-        return $this->create($project, $page, $params);
+        $this->create($project, $page, $params);
+
+        return $this->lastResponse->getContent();
     }
 
     /**