8000 Rename from to "InMemory" · symfony/symfony@38e1b51 · GitHub
[go: up one dir, main page]
Skip to content

Commit 38e1b51

Browse files
GaryPEGEOTGaryPEGEOT
committed
Rename from to "InMemory"
1 parent 60e58d8 commit 38e1b51

File tree

5 files changed

+36
-29
lines changed

5 files changed

+36
-29
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<argument /> <!-- multiplier -->
8383
<argument /> <!-- max delay ms -->
8484
</service>
85-
<service id="messenger.transport.null.factory" class="Symfony\Component\Messenger\Transport\NullTransportFactory">
85+
<service id="messenger.transport.in_memory.factory" class="Symfony\Component\Messenger\Transport\InMemoryTransportFactory">
8686
<tag name="messenger.transport_factory" />
8787
</service>
8888
</services>

‎src/Symfony/Component/Messenger/Tests/Transport/NullTransportFactoryTest.php renamed to ‎src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportFactoryTest.php

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,26 @@
1111

1212
namespace Symfony\Component\Messenger\Tests\Transport;
1313

14-
use Symfony\Component\Messenger\Transport\NullTransport;
15-
use Symfony\Component\Messenger\Transport\NullTransportFactory;
14+
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\Messenger\Transport\InMemoryTransport;
16+
use Symfony\Component\Messenger\Transport\InMemoryTransportFactory;
17+
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
1618

1719
/**
1820
* @internal
1921
*
2022
* @author Gary PEGEOT <garypegeot@gmail.com>
2123
*/
22-
class NullTransportFactoryTest extends \PHPUnit\Framework\TestCase
24+
class InMemoryTransportFactoryTest extends TestCase
2325
{
2426
/**
25-
* @var NullTransportFactory
27+
* @var InMemoryTransportFactory
2628
*/
2729
private $factory;
2830

2931
protected function setUp()
3032
{
31-
$this->factory = new NullTransportFactory();
33+
$this->factory = new InMemoryTransportFactory();
3234
}
3335

3436
/**
@@ -39,18 +41,21 @@ protected function setUp()
3941
*/
4042
public function testSupports(string $dsn, bool $expected = true)
4143
{
42-
$this->assertSame($expected, $this->factory->supports($dsn, []), 'NullTransportFactory::supports returned unexpected result.');
44+
$this->assertSame($expected, $this->factory->supports($dsn, []), 'InMemoryTransportFactory::supports returned unexpected result.');
4345
}
4446

4547
public function testCreateTransport()
4648
{
47-
$this->assertInstanceOf(NullTransport::class, $this->factory->createTransport('null://', []));
49+
/** @var SerializerInterface $serializer */
50+
$serializer = $this->createMock(SerializerInterface::class);
51+
52+
$this->assertInstanceOf(InMemoryTransport::class, $this->factory->createTransport('in-memory://', [], $serializer));
4853
}
4954

5055
public function provideDSN(): array
5156
{
5257
return [
53-
'Supported' => ['null://foo'],
58+
'Supported' => ['in-memory://foo'],
5459
'Unsupported' => ['amqp://bar', false],
5560
];
5661
}

‎src/Symfony/Component/Messenger/Tests/Transport/NullTransportTest.php renamed to ‎src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Messenger\Envelope;
16-
use Symfony\Component\Messenger\Transport\NullTransport;
16+
use Symfony\Component\Messenger\Transport\InMemoryTransport;
1717

1818
/**
1919
* @internal
2020
*
2121
* @author Gary PEGEOT <garypegeot@gmail.com>
2222
*/
23-
class NullTransportTest extends TestCase
23+
class InMemoryTransportTest extends TestCase
2424
{
2525
/**
26-
* @var NullTransport
26+
* @var InMemoryTransport
2727
*/
2828
private $transport;
2929

3030
protected function setUp()
3131
{
32-
$this->transport = new NullTransport();
32+
$this->transport = new InMemoryTransport();
3333
}
3434

3535
public function testSend()
3636
{
3737
$envelope = new Envelope(new \stdClass());
3838
$this->transport->send($envelope);
39-
$this->assertSame([$envelope], $this->transport->getSent());
39+
$this->assertSame([$envelope], $this->transport->get());
4040

4141
$handler = function (Envelope $env) use ($envelope) {
4242
$this->assertSame($env, $envelope);
@@ -75,7 +75,7 @@ public function testReset()
7575

7676
$this->transport->reset();
7777

78-
$this->assertEmpty($this->transport->getSent(), 'Should be empty after reset');
78+
$this->assertEmpty($this->transport->get(), 'Should be empty after reset');
7979
$this->assertEmpty($this->transport->getAcknowledged(), 'Should be empty after reset');
8080
$this->assertEmpty($this->transport->getRejected(), 'Should be empty after reset');
8181
}

‎src/Symfony/Component/Messenger/Transport/NullTransport.php renamed to ‎src/Symfony/Component/Messenger/Transport/InMemoryTransport.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
use Symfony\Contracts\Service\ResetInterface;
1616

1717
/**
18-
* Transport that send nothing. Useful for testing purpose.
18+
* Transport that stay in memory. Useful for testing purpose.
1919
*
2020
* @author Gary PEGEOT <garypegeot@gmail.com>
2121
*/
22-
class NullTransport implements TransportInterface, ResetInterface
22+
class InMemoryTransport implements TransportInterface, ResetInterface
2323
{
2424
/**
2525
* @var Envelope[]
@@ -75,14 +75,6 @@ public function send(Envelope $envelope): Envelope
7575
return $envelope;
7676
}
7777

78-
/**
79-
* @return Envelope[]
80-
*/
81-
public function getSent(): array
82-
{
83-
return $this->sent;
84-
}
85-
8678
public function isStopped(): bool
8779
{
8880
return $this->stopped;
@@ -118,4 +110,12 @@ public function getRejected(): array
118110
{
119111
return $this->rejected;
120112
}
113+
114+
/**
115+
* {@inheritdoc}
116+
*/
117+
public function get(): iterable
118+
{
119+
return $this->sent;
120+
}
121121
}

‎src/Symfony/Component/Messenger/Transport/NullTransportFactory.php renamed to ‎src/Symfony/Component/Messenger/Transport/InMemoryTransportFactory.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111

1212
namespace Symfony\Component\Messenger\Transport;
1313

14-
class NullTransportFactory implements TransportFactoryInterface
14+
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
15+
16+
class InMemoryTransportFactory implements TransportFactoryInterface
1517
{
16-
public function createTransport(string $dsn, array $options): TransportInterface
18+
public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
1719
{
18-
return new NullTransport();
20+
return new InMemoryTransport();
1921
}
2022

2123
public function supports(string $dsn, array $options): bool
2224
{
23-
return 0 === strpos($dsn, 'null://');
25+
return 0 === strpos($dsn, 'in-memory://');
2426
}
2527
}

0 commit comments

Comments
 (0)
0