diff --git a/ChangeLog.txt b/ChangeLog.txt index 2f88f36..18a4065 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,19 @@ +ParseCSV 1.2.1 +----------------------------------- +Date: 25-Apr-2020 + +Breaking changes: none +New features: none +Bug fixes: none + +Code quality: +- Switched from PHPUnit 4 to 6 to get rid of + wrappers. This will reduce friction for PhpStorm users, + because it gets rid of the "Multiple definitions" error + See issue #188. Thanks to @SharkMachine for the hint. +----------------------------------- + + ParseCSV 1.2.0 ----------------------------------- Date: 07-Jan-2020 diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 3de63b4..6b01b21 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -5,9 +5,3 @@ if (!file_exists('vendor/autoload.php')) { } require __DIR__ . '/../vendor/autoload.php'; - -if (!class_exists('PHPUnit\Framework\TestCase') && class_exists('PHPUnit_Framework_TestCase')) { - // we run on an older PHPUnit version without namespaces. - require_once __DIR__ . '/PHPUnit_Framework_TestCase.inc.php'; -} -