diff --git a/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc b/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc index bca30945..7384f2a5 100644 --- a/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc +++ b/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc @@ -174,7 +174,6 @@ class ColumnMeta } else { $this->encType = $encType; } - $this->encType = $encType; $this->forceEncrypt = $forceEncrypt; } /** diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt index 9d01b691..505d7296 100644 --- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt +++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt @@ -7,7 +7,7 @@ Connect using a custom keystore provider with some required inputs missing require("MsSetup.inc"); require_once("MsCommon_mid-refactor.inc"); - function connect( $connectionInfo ) + function kspConnect( $connectionInfo ) { global $server, $uid, $pwd; @@ -30,46 +30,46 @@ Connect using a custom keystore provider with some required inputs missing echo("Connecting... with column encryption\n"); $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; - connect( $connectionInfo ); + kspConnect( $connectionInfo ); echo("\nConnecting... with an invalid input to CEKeystoreProvider\n"); $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo .= "CEKeystoreName = 1; "; $connectionInfo .= "CEKeystoreProvider = $ksp_path; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; "; - connect( $connectionInfo ); + kspConnect( $connectionInfo ); echo("\nConnecting... with an empty path\n"); $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo .= "CEKeystoreName = $ksp_name; "; $connectionInfo .= "CEKeystoreProvider = ; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; "; - connect( $connectionInfo ); + kspConnect( $connectionInfo ); echo("\nConnecting... without a path\n"); $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo .= "CEKeystoreName = $ksp_name; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key;"; - connect( $connectionInfo ); + kspConnect( $connectionInfo ); echo("\nConnecting... without a name\n"); $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo .= "CEKeystoreProvider = $ksp_path; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; "; - connect( $connectionInfo ); + kspConnect( $connectionInfo ); echo("\nConnecting... without a key\n"); $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo .= "CEKeystoreProvider = $ksp_path; "; $connectionInfo .= "CEKeystoreName = $ksp_name; "; - connect( $connectionInfo ); + kspConnect( $connectionInfo ); echo("\nConnecting... with all required inputs\n"); $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo .= "CEKeystoreProvider = $ksp_path; "; $connectionInfo .= "CEKeystoreName = $ksp_name; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; "; - connect( $connectionInfo ); + kspConnect( $connectionInfo ); echo "Done\n"; ?>