Merge pull request reactphp#422 from clue-labs/promise-compatibility

Backwards compatibility with Promise v1 API

Author: WyriHaximus

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+# - 5.3 # requires old distro, see below
   - 5.4
   - 5.5
   - 5.6
@@ -9,7 +10,13 @@ php:
   - 7.2
   - hhvm
 
+# lock distro so new future defaults will not break the build
+dist: trusty
+
 matrix:
+  include:
+    - php: 5.3
+      dist: precise
   allow_failures:
     - php: hhvm
 

composer.json

@@ -8,14 +8,14 @@
         "irc": "irc://irc.freenode.org/reactphp"
     },
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.3.8",
         "react/cache": "^0.5",
         "react/child-process": "^0.5",
         "react/dns": "^0.4",
         "react/event-loop": "^1.0",
         "react/http": "^0.8.1",
         "react/http-client": "^0.5",
-        "react/promise": "^2.1",
+        "react/promise": "^2.1 || ^1.2",
         "react/promise-stream": "^1.1.1",
         "react/socket": "^1.0",
         "react/stream": "^1.0"

tests/bootstrap.php

@@ -18,5 +18,14 @@
 
 // load all legacy test bootstrap scripts from React's components
 foreach (glob(__DIR__ . '/../vendor/react/*/tests/bootstrap.php') as $b) {
+    // skip legacy react/promise for now and use manual autoload path from bootstrap config
+    // @link https://github.com/reactphp/promise/blob/1.x/tests/bootstrap.php
+    // @link https://github.com/reactphp/promise/blob/2.x/tests/bootstrap.php
+    if (strpos($b, 'react/promise/tests/bootstrap.php') !== false) {
+        $autoload->add('React\Promise', __DIR__ . '/../vendor/react/promise/tests');
+        $autoload->addPsr4('React\\Promise\\', __DIR__ . '/../vendor/react/promise/tests');
+        continue;
+    }
+
     include $b;
 }