Consistent naming for event loop implementations

clue · clue · commit d8e65fbe6e8a · 2017-12-04T11:35:30.000+01:00
diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ For the code of the current stable 0.4.x release, checkout the
     * [create()](#create)
   * [Loop implementations](#loop-implementations)
     * [StreamSelectLoop](#streamselectloop)
-    * [LibEventLoop](#libeventloop)
-    * [LibEvLoop](#libevloop)
     * [ExtEventLoop](#exteventloop)
+    * [ExtLibeventLoop](#extlibeventloop)
+    * [ExtLibevLoop](#extlibevloop)
   * [LoopInterface](#loopinterface)
     * [addtimer()](#addtimer)
     * [addPeriodicTimer()](#addperiodictimer)
@@ -184,7 +184,16 @@ It is commonly installed as part of many PHP distributions.
 If this extension is missing (or you're running on Windows), signal handling is
 not supported and throws a `BadMethodCallException` instead.
 
-#### LibEventLoop
+#### ExtEventLoop
+
+An `ext-event` based event loop.
+
+This uses the [`event` PECL extension](https://pecl.php.net/package/event).
+It supports the same backends as libevent.
+
+This loop is known to work with PHP 5.4 through PHP 7+.
+
+#### ExtLibeventLoop
 
 An `ext-libevent` based event loop.
 
@@ -198,7 +207,7 @@ To reiterate: Using this event loop on PHP 7 is not recommended.
 Accordingly, the [`Factory`](#factory) will not try to use this event loop on
 PHP 7.
 
-#### LibEvLoop
+#### ExtLibevLoop
 
 An `ext-libev` based event loop.
 
@@ -209,15 +218,6 @@ This loop does only work with PHP 5.
 An update for PHP 7 is [unlikely](https://github.com/m4rw3r/php-libev/issues/8)
 to happen any time soon.
 
-#### ExtEventLoop
-
-An `ext-event` based event loop.
-
-This uses the [`event` PECL extension](https://pecl.php.net/package/event).
-It supports the same backends as libevent.
-
-This loop is known to work with PHP 5.4 through PHP 7+.
-
 ### LoopInterface
 
 #### addTimer()
diff --git a/composer.json b/composer.json
@@ -10,10 +10,10 @@
         "phpunit/phpunit": "~4.8.35 || ^5.7 || ^6.4"
     },
     "suggest": {
-        "ext-libevent": ">=0.1.0 for LibEventLoop and PHP5 only",
         "ext-event": "~1.0 for ExtEventLoop",
-        "ext-libev": "for LibEvLoop",
-        "ext-pcntl": "For signals support when using the stream_select loop"
+        "ext-libevent": ">=0.1.0 for ExtLibeventLoop and PHP 5 only",
+        "ext-libev": "for ExtLibevLoop and PHP 5 only",
+        "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/ExtLibevLoop.php b/src/ExtLibevLoop.php
@@ -24,7 +24,7 @@
  * @see https://github.com/m4rw3r/php-libev
  * @see https://gist.github.com/1688204
  */
-class LibEvLoop implements LoopInterface
+class ExtLibevLoop implements LoopInterface
 {
     private $loop;
     private $futureTickQueue;
diff --git a/src/ExtLibeventLoop.php b/src/ExtLibeventLoop.php
@@ -24,7 +24,7 @@
  *
  * @link https://pecl.php.net/package/libevent
  */
-class LibEventLoop implements LoopInterface
+class ExtLibeventLoop implements LoopInterface
 {
     const MICROSECONDS_PER_SECOND = 1000000;
 
diff --git a/src/Factory.php b/src/Factory.php
@@ -25,12 +25,12 @@ public static function create()
     {
         // @codeCoverageIgnoreStart
         if (class_exists('libev\EventLoop', false)) {
-            return new LibEvLoop;
+            return new ExtLibevLoop();
         } elseif (class_exists('EventBase', false)) {
-            return new ExtEventLoop;
+            return new ExtEventLoop();
         } elseif (function_exists('event_base_new') && PHP_VERSION_ID < 70000) {
             // only use ext-libevent on PHP < 7 for now
-            return new LibEventLoop();
+            return new ExtLibeventLoop();
         }
 
         return new StreamSelectLoop();
diff --git a/tests/ExtLibevLoopTest.php b/tests/ExtLibevLoopTest.php
@@ -2,21 +2,21 @@
 
 namespace React\Tests\EventLoop;
 
-use React\EventLoop\LibEvLoop;
+use React\EventLoop\ExtLibevLoop;
 
-class LibEvLoopTest extends AbstractLoopTest
+class ExtLibevLoopTest extends AbstractLoopTest
 {
     public function createLoop()
     {
         if (!class_exists('libev\EventLoop')) {
             $this->markTestSkipped('libev tests skipped because ext-libev is not installed.');
         }
 
-        return new LibEvLoop();
+        return new ExtLibevLoop();
     }
 
     public function testLibEvConstructor()
     {
-        $loop = new LibEvLoop();
+        $loop = new ExtLibevLoop();
     }
 }
diff --git a/tests/ExtLibeventLoopTest.php b/tests/ExtLibeventLoopTest.php
@@ -2,9 +2,9 @@
 
 namespace React\Tests\EventLoop;
 
-use React\EventLoop\LibEventLoop;
+use React\EventLoop\ExtLibeventLoop;
 
-class LibEventLoopTest extends AbstractLoopTest
+class ExtLibeventLoopTest extends AbstractLoopTest
 {
     private $fifoPath;
 
@@ -18,7 +18,7 @@ public function createLoop()
             $this->markTestSkipped('libevent tests skipped because ext-libevent is not installed.');
         }
 
-        return new LibEventLoop();
+        return new ExtLibeventLoop();
     }
 
     public function tearDown()
diff --git a/tests/Timer/ExtLibevTimerTest.php b/tests/Timer/ExtLibevTimerTest.php
@@ -2,16 +2,16 @@
 
 namespace React\Tests\EventLoop\Timer;
 
-use React\EventLoop\LibEvLoop;
+use React\EventLoop\ExtLibevLoop;
 
-class LibEvTimerTest extends AbstractTimerTest
+class ExtLibevTimerTest extends AbstractTimerTest
 {
     public function createLoop()
     {
         if (!class_exists('libev\EventLoop')) {
             $this->markTestSkipped('libev tests skipped because ext-libev is not installed.');
         }
 
-        return new LibEvLoop();
+        return new ExtLibevLoop();
     }
 }
diff --git a/tests/Timer/ExtLibeventTimerTest.php b/tests/Timer/ExtLibeventTimerTest.php
@@ -2,16 +2,16 @@
 
 namespace React\Tests\EventLoop\Timer;
 
-use React\EventLoop\LibEventLoop;
+use React\EventLoop\ExtLibeventLoop;
 
-class LibEventTimerTest extends AbstractTimerTest
+class ExtLibeventTimerTest extends AbstractTimerTest
 {
     public function createLoop()
     {
         if (!function_exists('event_base_new')) {
             $this->markTestSkipped('libevent tests skipped because ext-libevent is not installed.');
         }
 
-        return new LibEventLoop();
+        return new ExtLibeventLoop();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`* @see https://github.com/m4rw3r/php-libev`
`25`	`25`	`* @see https://gist.github.com/1688204`
`26`	`26`	`*/`
`27`		`-class LibEvLoop implements LoopInterface`
	`27`	`+class ExtLibevLoop implements LoopInterface`
`28`	`28`	`{`
`29`	`29`	`private $loop;`
`30`	`30`	`private $futureTickQueue;`
Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,21 @@`
`2`	`2`
`3`	`3`	`namespace React\Tests\EventLoop;`
`4`	`4`
`5`		`-use React\EventLoop\LibEvLoop;`
	`5`	`+use React\EventLoop\ExtLibevLoop;`
`6`	`6`
`7`		`-class LibEvLoopTest extends AbstractLoopTest`
	`7`	`+class ExtLibevLoopTest extends AbstractLoopTest`
`8`	`8`	`{`
`9`	`9`	`public function createLoop()`
`10`	`10`	`{`
`11`	`11`	`if (!class_exists('libev\EventLoop')) {`
`12`	`12`	`$this->markTestSkipped('libev tests skipped because ext-libev is not installed.');`
`13`	`13`	`}`
`14`	`14`
`15`		`- return new LibEvLoop();`
	`15`	`+ return new ExtLibevLoop();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public function testLibEvConstructor()`
`19`	`19`	`{`
`20`		`- $loop = new LibEvLoop();`
	`20`	`+ $loop = new ExtLibevLoop();`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace React\Tests\EventLoop;`
`4`	`4`
`5`		`-use React\EventLoop\LibEventLoop;`
	`5`	`+use React\EventLoop\ExtLibeventLoop;`
`6`	`6`
`7`		`-class LibEventLoopTest extends AbstractLoopTest`
	`7`	`+class ExtLibeventLoopTest extends AbstractLoopTest`
`8`	`8`	`{`
`9`	`9`	`private $fifoPath;`
`10`	`10`
`@@ -18,7 +18,7 @@ public function createLoop()`
`18`	`18`	`$this->markTestSkipped('libevent tests skipped because ext-libevent is not installed.');`
`19`	`19`	`}`
`20`	`20`
`21`		`- return new LibEventLoop();`
	`21`	`+ return new ExtLibeventLoop();`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function tearDown()`
Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,16 @@`
`2`	`2`
`3`	`3`	`namespace React\Tests\EventLoop\Timer;`
`4`	`4`
`5`		`-use React\EventLoop\LibEvLoop;`
	`5`	`+use React\EventLoop\ExtLibevLoop;`
`6`	`6`
`7`		`-class LibEvTimerTest extends AbstractTimerTest`
	`7`	`+class ExtLibevTimerTest extends AbstractTimerTest`
`8`	`8`	`{`
`9`	`9`	`public function createLoop()`
`10`	`10`	`{`
`11`	`11`	`if (!class_exists('libev\EventLoop')) {`
`12`	`12`	`$this->markTestSkipped('libev tests skipped because ext-libev is not installed.');`
`13`	`13`	`}`
`14`	`14`
`15`		`- return new LibEvLoop();`
	`15`	`+ return new ExtLibevLoop();`
`16`	`16`	`}`
`17`	`17`	`}`