Merge remote-tracking branch 'bantu/1.0-tests-bootstrap-backport' into 1.0

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.0.4 - 2016-10-03
+
+- fix E_DEPRECATED errors on PHP 7.0 and 7.1 (#1041)
+- fix float to int conversions on 32-bit Linux pre-PHP 5.3 (#1038, #1034)
+- SFTP: speed up downloads (#945)
+- SFTP: fix infinite loop when uploading empty file (#995)
+- ASN1: fix possible infinite loop in decode (#1027)
+
 ## 1.0.3 - 2016-08-18
 
 - BigInteger/RSA: don't compare openssl versions > 1.0 (#946)

tests/bootstrap.php

@@ -7,25 +7,13 @@
 
 date_default_timezone_set('UTC');
 
-// Set up include path accordingly. This is especially required because some
+$loader_path = __DIR__ . '/../vendor/autoload.php';
-// class files of phpseclib require() other dependencies.
+if (!file_exists($loader_path)) {
-set_include_path(implode(PATH_SEPARATOR, array(
+    echo "Dependencies must be installed using composer:\n\n";
-    dirname(__FILE__) . '/../phpseclib/',
+    echo "php composer.phar install\n\n";
-    dirname(__FILE__) . '/',
+    echo "See http://getcomposer.org for help with installing composer\n";
-    get_include_path(),
+    exit(1);
-)));
-
-require_once 'Crypt/Random.php';
-
-function phpseclib_autoload($class)
-{
-    $file = str_replace('_', '/', $class) . '.php';
-
-    if (phpseclib_resolve_include_path($file)) {
-        // @codingStandardsIgnoreStart
-        require $file;
-        // @codingStandardsIgnoreEnd
-    }
 }
 
-spl_autoload_register('phpseclib_autoload');
+$loader = include $loader_path;
+$loader->add('', __DIR__);