Update travis and fix warnings in build

schmittjoh · Mar 11, 2021 · 7792fed · 7792fed
1 parent af85b78
commit 7792fed
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@ language: php
 
 sudo: false
 
+env:
+  - XDEBUG_MODE=coverage
+
 cache:
   directories:
     - $HOME/.composer/cache
@@ -15,8 +18,9 @@ matrix:
 before_script:
   - composer self-update
   - echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini  
+  - echo "xdebug.mode=coverage" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
-install: composer install --dev
+install: composer install
 
 script: phpunit --coverage-clover clover
 

diff --git a/Tests/Functional/JobManagerTest.php b/Tests/Functional/JobManagerTest.php
@@ -172,12 +172,12 @@ public function testCloseJob()
         $this->em->persist($b);
         $this->em->flush();
 
-        $this->dispatcher->expects($this->at(0))
+        $this->dispatcher->expects(self::exactly(2))
             ->method('dispatch')
-            ->with(new StateChangeEvent($a, 'terminated'), 'jms_job_queue.job_state_change');
-        $this->dispatcher->expects($this->at(1))
-            ->method('dispatch')
-            ->with(new StateChangeEvent($b, 'canceled'), 'jms_job_queue.job_state_change');
+            ->withConsecutive(
+                [new StateChangeEvent($a, 'terminated'), 'jms_job_queue.job_state_change'],
+                [new StateChangeEvent($b, 'canceled'), 'jms_job_queue.job_state_change'],
+            );
 
         $this->assertEquals('running', $a->getState());
         $this->assertEquals('pending', $b->getState());
@@ -197,13 +197,12 @@ public function testCloseJobDoesNotCreateRetryJobsWhenCanceled()
         $this->em->persist($b);
         $this->em->flush();
 
-        $this->dispatcher->expects($this->at(0))
-            ->method('dispatch')
-            ->with(new StateChangeEvent($a, 'canceled'), 'jms_job_queue.job_state_change');
-
-        $this->dispatcher->expects($this->at(1))
+        $this->dispatcher->expects(self::exactly(2))
             ->method('dispatch')
-            ->with(new StateChangeEvent($b, 'canceled'), 'jms_job_queue.job_state_change');
+            ->withConsecutive(
+                [new StateChangeEvent($a, 'canceled'), 'jms_job_queue.job_state_change'],
+                [new StateChangeEvent($b, 'canceled'), 'jms_job_queue.job_state_change'],
+            );
 
         $this->jobManager->closeJob($a, 'canceled');
         $this->assertEquals('canceled', $a->getState());
@@ -220,15 +219,13 @@ public function testCloseJobDoesNotCreateMoreThanAllowedRetries()
         $this->em->persist($a);
         $this->em->flush();
 
-        $this->dispatcher->expects($this->at(0))
-            ->method('dispatch')
-            ->with(new StateChangeEvent($a, 'failed'), 'jms_job_queue.job_state_change');
-        $this->dispatcher->expects($this->at(1))
-            ->method('dispatch')
-            ->with(new LogicalNot($this->equalTo(new StateChangeEvent($a, 'failed'))), 'jms_job_queue.job_state_change');
-        $this->dispatcher->expects($this->at(2))
+        $this->dispatcher->expects(self::exactly(3))
             ->method('dispatch')
-            ->with(new LogicalNot($this->equalTo(new StateChangeEvent($a, 'failed'))), 'jms_job_queue.job_state_change');
+            ->withConsecutive(
+                [new StateChangeEvent($a, 'failed'), 'jms_job_queue.job_state_change'],
+                [new LogicalNot($this->equalTo(new StateChangeEvent($a, 'failed'))), 'jms_job_queue.job_state_change'],
+                [new LogicalNot($this->equalTo(new StateChangeEvent($a, 'failed'))), 'jms_job_queue.job_state_change'],
+            );
 
         $this->assertCount(0, $a->getRetryJobs());
         $this->jobManager->closeJob($a, 'failed');