diff options
author | Xinchen Hui <laruence@php.net> | 2015-02-09 11:32:53 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2015-02-09 11:32:53 +0800 |
commit | 2a4ed626ca0307e37d82271de0c0c79efffad6b2 (patch) | |
tree | 016a06e372c7e8fc0484448b5c9a6c9a5c92caa0 | |
parent | e9f99e3d7157c8dbe61efe96ed94d90437893769 (diff) | |
parent | 3d1ec33f96de25abdcc5bb239e86e98ac278f955 (diff) | |
download | php-git-2a4ed626ca0307e37d82271de0c0c79efffad6b2.tar.gz |
Merge branch 'PHP-5.6'
-rw-r--r-- | Zend/tests/bug67436/bug67436.phpt | 2 | ||||
-rw-r--r-- | Zend/tests/bug67436/bug67436_nohandler.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/tests/bug67436/bug67436.phpt b/Zend/tests/bug67436/bug67436.phpt index 49b8b491d2..c8bfb50d10 100644 --- a/Zend/tests/bug67436/bug67436.phpt +++ b/Zend/tests/bug67436/bug67436.phpt @@ -9,7 +9,7 @@ error_reporting= spl_autoload_register(function($classname) { if (in_array($classname, array('a','b','c'))) { - require_once ($classname . '.php'); + require_once __DIR__ . "/{$classname}.php"; } }); diff --git a/Zend/tests/bug67436/bug67436_nohandler.phpt b/Zend/tests/bug67436/bug67436_nohandler.phpt index f1760c6462..21ce8e6122 100644 --- a/Zend/tests/bug67436/bug67436_nohandler.phpt +++ b/Zend/tests/bug67436/bug67436_nohandler.phpt @@ -9,7 +9,7 @@ error_reporting=-1 spl_autoload_register(function($classname) { if (in_array($classname, array('a','b','c'))) { - require_once ($classname . '.php'); + require_once __DIR__ . "/{$classname}.php"; } }); |