From 8f26ce6ea3b6273faefc2e4414b41eeac2fbad58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Bl=C3=A4ul?= <blaeul@quodata.de>
Date: Mon, 19 Feb 2018 22:49:43 +0100
Subject: [PATCH 1/3] Force Travis to output which PHPUnit version it uses

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 3969360..c40e1d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ php:
   - 5.4
 
 script:
+  - phpunit --version
   - phpunit --configuration tests/phpunit.xml
 
 notifications:

From ba9eae17d45212552b9c65c19884bcbc91214a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Bl=C3=A4ul?= <blaeul@quodata.de>
Date: Mon, 19 Feb 2018 23:00:57 +0100
Subject: [PATCH 2/3] Bootstrap: Improved the conditions under which the test
 wrapper loads

---
 tests/Bootstrap.php                                            | 2 +-
 ...default_values_test.php => DefaultValuesPropertiesTest.php} | 3 ++-
 .../{worthless_test.php => PublicPropertiesTest.php}           | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename tests/properties/{default_values_test.php => DefaultValuesPropertiesTest.php} (99%)
 rename tests/properties/{worthless_test.php => PublicPropertiesTest.php} (98%)

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 797e5b4..3de63b4 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -6,7 +6,7 @@ if (!file_exists('vendor/autoload.php')) {
 
 require __DIR__ . '/../vendor/autoload.php';
 
-if (!class_exists('PHPUnit\Framework\TestCase')) {
+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';
 }
diff --git a/tests/properties/default_values_test.php b/tests/properties/DefaultValuesPropertiesTest.php
similarity index 99%
rename from tests/properties/default_values_test.php
rename to tests/properties/DefaultValuesPropertiesTest.php
index ab803b9..3e26f95 100644
--- a/tests/properties/default_values_test.php
+++ b/tests/properties/DefaultValuesPropertiesTest.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace ParseCsv\tests\properties;
 
 use ParseCsv\Csv;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class default_values_properties_Test extends TestCase {
 
diff --git a/tests/properties/worthless_test.php b/tests/properties/PublicPropertiesTest.php
similarity index 98%
rename from tests/properties/worthless_test.php
rename to tests/properties/PublicPropertiesTest.php
index c41c8df..5102472 100644
--- a/tests/properties/worthless_test.php
+++ b/tests/properties/PublicPropertiesTest.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace ParseCsv\tests\properties;
 
 use ParseCsv\Csv;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class DefaultValuesTest extends TestCase {
 

From ec7b1c1d55b57657054e1c48a2d83513f94d0e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Bl=C3=A4ul?= <blaeul@quodata.de>
Date: Mon, 19 Feb 2018 23:01:31 +0100
Subject: [PATCH 3/3] PHPUnit: Better class names with modern naming scheme

---
 tests/properties/DefaultValuesPropertiesTest.php | 2 +-
 tests/properties/PublicPropertiesTest.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/properties/DefaultValuesPropertiesTest.php b/tests/properties/DefaultValuesPropertiesTest.php
index 3e26f95..803afcc 100644
--- a/tests/properties/DefaultValuesPropertiesTest.php
+++ b/tests/properties/DefaultValuesPropertiesTest.php
@@ -5,7 +5,7 @@ namespace ParseCsv\tests\properties;
 use ParseCsv\Csv;
 use PHPUnit\Framework\TestCase;
 
-class default_values_properties_Test extends TestCase {
+class DefaultValuesPropertiesTest extends TestCase {
 
     /**
      * CSV
diff --git a/tests/properties/PublicPropertiesTest.php b/tests/properties/PublicPropertiesTest.php
index 5102472..fbf85d5 100644
--- a/tests/properties/PublicPropertiesTest.php
+++ b/tests/properties/PublicPropertiesTest.php
@@ -5,7 +5,7 @@ namespace ParseCsv\tests\properties;
 use ParseCsv\Csv;
 use PHPUnit\Framework\TestCase;
 
-class DefaultValuesTest extends TestCase {
+class PublicPropertiesTest extends TestCase {
 
     /**
      * CSV