php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1' into PHP-7.2

Browse Source 
* PHP-7.1:
  Fix tests
This commit is contained in:
Anatol Belski
2018-01-04 16:09:51 +01:00
parent fc528afd2b 1448f0912f
commit fc6a990891
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/pdo_pgsql/tests/bug62479.phpt
+3 -2
View File
@@ -37,6 +37,7 @@ $db->exec("DROP USER $user");
?>
--FILE--
<?php
require dirname(__FILE__) . '/config.inc';
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
$pdo = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
@@ -49,7 +50,7 @@ $testQuery = 'SELECT 1 as verification';
// Create temp user with space in password
$sql = sprintf($template, 'my password');
$pdo->query($sql);
$testConn = new PDO($conf['ENV']['PDOTEST_DSN'], $user, "my password");
$testConn = new PDO($config['ENV']['PDOTEST_DSN'], $user, "my password");
$result = $testConn->query($testQuery)->fetch();
$check = $result[0];
var_dump($check);
@@ -61,7 +62,7 @@ $pdo->query($dropUser);
$sql = sprintf($template, "my pass''word");
$pdo->query($sql);
$testConn = new PDO($conf['ENV']['PDOTEST_DSN'], $user, "my pass'word");
$testConn = new PDO($config['ENV']['PDOTEST_DSN'], $user, "my pass'word");
$result = $testConn->query($testQuery)->fetch();
$check = $result[0];
var_dump($check);
ext/pdo_pgsql/tests/bug69362.phpt
+2 -1
View File
@@ -37,6 +37,7 @@ $db->exec("DROP USER $user");
?>
--FILE--
<?php
require dirname(__FILE__) . '/config.inc';
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
$pdo = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
@@ -49,7 +50,7 @@ $testQuery = 'SELECT 1 as verification';
// Create temp user with leading single quote
$sql = sprintf($template, "''mypassword");
$pdo->query($sql);
$testConn = new PDO($conf['ENV']['PDOTEST_DSN'], $user, "'mypassword");
$testConn = new PDO($config['ENV']['PDOTEST_DSN'], $user, "'mypassword");
$result = $testConn->query($testQuery)->fetch();
$check = $result[0];
var_dump($check);