diff --git a/src/Api.php b/src/Api.php index 71fc746..a49b18d 100644 --- a/src/Api.php +++ b/src/Api.php @@ -48,7 +48,7 @@ use RuntimeException; */ class Api { - public const string LIBRARY_VERSION = '1.4.0'; + public const string LIBRARY_VERSION = '1.4.1'; public const string API_VERSION = '1.2.5'; diff --git a/src/Models/Attachments/Payloads/PhotoAttachmentRequestPayload.php b/src/Models/Attachments/Payloads/PhotoAttachmentRequestPayload.php index c58a0eb..ce99331 100644 --- a/src/Models/Attachments/Payloads/PhotoAttachmentRequestPayload.php +++ b/src/Models/Attachments/Payloads/PhotoAttachmentRequestPayload.php @@ -23,9 +23,9 @@ final readonly class PhotoAttachmentRequestPayload extends AbstractAttachmentReq #[ArrayOf(PhotoToken::class)] public ?array $photos = null, ) { - if (count(array_filter([$this->url, $this->token, $this->photos])) !== 1) { + if ($this->url === null && $this->token === null && $this->photos === null) { throw new InvalidArgumentException( - 'Provide exactly one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.' + 'Provide one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.' ); } } diff --git a/src/Models/Attachments/Payloads/ShareAttachmentRequestPayload.php b/src/Models/Attachments/Payloads/ShareAttachmentRequestPayload.php index bbea2f0..8eb25d7 100644 --- a/src/Models/Attachments/Payloads/ShareAttachmentRequestPayload.php +++ b/src/Models/Attachments/Payloads/ShareAttachmentRequestPayload.php @@ -19,9 +19,9 @@ final readonly class ShareAttachmentRequestPayload extends AbstractAttachmentReq public ?string $url = null, public ?string $token = null, ) { - if (count(array_filter([$this->url, $this->token])) !== 1) { + if ($this->url === null && $this->token === null) { throw new InvalidArgumentException( - 'Provide exactly one of "url" or "token" for ShareAttachmentRequestPayload.' + 'Provide one of "url" or "token" for ShareAttachmentRequestPayload.' ); } } diff --git a/tests/Models/Attachments/Payloads/PhotoAttachmentRequestPayloadTest.php b/tests/Models/Attachments/Payloads/PhotoAttachmentRequestPayloadTest.php index fcb802b..fc1b45e 100644 --- a/tests/Models/Attachments/Payloads/PhotoAttachmentRequestPayloadTest.php +++ b/tests/Models/Attachments/Payloads/PhotoAttachmentRequestPayloadTest.php @@ -9,7 +9,6 @@ use BushlanovDev\MaxMessengerBot\Models\Attachments\Payloads\PhotoAttachmentRequ use BushlanovDev\MaxMessengerBot\Models\Attachments\Payloads\PhotoToken; use InvalidArgumentException; use PHPUnit\Framework\Attributes\CoversClass; -use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\Attributes\UsesClass; use PHPUnit\Framework\TestCase; @@ -77,32 +76,12 @@ final class PhotoAttachmentRequestPayloadTest extends TestCase $this->assertEquals($expectedArray, $payload->toArray()); } - /** - * Data provider for invalid constructor arguments. - * - * @return array - */ - public static function invalidPayloadProvider(): array - { - return [ - 'all null (no arguments)' => [null, null, null], - 'url and token provided' => ['https://a.com', 'token123', null], - 'url and photos provided' => ['https://a.com', null, [new PhotoToken('t')]], - 'token and photos provided' => [null, 'token123', [new PhotoToken('t')]], - 'all three arguments provided' => ['https://a.com', 'token123', [new PhotoToken('t')]], - ]; - } - #[Test] - #[DataProvider('invalidPayloadProvider')] - public function constructorThrowsExceptionForInvalidArguments( - ?string $url, - ?string $token, - ?array $photos - ): void { + public function constructorThrowsExceptionForInvalidArguments(): void + { $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage('Provide exactly one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.'); + $this->expectExceptionMessage('Provide one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.'); - new PhotoAttachmentRequestPayload($url, $token, $photos); + new PhotoAttachmentRequestPayload(null, null, null); } } diff --git a/tests/Models/Attachments/Payloads/ShareAttachmentRequestPayloadTest.php b/tests/Models/Attachments/Payloads/ShareAttachmentRequestPayloadTest.php index d9d3ed3..fa49c95 100644 --- a/tests/Models/Attachments/Payloads/ShareAttachmentRequestPayloadTest.php +++ b/tests/Models/Attachments/Payloads/ShareAttachmentRequestPayloadTest.php @@ -38,24 +38,12 @@ final class ShareAttachmentRequestPayloadTest extends TestCase $this->assertEquals($expectedArray, $payload->toArray()); } - /** - * @return array - */ - public static function invalidPayloadProvider(): array - { - return [ - 'both null' => [null, null], - 'both set' => ['https://a.com', 'token123'], - ]; - } - #[Test] - #[DataProvider('invalidPayloadProvider')] - public function constructorThrowsExceptionForInvalidArguments(?string $url, ?string $token): void + public function constructorThrowsExceptionForInvalidArguments(): void { $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage('Provide exactly one of "url" or "token" for ShareAttachmentRequestPayload.'); + $this->expectExceptionMessage('Provide one of "url" or "token" for ShareAttachmentRequestPayload.'); - new ShareAttachmentRequestPayload($url, $token); + new ShareAttachmentRequestPayload(null, null); } } diff --git a/tests/Models/Attachments/Requests/PhotoAttachmentRequestTest.php b/tests/Models/Attachments/Requests/PhotoAttachmentRequestTest.php index d66cc43..87ba7e3 100644 --- a/tests/Models/Attachments/Requests/PhotoAttachmentRequestTest.php +++ b/tests/Models/Attachments/Requests/PhotoAttachmentRequestTest.php @@ -98,29 +98,12 @@ final class PhotoAttachmentRequestTest extends TestCase $this->assertEquals($expectedArray, $request->toArray()); } - /** - * @return array - */ - public static function invalidPayloadProvider(): array - { - return [ - 'no arguments' => [null, null, null], - 'url and token' => ['http://a.com', 'token123', null], - 'token and photos' => [null, 'token123', [new PhotoToken('t')]], - 'all arguments' => ['http://a.com', 'token123', [new PhotoToken('t')]], - ]; - } - #[Test] - #[DataProvider('invalidPayloadProvider')] - public function payloadThrowsExceptionWhenNotExactlyOneArgumentIsProvided( - ?string $url, - ?string $token, - ?array $photos - ): void { + public function payloadThrowsExceptionWhenNotExactlyOneArgumentIsProvided(): void + { $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage('Provide exactly one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.'); + $this->expectExceptionMessage('Provide one of "url", "token", or "photos" for PhotoAttachmentRequestPayload.'); - new PhotoAttachmentRequestPayload($url, $token, $photos); + new PhotoAttachmentRequestPayload(null, null, null); } } diff --git a/tests/Models/Attachments/Requests/ShareAttachmentRequestTest.php b/tests/Models/Attachments/Requests/ShareAttachmentRequestTest.php index a333c26..4b1f6d9 100644 --- a/tests/Models/Attachments/Requests/ShareAttachmentRequestTest.php +++ b/tests/Models/Attachments/Requests/ShareAttachmentRequestTest.php @@ -9,7 +9,6 @@ use BushlanovDev\MaxMessengerBot\Models\Attachments\Payloads\ShareAttachmentRequ use BushlanovDev\MaxMessengerBot\Models\Attachments\Requests\ShareAttachmentRequest; use InvalidArgumentException; use PHPUnit\Framework\Attributes\CoversClass; -use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\Attributes\UsesClass; use PHPUnit\Framework\TestCase; @@ -42,21 +41,11 @@ final class ShareAttachmentRequestTest extends TestCase $this->assertEquals($expected, $request->toArray()); } - /** @return array */ - public static function invalidPayloadProvider(): array - { - return [ - 'both null' => [null, null], - 'both set' => ['https://a.com', 'token123'], - ]; - } - #[Test] - #[DataProvider('invalidPayloadProvider')] - public function payloadThrowsExceptionForInvalidArguments(?string $url, ?string $token): void + public function payloadThrowsExceptionForInvalidArguments(): void { $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage('Provide exactly one of "url" or "token" for ShareAttachmentRequestPayload.'); - new ShareAttachmentRequestPayload($url, $token); + $this->expectExceptionMessage('Provide one of "url" or "token" for ShareAttachmentRequestPayload.'); + new ShareAttachmentRequestPayload(null, null); } }