Simplify Travis CI test matrix for Mac OS X setup

Author: clue

.travis.yml

@@ -17,30 +17,19 @@ matrix:
     - php: 7.4
     - php: hhvm-3.18
       install: composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
-    - os: osx
+    - name: Mac OS X
+      os: osx
       language: generic
-      php: 7.0 # just to look right on travis
-      env:
-        - PACKAGE: php70
+      before_install:
+        - curl -s http://getcomposer.org/installer | php
+        - mv composer.phar /usr/local/bin/composer
   allow_failures:
     - php: hhvm-3.18
     - os: osx
 
 sudo: false
 
 install:
-  # OSX install inspired by https://github.com/kiler129/TravisCI-OSX-PHP
-  - |
-    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then 
-      brew tap homebrew/homebrew-php 
-      echo "Installing PHP ..."
-      brew install "${PACKAGE}"
-      brew install "${PACKAGE}"-xdebug
-      brew link "${PACKAGE}"
-      echo "Installing composer ..."
-      curl -s http://getcomposer.org/installer | php
-      mv composer.phar /usr/local/bin/composer
-    fi
   - composer install --no-interaction
 
 script:

tests/FunctionalConnectorTest.php

@@ -22,17 +22,16 @@ public function connectionToTcpServerShouldSucceedWithLocalhost()
         $loop = Factory::create();
 
         $server = new TcpServer(9998, $loop);
-        $server->on('connection', $this->expectCallableOnce());
-        $server->on('connection', array($server, 'close'));
 
         $connector = new Connector($loop);
 
         $connection = Block\await($connector->connect('localhost:9998'), $loop, self::TIMEOUT);
 
+        $server->close();
+
         $this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);
 
         $connection->close();
-        $server->close();
     }
 
     /**

tests/TcpConnectorTest.php

@@ -51,8 +51,6 @@ public function connectionToTcpServerShouldSucceed()
         $loop = Factory::create();
 
         $server = new TcpServer(9999, $loop);
-        $server->on('connection', $this->expectCallableOnce());
-        $server->on('connection', array($server, 'close'));
 
         $connector = new TcpConnector($loop);
 
@@ -61,6 +59,7 @@ public function connectionToTcpServerShouldSucceed()
         $this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);
 
         $connection->close();
+        $server->close();
     }
 
     /** @test */
@@ -69,7 +68,6 @@ public function connectionToTcpServerShouldSucceedWithRemoteAdressSameAsTarget()
         $loop = Factory::create();
 
         $server = new TcpServer(9999, $loop);
-        $server->on('connection', array($server, 'close'));
 
         $connector = new TcpConnector($loop);
 
@@ -79,6 +77,7 @@ public function connectionToTcpServerShouldSucceedWithRemoteAdressSameAsTarget()
         $this->assertEquals('tcp://127.0.0.1:9999', $connection->getRemoteAddress());
 
         $connection->close();
+        $server->close();
     }
 
     /** @test */
@@ -87,7 +86,6 @@ public function connectionToTcpServerShouldSucceedWithLocalAdressOnLocalhost()
         $loop = Factory::create();
 
         $server = new TcpServer(9999, $loop);
-        $server->on('connection', array($server, 'close'));
 
         $connector = new TcpConnector($loop);
 
@@ -98,6 +96,7 @@ public function connectionToTcpServerShouldSucceedWithLocalAdressOnLocalhost()
         $this->assertNotEquals('tcp://127.0.0.1:9999', $connection->getLocalAddress());
 
         $connection->close();
+        $server->close();
     }
 
     /** @test */
@@ -106,13 +105,13 @@ public function connectionToTcpServerShouldSucceedWithNullAddressesAfterConnecti
         $loop = Factory::create();
 
         $server = new TcpServer(9999, $loop);
-        $server->on('connection', array($server, 'close'));
 
         $connector = new TcpConnector($loop);
 
         $connection = Block\await($connector->connect('127.0.0.1:9999'), $loop, self::TIMEOUT);
         /* @var $connection ConnectionInterface */
 
+        $server->close();
         $connection->close();
 
         $this->assertNull($connection->getRemoteAddress());
@@ -165,9 +164,6 @@ public function connectionToIp6TcpServerShouldSucceed()
             $this->markTestSkipped('Unable to start IPv6 server socket (IPv6 not supported on this system?)');
         }
 
-        $server->on('connection', $this->expectCallableOnce());
-        $server->on('connection', array($server, 'close'));
-
         $connector = new TcpConnector($loop);
 
         $connection = Block\await($connector->connect('[::1]:9999'), $loop, self::TIMEOUT);
@@ -179,6 +175,7 @@ public function connectionToIp6TcpServerShouldSucceed()
         $this->assertNotEquals('tcp://[::1]:9999', $connection->getLocalAddress());
 
         $connection->close();
+        $server->close();
     }
 
     /** @test */