Handle mocking objects for both PHPUnit 4 and 5 (#226)

.travis.yml

@@ -2,19 +2,15 @@ language: php
 sudo: false
 
 php:
-  - 7.0
   - 5.6
-  - 5.5
-  - 5.4
+  - 7.0
   - hhvm
-  - hhvm-nightly
 
 matrix:
   fast_finish: true
   allow_failures:
     - php: 7.0
     - php: hhvm
-    - php: hhvm-nightly
 
 cache:
   directories:

composer.json

@@ -16,8 +16,8 @@
         "issues": "https://github.com/padraic/humbug/issues"
     },
     "require": {
-        "php": ">=5.4.0",
-        "phpunit/phpunit": "^4.5|^5.0",
+        "php": ">=5.6.0",
+        "phpunit/phpunit": "^5.0",
         "symfony/console": "^2.6|^3.0",
         "symfony/finder": "^2.6|^3.0",
         "symfony/process": "^2.6|^3.0",

tests/Adapter/Phpunit/ConfigurationLocatorTest.php

@@ -14,6 +14,7 @@
 
 use Humbug\Adapter\Phpunit\ConfigurationLocator;
 use Humbug\Adapter\Phpunit\XmlConfiguration;
+use Humbug\Exception\RuntimeException;
 
 class ConfigurationLocatorTest extends \PHPUnit_Framework_TestCase
 {
@@ -43,7 +44,7 @@ public function testShouldRiseExceptionWhileLocatingConfiguration()
     {
         $directory = __DIR__;
 
-        $this->setExpectedException('\Humbug\Exception\RuntimeException');
+        $this->expectException(RuntimeException::class);
 
         (new ConfigurationLocator())->locate($directory);
     }

tests/Adapter/Phpunit/JobTest.php

@@ -17,7 +17,6 @@ class JobTest extends \PHPUnit_Framework_TestCase
 {
     public function testGenerateReturnsPHPScriptRenderedWithCurrentRunnersSettingsAndSerialisedMutationArray()
     {
-        $this->markTestIncomplete();
         $script = Job::generate('the_file.php', '/path/to/bootstrap.php');
         $bootstrap = realpath(__DIR__ . '/../../../bootstrap.php');
         $this->assertFileExists($bootstrap);

tests/Adapter/Phpunit/XmlConfiguration/ObjectVisitorTest.php

@@ -132,7 +132,7 @@ public function testShouldAddManyDifferentArguments()
 
     public function testShouldRiseExceptionWhenArgumentTypeIsNotSupported()
     {
-        $this->setExpectedException('\InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
 
         $objectVisitor = new ObjectVisitor('This\Is\Test\ClassName', [new \stdClass()]);
 

tests/Adapter/Phpunit/XmlConfigurationTest.php

@@ -20,7 +20,8 @@ class XmlConfigurationTest extends \PHPUnit_Framework_TestCase
 {
     public function testShouldThrowExceptionIfNoDocumentElementIsPresent()
     {
-        $this->setExpectedException('\LogicException', 'No document element present. Document should not be empty!');
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('No document element present. Document should not be empty!');
 
         $dom = new \DOMDocument();
         new XmlConfiguration($dom);
@@ -165,8 +166,7 @@ public function testShouldAddListener()
 
         $xmlConfiguration = new XmlConfiguration($dom);
 
-        $visitor = $this->getMock('Humbug\Adapter\Phpunit\XmlConfiguration\Visitor');
-
+        $visitor = $this->createMock(XmlConfiguration\Visitor::class);
         $visitor->expects($this->once())->method('visitElement')->with($this->isInstanceOf('\DOMElement'));
 
         $xmlConfiguration->addListener($visitor);
@@ -182,8 +182,7 @@ public function testShouldAddListeners()
 
         $xmlConfiguration = new XmlConfiguration($dom);
 
-        $visitor = $this->getMock('Humbug\Adapter\Phpunit\XmlConfiguration\Visitor');
-
+        $visitor = $this->createMock(XmlConfiguration\Visitor::class);
         $visitor->expects($this->exactly(2))->method('visitElement')->with($this->isInstanceOf('\DOMElement'));
 
         $xmlConfiguration->addListener($visitor);

tests/Config/JsonParserTest.php

@@ -14,6 +14,7 @@
 namespace Humbug\Test\Config;
 
 use Humbug\Config\JsonParser;
+use Humbug\Exception\JsonConfigException;
 
 class JsonParserTest extends \PHPUnit_Framework_TestCase
 {
@@ -41,27 +42,22 @@ public function testParseShouldReturnDistConfigIfNoOther()
 
     public function testParsesNonDistFilePreferentially()
     {
-        $this->setExpectedException(
-            '\Humbug\Exception\JsonConfigException'
-        );
+        $this->expectException(JsonConfigException::class);
         $config = $this->parser->parseFile(__DIR__ . '/../_files/config4/');
     }
 
     public function testShouldRiseExceptionWhenFileNotExists()
     {
-        $this->setExpectedException(
-            '\Humbug\Exception\JsonConfigException',
-            'Please create a humbug.json(.dist) file.'
-        );
+        $this->expectException(JsonConfigException::class);
+        $this->expectExceptionMessage('Please create a humbug.json(.dist) file.');
         $this->parser->parseFile('it/not/exists/');
     }
 
     public function testShouldRiseExceptionWhenFileContainsInvalidJson()
     {
-        $this->setExpectedExceptionRegExp(
-            '\Humbug\Exception\JsonConfigException',
-            '/Error parsing configuration file JSON.*/'
-        );
+        $this->expectException(JsonConfigException::class);
+        $this->expectExceptionMessageRegExp('/Error parsing configuration file JSON.*/');
+
         $this->parser->parseFile(__DIR__ . '/../_files/config2/');
     }
 }

tests/ConfigTest.php

@@ -14,6 +14,7 @@
 namespace Humbug\Test;
 
 use Humbug\Config;
+use Humbug\Exception\JsonConfigException;
 
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
@@ -61,10 +62,8 @@ public function testShouldRiseExceptionWhenSourceIsNotPresent()
 
         $config = new Config($configData);
 
-        $this->setExpectedException(
-            'Humbug\Exception\JsonConfigException',
-            'Source code data is not included in configuration file'
-        );
+        $this->expectException(JsonConfigException::class);
+        $this->expectExceptionMessage('Source code data is not included in configuration file');
 
         $config->getSource();
     }
@@ -75,10 +74,8 @@ public function testShouldRiseExceptionWhenSourceDirectoriesAndExcludesAreNotPre
             'source' => (object)[]
         ];
 
-        $this->setExpectedException(
-            'Humbug\Exception\JsonConfigException',
-            'You must set at least one source directory or exclude in the configuration file'
-        );
+        $this->expectException(JsonConfigException::class);
+        $this->expectExceptionMessage('You must set at least one source directory or exclude in the configuration file');
 
         $config = new Config($configData);
 
@@ -134,10 +131,8 @@ public function testShouldRiseExceptionWhenChDirNotExists()
 
         $config = new Config($configData);
 
-        $this->setExpectedExceptionRegExp(
-            'Humbug\Exception\JsonConfigException',
-            '/Directory in which to run tests does not exist: .+/'
-        );
+        $this->expectException(JsonConfigException::class);
+        $this->expectExceptionMessageRegExp('/Directory in which to run tests does not exist: .+/');
 
         $config->getChDir();
     }

tests/ContainerTest.php

@@ -14,6 +14,7 @@
 namespace Humbug\Test;
 
 use Humbug\Container;
+use Humbug\Exception\InvalidArgumentException;
 use Mockery as m;
 use Symfony\Component\Finder\Finder;
 
@@ -50,7 +51,7 @@ public function testGetShouldRiseExceptionForUnknownOption()
         $input = [
             'options' => null
         ];
-        $this->setExpectedException('\InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $container = new Container($input);
         $container->get('invalid-option');
     }
@@ -88,7 +89,7 @@ public function testsetTempDirectory()
 
     public function testsetTempDirectoryThrowsExceptionOnUnwriteableParam()
     {
-        $this->setExpectedException('Humbug\\Exception\\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $result = $this->container->setTempDirectory('/really/does/not/exist');
     }
 

tests/MutableIteratorTest.php

@@ -32,7 +32,8 @@ public function testIteratorContainsMutableFilesReturnedByFinder()
     {
         $finder = new Finder();
 
-        $finder->files('*.php');
+        $finder->files();
+        $finder->name('*.php');
         $finder->in([ __DIR__ . '/_files/mutables' ]);
 
         $container = new Container([ 'options' => '' ]);

tests/Mutator/Arithmetic/ExponentiationTest.php

@@ -26,7 +26,7 @@ public function testReturnsTokenEquivalentToDivisionOperator()
     public function testMutatesExponentiationToDivision()
     {
         if (!defined('T_POW')) {
-            $this->markTestSkipped();
+            $this->markTestSkipped('No "T_POW" PHP constant');
         }
 
         $tokens = [10 => [T_POW]];

tests/Mutator/Arithmetic/PowEqualTest.php

@@ -26,7 +26,7 @@ public function testReturnsTokenEquivalentToDivEqualOperator()
     public function testMutatesMulEqualToDivEqual()
     {
         if (!defined('T_POW')) {
-            $this->markTestSkipped();
+            $this->markTestSkipped('No "T_POW" PHP constant');
         }
 
         $tokens = [10 => [T_POW_EQUAL, '**=']];

tests/Report/TextTest.php

@@ -12,6 +12,7 @@
  */
 namespace Humbug\Test\Report;
 
+use Humbug\Mutant;
 use Humbug\Mutation;
 use Humbug\Report\Text;
 use Humbug\TestSuite\Mutant\Result;
@@ -71,7 +72,9 @@ public function testShouldPrepareAllMutantsReport()
             $this->createMutantResult()
         ];
 
-        $textReport = $this->getMock('Humbug\Report\Text', ['prepareReportForMutant']);
+        $textReport = $this->getMockBuilder(Text::class)
+            ->setMethods(['prepareReportForMutant'])
+            ->getMock();
 
         $textReport->expects($this->at(0))->method('prepareReportForMutant')->with($results[0]);
         $textReport->expects($this->at(1))->method('prepareReportForMutant')->with($results[1]);
@@ -103,12 +106,12 @@ private function createMutantResultStub($errorOutput)
 
     private function createMutant()
     {
-        return $this->getMock('Humbug\Mutant', [], [], '', false);
+        return $this->getMockBuilder(Mutant::class)->disableOriginalConstructor()->getMock();
     }
 
     private function createMutantResult()
     {
-        return $this->getMock('Humbug\TestSuite\Mutant\Result', [], [], '', false);
+        return $this->getMockBuilder(Result::class)->disableOriginalConstructor()->getMock();
     }
 
     private function getExpectedMutantReport()