Skip to content

Commit 48d350b

Browse files
committed
Deprecate request...() methods in all clients
1 parent fad7949 commit 48d350b

File tree

6 files changed

+391
-15
lines changed

6 files changed

+391
-15
lines changed

CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
### Deprecated
1515

16-
- `Redmine\Client\Client::getLastResponseStatusCode()` is deprecated, use `\Redmine\Api\AbstractApi::getLastResponse()->getStatusCode()` instead.
17-
- `Redmine\Client\Client::getLastResponseContentType()` is deprecated, use `\Redmine\Api\AbstractApi::getLastResponse()->getContentType()` instead.
18-
- `Redmine\Client\Client::getLastResponseBody()` is deprecated, use `\Redmine\Api\AbstractApi::getLastResponse()->getContent()` instead.
16+
- `Redmine\Client\Client::requestGet()` is deprecated, use `\Redmine\Client\Client::request()` instead.
17+
- `Redmine\Client\Client::requestPost()` is deprecated, use `\Redmine\Client\Client::request()` instead.
18+
- `Redmine\Client\Client::requestPut()` is deprecated, use `\Redmine\Client\Client::request()` instead.
19+
- `Redmine\Client\Client::requestDelete()` is deprecated, use `\Redmine\Client\Client::request()` instead.
20+
- `Redmine\Client\Client::getLastResponseStatusCode()` is deprecated, use `\Redmine\Client\Client::request()` or `\Redmine\Api\AbstractApi::getLastResponse()->getStatusCode()` instead.
21+
- `Redmine\Client\Client::getLastResponseContentType()` is deprecated, use `\Redmine\Client\Client::request()` or `\Redmine\Api\AbstractApi::getLastResponse()->getContentType()` instead.
22+
- `Redmine\Client\Client::getLastResponseBody()` is deprecated, use `\Redmine\Client\Client::request()` or `\Redmine\Api\AbstractApi::getLastResponse()->getContent()` instead.
1923

2024
## [v2.7.0](https://github.com/kbsali/php-redmine-api/compare/v2.6.0...v2.7.0) - 2024-07-10
2125

src/Redmine/Client/Client.php

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,44 +28,59 @@ public function stopImpersonateUser(): void;
2828

2929
/**
3030
* Create and send a GET request.
31+
*
32+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
33+
* @see \Redmine\Http\HttpClient::request()
3134
*/
3235
public function requestGet(string $path): bool;
3336

3437
/**
3538
* Create and send a POST request.
39+
*
40+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
41+
* @see \Redmine\Http\HttpClient::request()
3642
*/
3743
public function requestPost(string $path, string $body): bool;
3844

3945
/**
4046
* Create and send a PUT request.
47+
*
48+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
49+
* @see \Redmine\Http\HttpClient::request()
4150
*/
4251
public function requestPut(string $path, string $body): bool;
4352

4453
/**
4554
* Create and send a DELETE request.
55+
*
56+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
57+
* @see \Redmine\Http\HttpClient::request()
4658
*/
4759
public function requestDelete(string $path): bool;
4860

4961
/**
5062
* Returns status code of the last response.
5163
*
52-
* @deprecated v2.8.0 Use `\Redmine\Api\AbstractApi::getLastResponse()` instead
64+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead
65+
* @see \Redmine\Http\HttpClient::request()
5366
* @see \Redmine\Api\AbstractApi::getLastResponse()
5467
*/
5568
public function getLastResponseStatusCode(): int;
5669

5770
/**
5871
* Returns content type of the last response.
5972
*
60-
* @deprecated v2.8.0 Use `\Redmine\Api\AbstractApi::getLastResponse()` instead
73+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead
74+
* @see \Redmine\Http\HttpClient::request()
6175
* @see \Redmine\Api\AbstractApi::getLastResponse()
6276
*/
6377
public function getLastResponseContentType(): string;
6478

6579
/**
6680
* Returns the body of the last response.
6781
*
68-
* @deprecated v2.8.0 Use `\Redmine\Api\AbstractApi::getLastResponse()` instead
82+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead
83+
* @see \Redmine\Http\HttpClient::request()
6984
* @see \Redmine\Api\AbstractApi::getLastResponse()
7085
*/
7186
public function getLastResponseBody(): string;

src/Redmine/Client/NativeCurlClient.php

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,71 +111,94 @@ public function stopImpersonateUser(): void
111111

112112
/**
113113
* Create and send a GET request.
114+
*
115+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
116+
* @see \Redmine\Http\HttpClient::request()
114117
*/
115118
public function requestGet(string $path): bool
116119
{
120+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\NativeCurlClient::request()` instead.', E_USER_DEPRECATED);
121+
117122
return $this->runRequest('GET', $path);
118123
}
119124

120125
/**
121126
* Create and send a POST request.
127+
*
128+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
129+
* @see \Redmine\Http\HttpClient::request()
122130
*/
123131
public function requestPost(string $path, string $body): bool
124132
{
133+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\NativeCurlClient::request()` instead.', E_USER_DEPRECATED);
134+
125135
return $this->runRequest('POST', $path, $body);
126136
}
127137

128138
/**
129139
* Create and send a PUT request.
140+
*
141+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
142+
* @see \Redmine\Http\HttpClient::request()
130143
*/
131144
public function requestPut(string $path, string $body): bool
132145
{
146+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\NativeCurlClient::request()` instead.', E_USER_DEPRECATED);
147+
133148
return $this->runRequest('PUT', $path, $body);
134149
}
135150

136151
/**
137152
* Create and send a DELETE request.
153+
*
154+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
155+
* @see \Redmine\Http\HttpClient::request()
138156
*/
139157
public function requestDelete(string $path): bool
140158
{
159+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\NativeCurlClient::request()` instead.', E_USER_DEPRECATED);
160+
141161
return $this->runRequest('DELETE', $path);
142162
}
143163

144164
/**
145165
* Returns status code of the last response.
146166
*
147-
* @deprecated v2.8.0 Use `\Redmine\Api\AbstractApi::getLastResponse()` instead
167+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead
168+
* @see \Redmine\Http\HttpClient::request()
148169
* @see \Redmine\Api\AbstractApi::getLastResponse()
149170
*/
150171
public function getLastResponseStatusCode(): int
151172
{
152-
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
173+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\NativeCurlClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
153174

154175
return $this->lastResponseStatusCode;
155176
}
156177

157178
/**
158179
* Returns content type of the last response.
159180
*
160-
* @deprecated v2.8.0 Use `\Redmine\Api\AbstractApi::getLastResponse()` instead
181+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead
182+
* @see \Redmine\Http\HttpClient::request()
161183
* @see \Redmine\Api\AbstractApi::getLastResponse()
162184
*/
163185
public function getLastResponseContentType(): string
164186
{
165-
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
187+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\NativeCurlClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
166188

167189
return $this->lastResponseContentType;
168190
}
169191

170192
/**
171193
* Returns the body of the last response.
172194
*
173-
* @deprecated v2.8.0 Use `\Redmine\Api\AbstractApi::getLastResponse()` instead
195+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead
196+
* @see \Redmine\Http\HttpClient::request()
174197
* @see \Redmine\Api\AbstractApi::getLastResponse()
175198
*/
176199
public function getLastResponseBody(): string
177200
{
178-
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
201+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\NativeCurlClient::request()` or `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
179202

180203
return $this->lastResponseBody;
181204
}

src/Redmine/Client/Psr18Client.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,17 @@ public function stopImpersonateUser(): void
118118
/**
119119
* Create and send a GET request.
120120
*
121+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
122+
* @see \Redmine\Http\HttpClient::request()
123+
*
121124
* @throws ClientException If anything goes wrong on the request
122125
*
123126
* @return bool true if status code of the response is not 4xx oder 5xx
124127
*/
125128
public function requestGet(string $path): bool
126129
{
130+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\Psr18Client::request()` instead.', E_USER_DEPRECATED);
131+
127132
$response = $this->runRequest('GET', $path);
128133

129134
return $response->getStatusCode() < 400;
@@ -132,12 +137,17 @@ public function requestGet(string $path): bool
132137
/**
133138
* Create and send a POST request.
134139
*
140+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
141+
* @see \Redmine\Http\HttpClient::request()
142+
*
135143
* @throws ClientException If anything goes wrong on the request
136144
*
137145
* @return bool true if status code of the response is not 4xx oder 5xx
138146
*/
139147
public function requestPost(string $path, string $body): bool
140148
{
149+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\Psr18Client::request()` instead.', E_USER_DEPRECATED);
150+
141151
$response = $this->runRequest('POST', $path, $body);
142152

143153
return $response->getStatusCode() < 400;
@@ -146,12 +156,17 @@ public function requestPost(string $path, string $body): bool
146156
/**
147157
* Create and send a PUT request.
148158
*
159+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
160+
* @see \Redmine\Http\HttpClient::request()
161+
*
149162
* @throws ClientException If anything goes wrong on the request
150163
*
151164
* @return bool true if status code of the response is not 4xx oder 5xx
152165
*/
153166
public function requestPut(string $path, string $body): bool
154167
{
168+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\Psr18Client::request()` instead.', E_USER_DEPRECATED);
169+
155170
$response = $this->runRequest('PUT', $path, $body);
156171

157172
return $response->getStatusCode() < 400;
@@ -160,12 +175,17 @@ public function requestPut(string $path, string $body): bool
160175
/**
161176
* Create and send a DELETE request.
162177
*
178+
* @deprecated v2.8.0 Use `\Redmine\Http\HttpClient::request()` instead
179+
* @see \Redmine\Http\HttpClient::request()
180+
*
163181
* @throws ClientException If anything goes wrong on the request
164182
*
165183
* @return bool true if status code of the response is not 4xx oder 5xx
166184
*/
167185
public function requestDelete(string $path): bool
168186
{
187+
@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Client\Psr18Client::request()` instead.', E_USER_DEPRECATED);
188+
169189
$response = $this->runRequest('DELETE', $path);
170190

171191
return $response->getStatusCode() < 400;

0 commit comments

Comments
 (0)