Skip to content

Commit d07ff19

Browse files
m3m0r7m3m0r7
committed
Revert to master
1 parent 8a757dc commit d07ff19

File tree

7 files changed

+42
-69
lines changed

7 files changed

+42
-69
lines changed

‎pkg/dbal/DbalConsumer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class DbalConsumer implements Consumer
1515
{
1616
use ConsumerPollingTrait;
1717
use DbalConsumerHelperTrait;
18-
use DbalTypeResolverTrait;
1918

2019
/**
2120
* @var DbalContext

‎pkg/dbal/DbalConsumerHelperTrait.php

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

77
use Doctrine\DBAL\Connection;
88
use Doctrine\DBAL\Exception\RetryableException;
9+
use Doctrine\DBAL\Types\Type;
910
use Ramsey\Uuid\Uuid;
1011

1112
trait DbalConsumerHelperTrait
@@ -38,7 +39,7 @@ protected function fetchMessage(array $queues, int $redeliveryDelay): ?DbalMessa
3839
->addOrderBy('priority', 'asc')
3940
->addOrderBy('published_at', 'asc')
4041
->setParameter('queues', $queues, Connection::PARAM_STR_ARRAY)
41-
->setParameter('delayedUntil', $now, static::resolveDbalType('INTEGER'))
42+
->setParameter('delayedUntil', $now, Type::INTEGER)
4243
->setMaxResults(1);
4344

4445
$update = $this->getConnection()->createQueryBuilder()
@@ -47,8 +48,8 @@ protected function fetchMessage(array $queues, int $redeliveryDelay): ?DbalMessa
4748
->set('redeliver_after', ':redeliverAfter')
4849
->andWhere('id = :messageId')
4950
->andWhere('delivery_id IS NULL')
50-
->setParameter('deliveryId', $deliveryId, static::resolveDbalType('GUID'))
51-
->setParameter('redeliverAfter', $now + $redeliveryDelay, static::resolveDbalType('BIGINT'))
51+
->setParameter('deliveryId', $deliveryId, Type::GUID)
52+
->setParameter('redeliverAfter', $now + $redeliveryDelay, Type::BIGINT)
5253
;
5354

5455
while (microtime(true) < $endAt) {
@@ -59,14 +60,14 @@ protected function fetchMessage(array $queues, int $redeliveryDelay): ?DbalMessa
5960
}
6061

6162
$update
62-
->setParameter('messageId', $result['id'], static::resolveDbalType('GUID'));
63+
->setParameter('messageId', $result['id'], Type::GUID);
6364

6465
if ($update->execute()) {
6566
$deliveredMessage = $this->getConnection()->createQueryBuilder()
6667
->select('*')
6768
->from($this->getContext()->getTableName())
6869
->andWhere('delivery_id = :deliveryId')
69-
->setParameter('deliveryId', $deliveryId, static::resolveDbalType('GUID'))
70+
->setParameter('deliveryId', $deliveryId, Type::GUID)
7071
->setMaxResults(1)
7172
->execute()
7273
->fetch();
@@ -102,9 +103,9 @@ protected function redeliverMessages(): void
102103
->set('redelivered', ':redelivered')
103104
->andWhere('redeliver_after < :now')
104105
->andWhere('delivery_id IS NOT NULL')
105-
->setParameter(':now', time(), static::resolveDbalType('BIGINT'))
106-
->setParameter('deliveryId', null, static::resolveDbalType('GUID'))
107-
->setParameter('redelivered', true, static::resolveDbalType('BOOLEAN'))
106+
->setParameter(':now', time(), Type::BIGINT)
107+
->setParameter('deliveryId', null, Type::GUID)
108+
->setParameter('redelivered', true, Type::BOOLEAN)
108109
;
109110

110111
try {
@@ -130,8 +131,8 @@ protected function removeExpiredMessages(): void
130131
->andWhere('delivery_id IS NULL')
131132
->andWhere('redelivered = :redelivered')
132133

133-
->setParameter(':now', time(), static::resolveDbalType('BIGINT'))
134-
->setParameter('redelivered', false, static::resolveDbalType('BOOLEAN'))
134+
->setParameter(':now', time(), Type::BIGINT)
135+
->setParameter('redelivered', false, Type::BOOLEAN)
135136
;
136137

137138
try {
@@ -152,7 +153,7 @@ private function deleteMessage(string $deliveryId): void
152153
$this->getConnection()->delete(
153154
$this->getContext()->getTableName(),
154155
['delivery_id' => $deliveryId],
155-
['delivery_id' => static::resolveDbalType('GUID')]
156+
['delivery_id' => Type::GUID]
156157
);
157158
}
158159
}

‎pkg/dbal/DbalContext.php

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Doctrine\DBAL\Connection;
88
use Doctrine\DBAL\Schema\Table;
9+
use Doctrine\DBAL\Types\Type;
910
use Interop\Queue\Consumer;
1011
use Interop\Queue\Context;
1112
use Interop\Queue\Destination;
@@ -19,8 +20,6 @@
1920

2021
class DbalContext implements Context
2122
{
22-
use DbalTypeResolverTrait;
23-
2423
/**
2524
* @var Connection
2625
*/
@@ -184,7 +183,7 @@ public function purgeQueue(Queue $queue): void
184183
$this->getDbalConnection()->delete(
185184
$this->getTableName(),
186185
['queue' => $queue->getQueueName()],
187-
['queue' => static::resolveDbalType('STRING')]
186+
['queue' => Type::STRING]
188187
);
189188
}
190189

@@ -222,18 +221,18 @@ public function createDataBaseTable(): void
222221

223222
$table = new Table($this->getTableName());
224223

225-
$table->addColumn('id', static::resolveDbalType('GUID'), ['length' => 16, 'fixed' => true]);
226-
$table->addColumn('published_at', static::resolveDbalType('BIGINT'));
227-
$table->addColumn('body', static::resolveDbalType('TEXT'), ['notnull' => false]);
228-
$table->addColumn('headers', static::resolveDbalType('TEXT'), ['notnull' => false]);
229-
$table->addColumn('properties', static::resolveDbalType('TEXT'), ['notnull' => false]);
230-
$table->addColumn('redelivered', static::resolveDbalType('BOOLEAN'), ['notnull' => false]);
231-
$table->addColumn('queue', static::resolveDbalType('STRING'));
232-
$table->addColumn('priority', static::resolveDbalType('SMALLINT'), ['notnull' => false]);
233-
$table->addColumn('delayed_until', static::resolveDbalType('BIGINT'), ['notnull' => false]);
234-
$table->addColumn('time_to_live', static::resolveDbalType('BIGINT'), ['notnull' => false]);
235-
$table->addColumn('delivery_id', static::resolveDbalType('GUID'), ['length' => 16, 'fixed' => true, 'notnull' => false]);
236-
$table->addColumn('redeliver_after', static::resolveDbalType('BIGINT'), ['notnull' => false]);
224+
$table->addColumn('id', Type::GUID, ['length' => 16, 'fixed' => true]);
225+
$table->addColumn('published_at', Type::BIGINT);
226+
$table->addColumn('body', Type::TEXT, ['notnull' => false]);
227+
$table->addColumn('headers', Type::TEXT, ['notnull' => false]);
228+
$table->addColumn('properties', Type::TEXT, ['notnull' => false]);
229+
$table->addColumn('redelivered', Type::BOOLEAN, ['notnull' => false]);
230+
$table->addColumn('queue', Type::STRING);
231+
$table->addColumn('priority', Type::SMALLINT, ['notnull' => false]);
232+
$table->addColumn('delayed_until', Type::BIGINT, ['notnull' => false]);
233+
$table->addColumn('time_to_live', Type::BIGINT, ['notnull' => false]);
234+
$table->addColumn('delivery_id', Type::GUID, ['length' => 16, 'fixed' => true, 'notnull' => false]);
235+
$table->addColumn('redeliver_after', Type::BIGINT, ['notnull' => false]);
237236

238237
$table->setPrimaryKey(['id']);
239238
$table->addIndex(['priority', 'published_at', 'queue', 'delivery_id', 'delayed_until', 'id']);

‎pkg/dbal/DbalProducer.php

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Enqueue\Dbal;
66

7+
use Doctrine\DBAL\Types\Type;
78
use Interop\Queue\Destination;
89
use Interop\Queue\Exception\Exception;
910
use Interop\Queue\Exception\InvalidDestinationException;
@@ -14,8 +15,6 @@
1415

1516
class DbalProducer implements Producer
1617
{
17-
use DbalTypeResolverTrait;
18-
1918
/**
2019
* @var int|null
2120
*/
@@ -108,18 +107,18 @@ public function send(Destination $destination, Message $message): void
108107

109108
try {
110109
$rowsAffected = $this->context->getDbalConnection()->insert($this->context->getTableName(), $dbalMessage, [
111-
'id' => static::resolveDbalType('GUID'),
112-
'published_at' => static::resolveDbalType('INTEGER'),
113-
'body' => static::resolveDbalType('TEXT'),
114-
'headers' => static::resolveDbalType('TEXT'),
115-
'properties' => static::resolveDbalType('TEXT'),
116-
'priority' => static::resolveDbalType('SMALLINT'),
117-
'queue' => static::resolveDbalType('STRING'),
118-
'time_to_live' => static::resolveDbalType('INTEGER'),
119-
'delayed_until' => static::resolveDbalType('INTEGER'),
120-
'redelivered' => static::resolveDbalType('SMALLINT'),
121-
'delivery_id' => static::resolveDbalType('STRING'),
122-
'redeliver_after' => static::resolveDbalType('BIGINT'),
110+
'id' => Type::GUID,
111+
'published_at' => Type::INTEGER,
112+
'body' => Type::TEXT,
113+
'headers' => Type::TEXT,
114+
'properties' => Type::TEXT,
115+
'priority' => Type::SMALLINT,
116+
'queue' => Type::STRING,
117+
'time_to_live' => Type::INTEGER,
118+
'delayed_until' => Type::INTEGER,
119+
'redelivered' => Type::SMALLINT,
120+
'delivery_id' => Type::STRING,
121+
'redeliver_after' => Type::BIGINT,
123122
]);
124123

125124
if (1 !== $rowsAffected) {

‎pkg/dbal/DbalSubscriptionConsumer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
class DbalSubscriptionConsumer implements SubscriptionConsumer
1212
{
1313
use DbalConsumerHelperTrait;
14-
use DbalTypeResolverTrait;
1514

1615
/**
1716
* @var DbalContext

‎pkg/dbal/DbalTypeResolverTrait.php

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎pkg/dbal/Tests/DbalConsumerTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
namespace Enqueue\Dbal\Tests;
66

77
use Doctrine\DBAL\Connection;
8+
use Doctrine\DBAL\Types\Type;
89
use Enqueue\Dbal\DbalConsumer;
910
use Enqueue\Dbal\DbalContext;
1011
use Enqueue\Dbal\DbalDestination;
1112
use Enqueue\Dbal\DbalMessage;
1213
use Enqueue\Dbal\DbalProducer;
13-
use Enqueue\Dbal\DbalTypeResolverTrait;
1414
use Enqueue\Test\ClassExtensionTrait;
1515
use Interop\Queue\Consumer;
1616
use Interop\Queue\Exception\InvalidMessageException;
@@ -22,7 +22,6 @@
2222
class DbalConsumerTest extends TestCase
2323
{
2424
use ClassExtensionTrait;
25-
use DbalTypeResolverTrait;
2625

2726
public function testShouldImplementConsumerInterface()
2827
{
@@ -73,7 +72,7 @@ public function testShouldDeleteMessageOnAcknowledge()
7372
->with(
7473
'some-table-name',
7574
['delivery_id' => $deliveryId->toString()],
76-
['delivery_id' => static::resolveDbalType('GUID')]
75+
['delivery_id' => Type::GUID]
7776
)
7877
;
7978

@@ -144,7 +143,7 @@ public function testShouldDeleteMessageFromQueueOnReject()
144143
->with(
145144
'some-table-name',
146145
['delivery_id' => $deliveryId->toString()],
147-
['delivery_id' => static::resolveDbalType('GUID')]
146+
['delivery_id' => Type::GUID]
148147
)
149148
;
150149

0 commit comments

Comments
 (0)