ReviewOS
Reload

also looking at this

meemalabs/meema-client-php

Exceptions

#27
Merged glennmichael123 wants to merge exceptions into main
5 files +168 -14

Review threads live on the whole diff, not on one commit, so none are shown here - a thread's line means something in the branch's final form, and painting it into an intermediate step would put it on code it is not about.

src/Exceptions/InvalidFormatException.phpmodified+5-7
@@ -7,15 +7,13 @@ use Exception;
77class InvalidFormatException extends Exception
88{
99 /**
10 * Render the exception as an HTTP response.
10 * Construct exception.
1111 *
12 * @return string
12 * @param string $message
1313 */
14 public function errorMessage(): string
14 public function __construct(string $message = null)
1515 {
16 $errorMsg = 'Error on line '.$this->getLine().' in '.$this->getFile()
17 .' ID is not a valid integer';
18
19 return $errorMsg;
16 parent::__construct($message ?? 'Error on line '.$this->getLine().' in '.$this->getFile()
17 .' ID is not a valid integer');
2018 }
2119}
src/Models/Folder.phpmodified+9-9
@@ -65,7 +65,7 @@ class Folder
6565
6666 $ids = is_array($id) ? $id : func_get_args();
6767 } catch (InvalidFormatException $e) {
68 return $e->errorMessage();
68 return $e->getMessage();
6969 }
7070
7171 return $this->client->request('GET', 'folders', ['folder_ids' => $ids]);
@@ -89,7 +89,7 @@ class Folder
8989
9090 $response = $this->client->request('GET', "folders/${id}");
9191 } catch (InvalidFormatException $e) {
92 return $e->errorMessage();
92 return $e->getMessage();
9393 }
9494
9595 return new Response($this, $response);
@@ -132,7 +132,7 @@ class Folder
132132
133133 $name = is_array($name) ? $name : compact('name');
134134 } catch (InvalidFormatException $e) {
135 return $e->errorMessage();
135 return $e->getMessage();
136136 }
137137
138138 return $this->client->request('PATCH', "folders/{$id}", $name);
@@ -158,7 +158,7 @@ class Folder
158158 return $this->deleteFolderFromMedia($this->model->getId(), $id);
159159 }
160160 } catch (InvalidFormatException $e) {
161 return $e->errorMessage();
161 return $e->getMessage();
162162 }
163163
164164 return $this->client->request('DELETE', "folders/{$id}");
@@ -194,7 +194,7 @@ class Folder
194194
195195 return $this->client->request('POST', "folders/{$id}/archive");
196196 } catch (InvalidFormatException $e) {
197 return $e->errorMessage();
197 return $e->getMessage();
198198 }
199199 }
200200
@@ -216,7 +216,7 @@ class Folder
216216
217217 return $this->client->request('POST', "folders/{$id}/unarchive");
218218 } catch (InvalidFormatException $e) {
219 return $e->errorMessage();
219 return $e->getMessage();
220220 }
221221 }
222222
@@ -238,7 +238,7 @@ class Folder
238238
239239 return $this->client->request('POST', "folders/{$id}/duplicate");
240240 } catch (InvalidFormatException $e) {
241 return $e->errorMessage();
241 return $e->getMessage();
242242 }
243243 }
244244
@@ -260,7 +260,7 @@ class Folder
260260
261261 return $this->client->request('POST', "media/{$id}/folders", $name);
262262 } catch (InvalidFormatException $e) {
263 return $e->errorMessage();
263 return $e->getMessage();
264264 }
265265 }
266266
@@ -283,7 +283,7 @@ class Folder
283283
284284 return $this->client->request('DELETE', "media/{$id}/folders/{$folderId}");
285285 } catch (InvalidFormatException $e) {
286 return $e->errorMessage();
286 return $e->getMessage();
287287 }
288288 }
289289
src/Models/Media.phpmodified+9-9
@@ -67,7 +67,7 @@ class Media
6767
6868 $ids = is_array($id) ? $id : func_get_args();
6969 } catch (InvalidFormatException $e) {
70 return $e->errorMessage();
70 return $e->getMessage();
7171 }
7272
7373 return $this->client->request('GET', 'media/show', ['media_ids' => $ids]);
@@ -91,7 +91,7 @@ class Media
9191
9292 $response = $this->client->request('GET', "media/${id}");
9393 } catch (InvalidFormatException $e) {
94 return $e->errorMessage();
94 return $e->getMessage();
9595 }
9696
9797 return new Response($this, $response);
@@ -132,7 +132,7 @@ class Media
132132
133133 return $this->client->request('PATCH', "media/{$id}/file-name", $name);
134134 } catch (InvalidFormatException $e) {
135 return $e->errorMessage();
135 return $e->getMessage();
136136 }
137137 }
138138
@@ -154,7 +154,7 @@ class Media
154154
155155 return $this->client->request('DELETE', "media/{$id}", ['media_id' => $id]);
156156 } catch (InvalidFormatException $e) {
157 return $e->errorMessage();
157 return $e->getMessage();
158158 }
159159 }
160160
@@ -188,7 +188,7 @@ class Media
188188
189189 return $this->client->request('POST', "media/{$id}/archive");
190190 } catch (InvalidFormatException $e) {
191 return $e->errorMessage();
191 return $e->getMessage();
192192 }
193193 }
194194
@@ -210,7 +210,7 @@ class Media
210210
211211 return $this->client->request('POST', "media/{$id}/unarchive");
212212 } catch (InvalidFormatException $e) {
213 return $e->errorMessage();
213 return $e->getMessage();
214214 }
215215 }
216216
@@ -232,7 +232,7 @@ class Media
232232
233233 return $this->client->request('PATCH', "media/{$id}/make-private");
234234 } catch (InvalidFormatException $e) {
235 return $e->errorMessage();
235 return $e->getMessage();
236236 }
237237 }
238238
@@ -254,7 +254,7 @@ class Media
254254
255255 return $this->client->request('PATCH', "media/{$id}/make-public");
256256 } catch (InvalidFormatException $e) {
257 return $e->errorMessage();
257 return $e->getMessage();
258258 }
259259 }
260260
@@ -276,7 +276,7 @@ class Media
276276
277277 return $this->client->request('POST', "media/{$id}/duplicate");
278278 } catch (InvalidFormatException $e) {
279 return $e->errorMessage();
279 return $e->getMessage();
280280 }
281281 }
282282