Commit21c4768

authored and

committed

[Notifier][Discord] Make webhookId argument required

1 parent9052b2b commit21c4768Copy full SHA for 21c4768

File tree

+16

-1

lines changed

+16

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ final class DiscordTransport extends AbstractTransport`
`32`	`32`	`private$token;`
`33`	`33`	`private$webhookId;`
`34`	`34`
`35`		`-publicfunction__construct(string$token,string$webhookId =null,HttpClientInterface$client =null,EventDispatcherInterface$dispatcher =null)`
	`35`	`+publicfunction__construct(string$token,string$webhookId,HttpClientInterface$client =null,EventDispatcherInterface$dispatcher =null)`
`36`	`36`	`{`
`37`	`37`	`$this->token =$token;`
`38`	`38`	`$this->webhookId =$webhookId;`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespaceSymfony\Component\Notifier\Bridge\Discord;`
`13`	`13`
	`14`	`+useSymfony\Component\Notifier\Exception\IncompleteDsnException;`
`14`	`15`	`useSymfony\Component\Notifier\Exception\UnsupportedSchemeException;`
`15`	`16`	`useSymfony\Component\Notifier\Transport\AbstractTransportFactory;`
`16`	`17`	`useSymfony\Component\Notifier\Transport\Dsn;`
`@@ -31,6 +32,11 @@ public function create(Dsn $dsn): TransportInterface`
`31`	`32`	`$scheme =$dsn->getScheme();`
`32`	`33`	`$token =$this->getUser($dsn);`
`33`	`34`	`$webhookId =$dsn->getOption('webhook_id');`
	`35`	`+`
	`36`	`+if (!$webhookId) {`
	`37`	`+thrownewIncompleteDsnException('Missing webhook_id.',$dsn->getOriginalDsn());`
	`38`	`+ }`
	`39`	`+`
`34`	`40`	`$host ='default' ===$dsn->getHost() ?null :$dsn->getHost();`
`35`	`41`	`$port =$dsn->getPort();`
`36`	`42`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,15 @@ public function testCreateWithDsn()`
`31`	`31`	`$this->assertSame(sprintf('discord://%s?webhook_id=%s',$host,$webhookId), (string)$transport);`
`32`	`32`	`}`
`33`	`33`
	`34`	`+publicfunctiontestCreateWithNoWebhookIdThrowsMalformed():void`
	`35`	`+ {`
	`36`	`+$factory =newDiscordTransportFactory();`
	`37`	`+`
	`38`	`+$this->expectException(IncompleteDsnException::class);`
	`39`	`+`
	`40`	`+$factory->create(Dsn::fromString('discord://token@host'));`
	`41`	`+ }`
	`42`	`+`
`34`	`43`	`publicfunctiontestCreateWithNoTokenThrowsMalformed()`
`35`	`44`	`{`
`36`	`45`	`$factory =newDiscordTransportFactory();`

Comments

(0)