Merge branch 'develop' of github.com:daylerees/scientist into develop

daylerees · Mar 14, 2018 · 5068867 · 5068867
2 parents d011d85 + 357055f
commit 5068867
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 16 deletions.
diff --git 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/src/Machine.php b/src/Machine.php
@@ -2,7 +2,7 @@
 
 namespace Scientist;
 
-use Exception;
+use Throwable;
 
 /**
  * Class Executor
@@ -102,7 +102,7 @@ protected function executeMutedCallback()
     {
         try {
             $this->result->setValue(call_user_func_array($this->callback, $this->params));
-        } catch (Exception $exception) {
+        } catch (Throwable $exception) {
             $this->result->setException($exception);
             $this->result->setValue(null);
         }

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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()
     {
@@ -52,9 +52,20 @@ public function test_that_exceptions_can_be_thrown_by_machine_callback_execution
         $m->execute();
     }
 
-    public function test_that_machine_can_mute_exceptions_from_callback()
+    public static function getErrorData()
     {
-        $m = new Machine(function () { throw new Exception('foo'); }, [], true);
+        return [
+            [new Exception()],
+            [new Error()],
+        ];
+    }
+
+    /**
+     * @dataProvider getErrorData
+     */
+    public function test_that_machine_can_mute_exceptions_from_callback($exception)
+    {
+        $m = new Machine(function () use ($exception) { throw $exception; }, [], true);
 
         $this->assertEquals(null, $m->execute()->getValue());
     }

diff --git 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
@@ -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
@@ -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
@@ -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()
     {