fix: Only use uuid for media and check for validity

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+4-2

Changes to src/Exceptions/InvalidFormatException.php

		⋯12 linesShow the 12 lines above this hunk@@ -13,7 +13,9 @@ class InvalidFormatException extends Exception
13	13	*/
14	14	public function __construct(string $message = null)
15	15	{
16		- parent::__construct($message ?? 'Error on line '.$this->getLine().' in '.$this->getFile()
17		- .' ID is not a valid integer');
	16	+ $customMessage = $message ? " {$message}" : ' ID is not a valid integer';
	17	+
	18	+ parent::__construct('Error on line '.$this->getLine().' in '.$this->getFile()
	19	+ . $customMessage);
18	20	}
19	21	}

src/Functions/Image.phpmodified+2-2

Changes to src/Functions/Image.php

		⋯134 linesShow the 134 lines above this hunk@@ -135,9 +135,9 @@ class Image
135	135	*
136	136	* @return $this
137	137	*/
138		- public function br($value)
	138	+ public function bri($value)
139	139	{
140		- $this->args = array_merge($this->args, ['br' => $value]);
	140	+ $this->args = array_merge($this->args, ['bri' => $value]);
141	141
142	142	return $this;
143	143	}

src/Models/Media.phpmodified+20-19

Changes to src/Models/Media.php

		⋯5 linesShow the 5 lines above this hunk@@ -6,10 +6,11 @@ use Meema\MeemaClient\Client;
6	6	use Meema\MeemaClient\Exceptions\InvalidFormatException;
7	7	use Meema\MeemaClient\Response\Response;
8	8	use Meema\MeemaClient\Traits\CollectionsResponse;
	9	+use Meema\MeemaClient\Traits\ValidsUuid;
9	10
10	11	class Media
11	12	{
12		- use CollectionsResponse;
	13	+ use CollectionsResponse, ValidsUuid;
13	14
14	15	/**
15	16	* @var \Meema\MeemaClient\Client
		⋯52 linesShow the 52 lines above this hunk@@ -68,8 +69,8 @@ class Media
68	69	$ids = is_array($ids) ? $ids : func_get_args();
69	70
70	71	foreach ($ids as $id) {
71		- if (! is_int($id)) {
72		- throw new InvalidFormatException();
	72	+ if (! $this->isValidUuid($id)) {
	73	+ throw new InvalidFormatException('ID is not a valid UUID');
73	74	}
74	75	}
75	76
		⋯27 linesShow the 27 lines above this hunk@@ -103,8 +104,8 @@ class Media
103	104	*/
104	105	public function find($id)
105	106	{
106		- if (! is_int($id)) {
107		- throw new InvalidFormatException();
	107	+ if (! $this->isValidUuid($id)) {
	108	+ throw new InvalidFormatException('ID is not a valid UUID');
108	109	}
109	110
110	111	$response = $this->client->request('GET', "media/${id}");
		⋯27 linesShow the 27 lines above this hunk@@ -138,8 +139,8 @@ class Media
138	139	*/
139	140	public function update($id, $name)
140	141	{
141		- if (! is_int($id)) {
142		- throw new InvalidFormatException();
	142	+ if (! $this->isValidUuid($id)) {
	143	+ throw new InvalidFormatException('ID is not a valid UUID');
143	144	}
144	145
145	146	$name = is_array($name) ? $name : compact('name');
		⋯15 linesShow the 15 lines above this hunk@@ -161,8 +162,8 @@ class Media
161	162	$ids = is_array($ids) ? $ids : func_get_args();
162	163
163	164	foreach ($ids as $id) {
164		- if (! is_int($id)) {
165		- throw new InvalidFormatException();
	165	+ if (! $this->isValidUuid($id)) {
	166	+ throw new InvalidFormatException('ID is not a valid UUID');
166	167	}
167	168	}
168	169
		⋯21 linesShow the 21 lines above this hunk@@ -190,8 +191,8 @@ class Media
190	191	$ids = is_array($ids) ? $ids : func_get_args();
191	192
192	193	foreach ($ids as $id) {
193		- if (! is_int($id)) {
194		- throw new InvalidFormatException();
	194	+ if (! $this->isValidUuid($id)) {
	195	+ throw new InvalidFormatException('ID is not a valid UUID');
195	196	}
196	197	}
197	198
		⋯21 linesShow the 21 lines above this hunk@@ -219,8 +220,8 @@ class Media
219	220	$ids = is_array($ids) ? $ids : func_get_args();
220	221
221	222	foreach ($ids as $id) {
222		- if (! is_int($id)) {
223		- throw new InvalidFormatException();
	223	+ if (! $this->isValidUuid($id)) {
	224	+ throw new InvalidFormatException('ID is not a valid UUID');
224	225	}
225	226	}
226	227
		⋯21 linesShow the 21 lines above this hunk@@ -248,8 +249,8 @@ class Media
248	249	$ids = is_array($ids) ? $ids : func_get_args();
249	250
250	251	foreach ($ids as $id) {
251		- if (! is_int($id)) {
252		- throw new InvalidFormatException();
	252	+ if (! $this->isValidUuid($id)) {
	253	+ throw new InvalidFormatException('ID is not a valid UUID');
253	254	}
254	255	}
255	256
		⋯21 linesShow the 21 lines above this hunk@@ -277,8 +278,8 @@ class Media
277	278	$ids = is_array($ids) ? $ids : func_get_args();
278	279
279	280	foreach ($ids as $id) {
280		- if (! is_int($id)) {
281		- throw new InvalidFormatException();
	281	+ if (! $this->isValidUuid($id)) {
	282	+ throw new InvalidFormatException('ID is not a valid UUID');
282	283	}
283	284	}
284	285
		⋯21 linesShow the 21 lines above this hunk@@ -306,8 +307,8 @@ class Media
306	307	$ids = is_array($ids) ? $ids : func_get_args();
307	308
308	309	foreach ($ids as $id) {
309		- if (! is_int($id)) {
310		- throw new InvalidFormatException();
	310	+ if (! $this->isValidUuid($id)) {
	311	+ throw new InvalidFormatException('ID is not a valid UUID');
311	312	}
312	313	}
313	314

src/Response/Response.phpmodified+1-3

Changes to src/Response/Response.php

		⋯72 linesShow the 72 lines above this hunk@@ -73,7 +73,7 @@ class Response formatting only
73	73	/**
74	74	* Get response content.
75	75	*
76		- * @param mixed $key
	76	+ * @param mixed $key
77	77	*
78	78	* @return array
79	79	*/
		⋯9 linesShow the 9 lines above this hunk@@ -89,8 +89,6 @@ class Response
89	89	/**
90	90	* Get response content to array.
91	91	*
92		- * @param mixed $key
93		- *
94	92	* @return array
95	93	*/
96	94	public function toArray()

src/Traits/ValidsUuid.phpadded+21-0

Changes to src/Traits/ValidsUuid.php

		@@ -0,0 +1,21 @@
	1	+<?php
	2	+
	3	+namespace Meema\MeemaClient\Traits;
	4	+
	5	+trait ValidsUuid
	6	+{
	7	+ /**
	8	+ * Check if a given string is a valid UUID
	9	+ *
	10	+ * @param string $uuid
	11	+ *
	12	+ * @return boolean
	13	+ */
	14	+ public function isValidUuid( $uuid ) {
	15	+ if (!is_string($uuid) || (preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/', $uuid) !== 1)) {
	16	+ return false;
	17	+ }
	18	+
	19	+ return true;
	20	+ }
	21	+}