chore: use phpunit 7

Author: Douglas Greenshields

Tests/Model/RecurringConsoleCommandConfigurationTest.php

@@ -3,14 +3,10 @@
 namespace Markup\Bundle\JobQueueBundle\Tests\Service;
 
 use Markup\JobQueueBundle\Model\RecurringConsoleCommandConfiguration;
-use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class RecurringConsoleCommandConfigurationTest extends \PHPUnit_Framework_TestCase
+class RecurringConsoleCommandConfigurationTest extends TestCase
 {
-    public function setUp()
-    {
-    }
-
     public function testCanBeConstructed()
     {
         $config = new RecurringConsoleCommandConfiguration('foo:bar', 'test', '30 1 * * *', 'a short description');
@@ -19,9 +15,4 @@ public function testCanBeConstructed()
         $this->assertEquals($config->getSchedule(), '30 1 * * *');
         $this->assertEquals($config->getDescription(), 'a short description');
     }
-
-    public function tearDown()
-    {
-        m::close();
-    }
 }

Tests/Publisher/JobPublisherTest.php

@@ -2,19 +2,20 @@
 
 namespace Markup\JobQueueBundle\Tests\Publisher;
 
+use Markup\JobQueueBundle\Exception\UndefinedProducerException;
 use Markup\JobQueueBundle\Job\BadJob;
 use Markup\JobQueueBundle\Publisher\JobPublisher;
 use Markup\JobQueueBundle\Repository\JobLogRepository;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 use OldSound\RabbitMqBundle\RabbitMq\ProducerInterface;
 use Psr\Log\NullLogger;
-use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class JobPublisherTest extends \PHPUnit_Framework_TestCase
+class JobPublisherTest extends MockeryTestCase
 {
-
     /**
-     * @var Container
+     * @var ContainerInterface
      */
     private $container;
 
@@ -28,12 +29,12 @@ class JobPublisherTest extends \PHPUnit_Framework_TestCase
      */
     private $producer;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->producer = m::mock('SimpleBus\RabbitMQBundle\RabbitMQPublisher');
         $this->jobLogRepository = m::mock(JobLogRepository::class);
         $this->producer->shouldReceive('setContentType')->andReturn(null);
-        $this->container = m::mock('Symfony\Component\DependencyInjection\ContainerInterface');
+        $this->container = m::mock(ContainerInterface::class);
         $this->container->shouldReceive('has')->with('old_sound_rabbit_mq.test_producer')->andReturn(true);
         $this->container->shouldReceive('get')->with('old_sound_rabbit_mq.test_producer')->andReturn($this->producer);
         $this->container->shouldReceive('has')->with('old_sound_rabbit_mq.nonsense_producer')->andReturn(false);
@@ -42,7 +43,7 @@ public function setUp()
 
     public function testPublishingJobWithInvalidTopicThrowsException()
     {
-        $this->setExpectedException('Markup\JobQueueBundle\Exception\UndefinedProducerException');
+        $this->expectException(UndefinedProducerException::class);
         $job = new BadJob([], 'nonsense');
         $publisher = new JobPublisher($this->jobLogRepository, new NullLogger());
         $publisher->setContainer($this->container);
@@ -57,9 +58,4 @@ public function testCanPublish()
         $this->producer->shouldReceive('publish')->once()->andReturn(null);
         $publisher->publish($job);
     }
-
-    public function tearDown()
-    {
-        m::close();
-    }
 }

Tests/Service/CliConsumerConfigFileWriterTest.php

@@ -3,15 +3,10 @@
 namespace Markup\Bundle\JobQueueBundle\Tests\Service;
 
 use Markup\JobQueueBundle\Service\CliConsumerConfigFileWriter;
-use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class CliConsumerConfigFileWriterTest extends \PHPUnit_Framework_TestCase
+class CliConsumerConfigFileWriterTest extends TestCase
 {
-    public function setUp()
-    {
-
-    }
-
     public function testCreatesCorrectConfigString()
     {
         $writer = new CliConsumerConfigFileWriter(
@@ -30,9 +25,4 @@ public function testCreatesCorrectConfigString()
 
         $this->assertEquals($fixture, $config);
     }
-
-    public function tearDown()
-    {
-        m::close();
-    }
 }

Tests/Service/JobManagerTest.php

@@ -3,15 +3,19 @@
 namespace Markup\Bundle\JobQueueBundle\Tests\Service;
 
 use Markup\JobQueueBundle\Job\SleepJob;
+use Markup\JobQueueBundle\Publisher\JobPublisher;
 use Markup\JobQueueBundle\Service\JobManager;
+use Markup\JobQueueBundle\Service\ScheduledJobService;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+use PHPUnit\Framework\Error\Error;
 
-class JobManagerTest extends \PHPUnit_Framework_TestCase
+class JobManagerTest extends MockeryTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
-        $jobPublisher = m::mock('Markup\JobQueueBundle\Publisher\JobPublisher');
-        $scheduledJob = m::mock('Markup\JobQueueBundle\Service\ScheduledJobService');
+        $jobPublisher = m::mock(JobPublisher::class);
+        $scheduledJob = m::mock(ScheduledJobService::class);
         $jobPublisher->shouldReceive('publish')->andReturn(null);
         $scheduledJob->shouldReceive('addScheduledJob')->andReturn(null);
         $this->jobManager = new JobManager($jobPublisher, $scheduledJob);
@@ -31,7 +35,7 @@ public function testDoesNotAcceptBadJobs()
         $exceptionThrown = false;
         try {
             $this->jobManager->addJob($badjob);
-        } catch (\PHPUnit_Framework_Error $e) {
+        } catch (Error $e) {
             $exceptionThrown = true;
         } catch (\TypeError $e) {
             $exceptionThrown = true;
@@ -45,9 +49,4 @@ public function testCanAddCommandJob()
     {
         $this->assertNull($this->jobManager->addCommandJob('console:herp:derp', 'system', 60, 60));
     }
-
-    public function tearDown()
-    {
-        m::close();
-    }
 }

Tests/Service/ScheduledJobServiceTest.php

@@ -10,14 +10,14 @@
 use Markup\JobQueueBundle\Service\ScheduledJobService;
 use Mockery as m;
 use Markup\JobQueueBundle\Model\ScheduledJobRepositoryInterface;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class ScheduledJobServiceTest extends \PHPUnit_Framework_TestCase
+class ScheduledJobServiceTest extends MockeryTestCase
 {
     private $doctrine;
 
-    public function setUp()
+    protected function setUp()
     {
-
         $scheduledJobRepository = m::mock(ScheduledJobRepositoryInterface::class);
         $scheduledJobRepository->shouldReceive('save');
 
@@ -43,9 +43,4 @@ public function testCanAddScheduledJob()
 
         $this->assertEquals($this->scheduledJobService->addScheduledJob($job, $scheduledTime), $scheduledJob);
     }
-
-    public function tearDown()
-    {
-        m::close();
-    }
 }

Tests/Service/SupervisordConfigFileWriterTest.php

@@ -3,11 +3,11 @@
 namespace Markup\Bundle\JobQueueBundle\Tests\Service;
 
 use Markup\JobQueueBundle\Service\SupervisordConfigFileWriter;
-use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class SupervisordConfigFileWriterTest extends \PHPUnit_Framework_TestCase
+class SupervisordConfigFileWriterTest extends TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->writer = new SupervisordConfigFileWriter(
             '/vagrant/app',
@@ -40,9 +40,4 @@ public function testWritesPhpConfiguration()
 
         $this->assertEquals($fixture, $config);
     }
-
-    public function tearDown()
-    {
-        m::close();
-    }
 }

composer.json

@@ -30,8 +30,8 @@
         "markup/rabbitmq-management-api": ">=2.1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "mockery/mockery": "~0.9",
+        "phpunit/phpunit": "^7.2",
+        "mockery/mockery": "^1.2",
         "symfony/form": "~2.3|^3",
         "predis/predis": "^1.0"
     },