Merge branch '5.2' into 5.x
* 5.2: [Notifier] Rework/streamline bridges (5.1) [Mailer] [Amazon] Ensure "ext-simplexml" is loaded if SesApiTransport is used Stop using deprecated trait [PhpUnitBridge] Lint files with PHP 5.5
This commit is contained in:
commit
138b273056
28
.github/workflows/phpunit-bridge.yml
vendored
Normal file
28
.github/workflows/phpunit-bridge.yml
vendored
Normal file
@ -0,0 +1,28 @@
|
||||
name: PhpUnitBridge
|
||||
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- 'src/Symfony/Bridge/PhpUnit/**'
|
||||
pull_request:
|
||||
paths:
|
||||
- 'src/Symfony/Bridge/PhpUnit/**'
|
||||
|
||||
jobs:
|
||||
|
||||
lint:
|
||||
name: Lint
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Setup PHP
|
||||
uses: shivammathur/setup-php@v2
|
||||
with:
|
||||
coverage: "none"
|
||||
php-version: "5.5"
|
||||
|
||||
- name: Lint
|
||||
run: find ./src/Symfony/Bridge/PhpUnit -name '*.php' | grep -v -e /Tests/ -e ForV6 -e ForV7 -e ForV8 -e ForV9 -e ConstraintLogicTrait | parallel -j 4 php -l {}
|
@ -30,17 +30,23 @@ class ClassExistsMock
|
||||
|
||||
public static function class_exists($name, $autoload = true)
|
||||
{
|
||||
return (bool) (self::$classes[ltrim($name, '\\')] ?? \class_exists($name, $autoload));
|
||||
$name = ltrim($name, '\\');
|
||||
|
||||
return isset(self::$classes[$name]) ? (bool) self::$classes[$name] : \class_exists($name, $autoload);
|
||||
}
|
||||
|
||||
public static function interface_exists($name, $autoload = true)
|
||||
{
|
||||
return (bool) (self::$classes[ltrim($name, '\\')] ?? \interface_exists($name, $autoload));
|
||||
$name = ltrim($name, '\\');
|
||||
|
||||
return isset(self::$classes[$name]) ? (bool) self::$classes[$name] : \interface_exists($name, $autoload);
|
||||
}
|
||||
|
||||
public static function trait_exists($name, $autoload = true)
|
||||
{
|
||||
return (bool) (self::$classes[ltrim($name, '\\')] ?? \trait_exists($name, $autoload));
|
||||
$name = ltrim($name, '\\');
|
||||
|
||||
return isset(self::$classes[$name]) ? (bool) self::$classes[$name] : \trait_exists($name, $autoload);
|
||||
}
|
||||
|
||||
public static function register($class)
|
||||
|
@ -14,6 +14,7 @@ namespace Symfony\Component\Mailer\Bridge\Amazon\Transport;
|
||||
use AsyncAws\Core\Configuration;
|
||||
use AsyncAws\Ses\SesClient;
|
||||
use Symfony\Component\HttpClient\HttpClient;
|
||||
use Symfony\Component\Mailer\Exception\LogicException;
|
||||
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
|
||||
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
|
||||
use Symfony\Component\Mailer\Transport\Dsn;
|
||||
@ -47,6 +48,10 @@ final class SesTransportFactory extends AbstractTransportFactory
|
||||
$port = $dsn->getPort();
|
||||
|
||||
if ('ses+api' === $scheme) {
|
||||
if (!\extension_loaded('simplexml')) {
|
||||
throw new LogicException(sprintf('Cannot use "%s". Make sure you have "ext-simplexml" installed and enabled.', SesApiTransport::class));
|
||||
}
|
||||
|
||||
return (new SesApiTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger))->setHost($host)->setPort($port);
|
||||
}
|
||||
if ('ses+https' === $scheme || 'ses' === $scheme) {
|
||||
|
@ -22,12 +22,9 @@ use Symfony\Component\Notifier\Message\MessageOptionsInterface;
|
||||
*/
|
||||
abstract class FirebaseOptions implements MessageOptionsInterface
|
||||
{
|
||||
/** @var string the recipient */
|
||||
private $to;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*
|
||||
* @see https://firebase.google.com/docs/cloud-messaging/xmpp-server-ref.html#notification-payload-support
|
||||
*/
|
||||
protected $options;
|
||||
|
@ -26,15 +26,16 @@ final class FirebaseTransportFactory extends AbstractTransportFactory
|
||||
public function create(Dsn $dsn): TransportInterface
|
||||
{
|
||||
$scheme = $dsn->getScheme();
|
||||
|
||||
if ('firebase' !== $scheme) {
|
||||
throw new UnsupportedSchemeException($dsn, 'firebase', $this->getSupportedSchemes());
|
||||
}
|
||||
|
||||
$token = sprintf('%s:%s', $this->getUser($dsn), $this->getPassword($dsn));
|
||||
$host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
|
||||
$port = $dsn->getPort();
|
||||
|
||||
if ('firebase' === $scheme) {
|
||||
return (new FirebaseTransport($token, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
throw new UnsupportedSchemeException($dsn, 'firebase', $this->getSupportedSchemes());
|
||||
return (new FirebaseTransport($token, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
protected function getSupportedSchemes(): array
|
||||
|
@ -0,0 +1,61 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Notifier\Bridge\Firebase\Tests;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Notifier\Bridge\Firebase\FirebaseTransportFactory;
|
||||
use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
|
||||
use Symfony\Component\Notifier\Transport\Dsn;
|
||||
|
||||
/**
|
||||
* @author Oskar Stark <oskarstark@googlemail.com>
|
||||
*/
|
||||
final class FirebaseTransportFactoryTest extends TestCase
|
||||
{
|
||||
public function testCreateWithDsn()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$transport = $factory->create(Dsn::fromString('firebase://username:password@default'));
|
||||
$transport->setHost('host.test');
|
||||
|
||||
$this->assertSame('firebase://host.test', (string) $transport);
|
||||
}
|
||||
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('firebase://username:password@default')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('somethingElse://username:password@default')));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$factory->create(Dsn::fromString('somethingElse://username:password@default'));
|
||||
}
|
||||
|
||||
private function createFactory(): FirebaseTransportFactory
|
||||
{
|
||||
return new FirebaseTransportFactory();
|
||||
}
|
||||
}
|
@ -0,0 +1,54 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Notifier\Bridge\Firebase\Tests;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Notifier\Bridge\Firebase\FirebaseTransport;
|
||||
use Symfony\Component\Notifier\Exception\LogicException;
|
||||
use Symfony\Component\Notifier\Message\ChatMessage;
|
||||
use Symfony\Component\Notifier\Message\MessageInterface;
|
||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||
|
||||
/**
|
||||
* @author Oskar Stark <oskarstark@googlemail.com>
|
||||
*/
|
||||
final class FirebaseTransportTest extends TestCase
|
||||
{
|
||||
public function testToStringContainsProperties()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->assertSame('firebase://host.test', (string) $transport);
|
||||
}
|
||||
|
||||
public function testSupportsMessageInterface()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->assertTrue($transport->supports(new ChatMessage('testChatMessage')));
|
||||
$this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));
|
||||
}
|
||||
|
||||
public function testSendNonSmsMessageThrowsException()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->expectException(LogicException::class);
|
||||
|
||||
$transport->send($this->createMock(MessageInterface::class));
|
||||
}
|
||||
|
||||
private function createTransport(): FirebaseTransport
|
||||
{
|
||||
return (new FirebaseTransport('username:password', $this->createMock(HttpClientInterface::class)))->setHost('host.test');
|
||||
}
|
||||
}
|
@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
|
||||
backupGlobals="false"
|
||||
colors="true"
|
||||
bootstrap="vendor/autoload.php"
|
||||
failOnRisky="true"
|
||||
failOnWarning="true"
|
||||
>
|
||||
<php>
|
||||
<ini name="error_reporting" value="-1" />
|
||||
</php>
|
||||
|
||||
<testsuites>
|
||||
<testsuite name="Symfony Firebase Notifier Bridge Test Suite">
|
||||
<directory>./Tests/</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
|
||||
<filter>
|
||||
<whitelist>
|
||||
<directory>./</directory>
|
||||
<exclude>
|
||||
<directory>./Resources</directory>
|
||||
<directory>./Tests</directory>
|
||||
<directory>./vendor</directory>
|
||||
</exclude>
|
||||
</whitelist>
|
||||
</filter>
|
||||
</phpunit>
|
@ -30,6 +30,11 @@ final class FreeMobileTransportFactory extends AbstractTransportFactory
|
||||
public function create(Dsn $dsn): TransportInterface
|
||||
{
|
||||
$scheme = $dsn->getScheme();
|
||||
|
||||
if ('freemobile' !== $scheme) {
|
||||
throw new UnsupportedSchemeException($dsn, 'freemobile', $this->getSupportedSchemes());
|
||||
}
|
||||
|
||||
$login = $this->getUser($dsn);
|
||||
$password = $this->getPassword($dsn);
|
||||
$phone = $dsn->getOption('phone');
|
||||
@ -38,11 +43,7 @@ final class FreeMobileTransportFactory extends AbstractTransportFactory
|
||||
throw new IncompleteDsnException('Missing phone.', $dsn->getOriginalDsn());
|
||||
}
|
||||
|
||||
if ('freemobile' === $scheme) {
|
||||
return new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher);
|
||||
}
|
||||
|
||||
throw new UnsupportedSchemeException($dsn, 'freemobile', $this->getSupportedSchemes());
|
||||
return new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher);
|
||||
}
|
||||
|
||||
protected function getSupportedSchemes(): array
|
||||
|
@ -30,35 +30,46 @@ final class FreeMobileTransportFactoryTest extends TestCase
|
||||
$this->assertSame('freemobile://host.test?phone=0611223344', (string) $transport);
|
||||
}
|
||||
|
||||
public function testCreateWithNoPhoneThrowsMalformed()
|
||||
public function testCreateWithNoPhoneThrowsIncompleteDsnException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
|
||||
$dsnIncomplete = 'freemobile://login:pass@default';
|
||||
$factory->create(Dsn::fromString($dsnIncomplete));
|
||||
$factory->create(Dsn::fromString('freemobile://login:pass@default'));
|
||||
}
|
||||
|
||||
public function testSupportsScheme()
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$dsn = 'freemobile://login:pass@default?phone=0611223344';
|
||||
$dsnUnsupported = 'foobarmobile://login:pass@default?phone=0611223344';
|
||||
|
||||
$this->assertTrue($factory->supports(Dsn::fromString($dsn)));
|
||||
$this->assertFalse($factory->supports(Dsn::fromString($dsnUnsupported)));
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('freemobile://login:pass@default?phone=0611223344')));
|
||||
}
|
||||
|
||||
public function testNonFreeMobileSchemeThrows()
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('somethingElse://login:pass@default?phone=0611223344')));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$dsnUnsupported = 'foobarmobile://login:pass@default?phone=0611223344';
|
||||
$factory->create(Dsn::fromString($dsnUnsupported));
|
||||
$factory->create(Dsn::fromString('somethingElse://login:pass@default?phone=0611223344'));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeExceptionEvenIfRequiredOptionIsMissing()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
// unsupported scheme and missing "phone" option
|
||||
$factory->create(Dsn::fromString('somethingElse://login:pass@default'));
|
||||
}
|
||||
|
||||
private function createFactory(): FreeMobileTransportFactory
|
||||
|
@ -11,6 +11,7 @@
|
||||
|
||||
namespace Symfony\Component\Notifier\Bridge\Mattermost;
|
||||
|
||||
use Symfony\Component\Notifier\Exception\IncompleteDsnException;
|
||||
use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
|
||||
use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
|
||||
use Symfony\Component\Notifier\Transport\Dsn;
|
||||
@ -26,16 +27,22 @@ final class MattermostTransportFactory extends AbstractTransportFactory
|
||||
public function create(Dsn $dsn): TransportInterface
|
||||
{
|
||||
$scheme = $dsn->getScheme();
|
||||
|
||||
if ('mattermost' !== $scheme) {
|
||||
throw new UnsupportedSchemeException($dsn, 'mattermost', $this->getSupportedSchemes());
|
||||
}
|
||||
|
||||
$token = $this->getUser($dsn);
|
||||
$channel = $dsn->getOption('channel');
|
||||
|
||||
if (!$channel) {
|
||||
throw new IncompleteDsnException('Missing channel.', $dsn->getOriginalDsn());
|
||||
}
|
||||
|
||||
$host = $dsn->getHost();
|
||||
$port = $dsn->getPort();
|
||||
|
||||
if ('mattermost' === $scheme) {
|
||||
return (new MattermostTransport($token, $channel, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
throw new UnsupportedSchemeException($dsn, 'mattermost', $this->getSupportedSchemes());
|
||||
return (new MattermostTransport($token, $channel, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
protected function getSupportedSchemes(): array
|
||||
|
@ -0,0 +1,92 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Notifier\Bridge\Mattermost\Tests;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
|
||||
use Symfony\Component\Notifier\Exception\IncompleteDsnException;
|
||||
use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
|
||||
use Symfony\Component\Notifier\Transport\Dsn;
|
||||
|
||||
/**
|
||||
* @author Oskar Stark <oskarstark@googlemail.com>
|
||||
*/
|
||||
final class MattermostTransportFactoryTest extends TestCase
|
||||
{
|
||||
public function testCreateWithDsn()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$accessToken = 'testAccessToken';
|
||||
$host = 'testHost';
|
||||
$channel = 'testChannel';
|
||||
|
||||
$transport = $factory->create(Dsn::fromString(sprintf('mattermost://%s@%s/?channel=%s', $accessToken, $host, $channel)));
|
||||
|
||||
$this->assertSame(sprintf('mattermost://%s?channel=%s', $host, $channel), (string) $transport);
|
||||
}
|
||||
|
||||
public function testCreateWithMissingOptionChannelThrowsIncompleteDsnException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
|
||||
$factory->create(Dsn::fromString('mattermost://token@host'));
|
||||
}
|
||||
|
||||
public function testCreateWithNoTokenThrowsIncompleteDsnException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
$factory->create(Dsn::fromString(sprintf('mattermost://%s/?channel=%s', 'testHost', 'testChannel')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('mattermost://token@host/?channel=testChannel')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host/?channel=testChannel')));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$factory->create(Dsn::fromString('somethingElse://token@host/?channel=testChannel'));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeExceptionEvenIfRequiredOptionIsMissing()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
// unsupported scheme and missing "channel" option
|
||||
$factory->create(Dsn::fromString('somethingElse://token@host'));
|
||||
}
|
||||
|
||||
private function createFactory(): MattermostTransportFactory
|
||||
{
|
||||
return new MattermostTransportFactory();
|
||||
}
|
||||
}
|
@ -0,0 +1,53 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Notifier\Bridge\Mattermost\Tests;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransport;
|
||||
use Symfony\Component\Notifier\Exception\LogicException;
|
||||
use Symfony\Component\Notifier\Message\ChatMessage;
|
||||
use Symfony\Component\Notifier\Message\MessageInterface;
|
||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||
|
||||
/**
|
||||
* @author Oskar Stark <oskarstark@googlemail.com>
|
||||
*/
|
||||
final class MattermostTransportTest extends TestCase
|
||||
{
|
||||
public function testToStringContainsProperties()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->assertSame('mattermost://host.test?channel=testChannel', (string) $transport);
|
||||
}
|
||||
|
||||
public function testSupportsChatMessage()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->assertTrue($transport->supports(new ChatMessage('testChatMessage')));
|
||||
$this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));
|
||||
}
|
||||
|
||||
public function testSendNonChatMessageThrows()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->expectException(LogicException::class);
|
||||
$transport->send($this->createMock(MessageInterface::class));
|
||||
}
|
||||
|
||||
private function createTransport(): MattermostTransport
|
||||
{
|
||||
return (new MattermostTransport('testAccessToken', 'testChannel', $this->createMock(HttpClientInterface::class)))->setHost('host.test');
|
||||
}
|
||||
}
|
@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
|
||||
backupGlobals="false"
|
||||
colors="true"
|
||||
bootstrap="vendor/autoload.php"
|
||||
failOnRisky="true"
|
||||
failOnWarning="true"
|
||||
>
|
||||
<php>
|
||||
<ini name="error_reporting" value="-1" />
|
||||
</php>
|
||||
|
||||
<testsuites>
|
||||
<testsuite name="Symfony Mattermost Notifier Bridge Test Suite">
|
||||
<directory>./Tests/</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
|
||||
<filter>
|
||||
<whitelist>
|
||||
<directory>./</directory>
|
||||
<exclude>
|
||||
<directory>./Resources</directory>
|
||||
<directory>./Tests</directory>
|
||||
<directory>./vendor</directory>
|
||||
</exclude>
|
||||
</whitelist>
|
||||
</filter>
|
||||
</phpunit>
|
@ -36,24 +36,21 @@ final class NexmoTransportFactoryTest extends TestCase
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
|
||||
$dsnIncomplete = 'nexmo://apiKey:apiSecret@default';
|
||||
$factory->create(Dsn::fromString($dsnIncomplete));
|
||||
$factory->create(Dsn::fromString('nexmo://apiKey:apiSecret@default'));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$dsn = 'nexmo://apiKey:apiSecret@default?from=0611223344';
|
||||
$this->assertTrue($factory->supports(Dsn::fromString($dsn)));
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('nexmo://apiKey:apiSecret@default?from=0611223344')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$dsnUnsupported = 'nexmoo://apiKey:apiSecret@default?from=0611223344';
|
||||
$this->assertFalse($factory->supports(Dsn::fromString($dsnUnsupported)));
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('nexmoo://apiKey:apiSecret@default?from=0611223344')));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
@ -62,8 +59,7 @@ final class NexmoTransportFactoryTest extends TestCase
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$dsnUnsupported = 'nexmoo://apiKey:apiSecret@default?from=0611223344';
|
||||
$factory->create(Dsn::fromString($dsnUnsupported));
|
||||
$factory->create(Dsn::fromString('somethingElse://apiKey:apiSecret@default?from=0611223344'));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeExceptionEvenIfRequiredOptionIsMissing()
|
||||
@ -73,7 +69,7 @@ final class NexmoTransportFactoryTest extends TestCase
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
// unsupported scheme and missing "from" option
|
||||
$factory->create(Dsn::fromString('nexmoo://apiKey:apiSecret@default'));
|
||||
$factory->create(Dsn::fromString('somethingElse://apiKey:apiSecret@default'));
|
||||
}
|
||||
|
||||
private function createFactory(): NexmoTransportFactory
|
||||
|
@ -36,8 +36,7 @@ final class OvhCloudTransportFactoryTest extends TestCase
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
|
||||
$dsnIncomplete = 'ovhcloud://applicationKey:applicationSecret@default?service_name=serviceName';
|
||||
$factory->create(Dsn::fromString($dsnIncomplete));
|
||||
$factory->create(Dsn::fromString('ovhcloud://applicationKey:applicationSecret@default?service_name=serviceName'));
|
||||
}
|
||||
|
||||
public function testCreateWithMissingOptionServiceNameThrowsIncompleteDsnException()
|
||||
@ -46,24 +45,21 @@ final class OvhCloudTransportFactoryTest extends TestCase
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
|
||||
$dsnIncomplete = 'ovhcloud://applicationKey:applicationSecret@default?consumeer_key=consumerKey';
|
||||
$factory->create(Dsn::fromString($dsnIncomplete));
|
||||
$factory->create(Dsn::fromString('ovhcloud://applicationKey:applicationSecret@default?consumeer_key=consumerKey'));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$dsn = 'ovhcloud://applicationKey:applicationSecret@default?consumer_key=consumerKey&service_name=serviceName';
|
||||
$this->assertTrue($factory->supports(Dsn::fromString($dsn)));
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('ovhcloud://applicationKey:applicationSecret@default?consumer_key=consumerKey&service_name=serviceName')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$dsnUnsupported = 'ovhclouddddd://applicationKey:applicationSecret@default?consumer_key=consumerKey&service_name=serviceName';
|
||||
$this->assertFalse($factory->supports(Dsn::fromString($dsnUnsupported)));
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('somethingElse://applicationKey:applicationSecret@default?consumer_key=consumerKey&service_name=serviceName')));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
@ -72,8 +68,7 @@ final class OvhCloudTransportFactoryTest extends TestCase
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$dsnUnsupported = 'ovhclouddddd://applicationKey:applicationSecret@default?consumer_key=consumerKey&service_name=serviceName';
|
||||
$factory->create(Dsn::fromString($dsnUnsupported));
|
||||
$factory->create(Dsn::fromString('somethingElse://applicationKey:applicationSecret@default?consumer_key=consumerKey&service_name=serviceName'));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeExceptionEvenIfRequiredOptionIsMissing()
|
||||
@ -83,7 +78,7 @@ final class OvhCloudTransportFactoryTest extends TestCase
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
// unsupported scheme and missing "service_name" option
|
||||
$factory->create(Dsn::fromString('ovhclouddddd://applicationKey:applicationSecret@default?consumer_key=consumerKey'));
|
||||
$factory->create(Dsn::fromString('somethingElse://applicationKey:applicationSecret@default?consumer_key=consumerKey'));
|
||||
}
|
||||
|
||||
private function createFactory(): OvhCloudTransportFactory
|
||||
|
@ -53,7 +53,7 @@ final class RocketChatTransport extends AbstractTransport
|
||||
}
|
||||
|
||||
/**
|
||||
* @see https://rocket.chat/docs/administrator-guides/integrations/
|
||||
* @see https://rocket.chat/docs/administrator-guides/integrations
|
||||
*/
|
||||
protected function doSend(MessageInterface $message): SentMessage
|
||||
{
|
||||
|
@ -26,16 +26,17 @@ final class RocketChatTransportFactory extends AbstractTransportFactory
|
||||
public function create(Dsn $dsn): TransportInterface
|
||||
{
|
||||
$scheme = $dsn->getScheme();
|
||||
|
||||
if ('rocketchat' !== $scheme) {
|
||||
throw new UnsupportedSchemeException($dsn, 'rocketchat', $this->getSupportedSchemes());
|
||||
}
|
||||
|
||||
$accessToken = $this->getUser($dsn);
|
||||
$channel = $dsn->getOption('channel');
|
||||
$host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
|
||||
$port = $dsn->getPort();
|
||||
|
||||
if ('rocketchat' === $scheme) {
|
||||
return (new RocketChatTransport($accessToken, $channel, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
throw new UnsupportedSchemeException($dsn, 'rocketchat', $this->getSupportedSchemes());
|
||||
return (new RocketChatTransport($accessToken, $channel, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
protected function getSupportedSchemes(): array
|
||||
|
@ -0,0 +1,73 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Notifier\Bridge\RocketChat\Tests;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
|
||||
use Symfony\Component\Notifier\Exception\IncompleteDsnException;
|
||||
use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
|
||||
use Symfony\Component\Notifier\Transport\Dsn;
|
||||
|
||||
/**
|
||||
* @author Oskar Stark <oskarstark@googlemail.com>
|
||||
*/
|
||||
final class RocketChatTransportFactoryTest extends TestCase
|
||||
{
|
||||
public function testCreateWithDsn()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$accessToken = 'testAccessToken';
|
||||
$host = 'testHost';
|
||||
$channel = 'testChannel';
|
||||
|
||||
$transport = $factory->create(Dsn::fromString(sprintf('rocketchat://%s@%s/?channel=%s', $accessToken, $host, $channel)));
|
||||
|
||||
$this->assertSame(sprintf('rocketchat://%s?channel=%s', $host, $channel), (string) $transport);
|
||||
}
|
||||
|
||||
public function testCreateWithNoTokenThrowsIncompleteDsnException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
$factory->create(Dsn::fromString(sprintf('rocketchat://%s/?channel=%s', 'testHost', 'testChannel')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('rocketchat://token@host/?channel=testChannel')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host/?channel=testChannel')));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$factory->create(Dsn::fromString('somethingElse://token@host/?channel=testChannel'));
|
||||
}
|
||||
|
||||
private function createFactory(): RocketChatTransportFactory
|
||||
{
|
||||
return new RocketChatTransportFactory();
|
||||
}
|
||||
}
|
@ -0,0 +1,53 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Notifier\Bridge\RocketChat\Tests;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransport;
|
||||
use Symfony\Component\Notifier\Exception\LogicException;
|
||||
use Symfony\Component\Notifier\Message\ChatMessage;
|
||||
use Symfony\Component\Notifier\Message\MessageInterface;
|
||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||
|
||||
/**
|
||||
* @author Oskar Stark <oskarstark@googlemail.com>
|
||||
*/
|
||||
final class RocketChatTransportTest extends TestCase
|
||||
{
|
||||
public function testToStringContainsProperties()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->assertSame('rocketchat://host.test?channel=testChannel', (string) $transport);
|
||||
}
|
||||
|
||||
public function testSupportsChatMessage()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->assertTrue($transport->supports(new ChatMessage('testChatMessage')));
|
||||
$this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));
|
||||
}
|
||||
|
||||
public function testSendNonChatMessageThrows()
|
||||
{
|
||||
$transport = $this->createTransport();
|
||||
|
||||
$this->expectException(LogicException::class);
|
||||
$transport->send($this->createMock(MessageInterface::class));
|
||||
}
|
||||
|
||||
private function createTransport(): RocketChatTransport
|
||||
{
|
||||
return (new RocketChatTransport('testAccessToken', 'testChannel', $this->createMock(HttpClientInterface::class)))->setHost('host.test');
|
||||
}
|
||||
}
|
@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
|
||||
backupGlobals="false"
|
||||
colors="true"
|
||||
bootstrap="vendor/autoload.php"
|
||||
failOnRisky="true"
|
||||
failOnWarning="true"
|
||||
>
|
||||
<php>
|
||||
<ini name="error_reporting" value="-1" />
|
||||
</php>
|
||||
|
||||
<testsuites>
|
||||
<testsuite name="Symfony RocketChat Notifier Bridge Test Suite">
|
||||
<directory>./Tests/</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
|
||||
<filter>
|
||||
<whitelist>
|
||||
<directory>./</directory>
|
||||
<exclude>
|
||||
<directory>./Resources</directory>
|
||||
<directory>./Tests</directory>
|
||||
<directory>./vendor</directory>
|
||||
</exclude>
|
||||
</whitelist>
|
||||
</filter>
|
||||
</phpunit>
|
@ -36,24 +36,21 @@ final class SinchTransportFactoryTest extends TestCase
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
|
||||
$dsnIncomplete = 'sinch://accountSid:authToken@default';
|
||||
$factory->create(Dsn::fromString($dsnIncomplete));
|
||||
$factory->create(Dsn::fromString('sinch://accountSid:authToken@default'));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$dsn = 'sinch://accountSid:authToken@default?from=0611223344';
|
||||
$this->assertTrue($factory->supports(Dsn::fromString($dsn)));
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('sinch://accountSid:authToken@default?from=0611223344')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$dsnUnsupported = 'sinnnnch://accountSid:authToken@default?from=0611223344';
|
||||
$this->assertFalse($factory->supports(Dsn::fromString($dsnUnsupported)));
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('somethingElse://accountSid:authToken@default?from=0611223344')));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
@ -62,8 +59,7 @@ final class SinchTransportFactoryTest extends TestCase
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$dsnUnsupported = 'sinnnnch://accountSid:authToken@default?from=0611223344';
|
||||
$factory->create(Dsn::fromString($dsnUnsupported));
|
||||
$factory->create(Dsn::fromString('somethingElse://accountSid:authToken@default?from=0611223344'));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeExceptionEvenIfRequiredOptionIsMissing()
|
||||
@ -73,7 +69,7 @@ final class SinchTransportFactoryTest extends TestCase
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
// unsupported scheme and missing "from" option
|
||||
$factory->create(Dsn::fromString('sinnnnch://accountSid:authToken@default'));
|
||||
$factory->create(Dsn::fromString('somethingElse://accountSid:authToken@default'));
|
||||
}
|
||||
|
||||
private function createFactory(): SinchTransportFactory
|
||||
|
@ -30,16 +30,17 @@ final class TelegramTransportFactory extends AbstractTransportFactory
|
||||
public function create(Dsn $dsn): TransportInterface
|
||||
{
|
||||
$scheme = $dsn->getScheme();
|
||||
|
||||
if ('telegram' !== $scheme) {
|
||||
throw new UnsupportedSchemeException($dsn, 'telegram', $this->getSupportedSchemes());
|
||||
}
|
||||
|
||||
$token = $this->getToken($dsn);
|
||||
$channel = $dsn->getOption('channel');
|
||||
$host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
|
||||
$port = $dsn->getPort();
|
||||
|
||||
if ('telegram' === $scheme) {
|
||||
return (new TelegramTransport($token, $channel, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
throw new UnsupportedSchemeException($dsn, 'telegram', $this->getSupportedSchemes());
|
||||
return (new TelegramTransport($token, $channel, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
protected function getSupportedSchemes(): array
|
||||
|
@ -21,7 +21,7 @@ final class TelegramTransportFactoryTest extends TestCase
|
||||
{
|
||||
public function testCreateWithDsn()
|
||||
{
|
||||
$factory = new TelegramTransportFactory();
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$host = 'testHost';
|
||||
$channel = 'testChannel';
|
||||
@ -31,35 +31,47 @@ final class TelegramTransportFactoryTest extends TestCase
|
||||
$this->assertSame(sprintf('telegram://%s?channel=%s', $host, $channel), (string) $transport);
|
||||
}
|
||||
|
||||
public function testCreateWithNoPasswordThrowsMalformed()
|
||||
public function testCreateWithNoPasswordThrowsIncompleteDsnException()
|
||||
{
|
||||
$factory = new TelegramTransportFactory();
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
$factory->create(Dsn::fromString(sprintf('telegram://%s@%s/?channel=%s', 'simpleToken', 'testHost', 'testChannel')));
|
||||
}
|
||||
|
||||
public function testCreateWithNoTokenThrowsMalformed()
|
||||
public function testCreateWithNoTokenThrowsIncompleteDsnException()
|
||||
{
|
||||
$factory = new TelegramTransportFactory();
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
$factory->create(Dsn::fromString(sprintf('telegram://%s/?channel=%s', 'testHost', 'testChannel')));
|
||||
}
|
||||
|
||||
public function testSupportsScheme()
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = new TelegramTransportFactory();
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('telegram://host/?channel=testChannel')));
|
||||
}
|
||||
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('somethingElse://host/?channel=testChannel')));
|
||||
}
|
||||
|
||||
public function testNonTelegramSchemeThrows()
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
{
|
||||
$factory = new TelegramTransportFactory();
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$factory->create(Dsn::fromString('somethingElse://user:pwd@host/?channel=testChannel'));
|
||||
}
|
||||
|
||||
private function createFactory(): TelegramTransportFactory
|
||||
{
|
||||
return new TelegramTransportFactory();
|
||||
}
|
||||
}
|
||||
|
@ -29,9 +29,9 @@ final class TelegramTransportTest extends TestCase
|
||||
$channel = 'testChannel';
|
||||
|
||||
$transport = new TelegramTransport('testToken', $channel, $this->createMock(HttpClientInterface::class));
|
||||
$transport->setHost('testHost');
|
||||
$transport->setHost('host.test');
|
||||
|
||||
$this->assertSame(sprintf('telegram://%s?channel=%s', 'testHost', $channel), (string) $transport);
|
||||
$this->assertSame(sprintf('telegram://%s?channel=%s', 'host.test', $channel), (string) $transport);
|
||||
}
|
||||
|
||||
public function testSupportsChatMessage()
|
||||
|
@ -30,35 +30,46 @@ final class TwilioTransportFactoryTest extends TestCase
|
||||
$this->assertSame('twilio://host.test?from=0611223344', (string) $transport);
|
||||
}
|
||||
|
||||
public function testCreateWithNoFromThrowsMalformed()
|
||||
public function testCreateWithNoFromThrowsIncompleteDsnException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(IncompleteDsnException::class);
|
||||
|
||||
$dsnIncomplete = 'twilio://accountSid:authToken@default';
|
||||
$factory->create(Dsn::fromString($dsnIncomplete));
|
||||
$factory->create(Dsn::fromString('twilio://accountSid:authToken@default'));
|
||||
}
|
||||
|
||||
public function testSupportsScheme()
|
||||
public function testSupportsReturnsTrueWithSupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$dsn = 'twilio://accountSid:authToken@default?from=0611223344';
|
||||
$dsnUnsupported = 'twilioooo://accountSid:authToken@default?from=0611223344';
|
||||
|
||||
$this->assertTrue($factory->supports(Dsn::fromString($dsn)));
|
||||
$this->assertFalse($factory->supports(Dsn::fromString($dsnUnsupported)));
|
||||
$this->assertTrue($factory->supports(Dsn::fromString('twilio://accountSid:authToken@default?from=0611223344')));
|
||||
}
|
||||
|
||||
public function testNonTwilioSchemeThrows()
|
||||
public function testSupportsReturnsFalseWithUnsupportedScheme()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->assertFalse($factory->supports(Dsn::fromString('somethingElse://accountSid:authToken@default?from=0611223344')));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
$dsnUnsupported = 'twilioooo://accountSid:authToken@default?from=0611223344';
|
||||
$factory->create(Dsn::fromString($dsnUnsupported));
|
||||
$factory->create(Dsn::fromString('somethingElse://accountSid:authToken@default?from=0611223344'));
|
||||
}
|
||||
|
||||
public function testUnsupportedSchemeThrowsUnsupportedSchemeExceptionEvenIfRequiredOptionIsMissing()
|
||||
{
|
||||
$factory = $this->createFactory();
|
||||
|
||||
$this->expectException(UnsupportedSchemeException::class);
|
||||
|
||||
// unsupported scheme and missing "from" option
|
||||
$factory->create(Dsn::fromString('somethingElse://token@host'));
|
||||
}
|
||||
|
||||
private function createFactory(): TwilioTransportFactory
|
||||
|
@ -30,6 +30,11 @@ final class TwilioTransportFactory extends AbstractTransportFactory
|
||||
public function create(Dsn $dsn): TransportInterface
|
||||
{
|
||||
$scheme = $dsn->getScheme();
|
||||
|
||||
if ('twilio' !== $scheme) {
|
||||
throw new UnsupportedSchemeException($dsn, 'twilio', $this->getSupportedSchemes());
|
||||
}
|
||||
|
||||
$accountSid = $this->getUser($dsn);
|
||||
$authToken = $this->getPassword($dsn);
|
||||
$from = $dsn->getOption('from');
|
||||
@ -41,11 +46,7 @@ final class TwilioTransportFactory extends AbstractTransportFactory
|
||||
$host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
|
||||
$port = $dsn->getPort();
|
||||
|
||||
if ('twilio' === $scheme) {
|
||||
return (new TwilioTransport($accountSid, $authToken, $from, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
throw new UnsupportedSchemeException($dsn, 'twilio', $this->getSupportedSchemes());
|
||||
return (new TwilioTransport($accountSid, $authToken, $from, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
|
||||
}
|
||||
|
||||
protected function getSupportedSchemes(): array
|
||||
|
Reference in New Issue
Block a user