summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-03-08 17:05:51 -0700
committerStanislav Malyshev <stas@php.net>2015-03-08 17:05:51 -0700
commitb0d1e236464a5775791b0136f37b119267eeb317 (patch)
tree8624fa2e7e3269c5b95c612b30b306fd00d3b07a
parent43da0d302bf50a62296759869b4102e5aafcb6c3 (diff)
parentd7931f8f66b2b718e7d06893161341b15eb45a5a (diff)
downloadphp-git-b0d1e236464a5775791b0136f37b119267eeb317.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Add missing value for error_reporting directive
-rw-r--r--Zend/tests/bug67436/bug67436.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/tests/bug67436/bug67436.phpt b/Zend/tests/bug67436/bug67436.phpt
index c8bfb50d10..8a6b3f8027 100644
--- a/Zend/tests/bug67436/bug67436.phpt
+++ b/Zend/tests/bug67436/bug67436.phpt
@@ -2,7 +2,7 @@
bug67436: Autoloader isn't called if user defined error handler is present
--INI--
-error_reporting=
+error_reporting=-1
--FILE--
<?php