dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Updated function signatures and error messages (#1163)

Browse source
This commit is contained in:
Jenny Tam 2020-07-22 09:52:16 -07:00 committed by GitHub
parent 550a7104a4
commit bba1f18f0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/functional/pdo_sqlsrv/PDO94_Extend1.phpt
View file

@ -58,7 +58,7 @@ class ExPDO extends PDO
$this->test2 = 22; $this->test2 = 22;
} }
function query($sql) function query($sql, $fetch_style = PDO::FETCH_BOTH,...$fetch_mode_args)
{ {
echo __METHOD__ . "()\n"; echo __METHOD__ . "()\n";
$stmt = parent::prepare($sql, array(PDO::ATTR_STATEMENT_CLASS=>array('ExPDOStatement'))); $stmt = parent::prepare($sql, array(PDO::ATTR_STATEMENT_CLASS=>array('ExPDOStatement')));

2
test/functional/pdo_sqlsrv/PDO95_Extend2.phpt
View file

@ -55,7 +55,7 @@ class ExPDO extends PDO
return (call_user_func_array(array($this, 'parent::exec'), $args)); return (call_user_func_array(array($this, 'parent::exec'), $args));
} }
public function query(string $statement) public function query($statement, $fetch_style = PDO::FETCH_BOTH,...$fetch_mode_args)
{ {
$this->protocol(); $this->protocol();
$args = func_get_args(); $args = func_get_args();

2
test/functional/pdo_sqlsrv/PDO96_Extend3.phpt
View file

@ -61,7 +61,7 @@ class ExPDO extends PDO
echo __METHOD__ . "()\n"; echo __METHOD__ . "()\n";
} }
function query($sql) function query($sql, $fetch_style = PDO::FETCH_BOTH,...$fetch_mode_args)
{ {
echo __METHOD__ . "()\n"; echo __METHOD__ . "()\n";
$stmt = $this->prepare($sql, array(PDO::ATTR_STATEMENT_CLASS=>array('ExPDOStatement', array($this)))); $stmt = $this->prepare($sql, array(PDO::ATTR_STATEMENT_CLASS=>array('ExPDOStatement', array($this))));

2
test/functional/pdo_sqlsrv/PDO97_Extend4.phpt
View file

@ -66,7 +66,7 @@ class ExPDO extends PDO
echo __METHOD__ . "()\n"; echo __METHOD__ . "()\n";
} }
function query($sql) function query($sql, $fetch_style = PDO::FETCH_BOTH,...$fetch_mode_args)
{ {
echo __METHOD__ . "()\n"; echo __METHOD__ . "()\n";
$stmt = $this->prepare($sql, array(PDO::ATTR_STATEMENT_CLASS=>array('ExPDOStatement', array($this)))); $stmt = $this->prepare($sql, array(PDO::ATTR_STATEMENT_CLASS=>array('ExPDOStatement', array($this))));

2
test/functional/pdo_sqlsrv/PDO98_Extend5.phpt
View file

@ -69,7 +69,7 @@ class ExPDO extends PDO
echo __METHOD__ . "()\n"; echo __METHOD__ . "()\n";
} }
function query($sql) function query($sql, $fetch_style = PDO::FETCH_BOTH,...$fetch_mode_args)
{ {
echo __METHOD__ . "()\n"; echo __METHOD__ . "()\n";
$stmt = parent::query($sql); $stmt = parent::query($sql);

7
test/functional/pdo_sqlsrv/pdostatement_fetchAll.phpt
View file

@ -80,8 +80,11 @@ function fetchAllInvalid($conn, $tbname)
} catch (PDOException $ex) { } catch (PDOException $ex) {
print_r($ex); print_r($ex);
} catch (Error $err) { } catch (Error $err) {
$expected = (PHP_MAJOR_VERSION == 8) ? 'PDO::FETCH_UNKNOWN' : 'FETCH_UNKNOWN'; if (PHP_MAJOR_VERSION == 8) {
$message = "Undefined class constant '$expected'"; $message = "Undefined constant PDO::FETCH_UNKNOWN";
} else {
$message = "Undefined class constant 'FETCH_UNKNOWN'";
}
if ($err->getMessage() !== $message) { if ($err->getMessage() !== $message) {
echo $err->getMessage() . PHP_EOL; echo $err->getMessage() . PHP_EOL;
} }

7
test/functional/pdo_sqlsrv/pdostatement_fetch_style.phpt
View file

@ -82,8 +82,11 @@ function fetchWithStyle($conn, $tbname, $style)
} catch (PDOException $err) { } catch (PDOException $err) {
print_r($err); print_r($err);
} catch (Error $err) { } catch (Error $err) {
$expected = (PHP_MAJOR_VERSION == 8) ? 'PDO::FETCH_UNKNOWN' : 'FETCH_UNKNOWN'; if (PHP_MAJOR_VERSION == 8) {
$message = "Undefined class constant '$expected'"; $message = "Undefined constant PDO::FETCH_UNKNOWN";
} else {
$message = "Undefined class constant 'FETCH_UNKNOWN'";
}
if ($err->getMessage() !== $message) { if ($err->getMessage() !== $message) {
echo $err->getMessage() . PHP_EOL; echo $err->getMessage() . PHP_EOL;
} }

2
test/functional/sqlsrv/sqlsrv_input_param_unknown_encoding.phpt
View file

@ -21,7 +21,7 @@ function warningHandler($errno, $errstr)
function compareMessages($err) function compareMessages($err)
{ {
$exp8x = "Undefined constant 'SQLSRV_ENC_UNKNOWN'"; $exp8x = 'Undefined constant "SQLSRV_ENC_UNKNOWN"';
$exp7x = "Use of undefined constant SQLSRV_ENC_UNKNOWN - assumed 'SQLSRV_ENC_UNKNOWN' (this will throw an Error in a future version of PHP)"; $exp7x = "Use of undefined constant SQLSRV_ENC_UNKNOWN - assumed 'SQLSRV_ENC_UNKNOWN' (this will throw an Error in a future version of PHP)";
$expected = (PHP_MAJOR_VERSION == 8) ? $exp8x : $exp7x; $expected = (PHP_MAJOR_VERSION == 8) ? $exp8x : $exp7x;