8000 minor #30857 [Messenger] test DoctrineTransport on travis and appveyo… · symfony/symfony@550a569 · GitHub
[go: up one dir, main page]
Skip to content

Commit 550a569

Browse files
srozesroze
committed
minor #30857 [Messenger] test DoctrineTransport on travis and appveyor (vincenttouzet)
This PR was merged into the 4.3-dev branch. Discussion ---------- [Messenger] test DoctrineTransport on travis and appveyor | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes ? WIP | Fixed tickets | | License | MIT | Doc PR | Currently tests on the `Symfony\Component\Messenger\Tests\Transport\Doctrine\DoctrineIntegrationTest` are skipped because there is no `MESSENGER_DOCTRINE_DSN` environment variable is not defined. This PR update the travis and AppVeyor configuration to run these tests. This is a WIP. I'm not a Travis/AppVeyor user so this clearly need more work Commits ------- 8f81f55 [Messenger] test DoctrineTransport on travis and appveyor
2 parents 4b61602 + 8f81f55 commit 550a569

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

‎src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,31 @@
1717
use Symfony\Component\Messenger\Transport\Doctrine\Connection;
1818

1919
/**
20-
* @requires pdo_mysql
20+
* @requires extension pdo_sqlite
2121
*/
2222
class DoctrineIntegrationTest extends TestCase
2323
{
2424
private $driverConnection;
2525
private $connection;
2626

27-
protected function setUp()
27+
/**
28+
* @after
29+
*/
30+
public function cleanup()
2831
{
29-
parent::setUp();
32+
@unlink(sys_get_temp_dir().'/symfony.messenger.sqlite');
33+
}
3034

31-
if (!getenv('MESSENGER_DOCTRINE_DSN')) {
32-
$this->markTestSkipped('The "MESSENGER_DOCTRINE_DSN" environment variable is required.');
35+
/**
36+
* @before
37+
*/
38+
public function createConnection()
39+
{
40+
if ($dsn = getenv('MESSENGER_DOCTRINE_DSN')) {
41+
$this->driverConnection = DriverManager::getConnection(['url' => $dsn]);
42+
} else {
43+
$this->driverConnection = DriverManager::getConnection(['pdo' => new \PDO('sqlite:'.sys_get_temp_dir().'/symfony.messenger.sqlite')]);
3344
}
34-
$dsn = getenv('MESSENGER_DOCTRINE_DSN');
35-
$this->driverConnection = DriverManager::getConnection(['url' => $dsn]);
3645
$this->connection = new Connection([], $this->driverConnection);
3746
// call send to auto-setup the table
3847
$this->connection->setup();
@@ -62,7 +71,7 @@ public function testSendWithDelay()
6271

6372
$available_at = new \DateTime($available_at);
6473

65-
$now = \DateTime::createFromFormat('U.u', microtime(true));
74+
$now = new \DateTime();
6675
$now->modify('+60 seconds');
6776
$this->assertGreaterThan($now, $available_at);
6877
}
@@ -77,7 +86,7 @@ public function testItRetrieveTheFirstAvailableMessage()
7786
'queue_name' => 'default',
7887
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
7988
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
80-
'delivered_at' => Connection::formatDateTime(\DateTime::createFromFormat('U.u', microtime(true))),
89+
'delivered_at' => Connection::formatDateTime(new \DateTime()),
8190
]);
8291
// one available later
8392
$this->driverConnection->insert('messenger_messages', [
@@ -110,7 +119,7 @@ public function testItCountMessages()
110119
'queue_name' => 'default',
111120
'created_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
112121
'available_at' => Connection::formatDateTime(new \DateTime('2019-03-15 12:00:00')),
113-
'delivered_at' => Connection::formatDateTime(\DateTime::createFromFormat('U.u', microtime(true))),
122+
'delivered_at' => Connection::formatDateTime(new \DateTime()),
114123
]);
115124
// one available later
116125
$this->driverConnection->insert('messenger_messages', [

‎src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public static function buildConfiguration($dsn, array $options = [])
106106
*/
107107
public function send(string $body, array $headers, int $delay = 0): void
108108
{
109-
$now = (\DateTime::createFromFormat('U.u', microtime(true)));
109+
$now = new \DateTime();
110110
$availableAt = (clone $now)->modify(sprintf('+%d seconds', $delay / 1000));
111111

112112
$queryBuilder = $this->driverConnection->createQueryBuilder()
@@ -157,7 +157,7 @@ public function get(): ?array
157157
->update($this->configuration['table_name'])
158158
->set('delivered_at', ':delivered_at')
159159
->where('id = :id');
160-
$now = \DateTime::createFromFormat('U.u', microtime(true));
160+
$now = new \DateTime();
161161
$this->executeQuery($queryBuilder->getSQL(), [
162162
':id' => $doctrineEnvelope['id'],
163163
':delivered_at' => self::formatDateTime($now),
@@ -207,7 +207,7 @@ public function getMessageCount(): int
207207

208208
private function createAvailableMessagesQueryBuilder(): QueryBuilder
209209
{
210-
$now = \DateTime::createFromFormat('U.u', microtime(true));
210+
$now = new \DateTime();
211211
$redeliverLimit = (clone $now)->modify(sprintf('-%d seconds', $this->configuration['redeliver_timeout']));
212212

213213
return $this->driverConnection->createQueryBuilder()
@@ -273,6 +273,6 @@ private function getSchema(): Schema
273273

274274
public static function formatDateTime(\DateTimeInterface $dateTime)
275275
{
276-
return $dateTime->format('Y-m-d\TH:i:s.uZ');
276+
return $dateTime->format('Y-m-d\TH:i:s');
277277
}
278278
}

‎src/Symfony/Component/Messenger/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"psr/log": "~1.0"
2121
},
2222
"require-dev": {
23-
"doctrine/dbal": "~2.4",
23+
"doctrine/dbal": "^2.5",
2424
"psr/cache": "~1.0",
2525
"symfony/console": "~3.4|~4.0",
2626
"symfony/dependency-injection": "~3.4.19|^4.1.8",

0 commit comments

Comments
 (0)
0