Fix test suite forward compatibility with upcoming EventLoop releases

composer.json

@@ -5,7 +5,7 @@
  "license": "MIT",
  "require":{
  "php": ">=5.3.8",
- "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
+ "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
  "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
  },
  "require-dev":{

tests/DuplexResourceStreamIntegrationTest.php

@@ -3,18 +3,52 @@
 namespace React\Tests\Stream;
 
 use React\Stream\DuplexResourceStream;
-use React\EventLoop as rel;
 use React\Stream\ReadableResourceStream;
+use React\EventLoop\ExtEventLoop;
+use React\EventLoop\ExtLibeventLoop;
+use React\EventLoop\ExtLibevLoop;
+use React\EventLoop\LoopInterface;
+use React\EventLoop\LibEventLoop;
+use React\EventLoop\LibEvLoop;
+use React\EventLoop\StreamSelectLoop;
 
 class DuplexResourceStreamIntegrationTest extends TestCase
 {
  public function loopProvider()
 {
  return array(
- array(function(){return true}, function(){return new rel\StreamSelectLoop}),
- array(function(){return function_exists('event_base_new')}, function(){return new rel\LibEventLoop}),
- array(function(){return class_exists('libev\EventLoop')}, function(){return new rel\LibEvLoop}),
- array(function(){return class_exists('EventBase')}, function(){return new rel\ExtEventLoop})
+ array(
+ function(){
+ return true;
+ },
+ function (){
+ return new StreamSelectLoop();
+ }
+ ),
+ array(
+ function (){
+ return function_exists('event_base_new');
+ },
+ function (){
+ return class_exists('React\EventLoop\ExtLibeventLoop') ? new ExtLibeventLoop() : LibEventLoop();
+ }
+ ),
+ array(
+ function (){
+ return class_exists('libev\EventLoop');
+ },
+ function (){
+ return class_exists('React\EventLoop\ExtLibevLoop') ? new ExtLibevLoop() : new LibEvLoop();
+ }
+ ),
+ array(
+ function (){
+ return class_exists('EventBase') && class_exists('React\EventLoop\ExtEventLoop');
+ },
+ function (){
+ return new ExtEventLoop();
+ }
+ )
  );
  }
 
@@ -44,9 +78,9 @@ public function testBufferReadsLargeChunks($condition, $loopFactory)
 
  $streamA->write($testString);
 
- $loop->tick();
- $loop->tick();
- $loop->tick();
+ $this->loopTick($loop);
+ $this->loopTick($loop);
+ $this->loopTick($loop);
 
  $streamA->close();
  $streamB->close();
@@ -307,4 +341,12 @@ public function testReadsNothingFromProcessPipeWithNoOutput($condition, $loopFac
 
  $loop->run();
  }
+
+ private function loopTick(LoopInterface $loop)
+{
+ $loop->addTimer(0, function () use ($loop){
+ $loop->stop();
+ });
+ $loop->run();
+ }
 }