Skip to content

Commit 7792fed

Browse files
author
Daan Biesterbos
committed
Update travis and fix warnings in build
1 parent af85b78 commit 7792fed

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ language: php
22

33
sudo: false
44

5+
env:
6+
- XDEBUG_MODE=coverage
7+
58
cache:
69
directories:
710
- $HOME/.composer/cache
@@ -15,8 +18,9 @@ matrix:
1518
before_script:
1619
- composer self-update
1720
- echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
21+
- echo "xdebug.mode=coverage" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
1822

19-
install: composer install --dev
23+
install: composer install
2024

2125
script: phpunit --coverage-clover clover
2226

Tests/Functional/JobManagerTest.php

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ public function testCloseJob()
172172
$this->em->persist($b);
173173
$this->em->flush();
174174

175-
$this->dispatcher->expects($this->at(0))
175+
$this->dispatcher->expects(self::exactly(2))
176176
->method('dispatch')
177-
->with(new StateChangeEvent($a, 'terminated'), 'jms_job_queue.job_state_change');
178-
$this->dispatcher->expects($this->at(1))
179-
->method('dispatch')
180-
->with(new StateChangeEvent($b, 'canceled'), 'jms_job_queue.job_state_change');
177+
->withConsecutive(
178+
[new StateChangeEvent($a, 'terminated'), 'jms_job_queue.job_state_change'],
179+
[new StateChangeEvent($b, 'canceled'), 'jms_job_queue.job_state_change'],
180+
);
181181

182182
$this->assertEquals('running', $a->getState());
183183
$this->assertEquals('pending', $b->getState());
@@ -197,13 +197,12 @@ public function testCloseJobDoesNotCreateRetryJobsWhenCanceled()
197197
$this->em->persist($b);
198198
$this->em->flush();
199199

200-
$this->dispatcher->expects($this->at(0))
201-
->method('dispatch')
202-
->with(new StateChangeEvent($a, 'canceled'), 'jms_job_queue.job_state_change');
203-
204-
$this->dispatcher->expects($this->at(1))
200+
$this->dispatcher->expects(self::exactly(2))
205201
->method('dispatch')
206-
->with(new StateChangeEvent($b, 'canceled'), 'jms_job_queue.job_state_change');
202+
->withConsecutive(
203+
[new StateChangeEvent($a, 'canceled'), 'jms_job_queue.job_state_change'],
204+
[new StateChangeEvent($b, 'canceled'), 'jms_job_queue.job_state_change'],
205+
);
207206

208207
$this->jobManager->closeJob($a, 'canceled');
209208
$this->assertEquals('canceled', $a->getState());
@@ -220,15 +219,13 @@ public function testCloseJobDoesNotCreateMoreThanAllowedRetries()
220219
$this->em->persist($a);
221220
$this->em->flush();
222221

223-
$this->dispatcher->expects($this->at(0))
224-
->method('dispatch')
225-
->with(new StateChangeEvent($a, 'failed'), 'jms_job_queue.job_state_change');
226-
$this->dispatcher->expects($this->at(1))
227-
->method('dispatch')
228-
->with(new LogicalNot($this->equalTo(new StateChangeEvent($a, 'failed'))), 'jms_job_queue.job_state_change');
229-
$this->dispatcher->expects($this->at(2))
222+
$this->dispatcher->expects(self::exactly(3))
230223
->method('dispatch')
231-
->with(new LogicalNot($this->equalTo(new StateChangeEvent($a, 'failed'))), 'jms_job_queue.job_state_change');
224+
->withConsecutive(
225+
[new StateChangeEvent($a, 'failed'), 'jms_job_queue.job_state_change'],
226+
[new LogicalNot($this->equalTo(new StateChangeEvent($a, 'failed'))), 'jms_job_queue.job_state_change'],
227+
[new LogicalNot($this->equalTo(new StateChangeEvent($a, 'failed'))), 'jms_job_queue.job_state_change'],
228+
);
232229

233230
$this->assertCount(0, $a->getRetryJobs());
234231
$this->jobManager->closeJob($a, 'failed');

0 commit comments

Comments
 (0)