Skip to content

Commit e30b76b

Browse files
committed
add type hint/updates for code coverage
1 parent c6763ff commit e30b76b

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

lib/Database.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ private function __wakeup() {}
2828
* @param mixed $setting - SQL connection parameters
2929
* @param mixed $tag - Store the instance for later use
3030
*/
31-
public static function initialize(string $vendor = null, $setting = null, string $tag = null)
31+
public static function initialize(string $vendor = null, array $setting = null, string $tag = null)
3232
{
3333
if (isset(self::$instances[$vendor]))
3434
return \setInstance(self::$instances[$vendor]) ? self::$instances[$vendor] : false;

lib/ezFunctions.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
global $ezInstance;
1111

1212
if (!function_exists('ezFunctions')) {
13-
function database(string $sqlDriver = null, $connectionSetting = null, string $instanceTag = null)
13+
function database(string $sqlDriver = null, array $connectionSetting = null, string $instanceTag = null)
1414
{
1515
return Database::initialize($sqlDriver, $connectionSetting, $instanceTag);
1616
}
@@ -20,27 +20,27 @@ function tagInstance(string $getTag = null)
2020
return \database($getTag);
2121
}
2222

23-
function mysqlInstance($databaseSetting = null, $instanceTag = null)
23+
function mysqlInstance(array $databaseSetting = null, string $instanceTag = null)
2424
{
2525
return \database(\MYSQLI, $databaseSetting, $instanceTag);
2626
}
2727

28-
function pgsqlInstance($databaseSetting = null, $instanceTag = null)
28+
function pgsqlInstance(array $databaseSetting = null, string $instanceTag = null)
2929
{
3030
return \database(\PGSQL, $databaseSetting, $instanceTag);
3131
}
3232

33-
function mssqlInstance($databaseSetting = null, $instanceTag = null)
33+
function mssqlInstance(array $databaseSetting = null, string $instanceTag = null)
3434
{
3535
return \database(\MSSQL, $databaseSetting, $instanceTag);
3636
}
3737

38-
function pdoInstance($databaseSetting = null, $instanceTag = null)
38+
function pdoInstance(array $databaseSetting = null, string $instanceTag = null)
3939
{
4040
return \database(\Pdo, $databaseSetting, $instanceTag);
4141
}
4242

43-
function sqliteInstance($databaseSetting = null, $instanceTag = null)
43+
function sqliteInstance(array $databaseSetting = null, string $instanceTag = null)
4444
{
4545
return \database(\SQLITE3, $databaseSetting, $instanceTag);
4646
}

tests/DatabaseTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class DatabaseTest extends EZTestCase
1717
* @covers ezsql\Database::Initialize
1818
* @covers ezsql\Database::benchmark
1919
* @covers \setInstance
20+
* @covers \tagInstance
2021
*/
2122
public function testInitialize()
2223
{
@@ -26,13 +27,14 @@ public function testInitialize()
2627
);
2728
}
2829

29-
$mysqli = Database::initialize(MYSQLI, [self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME]);
30+
$mysqli = Database::initialize(MYSQLI, [self::TEST_DB_USER, self::TEST_DB_PASSWORD, self::TEST_DB_NAME], MYSQLI);
3031
$this->assertFalse($mysqli instanceof ConfigInterface);
3132
$this->assertTrue($mysqli->settings() instanceof ConfigInterface);
3233
$this->assertTrue($mysqli instanceof ez_mysqli);
3334
$this->assertTrue($mysqli->getShow_Errors());
3435
$benchmark = Database::benchmark();
3536
$this->assertNotNull($benchmark['start']);
37+
$this->assertSame($mysqli, \tagInstance(MYSQLI));
3638
}
3739

3840
/**

0 commit comments

Comments
 (0)