for PHP 8 compatibility

symplely · Mar 4, 2021 · d54d9cc · d54d9cc
1 parent 0869ccd
commit d54d9cc
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 18 deletions.
diff --git a/Spawn/Core.php b/Spawn/Core.php
@@ -16,6 +16,9 @@
 if (!defined('IS_LINUX'))
     \define('IS_LINUX', ('/' === \DS));
 
+if (!defined('IS_PHP8'))
+    \define('IS_PHP8', ((float)phpversion() >= 8.0));
+
 if (\IS_WINDOWS && \function_exists('uv_loop_new')) {
     /**
      * The SIGUSR1 signal is sent to a process to indicate user-defined conditions.

diff --git a/Spawn/Launcher.php b/Spawn/Launcher.php
@@ -508,8 +508,7 @@ public function getOutput()
             $cleaned = $this->output;
             $replaceWith = $this->getResult();
             if (\is_string($cleaned) && \strpos($cleaned, $this->rawLastResult) !== false) {
-                if ((float)phpversion() >= 8.0) {
-                    print_r($replaceWith);
+                if (\IS_PHP8) {
                     $replaceWith = (string) $replaceWith;
                 }
 

diff --git a/tests/ChanneledTest.php b/tests/ChanneledTest.php
@@ -9,8 +9,10 @@
 
 class ChanneledTest extends TestCase
 {
-	protected function setUp(): void
+    protected function setUp(): void
     {
+        if (!\function_exists('uv_loop_new'))
+            $this->markTestSkipped('Test skipped "uv_loop_new" missing.');
         Spawn::setup(null, false, false, true);
     }
 

diff --git a/tests/ContainerTest.php b/tests/ContainerTest.php
@@ -10,6 +10,8 @@ class ContainerTest extends TestCase
 {
     protected function setUp(): void
     {
+        if (!\function_exists('uv_loop_new'))
+            $this->markTestSkipped('Test skipped "uv_loop_new" missing.');
         Spawn::setup(null, false, false, true);
     }
 

diff --git a/tests/ErrorHandlingTest.php b/tests/ErrorHandlingTest.php
@@ -9,18 +9,20 @@
 
 class ErrorHandlingTest extends TestCase
 {
-	protected function setUp(): void
+    protected function setUp(): void
     {
+        if (!\function_exists('uv_loop_new'))
+            $this->markTestSkipped('Test skipped "uv_loop_new" missing.');
         Spawn::setup(null, false, false, true);
     }
 
     public function testIt_can_handle_exceptions_via_catch_callback()
     {
         $process = \spawn(function () {
-                throw new \Exception('test');
-            })->catch(function (\Exception $e) {
-                $this->assertRegExp('/test/', $e->getMessage());
-            });
+            throw new \Exception('test');
+        })->catch(function (\Exception $e) {
+            $this->assertRegExp('/test/', $e->getMessage());
+        });
 
         \spawn_run($process);
         $this->assertFalse($process->isSuccessful());
@@ -32,10 +34,10 @@ public function testIt_can_handle_exceptions_via_catch_callback()
     public function testIt_can_handle_exceptions_via_catch_callback_yield()
     {
         $process = spawn(function () {
-                throw new \Exception('test');
-            })->catch(function (\Exception $e) {
-                $this->assertRegExp('/test/', $e->getMessage());
-            });
+            throw new \Exception('test');
+        })->catch(function (\Exception $e) {
+            $this->assertRegExp('/test/', $e->getMessage());
+        });
 
         $yield = $process->yielding();
         $this->assertInstanceOf(SerializableException::class, $yield->current());
@@ -49,7 +51,7 @@ public function testIt_handles_stderr_as_Spawn_error()
         $process = spawn(function () {
             fwrite(\STDERR, 'test');
         })->catch(function (SpawnError $error) {
-           $this->assertStringContainsString('test', $error->getMessage());
+            $this->assertStringContainsString('test', $error->getMessage());
         });
 
         spawn_run($process);

diff --git a/tests/SpawnTest.php b/tests/SpawnTest.php
@@ -10,6 +10,8 @@ class SpawnTest extends TestCase
 {
     protected function setUp(): void
     {
+        if (!\function_exists('uv_loop_new'))
+            $this->markTestSkipped('Test skipped "uv_loop_new" missing.');
         Spawn::setup(null, false, false, true);
     }
 

diff --git a/tests/libuv/006-uv_async_init-no-memory-leak.phpt b/tests/libuv/006-uv_async_init-no-memory-leak.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check uv_async has no memory leak
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $m = memory_get_usage();

diff --git a/tests/libuv/100-uv_async.phpt b/tests/libuv/100-uv_async.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check for uv_async
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $loop = uv_default_loop();

diff --git a/tests/libuv/100-uv_check.phpt b/tests/libuv/100-uv_check.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check for uv_check
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $loop = uv_default_loop();
@@ -10,7 +12,7 @@ $idle = uv_idle_init();
 $i = 0;
 uv_idle_start($idle, function($stat) use (&$i, $idle, $loop){
     $i++;
-    
+
     if ($i > 3) {
         uv_idle_stop($idle);
     }

diff --git a/tests/libuv/100-uv_stop.phpt b/tests/libuv/100-uv_stop.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test uv_stop ends loop execution
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $loop = uv_default_loop();
@@ -23,4 +25,4 @@ count: 0
 count: 1
 count: 2
 count: 3
-finished
+finished
diff --git a/tests/libuv/100-uv_timer.phpt b/tests/libuv/100-uv_timer.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check for uv_timer_init and uv_timer_start
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $loop = uv_default_loop();
@@ -9,7 +11,7 @@ $i = 0;
 uv_timer_start($timer, 10, 10, function($timer) use (&$i) {
     echo "count: {$i}" . PHP_EOL;
     $i++;
-    
+
     if ($i > 3) {
         uv_timer_stop($timer);
         uv_unref($timer);

diff --git a/tests/libuv/101-uv-idle.phpt b/tests/libuv/101-uv-idle.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check for uv_idle_init and uv_idle_start
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $loop = uv_default_loop();
@@ -11,7 +13,7 @@ uv_idle_start($idle, function($stat)
 
     echo "count: {$i}" . PHP_EOL;
     $i++;
-    
+
     if ($i > 3) {
         uv_idle_stop($idle);
     }

diff --git a/tests/libuv/800-broken-uv_spawn-issue-79.phpt b/tests/libuv/800-broken-uv_spawn-issue-79.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bad uv_spawn must not segfault (issue #79)
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $rt = uv_spawn(

diff --git a/tests/libuv/800-uv_stdio_new-issue59.phpt b/tests/libuv/800-uv_stdio_new-issue59.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test uv_stdio_new doesn't cause segfault #56
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 

diff --git a/tests/libuv/999-uv_cwd.phpt b/tests/libuv/999-uv_cwd.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check for uv_cwd
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $cwd = uv_cwd();
@@ -13,4 +15,4 @@ if ($cwd == $expected) {
 
 }
 --EXPECT--
-OK
+OK
diff --git a/tests/libuv/999-uv_exepath.phpt b/tests/libuv/999-uv_exepath.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check for uv_exepath
+--SKIPIF--
+<?php if (!extension_loaded("uv")) print "skip"; ?>
 --FILE--
 <?php
 $path = uv_exepath();