Skip to content

Commit 695db33

Browse files
michalsnmichalsn
committed
phpcpd
1 parent 9c13b26 commit 695db33

File tree

3 files changed

+16
-92
lines changed

3 files changed

+16
-92
lines changed

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"cs": "php-cs-fixer fix --ansi --verbose --dry-run --diff",
6464
"cs-fix": "php-cs-fixer fix --ansi --verbose --diff",
6565
"style": "@cs-fix",
66-
"deduplicate": "phpcpd app/ src/",
66+
"deduplicate": "phpcpd src/ tests/",
6767
"inspect": "deptrac analyze --cache-file=build/deptrac.cache",
6868
"mutate": "infection --threads=2 --skip-initial-tests --coverage=build/phpunit",
6969
"test": "phpunit"

‎tests/Payloads/ChainBuilderTest.php

-76
Original file line numberDiff line numberDiff line change
@@ -77,82 +77,6 @@ public function testChainWithSingleJob(): void
7777
]);
7878
}
7979

80-
public function testChainWithMultipleJobs(): void
81-
{
82-
Time::setTestNow('2023-12-29 14:15:16');
83-
84-
$handler = new DatabaseHandler($this->config);
85-
$result = $handler->chain(static function ($chain): void {
86-
$chain
87-
->push('queue', 'success', ['key1' => 'value1'])
88-
->push('queue', 'success', ['key2' => 'value2']);
89-
});
90-
91-
$this->assertTrue($result);
92-
$this->seeInDatabase('queue_jobs', [
93-
'queue' => 'queue',
94-
'payload' => json_encode([
95-
'job' => 'success',
96-
'data' => ['key1' => 'value1'],
97-
'metadata' => [
98-
'queue' => 'queue',
99-
'chainedJobs' => [
100-
[
101-
'job' => 'success',
102-
'data' => ['key2' => 'value2'],
103-
'metadata' => ['queue' => 'queue'],
104-
],
105-
],
106-
],
107-
]),
108-
'available_at' => 1703859316,
109-
]);
110-
}
111-
112-
public function testChainWithPriorityAndDelay(): void
113-
{
114-
Time::setTestNow('2023-12-29 14:15:16');
115-
116-
$handler = new DatabaseHandler($this->config);
117-
$result = $handler->chain(static function ($chain): void {
118-
$chain
119-
->push('queue', 'success', ['key1' => 'value1'])
120-
->setPriority('high')
121-
->setDelay(60)
122-
->push('queue', 'success', ['key2' => 'value2'])
123-
->setPriority('low')
124-
->setDelay(120);
125-
});
126-
127-
$this->assertTrue($result);
128-
129-
// First job should have high priority and 60 second delay
130-
$this->seeInDatabase('queue_jobs', [
131-
'queue' => 'queue',
132-
'payload' => json_encode([
133-
'job' => 'success',
134-
'data' => ['key1' => 'value1'],
135-
'metadata' => [
136-
'queue' => 'queue',
137-
'priority' => 'high',
138-
'delay' => 60,
139-
'chainedJobs' => [
140-
[
141-
'job' => 'success',
142-
'data' => ['key2' => 'value2'],
143-
'metadata' => [
144-
'queue' => 'queue',
145-
'priority' => 'low',
146-
'delay' => 120,
147-
],
148-
],
149-
],
150-
],
151-
]),
152-
'available_at' => 1703859316 + 60,
153-
]);
154-
}
155-
15680
public function testEmptyChain(): void
15781
{
15882
$handler = new DatabaseHandler($this->config);

‎tests/PredisHandlerTest.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,17 @@ public function testChain(): void
145145
$predis = self::getPrivateProperty($handler, 'predis');
146146
$this->assertSame(1, $predis->zcard('queues:queue:low'));
147147

148-
$task = $predis->zrangebyscore('queues:queue:low', '-inf', Time::now()->timestamp, ['limit' => [0, 1]]);
149-
$queueJob = new QueueJob(json_decode((string) $task[0], true));
148+
$task = $predis->zrangebyscore('queues:queue:low', '-inf', Time::now()->timestamp, ['limit' => [0, 1]]);
149+
$job = new QueueJob(json_decode((string) $task[0], true));
150150

151-
$this->assertSame('success', $queueJob->payload['job']);
152-
$this->assertSame(['key1' => 'value1'], $queueJob->payload['data']);
153-
$this->assertArrayHasKey('metadata', $queueJob->payload);
154-
$this->assertArrayHasKey('queue', $queueJob->payload['metadata']);
155-
$this->assertSame('queue', $queueJob->payload['metadata']['queue']);
156-
$this->assertArrayHasKey('chainedJobs', $queueJob->payload['metadata']);
151+
$this->assertSame('success', $job->payload['job']);
152+
$this->assertSame(['key1' => 'value1'], $job->payload['data']);
153+
$this->assertArrayHasKey('metadata', $job->payload);
154+
$this->assertArrayHasKey('queue', $job->payload['metadata']);
155+
$this->assertSame('queue', $job->payload['metadata']['queue']);
156+
$this->assertArrayHasKey('chainedJobs', $job->payload['metadata']);
157157

158-
$chainedJobs = $queueJob->payload['metadata']['chainedJobs'];
158+
$chainedJobs = $job->payload['metadata']['chainedJobs'];
159159
$this->assertCount(1, $chainedJobs);
160160
$this->assertSame('success', $chainedJobs[0]['job']);
161161
$this->assertSame(['key2' => 'value2'], $chainedJobs[0]['data']);
@@ -195,14 +195,14 @@ public function testChainWithPriorityAndDelay(): void
195195
$this->assertArrayHasKey('metadata', $queueJob->payload);
196196

197197
// Check metadata
198-
$metadata = $queueJob->payload['metadata'];
199-
$this->assertSame('queue', $metadata['queue']);
200-
$this->assertSame('high', $metadata['priority']);
201-
$this->assertSame(60, $metadata['delay']);
198+
$meta = $queueJob->payload['metadata'];
199+
$this->assertSame('queue', $meta['queue']);
200+
$this->assertSame('high', $meta['priority']);
201+
$this->assertSame(60, $meta['delay']);
202202

203203
// Check a chained job with its priority and delay
204-
$this->assertArrayHasKey('chainedJobs', $metadata);
205-
$chainedJobs = $metadata['chainedJobs'];
204+
$this->assertArrayHasKey('chainedJobs', $meta);
205+
$chainedJobs = $meta['chainedJobs'];
206206
$this->assertCount(1, $chainedJobs);
207207
$this->assertSame('success', $chainedJobs[0]['job']);
208208
$this->assertSame(['key2' => 'value2'], $chainedJobs[0]['data']);

0 commit comments

Comments
 (0)