Merge branch '2.0'

* 2.0:
  Make paths to runkit_import() absolute due to lack of include path.
This commit is contained in:
Andreas Fischer 2015-08-18 00:19:44 -04:00
commit 179be1e518

View File

@ -82,7 +82,7 @@ abstract class PhpseclibTestCase extends PHPUnit_Framework_TestCase
} }
/** /**
* @param string $filename * @param string $filename Filename relative to library directory.
* *
* @return null * @return null
*/ */
@ -90,7 +90,7 @@ abstract class PhpseclibTestCase extends PHPUnit_Framework_TestCase
{ {
if (function_exists('runkit_import')) { if (function_exists('runkit_import')) {
$result = runkit_import( $result = runkit_import(
$filename, sprintf('%s/../phpseclib/%s', __DIR__, $filename),
RUNKIT_IMPORT_FUNCTIONS | RUNKIT_IMPORT_FUNCTIONS |
RUNKIT_IMPORT_CLASS_METHODS | RUNKIT_IMPORT_CLASS_METHODS |
RUNKIT_IMPORT_OVERRIDE RUNKIT_IMPORT_OVERRIDE