From 031699e73847ffc7e2f0f2f13ddb016a3cb721fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Thu, 21 Dec 2017 13:51:49 +0100
Subject: [PATCH] Simplify test bootstrapping logic via Composer

---
 composer.json       | 8 +++++---
 phpunit.xml.dist    | 2 +-
 tests/bootstrap.php | 7 -------
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 tests/bootstrap.php

diff --git a/composer.json b/composer.json
index 6f83a32..b5e2f8a 100644
--- a/composer.json
+++ b/composer.json
@@ -12,12 +12,14 @@
         "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35",
         "clue/stream-filter": "~1.2"
     },
-    "suggest": {
-        "react/event-loop": "^0.4"
-    },
     "autoload": {
         "psr-4": {
             "React\\Stream\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "React\\Tests\\Stream\\": "tests"
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cba6d4d..13d3fab 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <testsuites>
         <testsuite name="React Test Suite">
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 754ef06..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$loader = @include __DIR__ . '/../vendor/autoload.php';
-if (!$loader) {
-    $loader = require __DIR__ . '/../../../../vendor/autoload.php';
-}
-$loader->addPsr4('React\\Tests\\Stream\\', __DIR__);