Merge branch '1.0-travis-exp' into 2.0-travis-exp

.travis.yml

@@ -6,6 +6,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:

composer.json

@@ -55,7 +55,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/File/X509.php

@@ -2719,7 +2719,9 @@ class X509
                     $value = array_pop($value); // Always strip data type.
                 }
             } elseif (is_object($value) && $value instanceof Element) {
-                $callback = create_function('$x', 'return "\x" . bin2hex($x[0]);');
+                $callback = function ($x) {
+                    return "\x" . bin2hex($x[0]);
+                };
                 $value = strtoupper(preg_replace_callback('#[^\x20-\x7E]#', $callback, $value->element));
             }
             $output.= $desc . '=' . $value;

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,76 @@
+{
+    "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": {
+        "php": ">=5.3.3"
+    },
+    "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