Merge remote-tracking branch 'bantu/bootstrap'

This commit is contained in:
terrafrost 2016-04-09 13:04:34 -05:00
commit ef04c870e9
3 changed files with 31 additions and 11 deletions

View File

@ -67,6 +67,9 @@
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations." "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
}, },
"autoload": { "autoload": {
"files": [
"phpseclib/bootstrap.php"
],
"psr-4": { "psr-4": {
"phpseclib\\": "phpseclib/" "phpseclib\\": "phpseclib/"
} }

23
composer.lock generated
View File

@ -4,21 +4,21 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "5f98ee3f3d86f0fac9934fec63c6cd03", "hash": "deb73cf7e6004dbc2550a38c4082df2d",
"content-hash": "39f9dd8d2c209ff69eebbb83e367257e", "content-hash": "39f9dd8d2c209ff69eebbb83e367257e",
"packages": [ "packages": [
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
"version": "v2.0.1", "version": "v2.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paragonie/random_compat.git", "url": "https://github.com/paragonie/random_compat.git",
"reference": "76e90f747b769b347fe584e8015a014549107d35" "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/76e90f747b769b347fe584e8015a014549107d35", "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
"reference": "76e90f747b769b347fe584e8015a014549107d35", "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -53,7 +53,7 @@
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2016-03-18 20:36:13" "time": "2016-04-03 06:00:07"
} }
], ],
"packages-dev": [ "packages-dev": [
@ -1253,19 +1253,20 @@
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
"version": "2.5.1", "version": "2.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8" "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6731851d6aaf1d0d6c58feff1065227b7fda3ba8", "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1bcdf03b068a530ac1962ce671dead356eeba43b",
"reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8", "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-simplexml": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"php": ">=5.1.2" "php": ">=5.1.2"
@ -1326,7 +1327,7 @@
"phpcs", "phpcs",
"standards" "standards"
], ],
"time": "2016-01-19 23:39:10" "time": "2016-04-03 22:58:34"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",

16
phpseclib/bootstrap.php Normal file
View File

@ -0,0 +1,16 @@
<?php
/**
* Bootstrapping File for phpseclib
*
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
if (extension_loaded('mbstring')) {
// 2 - MB_OVERLOAD_STRING
if (ini_get('mbstring.func_overload') & 2) {
throw new \UnexpectedValueException(
'Overloading of string functions using mbstring.func_overload ' .
'is not supported by phpseclib.'
);
}
}