From 779a05448110329cd7e9092234efcd346e493d7c Mon Sep 17 00:00:00 2001 From: Vin Souza Date: Sat, 26 Apr 2025 17:55:43 +0100 Subject: [PATCH] chore: update signature for JsonSerializable and fix some types --- src/Extensions/ButtonTemplate.php | 2 +- src/Extensions/Element.php | 2 +- src/Extensions/ElementButton.php | 2 +- src/Extensions/GenericTemplate.php | 2 +- src/Extensions/ListTemplate.php | 2 +- src/Extensions/MediaAttachmentElement.php | 2 +- src/Extensions/MediaTemplate.php | 2 +- src/Extensions/MediaUrlElement.php | 2 +- src/Extensions/QuickReplyButton.php | 2 +- src/Extensions/ReceiptAddress.php | 2 +- src/Extensions/ReceiptAdjustment.php | 2 +- src/Extensions/ReceiptElement.php | 2 +- src/Extensions/ReceiptSummary.php | 2 +- src/Extensions/ReceiptTemplate.php | 2 +- src/FacebookDriver.php | 8 +++++++- 15 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/Extensions/ButtonTemplate.php b/src/Extensions/ButtonTemplate.php index 31160c8..aeb3f8e 100644 --- a/src/Extensions/ButtonTemplate.php +++ b/src/Extensions/ButtonTemplate.php @@ -73,7 +73,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/Element.php b/src/Extensions/Element.php index 57b4a02..ad06d01 100644 --- a/src/Extensions/Element.php +++ b/src/Extensions/Element.php @@ -143,7 +143,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/ElementButton.php b/src/Extensions/ElementButton.php index 79e9097..358efdc 100755 --- a/src/Extensions/ElementButton.php +++ b/src/Extensions/ElementButton.php @@ -211,7 +211,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/GenericTemplate.php b/src/Extensions/GenericTemplate.php index efbe397..d582e8c 100644 --- a/src/Extensions/GenericTemplate.php +++ b/src/Extensions/GenericTemplate.php @@ -117,7 +117,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/ListTemplate.php b/src/Extensions/ListTemplate.php index 208ae15..942644f 100644 --- a/src/Extensions/ListTemplate.php +++ b/src/Extensions/ListTemplate.php @@ -94,7 +94,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/MediaAttachmentElement.php b/src/Extensions/MediaAttachmentElement.php index a1650d8..81b2381 100644 --- a/src/Extensions/MediaAttachmentElement.php +++ b/src/Extensions/MediaAttachmentElement.php @@ -84,7 +84,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/MediaTemplate.php b/src/Extensions/MediaTemplate.php index a83df13..a1c96cf 100644 --- a/src/Extensions/MediaTemplate.php +++ b/src/Extensions/MediaTemplate.php @@ -51,7 +51,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/MediaUrlElement.php b/src/Extensions/MediaUrlElement.php index 73bf112..89222cf 100644 --- a/src/Extensions/MediaUrlElement.php +++ b/src/Extensions/MediaUrlElement.php @@ -84,7 +84,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/QuickReplyButton.php b/src/Extensions/QuickReplyButton.php index c08d635..eddbb70 100644 --- a/src/Extensions/QuickReplyButton.php +++ b/src/Extensions/QuickReplyButton.php @@ -98,7 +98,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/ReceiptAddress.php b/src/Extensions/ReceiptAddress.php index 311e4f5..47a9ac5 100644 --- a/src/Extensions/ReceiptAddress.php +++ b/src/Extensions/ReceiptAddress.php @@ -116,7 +116,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/ReceiptAdjustment.php b/src/Extensions/ReceiptAdjustment.php index cdcd72a..1aeb533 100644 --- a/src/Extensions/ReceiptAdjustment.php +++ b/src/Extensions/ReceiptAdjustment.php @@ -56,7 +56,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/ReceiptElement.php b/src/Extensions/ReceiptElement.php index 3c28c29..71ae3fe 100644 --- a/src/Extensions/ReceiptElement.php +++ b/src/Extensions/ReceiptElement.php @@ -114,7 +114,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/ReceiptSummary.php b/src/Extensions/ReceiptSummary.php index 6d71907..8ce4471 100644 --- a/src/Extensions/ReceiptSummary.php +++ b/src/Extensions/ReceiptSummary.php @@ -86,7 +86,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/Extensions/ReceiptTemplate.php b/src/Extensions/ReceiptTemplate.php index ace4d23..47e1f2b 100644 --- a/src/Extensions/ReceiptTemplate.php +++ b/src/Extensions/ReceiptTemplate.php @@ -228,7 +228,7 @@ public function toArray() /** * @return array */ - public function jsonSerialize() + public function jsonSerialize(): array { return $this->toArray(); } diff --git a/src/FacebookDriver.php b/src/FacebookDriver.php index 75e3a71..d05fca7 100755 --- a/src/FacebookDriver.php +++ b/src/FacebookDriver.php @@ -76,7 +76,7 @@ class FacebookDriver extends HttpDriver implements VerifiesService /** @var DriverEventInterface */ protected $driverEvent; - protected $facebookProfileEndpoint = 'https://graph.facebook.com/v3.0/'; + protected $facebookProfileEndpoint = 'https://graph.facebook.com/v22.0/'; /** @var bool If the incoming request is a FB postback */ protected $isPostback = false; @@ -381,12 +381,18 @@ public function buildServicePayload($message, $matchingMessage, $additionalParam if ($message instanceof Question) { $parameters['message'] = $this->convertQuestion($message); } elseif (is_object($message) && in_array(get_class($message), $this->templates)) { + /** + * @var mixed $message + */ $parameters['message'] = $message->toArray(); } elseif ($message instanceof OutgoingMessage) { $attachment = $message->getAttachment(); if (! is_null($attachment) && in_array(get_class($attachment), $this->supportedAttachments)) { $attachmentType = strtolower(basename(str_replace('\\', '/', get_class($attachment)))); unset($parameters['message']['text']); + /** + * @var Video|Audio|Image|File $attachment + */ $parameters['message']['attachment'] = [ 'type' => $attachmentType, 'payload' => [