Merge pull request #1 from Vinceveve/feature/2.0

Switch to rxphp 2

.travis.yml

@@ -1,17 +1,47 @@
 language: php
-sudo: required
-
-php:
-  - 5.6
-  - 7
-  - hhvm
 
 matrix:
-  allow_failures:
-    - php: hhvm
+  include:
+    - php: 7.0
+      env:
+        - qaExtended=true
+    - php: 7.1
+    - php: 7.2
+      env:
+        - dropPlatform=false
+    - php: nightly
+      env:
+        - dropPlatform=false
+    - php: 7.0
+      env:
+        - dependencies=lowest
+    - php: 7.1
+      env:
+        - dependencies=lowest
+    - php: 7.2
+      env:
+        - dependencies=lowest
+        - dropPlatform=false
+    - php: nightly
+      env:
+        - dependencies=lowest
+        - dropPlatform=false
+    - php: 7.0
+      env:
+        - dependencies=highest
+    - php: 7.1
+      env:
+        - dependencies=highest
+    - php: 7.2
+      env:
+        - dependencies=highest
+        - dropPlatform=false
+    - php: nightly
+      env:
+        - dependencies=highest
+        - dropPlatform=false
 
-install:
-  - composer install
+before_script: composer install
 
 script:
-  - phpunit
+  - vendor/bin/phpunit

composer.json

@@ -27,8 +27,20 @@
       "src/functions.php"
     ]
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Rx\\React\\Tests\\": "tests/",
+      "Rx\\": "vendor/reactivex/rxphp/test/Rx"
+    },
+    "files": [
+      "vendor/reactivex/rxphp/test/helper-functions.php"
+    ]
+  },
   "require": {
-    "reactivex/rxphp": "^1.0",
-    "voryx/event-loop": "^0.2.0"
+    "reactivex/rxphp": "^2.0",
+    "voryx/event-loop": "^2.0 || ^3.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^6.0"
   }
 }

examples/delay_foreach.php

@@ -2,14 +2,12 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-
 $source = \Rx\Observable::range(0, 5)->delay(1000);
 
 $generator = \Rx\await($source);
 
-
 foreach ($generator as $item) {
     echo $item, PHP_EOL;
 }
 
-echo "DONE";
+echo 'DONE';

examples/delay_next.php

@@ -1,14 +1,11 @@
 <?php
-
 require __DIR__ . '/../vendor/autoload.php';
 
-
 $source = \Rx\Observable::range(0, 5)->delay(1000);
 
 /** @var Generator $generator */
 $generator = \Rx\await($source);
 
-
 echo $generator->current(), PHP_EOL; //0
 
 $generator->next();
@@ -23,5 +20,4 @@
 $generator->next();
 echo $generator->current(), PHP_EOL; //4
 
-
-echo "DONE";
+echo 'DONE';

examples/errors.php

@@ -2,7 +2,6 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-
 $source = \Rx\Observable::error(new Exception('some error'));
 
 $generator = \Rx\await($source);
@@ -12,10 +11,5 @@
         echo $item, PHP_EOL;
     }
 } catch (\Exception $e) {
-    echo "caught error: ", $e->getMessage();
+    echo 'caught error: ', $e->getMessage();
 }
-
-
-
-
-

examples/httpGet.php

@@ -4,7 +4,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$terms  = ["rxphp", "php", "make php great again"];
+$terms  = ['rxphp', 'php', 'make php great again'];
 $search = \Rx\Observable::fromArray($terms)
     ->map(function ($term) {
         return urlencode($term);
@@ -13,19 +13,18 @@
         return \Rx\React\Http::get("http://www.google.com/search?q={$term}")
             ->map(function ($result) use ($term) {
                 return [
-                    "term" => $term,
-                    "page" => $result
+                    'term' => $term,
+                    'page' => $result
                 ];
             });
     });
 
-
 $generator = \Rx\await($search);
 
-echo "BLOCKING", PHP_EOL;
+echo 'BLOCKING', PHP_EOL;
 
 foreach ($generator as $item) {
     echo "Result page for: {$item['term']}", PHP_EOL, $item['page'];
 }
 
-echo "DONE";
+echo 'DONE';

examples/interval.php

@@ -2,14 +2,12 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-
 $source = \Rx\Observable::interval(1000);
 
 $generator = \Rx\await($source);
 
-
 foreach ($generator as $item) {
     echo $item, PHP_EOL;
 }
 
-echo "DONE";
+echo 'DONE';

examples/interval_take.php

@@ -2,7 +2,6 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-
 $source = \Rx\Observable::interval(1000)
     ->take(5); //Take the first 5
 
@@ -12,4 +11,4 @@
     echo $item, PHP_EOL;
 }
 
-echo "DONE";
+echo 'DONE';

examples/interval_timeout.php

@@ -2,7 +2,6 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-
 $source = \Rx\Observable::interval(1000)
     ->takeUntil(\Rx\Observable::timer(10000)); //timeout after 10 seconds
 
@@ -12,4 +11,4 @@
     echo $item, PHP_EOL;
 }
 
-echo "DONE";
+echo 'DONE';

phpunit.xml

@@ -8,8 +8,7 @@
         convertWarningsToExceptions="true"
         processIsolation="false"
         stopOnFailure="false"
-        syntaxCheck="false"
-        bootstrap="tests/bootstrap.php">
+        syntaxCheck="false">
     <testsuites>
         <testsuite name="Rx/Await">
             <directory>tests/</directory>

src/functions.php

@@ -4,7 +4,6 @@
 
 use React\EventLoop\LoopInterface;
 use Rx\Observer\CallbackObserver;
-use Rx\Scheduler\EventLoopScheduler;
 
 /**
  * Wait until observable completes.
@@ -15,14 +14,12 @@
  */
 function await(Observable $observable, LoopInterface $loop = null)
 {
-
     $completed = false;
     $results   = [];
     $loop      = $loop ?: \EventLoop\getLoop();
-    $scheduler = new EventLoopScheduler($loop);
 
     $observable->subscribe(new CallbackObserver(
-        function ($value) use (&$results, &$results, $loop) {
+        function ($value) use (&$results, $loop) {
             $results[] = $value;
 
             $loop->stop();
@@ -35,7 +32,7 @@ function () use (&$completed) {
             $completed = true;
         }
 
-    ), $scheduler);
+    ));
 
     while (!$completed) {