Skip to content

Commit

Permalink
Update phpunit.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jelle-S committed Aug 6, 2019
1 parent 8cd86a4 commit c941699
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
2 changes: 0 additions & 2 deletions RoboFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public function test()
$this->stopOnFail(true);
$this->taskPHPUnit()
->option('disallow-test-output')
->option('report-useless-tests')
->option('strict-coverage')
->option('-v')
->option('-d error_reporting=-1')
Expand All @@ -27,7 +26,6 @@ public function testCoverageCodeclimate()
$this->stopOnFail(true);
$this->taskPHPUnit()
->option('disallow-test-output')
->option('report-useless-tests')
->option('strict-coverage')
->option('-d error_reporting=-1')
->option('--coverage-clover=build/logs/clover.xml')
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"prefer-stable": true,
"require": {
"consolidation/robo": "~1.0",
"php": ">=5.5.0",
"php": ">=7.0",
"pear/archive_tar": "^1.4.5",
"symfony/debug": "^4|^3.4"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
"phpunit/phpunit": "~6"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 2 additions & 1 deletion tests/PackageProjectTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@

use League\Container\ContainerAwareInterface;
use League\Container\ContainerAwareTrait;
use PHPUnit\Framework\TestCase;
use Robo\Common\CommandArguments;
use Robo\Contract\ConfigAwareInterface;
use Robo\Robo;
use Robo\TaskAccessor;
use Symfony\Component\Console\Output\NullOutput;
use Symfony\Component\Finder\Finder;

class PackageProjectTest extends \PHPUnit_Framework_TestCase implements ContainerAwareInterface, ConfigAwareInterface
class PackageProjectTest extends TestCase implements ContainerAwareInterface, ConfigAwareInterface
{

use \DigipolisGent\Robo\Task\Package\loadTasks;
Expand Down
11 changes: 7 additions & 4 deletions tests/ThemeCleanTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@

use League\Container\ContainerAwareInterface;
use League\Container\ContainerAwareTrait;
use Robo\Contract\ConfigAwareInterface;
use PHPUnit\Framework\Constraint\IsTrue;
use PHPUnit\Framework\TestCase;
use PHPUnit\Util\InvalidArgumentHelper;
use Robo\Common\CommandArguments;
use Robo\Contract\ConfigAwareInterface;
use Robo\Robo;
use Robo\TaskAccessor;
use Symfony\Component\Console\Output\NullOutput;

class ThemeCleanTest extends \PHPUnit_Framework_TestCase implements ContainerAwareInterface, ConfigAwareInterface
class ThemeCleanTest extends TestCase implements ContainerAwareInterface, ConfigAwareInterface
{

use \DigipolisGent\Robo\Task\Package\loadTasks;
Expand Down Expand Up @@ -87,10 +90,10 @@ public function testRun()
public static function assertDirectoryIsEmpty($directory, $message = '')
{
if (!is_string($directory)) {
throw \PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
throw InvalidArgumentHelper::factory(1, 'string');
}

$constraint = new \PHPUnit_Framework_Constraint_IsTrue();
$constraint = new IsTrue();
if (!is_readable($directory)) {
static::assertThat(false, $constraint, $message);
return;
Expand Down
5 changes: 3 additions & 2 deletions tests/ThemeCompileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

use League\Container\ContainerAwareInterface;
use League\Container\ContainerAwareTrait;
use Robo\Contract\ConfigAwareInterface;
use PHPUnit\Framework\TestCase;
use Robo\Common\CommandArguments;
use Robo\Contract\ConfigAwareInterface;
use Robo\Robo;
use Robo\TaskAccessor;
use Symfony\Component\Console\Output\NullOutput;

class ThemeCompileTest extends \PHPUnit_Framework_TestCase implements ContainerAwareInterface, ConfigAwareInterface
class ThemeCompileTest extends TestCase implements ContainerAwareInterface, ConfigAwareInterface
{

use \DigipolisGent\Robo\Task\Package\loadTasks;
Expand Down

0 comments on commit c941699

Please sign in to comment.