Merge branch 'master-travis-exp'

composer.json

@@ -57,7 +57,7 @@
     },
     "require-dev": {
         "phing/phing": "~2.7",
-        "phpunit/phpunit": "~4.0",
+        "phpunit/phpunit": "~6.0",
         "sami/sami": "~2.0",
         "squizlabs/php_codesniffer": "~2.0"
     },

phpseclib/Crypt/Random.php

@@ -46,6 +46,10 @@ abstract class Random
      */
     public static function string($length)
     {
+        if (!$length) {
+            return '';
+        }
+
         try {
             return \random_bytes($length);
         } catch (\Exception $e) {
@@ -192,7 +196,6 @@ abstract class Random
      * If a class has a private __sleep() it'll emit a warning
      * @return mixed
      * @param mixed $arr
-     * @access public
      */
     private static function safe_serialize(&$arr)
     {

tests/PHPUnit_Framework_TestCase.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2017 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+use PHPUnit\Framework\TestCase;
+
+abstract class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase
+{
+    public function getMock($className, $methodName)
+    {
+        return $this->getMockBuilder($className)->setMethods($methodName)->getMock();
+    }
+}

tests/PhpseclibTestCase.php

@@ -5,6 +5,8 @@
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
+include(__DIR__ . '/PHPUnit_Framework_TestCase.php');
+
 abstract class PhpseclibTestCase extends PHPUnit_Framework_TestCase
 {
     protected $tempFilesToUnlinkOnTearDown = array();

travis/composer.legacy.json

@@ -0,0 +1,78 @@
+{
+    "name": "phpseclib/phpseclib",
+    "type": "library",
+    "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
+    "keywords": [
+        "security",
+        "crypto",
+        "cryptography",
+        "encryption",
+        "signature",
+        "signing",
+        "rsa",
+        "aes",
+        "blowfish",
+        "twofish",
+        "ssh",
+        "sftp",
+        "x509",
+        "x.509",
+        "asn1",
+        "asn.1",
+        "BigInteger"
+        ],
+    "homepage": "http://phpseclib.sourceforge.net",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Jim Wigginton",
+            "email": "terrafrost@php.net",
+            "role": "Lead Developer"
+        },
+        {
+            "name": "Patrick Monnerat",
+            "email": "pm@datasphere.ch",
+            "role": "Developer"
+        },
+        {
+            "name": "Andreas Fischer",
+            "email": "bantu@phpbb.com",
+            "role": "Developer"
+        },
+        {
+            "name": "Hans-Jürgen Petrich",
+            "email": "petrich@tronic-media.com",
+            "role": "Developer"
+        },
+        {
+            "name": "Graham Campbell",
+            "email": "graham@alt-three.com",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "paragonie/constant_time_encoding": "^1",
+        "paragonie/random_compat": "^1.4|^2.0",
+        "php": ">=5.6.1"
+    },
+    "require-dev": {
+        "phing/phing": "~2.7",
+        "phpunit/phpunit": "~4.0",
+        "sami/sami": "~2.0",
+        "squizlabs/php_codesniffer": "~2.0"
+    },
+    "suggest": {
+        "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
+        "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
+        "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
+        "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
+    },
+    "autoload": {
+        "files": [
+            "phpseclib/bootstrap.php"
+        ],
+        "psr-4": {
+            "phpseclib\\": "phpseclib/"
+        }
+    }
+}

travis/setup-composer.sh

@@ -1,3 +1,9 @@
 #!/bin/sh
+if [ `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '<');"` = "1" ]
+then
+cp travis/composer.legacy.json composer.json
+cp travis/composer.legacy.lock composer.lock
+sed -i "s/include(__DIR__ . '\/PHPUnit_Framework_TestCase.php');//g" tests/PhpseclibTestCase.php
+fi
 composer self-update --no-interaction
 composer install --no-interaction