Add PHPUnit 6 support (#270)

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
- - 5.6
  - 7.0
  - 7.1
 

composer.json

@@ -15,12 +15,6 @@
  "support": {
  "issues": "https://github.com/padraic/humbug/issues"
  },
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.com/humbug/phpunit-accelerator"
- }
- ],
  "require": {
  "php": "^7.0",
  "ext-ctype": "*",
@@ -34,12 +28,11 @@
  "symfony/process": "^2.6|^3.0",
  "symfony/event-dispatcher": "^2.6|^3.0",
  "sebastian/diff": "^2.0",
- "padraic/phpunit-accelerator": "dev-master",
  "padraic/phpunit-extensions": "^1.0.0",
  "padraic/phar-updater": "^1.0.0"
  },
  "require-dev": {
- "mockery/mockery": "^0.9",
+ "mockery/mockery": "^1.0",
  "behat/behat": "^3.3",
  "symfony/filesystem": "^2.6|^3.0",
  "mikey179/vfsStream": "^1.4",

features/logging/developer_uses_json_logging_configuration.feature

@@ -29,7 +29,7 @@ Feature: Use Humbug
  And the test file "tests/FooNormalTest.php" contains:
  """
  <?php
- class FooNormalTest extends \PHPUnit_Framework_TestCase
+ class FooNormalTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;
@@ -40,7 +40,7 @@ Feature: Use Humbug
  And the test file "tests/FooErrorTest.php" contains:
  """
  <?php
- class FooErrorTest extends \PHPUnit_Framework_TestCase
+ class FooErrorTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbersError() {
  $foo = new Foo;
@@ -54,7 +54,7 @@ Feature: Use Humbug
  And the test file "tests/FooTimeoutTest.php" contains:
  """
  <?php
- class FooTimeoutTest extends \PHPUnit_Framework_TestCase
+ class FooTimeoutTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbersTimeout() {
  $foo = new Foo;
@@ -65,18 +65,6 @@ Feature: Use Humbug
  }
  }
  """
- And the test file "tests/FooEscapeTest.php" contains:
- """
- <?php
- class FooEscapeTest extends \PHPUnit_Framework_TestCase
- {
- public function testMultipliesNumbers() {
- $foo = new Foo;
- $foo->add4(2, 1);
- // No assertion here...
- }
- }
- """
  And the phpunit bootstrap file "tests/bootstrap.php" contains:
  """
  <?php

features/logging/developer_uses_text_logging_configuration.feature

@@ -29,7 +29,7 @@ Feature: Use Humbug
  And the test file "tests/FooNormalTest.php" contains:
  """
  <?php
- class FooNormalTest extends \PHPUnit_Framework_TestCase
+ class FooNormalTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;
@@ -40,7 +40,7 @@ Feature: Use Humbug
  And the test file "tests/FooErrorTest.php" contains:
  """
  <?php
- class FooErrorTest extends \PHPUnit_Framework_TestCase
+ class FooErrorTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbersError() {
  $foo = new Foo;
@@ -54,7 +54,7 @@ Feature: Use Humbug
  And the test file "tests/FooTimeoutTest.php" contains:
  """
  <?php
- class FooTimeoutTest extends \PHPUnit_Framework_TestCase
+ class FooTimeoutTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbersTimeout() {
  $foo = new Foo;
@@ -65,18 +65,6 @@ Feature: Use Humbug
  }
  }
  """
- And the test file "tests/FooEscapeTest.php" contains:
- """
- <?php
- class FooEscapeTest extends \PHPUnit_Framework_TestCase
- {
- public function testMultipliesNumbers() {
- $foo = new Foo;
- $foo->add4(2, 1);
- // No assertion here...
- }
- }
- """
  And the phpunit bootstrap file "tests/bootstrap.php" contains:
  """
  <?php

features/regression/developer_does_not_see_mutant_uncovered_result_for_multiline_comments.feature

@@ -22,7 +22,7 @@ Feature: Use Humbug
  And the test file "tests/FooTest.php" contains:
  """
  <?php
- class FooTest extends \PHPUnit_Framework_TestCase
+ class FooTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;

features/regression/developer_does_not_see_mutant_uncovered_result_for_multiline_strings.feature

@@ -21,7 +21,7 @@ Feature: Use Humbug
  And the test file "tests/FooTest.php" contains:
  """
  <?php
- class FooTest extends \PHPUnit_Framework_TestCase
+ class FooTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;

features/running/developer_sees_initial_testrun_error_if_suite_not_passing.feature

@@ -18,7 +18,7 @@ Feature: Use Humbug
  And the test file "tests/FooTest.php" contains:
  """
  <?php
- class FooTest extends \PHPUnit_Framework_TestCase
+ class FooTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;

features/running/developer_sees_mutant_error_result.feature

@@ -3,7 +3,6 @@ Feature: Use Humbug
  As a developer
  I need to be able to run Humbug
 
- @php:^5.6
  Scenario:
  Given the class file "src/Foo.php" contains:
  """
@@ -18,7 +17,7 @@ Feature: Use Humbug
  And the test file "tests/FooTest.php" contains:
  """
  <?php
- class FooTest extends \PHPUnit_Framework_TestCase
+ class FooTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;

features/running/developer_sees_mutant_escape_result.feature

@@ -17,12 +17,13 @@ Feature: Use Humbug
  And the test file "tests/FooTest.php" contains:
  """
  <?php
- class FooTest extends \PHPUnit_Framework_TestCase
+ class FooTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;
  $foo->add(2, 1);
- // Whoops! No assertion!
+ // Whoops! No good assertion!
+ $this->assertTrue(true);
  }
  }
  """

features/running/developer_sees_mutant_kill_result.feature

@@ -17,7 +17,7 @@ Feature: Use Humbug
  And the test file "tests/FooTest.php" contains:
  """
  <?php
- class FooTest extends \PHPUnit_Framework_TestCase
+ class FooTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;

features/running/developer_sees_mutant_timeout_result.feature

@@ -17,7 +17,7 @@ Feature: Use Humbug
  And the test file "tests/FooTest.php" contains:
  """
  <?php
- class FooTest extends \PHPUnit_Framework_TestCase
+ class FooTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
  $foo = new Foo;

features/running/developer_sees_mutant_uncovered_result.feature

@@ -17,10 +17,10 @@ Feature: Use Humbug
  And the test file "tests/FooTest.php" contains:
  """
  <?php
- class FooTest extends \PHPUnit_Framework_TestCase
+ class FooTest extends \PHPUnit\Framework\TestCase
  {
  public function testAddsNumbers() {
- true === true;
+ $this->assertTrue(true);
  // Well, that executes nothing...
  }
  }

src/Adapter/Phpunit/Listeners/JsonLoggingTimeCollectorListener.php

@@ -4,12 +4,13 @@
 
 use Humbug\Phpunit\Listener\TimeCollectorListener;
 use Humbug\Phpunit\Logger\JsonLogger;
+use Humbug\Phpunit\Writer\JsonWriter;
 
 class JsonLoggingTimeCollectorListener extends TimeCollectorListener
 {
  public function __construct($logFile, $rootSuiteNestingLevel = 0)
  {
- $logger = new JsonLogger($logFile);
+ $logger = new JsonLogger(new JsonWriter($logFile));
 
  parent::__construct($logger, $rootSuiteNestingLevel);
  }

src/Adapter/Phpunit/XmlConfigurationBuilder.php

@@ -103,11 +103,6 @@ public function getConfiguration()
  $xmlConfiguration->addWhiteListFilter($this->coverageWhiteListDirs, $this->coverageExcludeDirs);
  }
 
- if ($this->acceleratorListener) {
- $acceleratorListener = new ObjectVisitor('\MyBuilder\PhpunitAccelerator\TestListener', [true]);
- $xmlConfiguration->addListener($acceleratorListener);
- }
-
  if ($this->pathToTimeStats) {
  $timeCollectionListener = new ObjectVisitor('\Humbug\Adapter\Phpunit\Listeners\JsonLoggingTimeCollectorListener', [
  $this->pathToTimeStats,

tests/Adapter/Phpunit/XmlConfigurationBuilderTest.php

@@ -57,17 +57,6 @@ public function testShouldBuildXmlConfigurationFromConfigurationDirectory()
  $xmlConfiguration->wasCalledWith('replacePathsToAbsolutePaths', [$expectedPathVisitor, $expectedWildcardVisitor], 0);
  }
 
- public function testShouldBuildConfigurationWithAcceleratorListener()
- {
- $this->builder->setAcceleratorListener();
-
- $xmlConfiguration = $this->builder->getConfiguration();
-
- $acceleratorListener = new ObjectVisitor('\MyBuilder\PhpunitAccelerator\TestListener', [true]);
-
- $xmlConfiguration->wasCalledWith('addListener', [$acceleratorListener]);
- }
-
  public function testShouldBuildConfigurationWithPhpCoverage()
  {
  $this->builder->setPhpCoverage('file/coverage.php');
@@ -188,7 +177,7 @@ public function addEnvironmentVariable($name, $value)
 
  public function wasCalledWith($function, $arguments, $at = 1)
  {
- \PHPUnit_Framework_Assert::assertTrue(isset($this->calls[$at][$function]));
- \PHPUnit_Framework_Assert::assertEquals($arguments, $this->calls[$at][$function]);
+ \PHPUnit\Framework\Assert::assertTrue(isset($this->calls[$at][$function]));
+ \PHPUnit\Framework\Assert::assertEquals($arguments, $this->calls[$at][$function]);
  }
 }

tests/Adapter/_files/regression/wildcard-dirs/phpunit.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.4/phpunit.xsd"
+ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.0/phpunit.xsd"
  backupGlobals="false"
  backupStaticAttributes="false"
  colors="true"
  convertErrorsToExceptions="true"
  convertNoticesToExceptions="true"
  convertWarningsToExceptions="true"
  processIsolation="false"
- stopOnFailure="false"
- syntaxCheck="false">
+ stopOnFailure="false">
 
  <testsuites>
  <testsuite name="Test Suite">

tests/Adapter/_files/regression/wildcard-dirs/second-suite/Tests/SecondTest.php

@@ -4,5 +4,6 @@ class SecondTest extends \PHPUnit\Framework\TestCase
 {
  public function testSecond()
  {
+ $this->assertTrue(true);
  }
 }

tests/Adapter/_files/regression/wildcard-dirs/suite-first/Tests/FirstTest.php

@@ -4,5 +4,6 @@ class FirstTest extends \PHPUnit\Framework\TestCase
 {
  public function testFirst()
  {
+ $this->assertTrue(true);
  }
 }

tests/ContainerTest.php

@@ -16,17 +16,21 @@
 use Humbug\Container;
 use Humbug\Exception\InvalidArgumentException;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Symfony\Component\Finder\Finder;
 
 class ContainerTest extends \PHPUnit\Framework\TestCase
 {
+ use MockeryPHPUnitIntegration;
+
  private $container;
 
  public function setup()
  {
  $this->container = new Container(['timeout'=>10]);
  }
 
+
  public function testShouldHaveAdapterOptionsAfterCreate()
  {
  $input = [
@@ -95,7 +99,7 @@ public function testsetTempDirectory()
  */
  public function testsetTempDirectoryThrowsExceptionOnUnwriteableParam()
  {
- $result = $this->container->setTempDirectory('/really/does/not/exist');
+ $this->container->setTempDirectory('/really/does/not/exist');
  }
 
  public function testSetPrimaryTimeout()

tests/File/CollectionTest.php

@@ -13,11 +13,14 @@
 
 use Humbug\File\Collection;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
 
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
+ use MockeryPHPUnitIntegration;
+
  private $tmp;
 
  public function setup()