diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-09 11:32:32 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-09 11:32:32 +0800 |
| commit | 3d1ec33f96de25abdcc5bb239e86e98ac278f955 (patch) | |
| tree | cbf2dc76e85926387cbc12ad614d410af32c7505 | |
| parent | 979020fcaddaed341c9159e9cac0c30436fa0ea9 (diff) | |
| parent | d078c59ed942a00ec3e6c1f6c43dcefc07eedecb (diff) | |
| download | php-git-3d1ec33f96de25abdcc5bb239e86e98ac278f955.tar.gz | |
Merge branch 'PHP-5.5' into 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"; } }); |