Clean up test suite

Author: SimonFrings

composer.json

@@ -5,21 +5,26 @@
     "authors": [
         {"name": "Jan Sorgalla", "email": "[email protected]"}
     ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
+    },
     "autoload": {
-        "psr-0": {
-            "React\\Promise": "src/"
+        "psr-4": { 
+            "React\\Promise\\": "src/React/Promise/" 
         },
         "files": ["src/React/Promise/functions_include.php"]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "React\\Tests\\Promise\\": "tests/React/Promise/" 
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.1-dev"
         }
-    },
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
     }
 }

phpunit.xml.dist

@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="false"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="tests/bootstrap.php"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="Promise Test Suite">
             <directory>./tests/React/Promise/</directory>

tests/React/Promise/DeferredProgressTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
 
 /**
  * @group Deferred

tests/React/Promise/DeferredPromiseTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\DeferredPromise;
 
 /**
  * @group Promise

tests/React/Promise/DeferredRejectTest.php

@@ -1,6 +1,10 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
+use React\Promise\FulfilledPromise;
+use React\Promise\RejectedPromise;
 
 /**
  * @group Deferred

tests/React/Promise/DeferredResolveTest.php

@@ -1,6 +1,11 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
+use React\Promise\FulfilledPromise;
+use React\Promise\RejectedPromise;
+use React\Promise\When;
 
 /**
  * @group Deferred

tests/React/Promise/DeferredResolverTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\DeferredResolver;
 
 /**
  * @group Resolver

tests/React/Promise/DeferredTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
 
 /**
  * @group Deferred

tests/React/Promise/ErrorCollector.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
 
 class ErrorCollector
 {

tests/React/Promise/FulfilledPromiseTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\FulfilledPromise;
+use React\Promise\RejectedPromise;
 
 /**
  * @group Promise

tests/React/Promise/LazyPromiseTest.php

@@ -1,6 +1,10 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
+use React\Promise\FulfilledPromise;
+use React\Promise\LazyPromise;
 
 /**
  * @group Promise

tests/React/Promise/PromiseTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Promise;
 
 /**
  * @group Promise

tests/React/Promise/RejectedPromiseTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\FulfilledPromise;
+use React\Promise\RejectedPromise;
 
 /**
  * @group Promise

tests/React/Promise/TestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
 
 class TestCase extends \PHPUnit\Framework\TestCase
 {

tests/React/Promise/UtilPromiseForTest.php

@@ -1,6 +1,10 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\FulfilledPromise;
+use React\Promise\RejectedPromise;
+use React\Promise\Util;
 
 /**
  * @group Util

tests/React/Promise/UtilRejectedPromiseForTest.php

@@ -1,6 +1,10 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\FulfilledPromise;
+use React\Promise\RejectedPromise;
+use React\Promise\Util;
 
 /**
  * @group Util

tests/React/Promise/WhenAllTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\When;
 
 /**
  * @group When

tests/React/Promise/WhenAnyTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
+use React\Promise\When;
 
 /**
  * @group When

tests/React/Promise/WhenLazyTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\When;
 
 /**
  * @group When

tests/React/Promise/WhenMapTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\When;
 
 /**
  * @group When

tests/React/Promise/WhenReduceTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
+use React\Promise\When;
 
 /**
  * @group When

tests/React/Promise/WhenRejectTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
+use React\Promise\When;
 
 /**
  * @group When

tests/React/Promise/WhenResolveTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\Deferred;
+use React\Promise\When;
 
 /**
  * @group When

tests/React/Promise/WhenSomeTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
+
+use React\Promise\When;
 
 /**
  * @group When