Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.5 - 2016-10-22
+
+- fix issue preventing installation of 1.0.x via Composer (#1048)
+
 ## 1.0.4 - 2016-10-03
 
 - fix E_DEPRECATED errors on PHP 7.0 and 7.1 (#1041)

README.md

@@ -6,7 +6,7 @@ MIT-licensed pure-PHP implementations of an arbitrary-precision integer
 arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
 AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 
-* [Download (1.0.4)](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.4.zip/download)
+* [Download (1.0.5)](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.5.zip/download)
 * [Browse Git](https://github.com/phpseclib/phpseclib)
 * [Code Coverage Report](http://phpseclib.bantux.org/code_coverage/1.0/latest/)
 

composer.json

@@ -74,8 +74,8 @@
             "System": "phpseclib/"
         },
         "files": [
-            "phpseclib/Crypt/Random.php",
-            "phpseclib/bootstrap.php"
+            "phpseclib/bootstrap.php",
+            "phpseclib/Crypt/Random.php"
         ]
     }
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ef3ada42c17aee960068e0a98b4de602",
+    "hash": "24648c5326ee237cd79bb0d311b16cb8",
     "content-hash": "cec0167a357df0f3da215133e2424a6c",
     "packages": [],
     "packages-dev": [

tests/bootstrap.php

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