Merge branch 'master' into scrummer-enums

scrummer · scrummer · commit 42febf0a3ce6 · 2022-01-23T21:41:23.000+01:00
diff --git a/src/DiscordWebhook/Webhook.php b/src/DiscordWebhook/Webhook.php
@@ -65,7 +65,7 @@ public function send(): bool
         /** @var ArrayCollection|int[] $responseCodes */
         $responseCodes = new ArrayCollection();
 
-        if ($this->getFile() !== null && $this->embeds->count() > 0) {
+        if (isset($this->file) && $this->embeds->count() > 0) {
             throw new RuntimeException('Cannot use embeds and files in the same Webhook.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function send(): bool`
`65`	`65`	`/** @var ArrayCollection\|int[] $responseCodes */`
`66`	`66`	`$responseCodes = new ArrayCollection();`
`67`	`67`
`68`		`- if ($this->getFile() !== null && $this->embeds->count() > 0) {`
	`68`	`+ if (isset($this->file) && $this->embeds->count() > 0) {`
`69`	`69`	`throw new RuntimeException('Cannot use embeds and files in the same Webhook.');`
`70`	`70`	`}`
`71`	`71`