Merge pull request #698 from deeky666/support-hhvm-mysqli-driver

[DBAL-1014] Support HHVM mysqli driver

.travis.yml

@@ -45,8 +45,6 @@ matrix:
         env: DB=sqlite
       - php: hhvm
         env: DB=mysql
-      - php: hhvm
-        env: DB=mysqli
       - php: hhvm-nightly
   exclude:
       - php: hhvm

lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php

@@ -50,6 +50,12 @@ class MysqliConnection implements Connection, PingableConnection, ServerInfoAwar
     public function __construct(array $params, $username, $password, array $driverOptions = array())
     {
         $port = isset($params['port']) ? $params['port'] : ini_get('mysqli.default_port');
+
+        // Fallback to default MySQL port if not given.
+        if ( ! $port) {
+            $port = 3306;
+        }
+
         $socket = isset($params['unix_socket']) ? $params['unix_socket'] : ini_get('mysqli.default_socket');
         $dbname = isset($params['dbname']) ? $params['dbname'] : null;
 

tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL421Test.php

@@ -39,6 +39,8 @@ class DBAL421Test extends \Doctrine\Tests\DbalFunctionalTestCase
             $this->assertNotContains($guid, $guids, "Duplicate GUID detected");
             $guids[] = $guid;
         }
+
+        $statement->closeCursor();
     }
 
     private function getSelectGuidSql()