From 9e7d3bd3862693a7051b5d7c4d72f1c079d9b73c Mon Sep 17 00:00:00 2001 From: Ben Davies Date: Tue, 13 Mar 2018 18:15:07 +0000 Subject: [PATCH] upgrade to phpunit 6 --- composer.json | 2 +- tests/Chances/StandardChanceTest.php | 2 +- tests/ExperimentTest.php | 4 ++-- tests/InternTest.php | 2 +- tests/Journals/JournalTest.php | 2 +- tests/LaboratoryTest.php | 2 +- tests/MachineTest.php | 2 +- tests/Matchers/ClosureMatcherTest.php | 2 +- tests/Matchers/StandardMatcherTest.php | 2 +- tests/ReportTest.php | 2 +- tests/ResultTest.php | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 0bdc7e2..13524e6 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "ircmaxell/random-lib": "^1.2" }, "require-dev": { - "phpunit/phpunit": ">=4.8", + "phpunit/phpunit": "^6.0", "squizlabs/php_codesniffer": "^2.5", "jakub-onderka/php-parallel-lint": "^0.9.2", "phing/phing": "^2.13" diff --git a/tests/Chances/StandardChanceTest.php b/tests/Chances/StandardChanceTest.php index 4001849..357850c 100644 --- a/tests/Chances/StandardChanceTest.php +++ b/tests/Chances/StandardChanceTest.php @@ -3,7 +3,7 @@ use RandomLib\Generator; -class StandardChanceTest extends \PHPUnit_Framework_TestCase +class StandardChanceTest extends \PHPUnit\Framework\TestCase { /** * @var StandardChance diff --git a/tests/ExperimentTest.php b/tests/ExperimentTest.php index eb5ce88..1fa064e 100644 --- a/tests/ExperimentTest.php +++ b/tests/ExperimentTest.php @@ -4,7 +4,7 @@ use Scientist\Laboratory; use Scientist\Matchers\StandardMatcher; -class ExperimentTest extends PHPUnit_Framework_TestCase +class ExperimentTest extends \PHPUnit\Framework\TestCase { public function test_that_a_new_experiment_can_be_created() { @@ -63,7 +63,7 @@ public function test_that_multiple_trial_callbacks_can_be_defined() public function test_that_a_chance_variable_can_be_set() { - $chance = $this->getMock('\Scientist\Chances\Chance'); + $chance = $this->createMock('\Scientist\Chances\Chance'); $e = new Experiment('test experiment', new Laboratory); $e->chance($chance); $this->assertEquals($chance, $e->getChance()); diff --git a/tests/InternTest.php b/tests/InternTest.php index 986a54c..1801fcb 100644 --- a/tests/InternTest.php +++ b/tests/InternTest.php @@ -5,7 +5,7 @@ use Scientist\Experiment; use Scientist\Laboratory; -class InternTest extends PHPUnit_Framework_TestCase +class InternTest extends \PHPUnit\Framework\TestCase { public function test_that_intern_can_be_created() { diff --git a/tests/Journals/JournalTest.php b/tests/Journals/JournalTest.php index 8880cf9..63b4032 100644 --- a/tests/Journals/JournalTest.php +++ b/tests/Journals/JournalTest.php @@ -5,7 +5,7 @@ use Scientist\Experiment; use Scientist\Journals\StandardJournal; -class JournalTest extends PHPUnit_Framework_TestCase +class JournalTest extends \PHPUnit\Framework\TestCase { public function test_that_journals_can_be_created() { diff --git a/tests/LaboratoryTest.php b/tests/LaboratoryTest.php index 3b0d6b1..9283fa0 100644 --- a/tests/LaboratoryTest.php +++ b/tests/LaboratoryTest.php @@ -3,7 +3,7 @@ use Scientist\Report; use Scientist\Laboratory; -class LaboratoryTest extends PHPUnit_Framework_TestCase +class LaboratoryTest extends \PHPUnit\Framework\TestCase { public function test_laboratory_can_be_created() { diff --git a/tests/MachineTest.php b/tests/MachineTest.php index e9c92f6..f51a9e6 100644 --- a/tests/MachineTest.php +++ b/tests/MachineTest.php @@ -3,7 +3,7 @@ use Scientist\Result; use Scientist\Machine; -class MachineTest extends PHPUnit_Framework_TestCase +class MachineTest extends \PHPUnit\Framework\TestCase { public function test_that_machine_can_be_created() { diff --git a/tests/Matchers/ClosureMatcherTest.php b/tests/Matchers/ClosureMatcherTest.php index 92e5ef8..61641b2 100644 --- a/tests/Matchers/ClosureMatcherTest.php +++ b/tests/Matchers/ClosureMatcherTest.php @@ -2,7 +2,7 @@ use Scientist\Matchers\ClosureMatcher; -class ClosureMatcherTest extends PHPUnit_Framework_TestCase +class ClosureMatcherTest extends \PHPUnit\Framework\TestCase { private function getClosure() { diff --git a/tests/Matchers/StandardMatcherTest.php b/tests/Matchers/StandardMatcherTest.php index 57a6314..0c1941b 100644 --- a/tests/Matchers/StandardMatcherTest.php +++ b/tests/Matchers/StandardMatcherTest.php @@ -2,7 +2,7 @@ use Scientist\Matchers\StandardMatcher; -class StandardMatcherTest extends PHPUnit_Framework_TestCase +class StandardMatcherTest extends \PHPUnit\Framework\TestCase { public function test_that_standard_matcher_can_be_created() { diff --git a/tests/ReportTest.php b/tests/ReportTest.php index 4c46c9c..9bf12af 100644 --- a/tests/ReportTest.php +++ b/tests/ReportTest.php @@ -3,7 +3,7 @@ use Scientist\Result; use Scientist\Report; -class ReportTest extends PHPUnit_Framework_TestCase +class ReportTest extends \PHPUnit\Framework\TestCase { public function test_that_report_can_be_created() { diff --git a/tests/ResultTest.php b/tests/ResultTest.php index 8f33104..8739c5d 100644 --- a/tests/ResultTest.php +++ b/tests/ResultTest.php @@ -2,7 +2,7 @@ use Scientist\Result; -class ResultTest extends PHPUnit_Framework_TestCase +class ResultTest extends \PHPUnit\Framework\TestCase { public function test_result_can_be_created() {