Split the methods in TestUtil more and improve naming

tests/Doctrine/Tests/TestUtil.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests;
 
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
 
 /**
@@ -32,13 +33,47 @@ class TestUtil
      * 1) Each invocation of this method returns a NEW database connection.
      * 2) The database is dropped and recreated to ensure it's clean.
      *
-     * @return \Doctrine\DBAL\Connection The database connection instance.
+     * @return Connection The database connection instance.
      */
     public static function getConnection()
     {
+        $conn = DriverManager::getConnection(self::getConnectionParams());
+
+        self::addDbEventSubscribers($conn);
+
+        return $conn;
+    }
+
+    private static function getConnectionParams() {
         if (self::hasRequiredConnectionParams()) {
-            $realDbParams = self::getConnectionParams();
-            $tmpDbParams = self::getTmpConnectionParams();
+            return self::getSpecifiedConnectionParams();
+        }
+
+        return self::getFallbackConnectionParams();
+    }
+
+    private static function hasRequiredConnectionParams()
+    {
+        return isset(
+            $GLOBALS['db_type'],
+            $GLOBALS['db_username'],
+            $GLOBALS['db_password'],
+            $GLOBALS['db_host'],
+            $GLOBALS['db_name'],
+            $GLOBALS['db_port']
+        )
+        && isset(
+            $GLOBALS['tmpdb_type'],
+            $GLOBALS['tmpdb_username'],
+            $GLOBALS['tmpdb_password'],
+            $GLOBALS['tmpdb_host'],
+            $GLOBALS['tmpdb_port']
+        );
+    }
+
+    private static function getSpecifiedConnectionParams() {
+        $realDbParams = self::getParamsForMainConnection();
+        $tmpDbParams = self::getParamsForTemporaryConnection();
 
         $realConn = DriverManager::getConnection($realDbParams);
 
@@ -65,19 +100,24 @@ class TestUtil
             }
         }
 
-            $conn = DriverManager::getConnection($realDbParams, null, null);
-        } else {
+        return $realDbParams;
+    }
+
+    private static function getFallbackConnectionParams() {
         $params = array(
             'driver' => 'pdo_sqlite',
             'memory' => true
         );
+
         if (isset($GLOBALS['db_path'])) {
             $params['path'] = $GLOBALS['db_path'];
             unlink($GLOBALS['db_path']);
         }
-            $conn = DriverManager::getConnection($params);
+
+        return $params;
     }
 
+    private static function addDbEventSubscribers(Connection $conn) {
         if (isset($GLOBALS['db_event_subscribers'])) {
             $evm = $conn->getEventManager();
             foreach (explode(",", $GLOBALS['db_event_subscribers']) as $subscriberClass) {
@@ -85,30 +125,9 @@ class TestUtil
                 $evm->addEventSubscriber($subscriberInstance);
             }
         }
-
-        return $conn;
-    }
-
-    private static function hasRequiredConnectionParams()
-    {
-        return isset(
-            $GLOBALS['db_type'],
-            $GLOBALS['db_username'],
-            $GLOBALS['db_password'],
-            $GLOBALS['db_host'],
-            $GLOBALS['db_name'],
-            $GLOBALS['db_port']
-        )
-        && isset(
-            $GLOBALS['tmpdb_type'],
-            $GLOBALS['tmpdb_username'],
-            $GLOBALS['tmpdb_password'],
-            $GLOBALS['tmpdb_host'],
-            $GLOBALS['tmpdb_port']
-        );
     }
 
-    private static function getTmpConnectionParams()
+    private static function getParamsForTemporaryConnection()
     {
         $connectionParams = array(
             'driver' => $GLOBALS['tmpdb_type'],
@@ -134,7 +153,7 @@ class TestUtil
         return $connectionParams;
     }
 
-    private static function getConnectionParams()
+    private static function getParamsForMainConnection()
     {
         $connectionParams = array(
             'driver' => $GLOBALS['db_type'],
@@ -157,10 +176,10 @@ class TestUtil
     }
 
     /**
-     * @return \Doctrine\DBAL\Connection
+     * @return Connection
      */
     public static function getTempConnection()
     {
-        return DriverManager::getConnection(self::getTmpConnectionParams());
+        return DriverManager::getConnection(self::getParamsForTemporaryConnection());
     }
 }