archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

Browse source
This commit is contained in:
Xinchen Hui 2015-04-02 09:06:38 +08:00
commit 3645a80b38
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/tests/bug43201.phpt
View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Bug #43201 (Crash on using unitialized vals and __get/__set) Bug #43201 (Crash on using uninitialized vals and __get/__set)
--FILE-- --FILE--
<?php <?php
class Foo { class Foo {

2
ext/mysqli/tests/mysqli_fetch_field_flags.phpt
View file

@ -199,7 +199,6 @@ mysqli_close($link);
if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
printf("[008] %s [%d] %s\n", $column_def, printf("[008] %s [%d] %s\n", $column_def,
mysqli_errno($link), mysqli_error($link)); mysqli_errno($link), mysqli_error($link));
continue;
} }
$column_def = array('col1 CHAR(1)', 'col2 CHAR(2)','INDEX idx_col1_col2(col1, col2)'); $column_def = array('col1 CHAR(1)', 'col2 CHAR(2)','INDEX idx_col1_col2(col1, col2)');
@ -220,7 +219,6 @@ mysqli_close($link);
while ($field = mysqli_fetch_field($res)) { while ($field = mysqli_fetch_field($res)) {
if (!isset($expected_flags[$field->name])) { if (!isset($expected_flags[$field->name])) {
printf("[010] Found unexpected field '%s'\n", $field->name); printf("[010] Found unexpected field '%s'\n", $field->name);
continue;
} }
list($missing_flags, $unexpected_flags, $flags_found) = checkFlags($field->flags, $expected_flags[$field->name], $flags); list($missing_flags, $unexpected_flags, $flags_found) = checkFlags($field->flags, $expected_flags[$field->name], $flags);
if ($unexpected_flags) if ($unexpected_flags)

8
ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
View file

@ -85,10 +85,12 @@ MySQLPDOTest::skip();
} catch (PDOException $e) { } catch (PDOException $e) {
printf("[001] %s, [%s] %s\n", printf("[001] %s, [%s] %s [%s] %s\n",
$e->getMessage(), $e->getMessage(),
(is_object($db)) ? $db->errorCode() : 'n/a', (is_object($db1)) ? $db1->errorCode() : 'n/a',
(is_object($db)) ? implode(' ', $db->errorInfo()) : 'n/a'); (is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a',
(is_object($db2)) ? $db2->errorCode() : 'n/a',
(is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a');
} }
print "done!"; print "done!";