From 82b6a4426266bf95e77f1ab7fad9d7b94d81e768 Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Wed, 13 May 2020 11:21:46 +0200
Subject: [PATCH 1/3] Run tests on PHP 7.4 and simplify test matrix

---
 .travis.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9fbb7fa..845ce05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,5 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-
 # lock distro so future defaults will not break the build
 dist: trusty
 
@@ -17,6 +7,14 @@ matrix:
   include:
     - php: 5.3
       dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
 
 sudo: false
 

From 3c9f875fdd4bfa60e9472bf517e216e83c287dbf Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Wed, 13 May 2020 11:23:04 +0200
Subject: [PATCH 2/3] Add .gitattributes to exclude dev files from exports

---
 .gitattributes | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..0925d33
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/examples/ export-ignore
+/phpunit.xml.dist export-ignore
+/tests/ export-ignore

From 1534a34b5269538eaeecf60fdb538479849b8a58 Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Wed, 13 May 2020 11:29:11 +0200
Subject: [PATCH 3/3] Clean up test suite

---
 composer.json                         | 3 +++
 phpunit.xml.dist                      | 7 +------
 tests/DeferredShellTest.php           | 2 ++
 tests/FunctionalTest.php              | 2 ++
 tests/ProcessLauncherTest.php         | 2 ++
 tests/{bootstrap.php => TestCase.php} | 8 +++-----
 6 files changed, 13 insertions(+), 11 deletions(-)
 rename tests/{bootstrap.php => TestCase.php} (95%)

diff --git a/composer.json b/composer.json
index 63c3095..a5cbbb0 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,9 @@
     "autoload": {
         "psr-4" : { "Clue\\React\\Shell\\": "src/" }
     },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Shell\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "react/child-process": "^0.5 || ^0.4 || ^0.3",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b3f90f3..471539b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="Shell React Test Suite">
             <directory>./tests/</directory>
diff --git a/tests/DeferredShellTest.php b/tests/DeferredShellTest.php
index 8fd8ad4..2dabfb7 100644
--- a/tests/DeferredShellTest.php
+++ b/tests/DeferredShellTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Shell;
+
 use Clue\React\Shell\DeferredShell;
 
 class DeferredShellTest extends TestCase
diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
index 7d37099..456724d 100644
--- a/tests/FunctionalTest.php
+++ b/tests/FunctionalTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Shell;
+
 use React\EventLoop\Factory;
 use Clue\React\Shell\ProcessLauncher;
 
diff --git a/tests/ProcessLauncherTest.php b/tests/ProcessLauncherTest.php
index 89f912f..884e03d 100644
--- a/tests/ProcessLauncherTest.php
+++ b/tests/ProcessLauncherTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Shell;
+
 use Clue\React\Shell\ProcessLauncher;
 
 class ProcessLauncherTest extends TestCase
diff --git a/tests/bootstrap.php b/tests/TestCase.php
similarity index 95%
rename from tests/bootstrap.php
rename to tests/TestCase.php
index 3e3aaee..b6fe2bd 100644
--- a/tests/bootstrap.php
+++ b/tests/TestCase.php
@@ -1,13 +1,11 @@
 <?php
 
+namespace Clue\Tests\React\Shell;
+
 use React\EventLoop\LoopInterface;
 use React\Promise\PromiseInterface;
 
-require_once __DIR__ . '/../vendor/autoload.php';
-
-error_reporting(-1);
-
-class TestCase extends PHPUnit\Framework\TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     protected function expectCallableOnce()
     {