Fix Travis config to test against legacy PHP 5.3 again

clue · clue · commit acefd6cf45b1 · 2018-05-06T11:11:47.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,6 @@ matrix:
   include:
     - php: 5.3
       dist: precise
-  include:
     - os: osx
       language: generic
       php: 7.0 # just to look right on travis
diff --git a/composer.json b/composer.json
@@ -25,5 +25,10 @@
         "psr-4": {
             "React\\Tests\\Socket\\": "tests"
         }
+    },
+    "config": {
+        "platform": {
+            "php": "5.3.29"
+        }
     }
 }
diff --git a/src/TcpConnector.php b/src/TcpConnector.php
@@ -116,6 +116,13 @@ private function waitForStreamOnce($stream)
             $loop->removeWriteStream($stream);
             fclose($stream);
 
+            // @codeCoverageIgnoreStart
+            // legacy PHP 5.3 sometimes requires a second close call (see tests)
+            if (PHP_VERSION_ID < 50400 && is_resource($stream)) {
+                fclose($stream);
+            }
+            // @codeCoverageIgnoreEnd
+
             $resolve = $reject = $progress = null;
             throw new RuntimeException('Cancelled while waiting for TCP/IP connection to be established');
         });
diff --git a/tests/TcpConnectorTest.php b/tests/TcpConnectorTest.php
@@ -221,6 +221,7 @@ public function cancellingConnectionShouldRemoveResourceFromLoopAndCloseResource
         $connector = new TcpConnector($loop);
 
         $server = new TcpServer(0, $loop);
+        $server->on('connection', $this->expectCallableNever());
 
         $loop->expects($this->once())->method('addWriteStream');
         $promise = $connector->connect($server->getAddress());
@@ -234,7 +235,11 @@ public function cancellingConnectionShouldRemoveResourceFromLoopAndCloseResource
         }));
         $promise->cancel();
 
+        // ensure that this was a valid resource during the removeWriteStream() call
         $this->assertTrue($valid);
+
+        // ensure that this resource should now be closed after the cancel() call
+        $this->assertInternalType('resource', $resource);
         $this->assertFalse(is_resource($resource));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,10 @@`
`25`	`25`	`"psr-4": {`
`26`	`26`	`"React\\Tests\\Socket\\": "tests"`
`27`	`27`	`}`
	`28`	`+ },`
	`29`	`+ "config": {`
	`30`	`+ "platform": {`
	`31`	`+ "php": "5.3.29"`
	`32`	`+ }`
`28`	`33`	`}`
`29`	`34`	`}`