Skip to content

Commit 29f1aa2

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: ensure notices are not ignored when tests need them
2 parents 1a5c460 + cf39c3d commit 29f1aa2

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

ext/pgsql/tests/09notice.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ _skip_lc_messages();
1010
?>
1111
--INI--
1212
pgsql.log_notice=1
13-
pgsql.ignore_notices=0
13+
pgsql.ignore_notice=0
1414
--FILE--
1515
<?php
1616
include 'config.inc';

ext/pgsql/tests/80_bug32223.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ end;
1515
' LANGUAGE plpgsql;");
1616
if (!$res) die('skip PLPGSQL not available');
1717
?>
18+
--INI--
19+
pgsql.ignore_notice=0
1820
--FILE--
1921
<?php
2022

ext/pgsql/tests/80_bug32223b.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ end;
1515
' LANGUAGE plpgsql;");
1616
if (!$res) die('skip PLPGSQL not available');
1717
?>
18+
--INI--
19+
pgsql.ignore_notice=0
1820
--FILE--
1921
<?php
2022

0 commit comments

Comments
 (0)