Merge pull request #3 from voryx/static-react

Use static react loop when available

.github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  PHPUnit:
+    name: PHPUnit (PHP ${{ matrix.php }} on ${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-20.04
+        php:
+          - 8.0
+          - 7.4
+          - 7.3
+    steps:
+      - uses: actions/checkout@v2
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+      - run: composer install
+      - run: vendor/bin/phpunit

composer.json

@@ -11,19 +11,16 @@
   ],
   "license": "MIT",
   "authors": [
-    { 
-        "name": "Matt Bonneau", "email": "[email protected]", "role": "Developer" 
+    {
+        "name": "Matt Bonneau", "email": "[email protected]", "role": "Developer"
     },
-    { 
-        "name": "David Dan", "email": "[email protected]", "role": "Developer" 
+    {
+        "name": "David Dan", "email": "[email protected]", "role": "Developer"
     }
   ],
   "require": {
     "react/event-loop": "^1.0 || ^0.5 || ^0.4.1"
   },
-  "require-dev": {
-    "phpunit/phpunit": "^6"
-  },
   "autoload": {
     "psr-4": {
       "EventLoop\\": "src"
@@ -37,5 +34,8 @@
     "psr-4": {
       "EventLoop\\Tests\\": "tests"
     }
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^9.5 | ^8"
   }
 }

phpunit.xml

@@ -8,12 +8,11 @@
         convertWarningsToExceptions="true"
         processIsolation="false"
         stopOnFailure="false"
-        syntaxCheck="false"
         >
     <testsuites>
         <testsuite name="Global EventLoop">
             <directory>tests/</directory>
         </testsuite>
     </testsuites>
 
-</phpunit>
+</phpunit>

src/EventLoop.php

@@ -3,6 +3,7 @@
 namespace EventLoop;
 
 use React\EventLoop\Factory;
+use React\EventLoop\Loop;
 use React\EventLoop\LoopInterface;
 
 class EventLoop
@@ -27,7 +28,7 @@ static public function getLoop() {
             return static::$loop;
         }
 
-        static::$loop = Factory::create();
+        static::$loop = class_exists('React\EventLoop\Loop') ? Loop::get() : Factory::create();
 
         static::registerLoopRunner();
 

tests/Unit/EventLoopTest.php

@@ -16,7 +16,7 @@ private function resetStaticLoop() {
         $prop->setAccessible(false);
     }
 
-    public function setup() {
+    public function setup() : void {
         $this->resetStaticLoop();
     }
 
@@ -44,10 +44,8 @@ public function testGetLoopWithoutSet() {
         $this->assertSame($loop, \EventLoop\getLoop());
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function testSettingDifferentInstance() {
+        $this->expectException(\Exception::class);
         \EventLoop\getLoop();
 
         \EventLoop\setLoop(Factory::create());
@@ -56,4 +54,4 @@ public function testSettingDifferentInstance() {
     public function testGetLoopTwice() {
         $this->assertSame(\EventLoop\getLoop(), \EventLoop\getLoop());
     }
-}
+}