diff --git a/README.md b/README.md index e9531a50..27bb0bd3 100644 --- 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 index e39df9ab..ad14cf4b 100644 --- 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/LibEvLoop.php b/src/ExtLibevLoop.php similarity index 99% rename from src/LibEvLoop.php rename to src/ExtLibevLoop.php index 640c7da7..93af0cd9 100644 --- a/src/LibEvLoop.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/LibEventLoop.php b/src/ExtLibeventLoop.php similarity index 99% rename from src/LibEventLoop.php rename to src/ExtLibeventLoop.php index 94cdbb01..0d0a1b3e 100644 --- a/src/LibEventLoop.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 index 0e868358..b497667d 100644 --- 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/LibEvLoopTest.php b/tests/ExtLibevLoopTest.php similarity index 66% rename from tests/LibEvLoopTest.php rename to tests/ExtLibevLoopTest.php index 5ea98e30..19a5e876 100644 --- a/tests/LibEvLoopTest.php +++ b/tests/ExtLibevLoopTest.php @@ -2,9 +2,9 @@ namespace React\Tests\EventLoop; -use React\EventLoop\LibEvLoop; +use React\EventLoop\ExtLibevLoop; -class LibEvLoopTest extends AbstractLoopTest +class ExtLibevLoopTest extends AbstractLoopTest { public function createLoop() { @@ -12,11 +12,11 @@ public function createLoop() $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/LibEventLoopTest.php b/tests/ExtLibeventLoopTest.php similarity index 91% rename from tests/LibEventLoopTest.php rename to tests/ExtLibeventLoopTest.php index 920b33cc..84970658 100644 --- a/tests/LibEventLoopTest.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/LibEvTimerTest.php b/tests/Timer/ExtLibevTimerTest.php similarity index 67% rename from tests/Timer/LibEvTimerTest.php rename to tests/Timer/ExtLibevTimerTest.php index 73abe8ed..65e82bee 100644 --- a/tests/Timer/LibEvTimerTest.php +++ b/tests/Timer/ExtLibevTimerTest.php @@ -2,9 +2,9 @@ namespace React\Tests\EventLoop\Timer; -use React\EventLoop\LibEvLoop; +use React\EventLoop\ExtLibevLoop; -class LibEvTimerTest extends AbstractTimerTest +class ExtLibevTimerTest extends AbstractTimerTest { public function createLoop() { @@ -12,6 +12,6 @@ public function createLoop() $this->markTestSkipped('libev tests skipped because ext-libev is not installed.'); } - return new LibEvLoop(); + return new ExtLibevLoop(); } } diff --git a/tests/Timer/LibEventTimerTest.php b/tests/Timer/ExtLibeventTimerTest.php similarity index 66% rename from tests/Timer/LibEventTimerTest.php rename to tests/Timer/ExtLibeventTimerTest.php index 3db20350..9089b9a5 100644 --- a/tests/Timer/LibEventTimerTest.php +++ b/tests/Timer/ExtLibeventTimerTest.php @@ -2,9 +2,9 @@ namespace React\Tests\EventLoop\Timer; -use React\EventLoop\LibEventLoop; +use React\EventLoop\ExtLibeventLoop; -class LibEventTimerTest extends AbstractTimerTest +class ExtLibeventTimerTest extends AbstractTimerTest { public function createLoop() { @@ -12,6 +12,6 @@ public function createLoop() $this->markTestSkipped('libevent tests skipped because ext-libevent is not installed.'); } - return new LibEventLoop(); + return new ExtLibeventLoop(); } }
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: