Skip to content

Commit df4684f

Browse files
committed
Remove Psr prefix in Dbal transport
1 parent c13d039 commit df4684f

15 files changed

+73
-73
lines changed

DbalConnectionFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
use Doctrine\DBAL\Connection;
88
use Doctrine\DBAL\DriverManager;
9-
use Interop\Queue\PsrConnectionFactory;
10-
use Interop\Queue\PsrContext;
9+
use Interop\Queue\ConnectionFactory;
10+
use Interop\Queue\Context;
1111

12-
class DbalConnectionFactory implements PsrConnectionFactory
12+
class DbalConnectionFactory implements ConnectionFactory
1313
{
1414
/**
1515
* @var array
@@ -64,7 +64,7 @@ public function __construct($config = 'mysql:')
6464
/**
6565
* @return DbalContext
6666
*/
67-
public function createContext(): PsrContext
67+
public function createContext(): Context
6868
{
6969
if ($this->config['lazy']) {
7070
return new DbalContext(function () {

DbalConsumer.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
use Doctrine\DBAL\Connection;
88
use Doctrine\DBAL\Types\Type;
9+
use Interop\Queue\Consumer;
910
use Interop\Queue\InvalidMessageException;
10-
use Interop\Queue\PsrConsumer;
11-
use Interop\Queue\PsrMessage;
12-
use Interop\Queue\PsrQueue;
11+
use Interop\Queue\Message;
12+
use Interop\Queue\Queue;
1313

14-
class DbalConsumer implements PsrConsumer
14+
class DbalConsumer implements Consumer
1515
{
1616
/**
1717
* @var DbalContext
@@ -61,12 +61,12 @@ public function getPollingInterval(): int
6161
/**
6262
* @return DbalDestination
6363
*/
64-
public function getQueue(): PsrQueue
64+
public function getQueue(): Queue
6565
{
6666
return $this->queue;
6767
}
6868

69-
public function receive(int $timeout = 0): ?PsrMessage
69+
public function receive(int $timeout = 0): ?Message
7070
{
7171
$timeout /= 1000;
7272
$startAt = microtime(true);
@@ -90,23 +90,23 @@ public function receive(int $timeout = 0): ?PsrMessage
9090
}
9191
}
9292

93-
public function receiveNoWait(): ?PsrMessage
93+
public function receiveNoWait(): ?Message
9494
{
9595
return $this->receiveMessage();
9696
}
9797

9898
/**
9999
* @param DbalMessage $message
100100
*/
101-
public function acknowledge(PsrMessage $message): void
101+
public function acknowledge(Message $message): void
102102
{
103103
// does nothing
104104
}
105105

106106
/**
107107
* @param DbalMessage $message
108108
*/
109-
public function reject(PsrMessage $message, bool $requeue = false): void
109+
public function reject(Message $message, bool $requeue = false): void
110110
{
111111
InvalidMessageException::assertMessageInstanceOf($message, DbalMessage::class);
112112

DbalContext.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
use Doctrine\DBAL\Connection;
88
use Doctrine\DBAL\Schema\Table;
99
use Doctrine\DBAL\Types\Type;
10+
use Interop\Queue\Consumer;
11+
use Interop\Queue\Context;
12+
use Interop\Queue\Destination;
1013
use Interop\Queue\InvalidDestinationException;
11-
use Interop\Queue\PsrConsumer;
12-
use Interop\Queue\PsrContext;
13-
use Interop\Queue\PsrDestination;
14-
use Interop\Queue\PsrMessage;
15-
use Interop\Queue\PsrProducer;
16-
use Interop\Queue\PsrQueue;
17-
use Interop\Queue\PsrSubscriptionConsumer;
18-
use Interop\Queue\PsrTopic;
14+
use Interop\Queue\Message;
15+
use Interop\Queue\Producer;
16+
use Interop\Queue\Queue;
17+
use Interop\Queue\SubscriptionConsumer;
1918
use Interop\Queue\SubscriptionConsumerNotSupportedException;
2019
use Interop\Queue\TemporaryQueueNotSupportedException;
20+
use Interop\Queue\Topic;
2121

22-
class DbalContext implements PsrContext
22+
class DbalContext implements Context
2323
{
2424
/**
2525
* @var Connection
@@ -65,7 +65,7 @@ public function __construct($connection, array $config = [])
6565
/**
6666
* {@inheritdoc}
6767
*/
68-
public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage
68+
public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
6969
{
7070
$message = new DbalMessage();
7171
$message->setBody($body);
@@ -78,36 +78,36 @@ public function createMessage(string $body = '', array $properties = [], array $
7878
/**
7979
* @return DbalDestination
8080
*/
81-
public function createQueue(string $name): PsrQueue
81+
public function createQueue(string $name): Queue
8282
{
8383
return new DbalDestination($name);
8484
}
8585

8686
/**
8787
* @return DbalDestination
8888
*/
89-
public function createTopic(string $name): PsrTopic
89+
public function createTopic(string $name): Topic
9090
{
9191
return new DbalDestination($name);
9292
}
9393

94-
public function createTemporaryQueue(): PsrQueue
94+
public function createTemporaryQueue(): Queue
9595
{
9696
throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt();
9797
}
9898

9999
/**
100100
* @return DbalProducer
101101
*/
102-
public function createProducer(): PsrProducer
102+
public function createProducer(): Producer
103103
{
104104
return new DbalProducer($this);
105105
}
106106

107107
/**
108108
* @return DbalConsumer
109109
*/
110-
public function createConsumer(PsrDestination $destination): PsrConsumer
110+
public function createConsumer(Destination $destination): Consumer
111111
{
112112
InvalidDestinationException::assertDestinationInstanceOf($destination, DbalDestination::class);
113113

@@ -124,15 +124,15 @@ public function close(): void
124124
{
125125
}
126126

127-
public function createSubscriptionConsumer(): PsrSubscriptionConsumer
127+
public function createSubscriptionConsumer(): SubscriptionConsumer
128128
{
129129
throw SubscriptionConsumerNotSupportedException::providerDoestNotSupportIt();
130130
}
131131

132132
/**
133133
* @param DbalDestination $queue
134134
*/
135-
public function purgeQueue(PsrQueue $queue): void
135+
public function purgeQueue(Queue $queue): void
136136
{
137137
$this->getDbalConnection()->delete(
138138
$this->getTableName(),

DbalDestination.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace Enqueue\Dbal;
66

7-
use Interop\Queue\PsrQueue;
8-
use Interop\Queue\PsrTopic;
7+
use Interop\Queue\Queue;
8+
use Interop\Queue\Topic;
99

10-
class DbalDestination implements PsrTopic, PsrQueue
10+
class DbalDestination implements Topic, Queue
1111
{
1212
/**
1313
* @var string

DbalMessage.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace Enqueue\Dbal;
66

7-
use Interop\Queue\PsrMessage;
7+
use Interop\Queue\Message;
88

9-
class DbalMessage implements PsrMessage
9+
class DbalMessage implements Message
1010
{
1111
/**
1212
* @var string

DbalProducer.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
namespace Enqueue\Dbal;
66

77
use Doctrine\DBAL\Types\Type;
8+
use Interop\Queue\Destination;
89
use Interop\Queue\Exception;
910
use Interop\Queue\InvalidDestinationException;
1011
use Interop\Queue\InvalidMessageException;
11-
use Interop\Queue\PsrDestination;
12-
use Interop\Queue\PsrMessage;
13-
use Interop\Queue\PsrProducer;
12+
use Interop\Queue\Message;
13+
use Interop\Queue\Producer;
1414
use Ramsey\Uuid\Codec\OrderedTimeCodec;
1515
use Ramsey\Uuid\Uuid;
1616
use Ramsey\Uuid\UuidFactory;
1717

18-
class DbalProducer implements PsrProducer
18+
class DbalProducer implements Producer
1919
{
2020
/**
2121
* @var int|null
@@ -55,7 +55,7 @@ public function __construct(DbalContext $context)
5555
* @param DbalDestination $destination
5656
* @param DbalMessage $message
5757
*/
58-
public function send(PsrDestination $destination, PsrMessage $message): void
58+
public function send(Destination $destination, Message $message): void
5959
{
6060
InvalidDestinationException::assertDestinationInstanceOf($destination, DbalDestination::class);
6161
InvalidMessageException::assertMessageInstanceOf($message, DbalMessage::class);
@@ -138,7 +138,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void
138138
}
139139
}
140140

141-
public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer
141+
public function setDeliveryDelay(int $deliveryDelay = null): Producer
142142
{
143143
$this->deliveryDelay = $deliveryDelay;
144144

@@ -150,7 +150,7 @@ public function getDeliveryDelay(): ?int
150150
return $this->deliveryDelay;
151151
}
152152

153-
public function setPriority(int $priority = null): PsrProducer
153+
public function setPriority(int $priority = null): Producer
154154
{
155155
$this->priority = $priority;
156156

@@ -162,7 +162,7 @@ public function getPriority(): ?int
162162
return $this->priority;
163163
}
164164

165-
public function setTimeToLive(int $timeToLive = null): PsrProducer
165+
public function setTimeToLive(int $timeToLive = null): Producer
166166
{
167167
$this->timeToLive = $timeToLive;
168168

ManagerRegistryConnectionFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
use Doctrine\Common\Persistence\ManagerRegistry;
88
use Doctrine\DBAL\Connection;
9-
use Interop\Queue\PsrConnectionFactory;
10-
use Interop\Queue\PsrContext;
9+
use Interop\Queue\ConnectionFactory;
10+
use Interop\Queue\Context;
1111

12-
class ManagerRegistryConnectionFactory implements PsrConnectionFactory
12+
class ManagerRegistryConnectionFactory implements ConnectionFactory
1313
{
1414
/**
1515
* @var ManagerRegistry
@@ -45,7 +45,7 @@ public function __construct(ManagerRegistry $registry, array $config = [])
4545
/**
4646
* @return DbalContext
4747
*/
48-
public function createContext(): PsrContext
48+
public function createContext(): Context
4949
{
5050
if ($this->config['lazy']) {
5151
return new DbalContext(function () {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Total Downloads](https://poser.pugx.org/enqueue/dbal/d/total.png)](https://packagist.org/packages/enqueue/dbal)
66
[![Latest Stable Version](https://poser.pugx.org/enqueue/dbal/version.png)](https://packagist.org/packages/enqueue/dbal)
77

8-
This is an implementation of PSR specification. It allows you to send and consume message through Doctrine DBAL library and SQL like database as broker.
8+
This is an implementation of Queue Interop specification. It allows you to send and consume message through Doctrine DBAL library and SQL like database as broker.
99

1010
## Resources
1111

Tests/DbalConnectionFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
use Enqueue\Dbal\DbalConnectionFactory;
66
use Enqueue\Dbal\DbalContext;
77
use Enqueue\Test\ClassExtensionTrait;
8-
use Interop\Queue\PsrConnectionFactory;
8+
use Interop\Queue\ConnectionFactory;
99

1010
class DbalConnectionFactoryTest extends \PHPUnit_Framework_TestCase
1111
{
1212
use ClassExtensionTrait;
1313

1414
public function testShouldImplementConnectionFactoryInterface()
1515
{
16-
$this->assertClassImplements(PsrConnectionFactory::class, DbalConnectionFactory::class);
16+
$this->assertClassImplements(ConnectionFactory::class, DbalConnectionFactory::class);
1717
}
1818

1919
public function testShouldCreateLazyContext()

Tests/DbalConsumerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
use Enqueue\Dbal\DbalMessage;
99
use Enqueue\Dbal\DbalProducer;
1010
use Enqueue\Test\ClassExtensionTrait;
11+
use Interop\Queue\Consumer;
1112
use Interop\Queue\InvalidMessageException;
12-
use Interop\Queue\PsrConsumer;
13-
use Interop\Queue\PsrMessage;
13+
use Interop\Queue\Message;
1414

1515
class DbalConsumerTest extends \PHPUnit_Framework_TestCase
1616
{
1717
use ClassExtensionTrait;
1818

1919
public function testShouldImplementConsumerInterface()
2020
{
21-
$this->assertClassImplements(PsrConsumer::class, DbalConsumer::class);
21+
$this->assertClassImplements(Consumer::class, DbalConsumer::class);
2222
}
2323

2424
public function testCouldBeConstructedWithRequiredArguments()
@@ -125,7 +125,7 @@ private function createContextMock()
125125
}
126126
}
127127

128-
class InvalidMessage implements PsrMessage
128+
class InvalidMessage implements Message
129129
{
130130
public function getBody(): string
131131
{

Tests/DbalContextTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use Enqueue\Dbal\DbalMessage;
1010
use Enqueue\Dbal\DbalProducer;
1111
use Enqueue\Test\ClassExtensionTrait;
12+
use Interop\Queue\Context;
13+
use Interop\Queue\Destination;
1214
use Interop\Queue\InvalidDestinationException;
13-
use Interop\Queue\PsrContext;
14-
use Interop\Queue\PsrDestination;
1515
use Interop\Queue\TemporaryQueueNotSupportedException;
1616

1717
class DbalContextTest extends \PHPUnit_Framework_TestCase
@@ -20,7 +20,7 @@ class DbalContextTest extends \PHPUnit_Framework_TestCase
2020

2121
public function testShouldImplementContextInterface()
2222
{
23-
$this->assertClassImplements(PsrContext::class, DbalContext::class);
23+
$this->assertClassImplements(Context::class, DbalContext::class);
2424
}
2525

2626
public function testCouldBeConstructedWithRequiredArguments()
@@ -154,6 +154,6 @@ private function createConnectionMock()
154154
}
155155
}
156156

157-
class NotSupportedDestination2 implements PsrDestination
157+
class NotSupportedDestination2 implements Destination
158158
{
159159
}

0 commit comments

Comments
 (0)