Improve test suite to declare and validate helper variables (PHP 8.1)

reactphp · Feb 4, 2022 · 4f641e8 · 4f641e8
1 parent ae621e4
commit 4f641e8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -4,8 +4,9 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          bootstrap="vendor/autoload.php"
+         cacheResult="false"
          colors="true"
-         cacheResult="false">
+         convertDeprecationsToExceptions="true">
     <testsuites>
         <testsuite name="React test suite">
             <directory>./tests/</directory>

diff --git a/tests/AbstractLoopTest.php b/tests/AbstractLoopTest.php
@@ -12,8 +12,12 @@ abstract class AbstractLoopTest extends TestCase
      */
     protected $loop;
 
+    /** @var float */
     private $tickTimeout;
 
+    /** @var ?string */
+    private $received;
+
     const PHP_DEFAULT_CHUNK_SIZE = 8192;
 
     /**

diff --git a/tests/ExtEventLoopTest.php b/tests/ExtEventLoopTest.php
@@ -6,6 +6,9 @@
 
 class ExtEventLoopTest extends AbstractLoopTest
 {
+    /** @var ?string */
+    private $fifoPath;
+
     public function createLoop($readStreamCompatible = false)
     {
         if ('Linux' === PHP_OS && !extension_loaded('posix')) {
@@ -19,12 +22,23 @@ public function createLoop($readStreamCompatible = false)
         return new ExtEventLoop();
     }
 
+    /**
+     * @after
+     */
+    public function tearDownFile()
+    {
+        if ($this->fifoPath !== null && file_exists($this->fifoPath)) {
+            unlink($this->fifoPath);
+        }
+    }
+
     public function createStream()
     {
         // Use a FIFO on linux to get around lack of support for disk-based file
         // descriptors when using the EPOLL back-end.
         if ('Linux' === PHP_OS) {
             $this->fifoPath = tempnam(sys_get_temp_dir(), 'react-');
+            assert(is_string($this->fifoPath));
 
             unlink($this->fifoPath);
 

diff --git a/tests/ExtLibeventLoopTest.php b/tests/ExtLibeventLoopTest.php
@@ -6,6 +6,7 @@
 
 class ExtLibeventLoopTest extends AbstractLoopTest
 {
+    /** @var ?string */
     private $fifoPath;
 
     public function createLoop()
@@ -26,7 +27,7 @@ public function createLoop()
      */
     public function tearDownFile()
     {
-        if (file_exists($this->fifoPath)) {
+        if ($this->fifoPath !== null && file_exists($this->fifoPath)) {
             unlink($this->fifoPath);
         }
     }
@@ -38,6 +39,7 @@ public function createStream()
         }
 
         $this->fifoPath = tempnam(sys_get_temp_dir(), 'react-');
+        assert(is_string($this->fifoPath));
 
         unlink($this->fifoPath);