Run tests on PHPUnit 9 and PHP 7.4, clean up test suite and add .gitattributes to exclude dev files from export (promise-1.x)

.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

.travis.yml

@@ -1,18 +1,26 @@
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+# lock distro so new future defaults will not break the build
+dist: trusty
 
-before_install:
-  - composer self-update
+jobs:
+  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
+    - php: hhvm-3.18
+  allow_failures:
+    - php: hhvm-3.18
 
 install:
-  - composer install --prefer-source
+  - composer install
 
 script:
-  - phpunit -v --coverage-text
+  - vendor/bin/phpunit --coverage-text

composer.json

@@ -8,12 +8,20 @@
     "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"

phpunit.xml.dist

@@ -1,16 +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"
-         syntaxCheck="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
@@ -204,10 +206,10 @@ public function shouldInvokeCancellationHandleWhenCancellingAllDerived()
 
     /**
      * @test
-     * @expectedException InvalidArgumentException
      */
     public function shouldThrowIfCancellerIsNotACallable()
     {
+        $this->setExpectedException('InvalidArgumentException');
         new Deferred(false);
     }
 }

tests/React/Promise/ErrorCollector.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
 
 class ErrorCollector
 {
@@ -33,6 +33,6 @@ public function assertCollectedError($errstr, $errno)
 
         $message = 'Error with level ' . $errno . ' and message "' . $errstr . '" not found in ' . var_export($this->errors, true);
 
-        throw new \PHPUnit_Framework_AssertionFailedError($message);
+        throw new \PHPUnit\Framework\AssertionFailedError($message);
     }
 }

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
@@ -10,7 +12,7 @@ class PromiseTest extends TestCase
     /** @test */
     public function shouldThrowIfResolverIsNotACallable()
     {
-        $this->setExpectedException('\InvalidArgumentException');
+        $this->setExpectedException('InvalidArgumentException');
 
         new Promise(null);
     }
@@ -93,10 +95,10 @@ public function shouldInvokeCancellationHandlerAndStayPendingWhenCallingCancel()
 
     /**
      * @test
-     * @expectedException InvalidArgumentException
      */
     public function shouldThrowIfCancellerIsNotACallable()
     {
+        $this->setExpectedException('InvalidArgumentException');
         new Promise(function () { }, false);
     }
 }

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,8 +1,8 @@
 <?php
 
-namespace React\Promise;
+namespace React\Tests\Promise;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     public function expectCallableExactly($amount)
     {
@@ -36,9 +36,13 @@ public function expectCallableNever()
 
     public function createCallableMock()
     {
-        return $this
-            ->getMockBuilder('React\\Promise\Stub\CallableStub')
-            ->getMock();
+        if (method_exists('PHPUnit\Framework\MockObject\MockBuilder', 'addMethods')) {
+            // PHPUnit 9+
+            return $this->getMockBuilder('stdClass')->addMethods(array('__invoke'))->getMock();
+        } else {
+            // legacy PHPUnit 4 - PHPUnit 9
+            return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        }
     }
 
     public function invalidCallbackDataProvider()
@@ -52,4 +56,21 @@ public function invalidCallbackDataProvider()
             'falsey'       => array(0)
         );
     }
+
+    public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
+    {
+        if (method_exists($this, 'expectException')) {
+            // PHPUnit 5+
+            $this->expectException($exception);
+            if ($exceptionMessage !== '') {
+                $this->expectExceptionMessage($exceptionMessage);
+            }
+            if ($exceptionCode !== null) {
+                $this->expectExceptionCode($exceptionCode);
+            }
+        } else {
+            // legacy PHPUnit 4
+            parent::setExpectedException($exception, $exceptionMessage, $exceptionCode);
+        }
+    }
 }

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