Remove paragonie/random_compat (not required for PHP 7)
This commit is contained in:
parent
25f3f6f2d2
commit
884a8eb2c4
|
|
@ -29,7 +29,6 @@
|
||||||
"christian-riesen/otp" : "1.4.3",
|
"christian-riesen/otp" : "1.4.3",
|
||||||
"eluceo/ical": "0.10.1",
|
"eluceo/ical": "0.10.1",
|
||||||
"erusev/parsedown" : "^1.7",
|
"erusev/parsedown" : "^1.7",
|
||||||
"paragonie/random_compat": "2.0.11",
|
|
||||||
"pimple/pimple" : "3.2.2",
|
"pimple/pimple" : "3.2.2",
|
||||||
"psr/log": "~1.0",
|
"psr/log": "~1.0",
|
||||||
"swiftmailer/swiftmailer" : "5.4.8",
|
"swiftmailer/swiftmailer" : "5.4.8",
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "1d9c23ea1e814d43033e1a1cf0a7b35a",
|
"content-hash": "954c6e8789e4cb703ce6def8fd20bb1a",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "christian-riesen/base32",
|
"name": "christian-riesen/base32",
|
||||||
|
|
@ -167,16 +167,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "erusev/parsedown",
|
"name": "erusev/parsedown",
|
||||||
"version": "1.7.3",
|
"version": "1.7.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/erusev/parsedown.git",
|
"url": "https://github.com/erusev/parsedown.git",
|
||||||
"reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7"
|
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
|
"url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
|
||||||
"reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
|
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -209,7 +209,7 @@
|
||||||
"markdown",
|
"markdown",
|
||||||
"parser"
|
"parser"
|
||||||
],
|
],
|
||||||
"time": "2019-03-17T18:48:37+00:00"
|
"time": "2019-12-30T22:54:17+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "gregwar/captcha",
|
"name": "gregwar/captcha",
|
||||||
|
|
@ -264,54 +264,6 @@
|
||||||
],
|
],
|
||||||
"time": "2017-12-01T13:59:36+00:00"
|
"time": "2017-12-01T13:59:36+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "paragonie/random_compat",
|
|
||||||
"version": "v2.0.11",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/paragonie/random_compat.git",
|
|
||||||
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
|
|
||||||
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.2.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "4.*|5.*"
|
|
||||||
},
|
|
||||||
"suggest": {
|
|
||||||
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"lib/random.php"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Paragon Initiative Enterprises",
|
|
||||||
"email": "security@paragonie.com",
|
|
||||||
"homepage": "https://paragonie.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
|
|
||||||
"keywords": [
|
|
||||||
"csprng",
|
|
||||||
"pseudorandom",
|
|
||||||
"random"
|
|
||||||
],
|
|
||||||
"time": "2017-09-27T21:40:39+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "pimple/pimple",
|
"name": "pimple/pimple",
|
||||||
"version": "v3.2.2",
|
"version": "v3.2.2",
|
||||||
|
|
@ -751,16 +703,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-mbstring",
|
"name": "symfony/polyfill-mbstring",
|
||||||
"version": "v1.13.1",
|
"version": "v1.17.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||||
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
|
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
|
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
|
||||||
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
|
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -772,7 +724,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.13-dev"
|
"dev-master": "1.17-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
@ -806,7 +758,7 @@
|
||||||
"portable",
|
"portable",
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"time": "2019-11-27T14:18:11+00:00"
|
"time": "2020-05-12T16:47:27+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
|
|
@ -1164,33 +1116,33 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpspec/prophecy",
|
"name": "phpspec/prophecy",
|
||||||
"version": "1.9.0",
|
"version": "v1.10.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phpspec/prophecy.git",
|
"url": "https://github.com/phpspec/prophecy.git",
|
||||||
"reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
|
"reference": "451c3cd1418cf640de218914901e51b064abb093"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
|
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
|
||||||
"reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
|
"reference": "451c3cd1418cf640de218914901e51b064abb093",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"doctrine/instantiator": "^1.0.2",
|
"doctrine/instantiator": "^1.0.2",
|
||||||
"php": "^5.3|^7.0",
|
"php": "^5.3|^7.0",
|
||||||
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
|
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
|
||||||
"sebastian/comparator": "^1.1|^2.0|^3.0",
|
"sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
|
||||||
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
|
"sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpspec/phpspec": "^2.5|^3.2",
|
"phpspec/phpspec": "^2.5 || ^3.2",
|
||||||
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
|
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.8.x-dev"
|
"dev-master": "1.10.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
@ -1223,7 +1175,7 @@
|
||||||
"spy",
|
"spy",
|
||||||
"stub"
|
"stub"
|
||||||
],
|
],
|
||||||
"time": "2019-10-03T11:07:50+00:00"
|
"time": "2020-03-05T15:02:03+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
|
|
@ -1479,16 +1431,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "7.5.18",
|
"version": "7.5.20",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "fcf6c4bfafaadc07785528b06385cce88935474d"
|
"reference": "9467db479d1b0487c99733bb1e7944d32deded2c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fcf6c4bfafaadc07785528b06385cce88935474d",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c",
|
||||||
"reference": "fcf6c4bfafaadc07785528b06385cce88935474d",
|
"reference": "9467db479d1b0487c99733bb1e7944d32deded2c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -1559,7 +1511,7 @@
|
||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2019-12-06T05:14:37+00:00"
|
"time": "2020-01-08T08:45:45+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit-selenium",
|
"name": "phpunit/phpunit-selenium",
|
||||||
|
|
@ -2473,16 +2425,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-ctype",
|
"name": "symfony/polyfill-ctype",
|
||||||
"version": "v1.13.1",
|
"version": "v1.17.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-ctype.git",
|
"url": "https://github.com/symfony/polyfill-ctype.git",
|
||||||
"reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
|
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
|
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
|
||||||
"reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
|
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -2494,7 +2446,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.13-dev"
|
"dev-master": "1.17-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
@ -2527,24 +2479,24 @@
|
||||||
"polyfill",
|
"polyfill",
|
||||||
"portable"
|
"portable"
|
||||||
],
|
],
|
||||||
"time": "2019-11-27T13:56:44+00:00"
|
"time": "2020-05-12T16:14:59+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/service-contracts",
|
"name": "symfony/service-contracts",
|
||||||
"version": "v1.1.8",
|
"version": "v2.1.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/service-contracts.git",
|
"url": "https://github.com/symfony/service-contracts.git",
|
||||||
"reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf"
|
"reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
|
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
|
||||||
"reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
|
"reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1.3",
|
"php": ">=7.2.5",
|
||||||
"psr/container": "^1.0"
|
"psr/container": "^1.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
|
|
@ -2553,7 +2505,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.1-dev"
|
"dev-master": "2.1-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
@ -2585,7 +2537,7 @@
|
||||||
"interoperability",
|
"interoperability",
|
||||||
"standards"
|
"standards"
|
||||||
],
|
],
|
||||||
"time": "2019-10-14T12:27:06+00:00"
|
"time": "2020-05-20T17:43:50+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/stopwatch",
|
"name": "symfony/stopwatch",
|
||||||
|
|
@ -2738,16 +2690,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "webmozart/assert",
|
"name": "webmozart/assert",
|
||||||
"version": "1.6.0",
|
"version": "1.8.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/webmozart/assert.git",
|
"url": "https://github.com/webmozart/assert.git",
|
||||||
"reference": "573381c0a64f155a0d9a23f4b0c797194805b925"
|
"reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925",
|
"url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
|
||||||
"reference": "573381c0a64f155a0d9a23f4b0c797194805b925",
|
"reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -2755,7 +2707,7 @@
|
||||||
"symfony/polyfill-ctype": "^1.8"
|
"symfony/polyfill-ctype": "^1.8"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"vimeo/psalm": "<3.6.0"
|
"vimeo/psalm": "<3.9.1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
|
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
|
||||||
|
|
@ -2782,7 +2734,7 @@
|
||||||
"check",
|
"check",
|
||||||
"validate"
|
"validate"
|
||||||
],
|
],
|
||||||
"time": "2019-11-24T13:36:37+00:00"
|
"time": "2020-04-18T12:12:48+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,7 @@ return array(
|
||||||
'Kanboard\\Action\\TaskAssignPrioritySwimlane' => $baseDir . '/app/Action/TaskAssignPrioritySwimlane.php',
|
'Kanboard\\Action\\TaskAssignPrioritySwimlane' => $baseDir . '/app/Action/TaskAssignPrioritySwimlane.php',
|
||||||
'Kanboard\\Action\\TaskAssignSpecificUser' => $baseDir . '/app/Action/TaskAssignSpecificUser.php',
|
'Kanboard\\Action\\TaskAssignSpecificUser' => $baseDir . '/app/Action/TaskAssignSpecificUser.php',
|
||||||
'Kanboard\\Action\\TaskAssignUser' => $baseDir . '/app/Action/TaskAssignUser.php',
|
'Kanboard\\Action\\TaskAssignUser' => $baseDir . '/app/Action/TaskAssignUser.php',
|
||||||
|
'Kanboard\\Action\\TaskAssignUserSwimlaneChange' => $baseDir . '/app/Action/TaskAssignUserSwimlaneChange.php',
|
||||||
'Kanboard\\Action\\TaskClose' => $baseDir . '/app/Action/TaskClose.php',
|
'Kanboard\\Action\\TaskClose' => $baseDir . '/app/Action/TaskClose.php',
|
||||||
'Kanboard\\Action\\TaskCloseColumn' => $baseDir . '/app/Action/TaskCloseColumn.php',
|
'Kanboard\\Action\\TaskCloseColumn' => $baseDir . '/app/Action/TaskCloseColumn.php',
|
||||||
'Kanboard\\Action\\TaskCloseNoActivity' => $baseDir . '/app/Action/TaskCloseNoActivity.php',
|
'Kanboard\\Action\\TaskCloseNoActivity' => $baseDir . '/app/Action/TaskCloseNoActivity.php',
|
||||||
|
|
@ -792,7 +793,7 @@ return array(
|
||||||
'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
|
'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
|
||||||
'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
|
'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
|
||||||
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
|
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
|
||||||
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
|
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
|
||||||
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
|
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
|
||||||
'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
|
'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
|
||||||
'RequestBuilderTest' => $baseDir . '/libs/jsonrpc/tests/Request/RequestBuilderTest.php',
|
'RequestBuilderTest' => $baseDir . '/libs/jsonrpc/tests/Request/RequestBuilderTest.php',
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ $baseDir = dirname($vendorDir);
|
||||||
|
|
||||||
return array(
|
return array(
|
||||||
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
|
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
|
||||||
'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
|
|
||||||
'2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
|
'2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
|
||||||
'8a67f3044590529ed0a5e02f9cc9c90b' => $baseDir . '/app/functions.php',
|
'8a67f3044590529ed0a5e02f9cc9c90b' => $baseDir . '/app/functions.php',
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ class ComposerStaticInit094f3eabe2924332bc2198a9ba245f27
|
||||||
{
|
{
|
||||||
public static $files = array (
|
public static $files = array (
|
||||||
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
|
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
|
||||||
'5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
|
|
||||||
'2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
|
'2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
|
||||||
'8a67f3044590529ed0a5e02f9cc9c90b' => __DIR__ . '/../..' . '/app/functions.php',
|
'8a67f3044590529ed0a5e02f9cc9c90b' => __DIR__ . '/../..' . '/app/functions.php',
|
||||||
);
|
);
|
||||||
|
|
@ -206,6 +205,7 @@ class ComposerStaticInit094f3eabe2924332bc2198a9ba245f27
|
||||||
'Kanboard\\Action\\TaskAssignPrioritySwimlane' => __DIR__ . '/../..' . '/app/Action/TaskAssignPrioritySwimlane.php',
|
'Kanboard\\Action\\TaskAssignPrioritySwimlane' => __DIR__ . '/../..' . '/app/Action/TaskAssignPrioritySwimlane.php',
|
||||||
'Kanboard\\Action\\TaskAssignSpecificUser' => __DIR__ . '/../..' . '/app/Action/TaskAssignSpecificUser.php',
|
'Kanboard\\Action\\TaskAssignSpecificUser' => __DIR__ . '/../..' . '/app/Action/TaskAssignSpecificUser.php',
|
||||||
'Kanboard\\Action\\TaskAssignUser' => __DIR__ . '/../..' . '/app/Action/TaskAssignUser.php',
|
'Kanboard\\Action\\TaskAssignUser' => __DIR__ . '/../..' . '/app/Action/TaskAssignUser.php',
|
||||||
|
'Kanboard\\Action\\TaskAssignUserSwimlaneChange' => __DIR__ . '/../..' . '/app/Action/TaskAssignUserSwimlaneChange.php',
|
||||||
'Kanboard\\Action\\TaskClose' => __DIR__ . '/../..' . '/app/Action/TaskClose.php',
|
'Kanboard\\Action\\TaskClose' => __DIR__ . '/../..' . '/app/Action/TaskClose.php',
|
||||||
'Kanboard\\Action\\TaskCloseColumn' => __DIR__ . '/../..' . '/app/Action/TaskCloseColumn.php',
|
'Kanboard\\Action\\TaskCloseColumn' => __DIR__ . '/../..' . '/app/Action/TaskCloseColumn.php',
|
||||||
'Kanboard\\Action\\TaskCloseNoActivity' => __DIR__ . '/../..' . '/app/Action/TaskCloseNoActivity.php',
|
'Kanboard\\Action\\TaskCloseNoActivity' => __DIR__ . '/../..' . '/app/Action/TaskCloseNoActivity.php',
|
||||||
|
|
@ -903,7 +903,7 @@ class ComposerStaticInit094f3eabe2924332bc2198a9ba245f27
|
||||||
'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
|
'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
|
||||||
'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
|
'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
|
||||||
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
|
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
|
||||||
'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
|
'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
|
||||||
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
|
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
|
||||||
'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
|
'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
|
||||||
'RequestBuilderTest' => __DIR__ . '/../..' . '/libs/jsonrpc/tests/Request/RequestBuilderTest.php',
|
'RequestBuilderTest' => __DIR__ . '/../..' . '/libs/jsonrpc/tests/Request/RequestBuilderTest.php',
|
||||||
|
|
|
||||||
|
|
@ -166,17 +166,17 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "erusev/parsedown",
|
"name": "erusev/parsedown",
|
||||||
"version": "1.7.3",
|
"version": "1.7.4",
|
||||||
"version_normalized": "1.7.3.0",
|
"version_normalized": "1.7.4.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/erusev/parsedown.git",
|
"url": "https://github.com/erusev/parsedown.git",
|
||||||
"reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7"
|
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
|
"url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
|
||||||
"reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
|
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -186,7 +186,7 @@
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^4.8.35"
|
"phpunit/phpunit": "^4.8.35"
|
||||||
},
|
},
|
||||||
"time": "2019-03-17T18:48:37+00:00",
|
"time": "2019-12-30T22:54:17+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
@ -267,56 +267,6 @@
|
||||||
"spam"
|
"spam"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "paragonie/random_compat",
|
|
||||||
"version": "v2.0.11",
|
|
||||||
"version_normalized": "2.0.11.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/paragonie/random_compat.git",
|
|
||||||
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
|
|
||||||
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.2.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "4.*|5.*"
|
|
||||||
},
|
|
||||||
"suggest": {
|
|
||||||
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
|
|
||||||
},
|
|
||||||
"time": "2017-09-27T21:40:39+00:00",
|
|
||||||
"type": "library",
|
|
||||||
"installation-source": "dist",
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"lib/random.php"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Paragon Initiative Enterprises",
|
|
||||||
"email": "security@paragonie.com",
|
|
||||||
"homepage": "https://paragonie.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
|
|
||||||
"keywords": [
|
|
||||||
"csprng",
|
|
||||||
"pseudorandom",
|
|
||||||
"random"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "pimple/pimple",
|
"name": "pimple/pimple",
|
||||||
"version": "v3.2.2",
|
"version": "v3.2.2",
|
||||||
|
|
@ -422,23 +372,23 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psr/log",
|
"name": "psr/log",
|
||||||
"version": "1.1.2",
|
"version": "1.1.3",
|
||||||
"version_normalized": "1.1.2.0",
|
"version_normalized": "1.1.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/php-fig/log.git",
|
"url": "https://github.com/php-fig/log.git",
|
||||||
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
|
"reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
|
"url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
|
||||||
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
|
"reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.0"
|
"php": ">=5.3.0"
|
||||||
},
|
},
|
||||||
"time": "2019-11-01T11:05:21+00:00",
|
"time": "2020-03-23T09:12:05+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
|
|
@ -772,17 +722,17 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-mbstring",
|
"name": "symfony/polyfill-mbstring",
|
||||||
"version": "v1.13.1",
|
"version": "v1.17.0",
|
||||||
"version_normalized": "1.13.1.0",
|
"version_normalized": "1.17.0.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||||
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
|
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
|
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
|
||||||
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
|
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -791,11 +741,11 @@
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-mbstring": "For best performance"
|
"ext-mbstring": "For best performance"
|
||||||
},
|
},
|
||||||
"time": "2019-11-27T14:18:11+00:00",
|
"time": "2020-05-12T16:47:27+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.13-dev"
|
"dev-master": "1.17-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ class Parsedown
|
||||||
{
|
{
|
||||||
# ~
|
# ~
|
||||||
|
|
||||||
const version = '1.7.3';
|
const version = '1.7.4';
|
||||||
|
|
||||||
# ~
|
# ~
|
||||||
|
|
||||||
|
|
@ -1489,22 +1489,41 @@ class Parsedown
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$permitRawHtml = false;
|
||||||
|
|
||||||
if (isset($Element['text']))
|
if (isset($Element['text']))
|
||||||
|
{
|
||||||
|
$text = $Element['text'];
|
||||||
|
}
|
||||||
|
// very strongly consider an alternative if you're writing an
|
||||||
|
// extension
|
||||||
|
elseif (isset($Element['rawHtml']))
|
||||||
|
{
|
||||||
|
$text = $Element['rawHtml'];
|
||||||
|
$allowRawHtmlInSafeMode = isset($Element['allowRawHtmlInSafeMode']) && $Element['allowRawHtmlInSafeMode'];
|
||||||
|
$permitRawHtml = !$this->safeMode || $allowRawHtmlInSafeMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($text))
|
||||||
{
|
{
|
||||||
$markup .= '>';
|
$markup .= '>';
|
||||||
|
|
||||||
if (!isset($Element['nonNestables']))
|
if (!isset($Element['nonNestables']))
|
||||||
{
|
{
|
||||||
$Element['nonNestables'] = array();
|
$Element['nonNestables'] = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($Element['handler']))
|
if (isset($Element['handler']))
|
||||||
{
|
{
|
||||||
$markup .= $this->{$Element['handler']}($Element['text'], $Element['nonNestables']);
|
$markup .= $this->{$Element['handler']}($text, $Element['nonNestables']);
|
||||||
|
}
|
||||||
|
elseif (!$permitRawHtml)
|
||||||
|
{
|
||||||
|
$markup .= self::escape($text, true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$markup .= self::escape($Element['text'], true);
|
$markup .= $text;
|
||||||
}
|
}
|
||||||
|
|
||||||
$markup .= '</'.$Element['name'].'>';
|
$markup .= '</'.$Element['name'].'>';
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
The MIT License (MIT)
|
|
||||||
|
|
||||||
Copyright (c) 2015 Paragon Initiative Enterprises
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
basedir=$( dirname $( readlink -f ${BASH_SOURCE[0]} ) )
|
|
||||||
|
|
||||||
php -dphar.readonly=0 "$basedir/other/build_phar.php" $*
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
{
|
|
||||||
"name": "paragonie/random_compat",
|
|
||||||
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
|
|
||||||
"keywords": [
|
|
||||||
"csprng",
|
|
||||||
"random",
|
|
||||||
"pseudorandom"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"type": "library",
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Paragon Initiative Enterprises",
|
|
||||||
"email": "security@paragonie.com",
|
|
||||||
"homepage": "https://paragonie.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/paragonie/random_compat/issues",
|
|
||||||
"email": "info@paragonie.com",
|
|
||||||
"source": "https://github.com/paragonie/random_compat"
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.2.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "4.*|5.*"
|
|
||||||
},
|
|
||||||
"suggest": {
|
|
||||||
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"lib/random.php"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
-----BEGIN PUBLIC KEY-----
|
|
||||||
MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEEd+wCqJDrx5B4OldM0dQE0ZMX+lx1ZWm
|
|
||||||
pui0SUqD4G29L3NGsz9UhJ/0HjBdbnkhIK5xviT0X5vtjacF6ajgcCArbTB+ds+p
|
|
||||||
+h7Q084NuSuIpNb6YPfoUFgC/CL9kAoc
|
|
||||||
-----END PUBLIC KEY-----
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v2.0.22 (MingW32)
|
|
||||||
|
|
||||||
iQEcBAABAgAGBQJWtW1hAAoJEGuXocKCZATaJf0H+wbZGgskK1dcRTsuVJl9IWip
|
|
||||||
QwGw/qIKI280SD6/ckoUMxKDCJiFuPR14zmqnS36k7N5UNPnpdTJTS8T11jttSpg
|
|
||||||
1LCmgpbEIpgaTah+cELDqFCav99fS+bEiAL5lWDAHBTE/XPjGVCqeehyPYref4IW
|
|
||||||
NDBIEsvnHPHPLsn6X5jq4+Yj5oUixgxaMPiR+bcO4Sh+RzOVB6i2D0upWfRXBFXA
|
|
||||||
NNnsg9/zjvoC7ZW73y9uSH+dPJTt/Vgfeiv52/v41XliyzbUyLalf02GNPY+9goV
|
|
||||||
JHG1ulEEBJOCiUD9cE1PUIJwHA/HqyhHIvV350YoEFiHl8iSwm7SiZu5kPjaq74=
|
|
||||||
=B6+8
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
|
|
@ -1,181 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!is_callable('RandomCompat_strlen')) {
|
|
||||||
if (
|
|
||||||
defined('MB_OVERLOAD_STRING') &&
|
|
||||||
ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
|
|
||||||
) {
|
|
||||||
/**
|
|
||||||
* strlen() implementation that isn't brittle to mbstring.func_overload
|
|
||||||
*
|
|
||||||
* This version uses mb_strlen() in '8bit' mode to treat strings as raw
|
|
||||||
* binary rather than UTF-8, ISO-8859-1, etc
|
|
||||||
*
|
|
||||||
* @param string $binary_string
|
|
||||||
*
|
|
||||||
* @throws TypeError
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
function RandomCompat_strlen($binary_string)
|
|
||||||
{
|
|
||||||
if (!is_string($binary_string)) {
|
|
||||||
throw new TypeError(
|
|
||||||
'RandomCompat_strlen() expects a string'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (int) mb_strlen($binary_string, '8bit');
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
/**
|
|
||||||
* strlen() implementation that isn't brittle to mbstring.func_overload
|
|
||||||
*
|
|
||||||
* This version just used the default strlen()
|
|
||||||
*
|
|
||||||
* @param string $binary_string
|
|
||||||
*
|
|
||||||
* @throws TypeError
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
function RandomCompat_strlen($binary_string)
|
|
||||||
{
|
|
||||||
if (!is_string($binary_string)) {
|
|
||||||
throw new TypeError(
|
|
||||||
'RandomCompat_strlen() expects a string'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return (int) strlen($binary_string);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_callable('RandomCompat_substr')) {
|
|
||||||
|
|
||||||
if (
|
|
||||||
defined('MB_OVERLOAD_STRING')
|
|
||||||
&&
|
|
||||||
ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
|
|
||||||
) {
|
|
||||||
/**
|
|
||||||
* substr() implementation that isn't brittle to mbstring.func_overload
|
|
||||||
*
|
|
||||||
* This version uses mb_substr() in '8bit' mode to treat strings as raw
|
|
||||||
* binary rather than UTF-8, ISO-8859-1, etc
|
|
||||||
*
|
|
||||||
* @param string $binary_string
|
|
||||||
* @param int $start
|
|
||||||
* @param int $length (optional)
|
|
||||||
*
|
|
||||||
* @throws TypeError
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
function RandomCompat_substr($binary_string, $start, $length = null)
|
|
||||||
{
|
|
||||||
if (!is_string($binary_string)) {
|
|
||||||
throw new TypeError(
|
|
||||||
'RandomCompat_substr(): First argument should be a string'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_int($start)) {
|
|
||||||
throw new TypeError(
|
|
||||||
'RandomCompat_substr(): Second argument should be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($length === null) {
|
|
||||||
/**
|
|
||||||
* mb_substr($str, 0, NULL, '8bit') returns an empty string on
|
|
||||||
* PHP 5.3, so we have to find the length ourselves.
|
|
||||||
*/
|
|
||||||
$length = RandomCompat_strlen($binary_string) - $start;
|
|
||||||
} elseif (!is_int($length)) {
|
|
||||||
throw new TypeError(
|
|
||||||
'RandomCompat_substr(): Third argument should be an integer, or omitted'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Consistency with PHP's behavior
|
|
||||||
if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
if ($start > RandomCompat_strlen($binary_string)) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
return (string) mb_substr($binary_string, $start, $length, '8bit');
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* substr() implementation that isn't brittle to mbstring.func_overload
|
|
||||||
*
|
|
||||||
* This version just uses the default substr()
|
|
||||||
*
|
|
||||||
* @param string $binary_string
|
|
||||||
* @param int $start
|
|
||||||
* @param int $length (optional)
|
|
||||||
*
|
|
||||||
* @throws TypeError
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
function RandomCompat_substr($binary_string, $start, $length = null)
|
|
||||||
{
|
|
||||||
if (!is_string($binary_string)) {
|
|
||||||
throw new TypeError(
|
|
||||||
'RandomCompat_substr(): First argument should be a string'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_int($start)) {
|
|
||||||
throw new TypeError(
|
|
||||||
'RandomCompat_substr(): Second argument should be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($length !== null) {
|
|
||||||
if (!is_int($length)) {
|
|
||||||
throw new TypeError(
|
|
||||||
'RandomCompat_substr(): Third argument should be an integer, or omitted'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (string) substr($binary_string, $start, $length);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (string) substr($binary_string, $start);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,75 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!is_callable('RandomCompat_intval')) {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cast to an integer if we can, safely.
|
|
||||||
*
|
|
||||||
* If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
|
|
||||||
* (non-inclusive), it will sanely cast it to an int. If you it's equal to
|
|
||||||
* ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
|
|
||||||
* lose precision, so the <= and => operators might accidentally let a float
|
|
||||||
* through.
|
|
||||||
*
|
|
||||||
* @param int|float $number The number we want to convert to an int
|
|
||||||
* @param bool $fail_open Set to true to not throw an exception
|
|
||||||
*
|
|
||||||
* @return float|int
|
|
||||||
* @psalm-suppress InvalidReturnType
|
|
||||||
*
|
|
||||||
* @throws TypeError
|
|
||||||
*/
|
|
||||||
function RandomCompat_intval($number, $fail_open = false)
|
|
||||||
{
|
|
||||||
if (is_int($number) || is_float($number)) {
|
|
||||||
$number += 0;
|
|
||||||
} elseif (is_numeric($number)) {
|
|
||||||
$number += 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
is_float($number)
|
|
||||||
&&
|
|
||||||
$number > ~PHP_INT_MAX
|
|
||||||
&&
|
|
||||||
$number < PHP_INT_MAX
|
|
||||||
) {
|
|
||||||
$number = (int) $number;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_int($number)) {
|
|
||||||
return (int) $number;
|
|
||||||
} elseif (!$fail_open) {
|
|
||||||
throw new TypeError(
|
|
||||||
'Expected an integer.'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return $number;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!class_exists('Error', false)) {
|
|
||||||
// We can't really avoid making this extend Exception in PHP 5.
|
|
||||||
class Error extends Exception
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!class_exists('TypeError', false)) {
|
|
||||||
if (is_subclass_of('Error', 'Exception')) {
|
|
||||||
class TypeError extends Error
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
class TypeError extends Exception
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,223 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* @version 2.0.10
|
|
||||||
* @released 2017-03-13
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!defined('PHP_VERSION_ID')) {
|
|
||||||
// This constant was introduced in PHP 5.2.7
|
|
||||||
$RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
|
|
||||||
define(
|
|
||||||
'PHP_VERSION_ID',
|
|
||||||
$RandomCompatversion[0] * 10000
|
|
||||||
+ $RandomCompatversion[1] * 100
|
|
||||||
+ $RandomCompatversion[2]
|
|
||||||
);
|
|
||||||
$RandomCompatversion = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* PHP 7.0.0 and newer have these functions natively.
|
|
||||||
*/
|
|
||||||
if (PHP_VERSION_ID >= 70000) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
|
|
||||||
define('RANDOM_COMPAT_READ_BUFFER', 8);
|
|
||||||
}
|
|
||||||
|
|
||||||
$RandomCompatDIR = dirname(__FILE__);
|
|
||||||
|
|
||||||
require_once $RandomCompatDIR . '/byte_safe_strings.php';
|
|
||||||
require_once $RandomCompatDIR . '/cast_to_int.php';
|
|
||||||
require_once $RandomCompatDIR . '/error_polyfill.php';
|
|
||||||
|
|
||||||
if (!is_callable('random_bytes')) {
|
|
||||||
/**
|
|
||||||
* PHP 5.2.0 - 5.6.x way to implement random_bytes()
|
|
||||||
*
|
|
||||||
* We use conditional statements here to define the function in accordance
|
|
||||||
* to the operating environment. It's a micro-optimization.
|
|
||||||
*
|
|
||||||
* In order of preference:
|
|
||||||
* 1. Use libsodium if available.
|
|
||||||
* 2. fread() /dev/urandom if available (never on Windows)
|
|
||||||
* 3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
|
|
||||||
* 4. COM('CAPICOM.Utilities.1')->GetRandom()
|
|
||||||
*
|
|
||||||
* See RATIONALE.md for our reasoning behind this particular order
|
|
||||||
*/
|
|
||||||
if (extension_loaded('libsodium')) {
|
|
||||||
// See random_bytes_libsodium.php
|
|
||||||
if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
|
|
||||||
require_once $RandomCompatDIR . '/random_bytes_libsodium.php';
|
|
||||||
} elseif (method_exists('Sodium', 'randombytes_buf')) {
|
|
||||||
require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.php';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reading directly from /dev/urandom:
|
|
||||||
*/
|
|
||||||
if (DIRECTORY_SEPARATOR === '/') {
|
|
||||||
// DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
|
|
||||||
// way to exclude Windows.
|
|
||||||
$RandomCompatUrandom = true;
|
|
||||||
$RandomCompat_basedir = ini_get('open_basedir');
|
|
||||||
|
|
||||||
if (!empty($RandomCompat_basedir)) {
|
|
||||||
$RandomCompat_open_basedir = explode(
|
|
||||||
PATH_SEPARATOR,
|
|
||||||
strtolower($RandomCompat_basedir)
|
|
||||||
);
|
|
||||||
$RandomCompatUrandom = (array() !== array_intersect(
|
|
||||||
array('/dev', '/dev/', '/dev/urandom'),
|
|
||||||
$RandomCompat_open_basedir
|
|
||||||
));
|
|
||||||
$RandomCompat_open_basedir = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
!is_callable('random_bytes')
|
|
||||||
&&
|
|
||||||
$RandomCompatUrandom
|
|
||||||
&&
|
|
||||||
@is_readable('/dev/urandom')
|
|
||||||
) {
|
|
||||||
// Error suppression on is_readable() in case of an open_basedir
|
|
||||||
// or safe_mode failure. All we care about is whether or not we
|
|
||||||
// can read it at this point. If the PHP environment is going to
|
|
||||||
// panic over trying to see if the file can be read in the first
|
|
||||||
// place, that is not helpful to us here.
|
|
||||||
|
|
||||||
// See random_bytes_dev_urandom.php
|
|
||||||
require_once $RandomCompatDIR . '/random_bytes_dev_urandom.php';
|
|
||||||
}
|
|
||||||
// Unset variables after use
|
|
||||||
$RandomCompat_basedir = null;
|
|
||||||
} else {
|
|
||||||
$RandomCompatUrandom = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* mcrypt_create_iv()
|
|
||||||
*
|
|
||||||
* We only want to use mcypt_create_iv() if:
|
|
||||||
*
|
|
||||||
* - random_bytes() hasn't already been defined
|
|
||||||
* - the mcrypt extensions is loaded
|
|
||||||
* - One of these two conditions is true:
|
|
||||||
* - We're on Windows (DIRECTORY_SEPARATOR !== '/')
|
|
||||||
* - We're not on Windows and /dev/urandom is readabale
|
|
||||||
* (i.e. we're not in a chroot jail)
|
|
||||||
* - Special case:
|
|
||||||
* - If we're not on Windows, but the PHP version is between
|
|
||||||
* 5.6.10 and 5.6.12, we don't want to use mcrypt. It will
|
|
||||||
* hang indefinitely. This is bad.
|
|
||||||
* - If we're on Windows, we want to use PHP >= 5.3.7 or else
|
|
||||||
* we get insufficient entropy errors.
|
|
||||||
*/
|
|
||||||
if (
|
|
||||||
!is_callable('random_bytes')
|
|
||||||
&&
|
|
||||||
// Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
|
|
||||||
(DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
|
|
||||||
&&
|
|
||||||
// Prevent this code from hanging indefinitely on non-Windows;
|
|
||||||
// see https://bugs.php.net/bug.php?id=69833
|
|
||||||
(
|
|
||||||
DIRECTORY_SEPARATOR !== '/' ||
|
|
||||||
(PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
|
|
||||||
)
|
|
||||||
&&
|
|
||||||
extension_loaded('mcrypt')
|
|
||||||
) {
|
|
||||||
// See random_bytes_mcrypt.php
|
|
||||||
require_once $RandomCompatDIR . '/random_bytes_mcrypt.php';
|
|
||||||
}
|
|
||||||
$RandomCompatUrandom = null;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This is a Windows-specific fallback, for when the mcrypt extension
|
|
||||||
* isn't loaded.
|
|
||||||
*/
|
|
||||||
if (
|
|
||||||
!is_callable('random_bytes')
|
|
||||||
&&
|
|
||||||
extension_loaded('com_dotnet')
|
|
||||||
&&
|
|
||||||
class_exists('COM')
|
|
||||||
) {
|
|
||||||
$RandomCompat_disabled_classes = preg_split(
|
|
||||||
'#\s*,\s*#',
|
|
||||||
strtolower(ini_get('disable_classes'))
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!in_array('com', $RandomCompat_disabled_classes)) {
|
|
||||||
try {
|
|
||||||
$RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
|
|
||||||
if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
|
|
||||||
// See random_bytes_com_dotnet.php
|
|
||||||
require_once $RandomCompatDIR . '/random_bytes_com_dotnet.php';
|
|
||||||
}
|
|
||||||
} catch (com_exception $e) {
|
|
||||||
// Don't try to use it.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$RandomCompat_disabled_classes = null;
|
|
||||||
$RandomCompatCOMtest = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* throw new Exception
|
|
||||||
*/
|
|
||||||
if (!is_callable('random_bytes')) {
|
|
||||||
/**
|
|
||||||
* We don't have any more options, so let's throw an exception right now
|
|
||||||
* and hope the developer won't let it fail silently.
|
|
||||||
*
|
|
||||||
* @param mixed $length
|
|
||||||
* @return void
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
|
||||||
function random_bytes($length)
|
|
||||||
{
|
|
||||||
unset($length); // Suppress "variable not used" warnings.
|
|
||||||
throw new Exception(
|
|
||||||
'There is no suitable CSPRNG installed on your system'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_callable('random_int')) {
|
|
||||||
require_once $RandomCompatDIR . '/random_int.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
$RandomCompatDIR = null;
|
|
||||||
|
|
@ -1,88 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!is_callable('random_bytes')) {
|
|
||||||
/**
|
|
||||||
* Windows with PHP < 5.3.0 will not have the function
|
|
||||||
* openssl_random_pseudo_bytes() available, so let's use
|
|
||||||
* CAPICOM to work around this deficiency.
|
|
||||||
*
|
|
||||||
* @param int $bytes
|
|
||||||
*
|
|
||||||
* @throws Exception
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
function random_bytes($bytes)
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
$bytes = RandomCompat_intval($bytes);
|
|
||||||
} catch (TypeError $ex) {
|
|
||||||
throw new TypeError(
|
|
||||||
'random_bytes(): $bytes must be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($bytes < 1) {
|
|
||||||
throw new Error(
|
|
||||||
'Length must be greater than 0'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$buf = '';
|
|
||||||
if (!class_exists('COM')) {
|
|
||||||
throw new Error(
|
|
||||||
'COM does not exist'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$util = new COM('CAPICOM.Utilities.1');
|
|
||||||
$execCount = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Let's not let it loop forever. If we run N times and fail to
|
|
||||||
* get N bytes of random data, then CAPICOM has failed us.
|
|
||||||
*/
|
|
||||||
do {
|
|
||||||
$buf .= base64_decode($util->GetRandom($bytes, 0));
|
|
||||||
if (RandomCompat_strlen($buf) >= $bytes) {
|
|
||||||
/**
|
|
||||||
* Return our random entropy buffer here:
|
|
||||||
*/
|
|
||||||
return RandomCompat_substr($buf, 0, $bytes);
|
|
||||||
}
|
|
||||||
++$execCount;
|
|
||||||
} while ($execCount < $bytes);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If we reach here, PHP has failed us.
|
|
||||||
*/
|
|
||||||
throw new Exception(
|
|
||||||
'Could not gather sufficient random data'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,167 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
|
|
||||||
define('RANDOM_COMPAT_READ_BUFFER', 8);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_callable('random_bytes')) {
|
|
||||||
/**
|
|
||||||
* Unless open_basedir is enabled, use /dev/urandom for
|
|
||||||
* random numbers in accordance with best practices
|
|
||||||
*
|
|
||||||
* Why we use /dev/urandom and not /dev/random
|
|
||||||
* @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
|
|
||||||
*
|
|
||||||
* @param int $bytes
|
|
||||||
*
|
|
||||||
* @throws Exception
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
function random_bytes($bytes)
|
|
||||||
{
|
|
||||||
static $fp = null;
|
|
||||||
/**
|
|
||||||
* This block should only be run once
|
|
||||||
*/
|
|
||||||
if (empty($fp)) {
|
|
||||||
/**
|
|
||||||
* We use /dev/urandom if it is a char device.
|
|
||||||
* We never fall back to /dev/random
|
|
||||||
*/
|
|
||||||
$fp = fopen('/dev/urandom', 'rb');
|
|
||||||
if (!empty($fp)) {
|
|
||||||
$st = fstat($fp);
|
|
||||||
if (($st['mode'] & 0170000) !== 020000) {
|
|
||||||
fclose($fp);
|
|
||||||
$fp = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($fp)) {
|
|
||||||
/**
|
|
||||||
* stream_set_read_buffer() does not exist in HHVM
|
|
||||||
*
|
|
||||||
* If we don't set the stream's read buffer to 0, PHP will
|
|
||||||
* internally buffer 8192 bytes, which can waste entropy
|
|
||||||
*
|
|
||||||
* stream_set_read_buffer returns 0 on success
|
|
||||||
*/
|
|
||||||
if (is_callable('stream_set_read_buffer')) {
|
|
||||||
stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
|
|
||||||
}
|
|
||||||
if (is_callable('stream_set_chunk_size')) {
|
|
||||||
stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$bytes = RandomCompat_intval($bytes);
|
|
||||||
} catch (TypeError $ex) {
|
|
||||||
throw new TypeError(
|
|
||||||
'random_bytes(): $bytes must be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($bytes < 1) {
|
|
||||||
throw new Error(
|
|
||||||
'Length must be greater than 0'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This if() block only runs if we managed to open a file handle
|
|
||||||
*
|
|
||||||
* It does not belong in an else {} block, because the above
|
|
||||||
* if (empty($fp)) line is logic that should only be run once per
|
|
||||||
* page load.
|
|
||||||
*/
|
|
||||||
if (!empty($fp)) {
|
|
||||||
/**
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
$remaining = $bytes;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var string|bool
|
|
||||||
*/
|
|
||||||
$buf = '';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* We use fread() in a loop to protect against partial reads
|
|
||||||
*/
|
|
||||||
do {
|
|
||||||
/**
|
|
||||||
* @var string|bool
|
|
||||||
*/
|
|
||||||
$read = fread($fp, $remaining);
|
|
||||||
if (!is_string($read)) {
|
|
||||||
if ($read === false) {
|
|
||||||
/**
|
|
||||||
* We cannot safely read from the file. Exit the
|
|
||||||
* do-while loop and trigger the exception condition
|
|
||||||
*
|
|
||||||
* @var string|bool
|
|
||||||
*/
|
|
||||||
$buf = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Decrease the number of bytes returned from remaining
|
|
||||||
*/
|
|
||||||
$remaining -= RandomCompat_strlen($read);
|
|
||||||
/**
|
|
||||||
* @var string|bool
|
|
||||||
*/
|
|
||||||
$buf = $buf . $read;
|
|
||||||
} while ($remaining > 0);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Is our result valid?
|
|
||||||
*/
|
|
||||||
if (is_string($buf)) {
|
|
||||||
if (RandomCompat_strlen($buf) === $bytes) {
|
|
||||||
/**
|
|
||||||
* Return our random entropy buffer here:
|
|
||||||
*/
|
|
||||||
return $buf;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If we reach here, PHP has failed us.
|
|
||||||
*/
|
|
||||||
throw new Exception(
|
|
||||||
'Error reading from source device'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,88 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!is_callable('random_bytes')) {
|
|
||||||
/**
|
|
||||||
* If the libsodium PHP extension is loaded, we'll use it above any other
|
|
||||||
* solution.
|
|
||||||
*
|
|
||||||
* libsodium-php project:
|
|
||||||
* @ref https://github.com/jedisct1/libsodium-php
|
|
||||||
*
|
|
||||||
* @param int $bytes
|
|
||||||
*
|
|
||||||
* @throws Exception
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
function random_bytes($bytes)
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
$bytes = RandomCompat_intval($bytes);
|
|
||||||
} catch (TypeError $ex) {
|
|
||||||
throw new TypeError(
|
|
||||||
'random_bytes(): $bytes must be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($bytes < 1) {
|
|
||||||
throw new Error(
|
|
||||||
'Length must be greater than 0'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
|
|
||||||
* generated in one invocation.
|
|
||||||
*/
|
|
||||||
if ($bytes > 2147483647) {
|
|
||||||
$buf = '';
|
|
||||||
for ($i = 0; $i < $bytes; $i += 1073741824) {
|
|
||||||
$n = ($bytes - $i) > 1073741824
|
|
||||||
? 1073741824
|
|
||||||
: $bytes - $i;
|
|
||||||
$buf .= \Sodium\randombytes_buf($n);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$buf = \Sodium\randombytes_buf($bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($buf !== false) {
|
|
||||||
if (RandomCompat_strlen($buf) === $bytes) {
|
|
||||||
return $buf;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If we reach here, PHP has failed us.
|
|
||||||
*/
|
|
||||||
throw new Exception(
|
|
||||||
'Could not gather sufficient random data'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,92 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!is_callable('random_bytes')) {
|
|
||||||
/**
|
|
||||||
* If the libsodium PHP extension is loaded, we'll use it above any other
|
|
||||||
* solution.
|
|
||||||
*
|
|
||||||
* libsodium-php project:
|
|
||||||
* @ref https://github.com/jedisct1/libsodium-php
|
|
||||||
*
|
|
||||||
* @param int $bytes
|
|
||||||
*
|
|
||||||
* @throws Exception
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
function random_bytes($bytes)
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
$bytes = RandomCompat_intval($bytes);
|
|
||||||
} catch (TypeError $ex) {
|
|
||||||
throw new TypeError(
|
|
||||||
'random_bytes(): $bytes must be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($bytes < 1) {
|
|
||||||
throw new Error(
|
|
||||||
'Length must be greater than 0'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
$buf = '';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
|
|
||||||
* generated in one invocation.
|
|
||||||
*/
|
|
||||||
if ($bytes > 2147483647) {
|
|
||||||
for ($i = 0; $i < $bytes; $i += 1073741824) {
|
|
||||||
$n = ($bytes - $i) > 1073741824
|
|
||||||
? 1073741824
|
|
||||||
: $bytes - $i;
|
|
||||||
$buf .= Sodium::randombytes_buf((int) $n);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$buf .= Sodium::randombytes_buf((int) $bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_string($buf)) {
|
|
||||||
if (RandomCompat_strlen($buf) === $bytes) {
|
|
||||||
return $buf;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If we reach here, PHP has failed us.
|
|
||||||
*/
|
|
||||||
throw new Exception(
|
|
||||||
'Could not gather sufficient random data'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,77 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!is_callable('random_bytes')) {
|
|
||||||
/**
|
|
||||||
* Powered by ext/mcrypt (and thankfully NOT libmcrypt)
|
|
||||||
*
|
|
||||||
* @ref https://bugs.php.net/bug.php?id=55169
|
|
||||||
* @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
|
|
||||||
*
|
|
||||||
* @param int $bytes
|
|
||||||
*
|
|
||||||
* @throws Exception
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
function random_bytes($bytes)
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
$bytes = RandomCompat_intval($bytes);
|
|
||||||
} catch (TypeError $ex) {
|
|
||||||
throw new TypeError(
|
|
||||||
'random_bytes(): $bytes must be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($bytes < 1) {
|
|
||||||
throw new Error(
|
|
||||||
'Length must be greater than 0'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
|
|
||||||
if (
|
|
||||||
$buf !== false
|
|
||||||
&&
|
|
||||||
RandomCompat_strlen($buf) === $bytes
|
|
||||||
) {
|
|
||||||
/**
|
|
||||||
* Return our random entropy buffer here:
|
|
||||||
*/
|
|
||||||
return $buf;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If we reach here, PHP has failed us.
|
|
||||||
*/
|
|
||||||
throw new Exception(
|
|
||||||
'Could not gather sufficient random data'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,190 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
if (!is_callable('random_int')) {
|
|
||||||
/**
|
|
||||||
* Random_* Compatibility Library
|
|
||||||
* for using the new PHP 7 random_* API in PHP 5 projects
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetch a random integer between $min and $max inclusive
|
|
||||||
*
|
|
||||||
* @param int $min
|
|
||||||
* @param int $max
|
|
||||||
*
|
|
||||||
* @throws Exception
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
function random_int($min, $max)
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Type and input logic checks
|
|
||||||
*
|
|
||||||
* If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
|
|
||||||
* (non-inclusive), it will sanely cast it to an int. If you it's equal to
|
|
||||||
* ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
|
|
||||||
* lose precision, so the <= and => operators might accidentally let a float
|
|
||||||
* through.
|
|
||||||
*/
|
|
||||||
|
|
||||||
try {
|
|
||||||
$min = RandomCompat_intval($min);
|
|
||||||
} catch (TypeError $ex) {
|
|
||||||
throw new TypeError(
|
|
||||||
'random_int(): $min must be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$max = RandomCompat_intval($max);
|
|
||||||
} catch (TypeError $ex) {
|
|
||||||
throw new TypeError(
|
|
||||||
'random_int(): $max must be an integer'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Now that we've verified our weak typing system has given us an integer,
|
|
||||||
* let's validate the logic then we can move forward with generating random
|
|
||||||
* integers along a given range.
|
|
||||||
*/
|
|
||||||
if ($min > $max) {
|
|
||||||
throw new Error(
|
|
||||||
'Minimum value must be less than or equal to the maximum value'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($max === $min) {
|
|
||||||
return (int) $min;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize variables to 0
|
|
||||||
*
|
|
||||||
* We want to store:
|
|
||||||
* $bytes => the number of random bytes we need
|
|
||||||
* $mask => an integer bitmask (for use with the &) operator
|
|
||||||
* so we can minimize the number of discards
|
|
||||||
*/
|
|
||||||
$attempts = $bits = $bytes = $mask = $valueShift = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* At this point, $range is a positive number greater than 0. It might
|
|
||||||
* overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
|
|
||||||
* a float and we will lose some precision.
|
|
||||||
*/
|
|
||||||
$range = $max - $min;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test for integer overflow:
|
|
||||||
*/
|
|
||||||
if (!is_int($range)) {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Still safely calculate wider ranges.
|
|
||||||
* Provided by @CodesInChaos, @oittaa
|
|
||||||
*
|
|
||||||
* @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
|
|
||||||
*
|
|
||||||
* We use ~0 as a mask in this case because it generates all 1s
|
|
||||||
*
|
|
||||||
* @ref https://eval.in/400356 (32-bit)
|
|
||||||
* @ref http://3v4l.org/XX9r5 (64-bit)
|
|
||||||
*/
|
|
||||||
$bytes = PHP_INT_SIZE;
|
|
||||||
$mask = ~0;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* $bits is effectively ceil(log($range, 2)) without dealing with
|
|
||||||
* type juggling
|
|
||||||
*/
|
|
||||||
while ($range > 0) {
|
|
||||||
if ($bits % 8 === 0) {
|
|
||||||
++$bytes;
|
|
||||||
}
|
|
||||||
++$bits;
|
|
||||||
$range >>= 1;
|
|
||||||
$mask = $mask << 1 | 1;
|
|
||||||
}
|
|
||||||
$valueShift = $min;
|
|
||||||
}
|
|
||||||
|
|
||||||
$val = 0;
|
|
||||||
/**
|
|
||||||
* Now that we have our parameters set up, let's begin generating
|
|
||||||
* random integers until one falls between $min and $max
|
|
||||||
*/
|
|
||||||
do {
|
|
||||||
/**
|
|
||||||
* The rejection probability is at most 0.5, so this corresponds
|
|
||||||
* to a failure probability of 2^-128 for a working RNG
|
|
||||||
*/
|
|
||||||
if ($attempts > 128) {
|
|
||||||
throw new Exception(
|
|
||||||
'random_int: RNG is broken - too many rejections'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Let's grab the necessary number of random bytes
|
|
||||||
*/
|
|
||||||
$randomByteString = random_bytes($bytes);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Let's turn $randomByteString into an integer
|
|
||||||
*
|
|
||||||
* This uses bitwise operators (<< and |) to build an integer
|
|
||||||
* out of the values extracted from ord()
|
|
||||||
*
|
|
||||||
* Example: [9F] | [6D] | [32] | [0C] =>
|
|
||||||
* 159 + 27904 + 3276800 + 201326592 =>
|
|
||||||
* 204631455
|
|
||||||
*/
|
|
||||||
$val &= 0;
|
|
||||||
for ($i = 0; $i < $bytes; ++$i) {
|
|
||||||
$val |= ord($randomByteString[$i]) << ($i * 8);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Apply mask
|
|
||||||
*/
|
|
||||||
$val &= $mask;
|
|
||||||
$val += $valueShift;
|
|
||||||
|
|
||||||
++$attempts;
|
|
||||||
/**
|
|
||||||
* If $val overflows to a floating point number,
|
|
||||||
* ... or is larger than $max,
|
|
||||||
* ... or smaller than $min,
|
|
||||||
* then try again.
|
|
||||||
*/
|
|
||||||
} while (!is_int($val) || $val > $max || $val < $min);
|
|
||||||
|
|
||||||
return (int) $val;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
<?php
|
|
||||||
$dist = dirname(__DIR__).'/dist';
|
|
||||||
if (!is_dir($dist)) {
|
|
||||||
mkdir($dist, 0755);
|
|
||||||
}
|
|
||||||
if (file_exists($dist.'/random_compat.phar')) {
|
|
||||||
unlink($dist.'/random_compat.phar');
|
|
||||||
}
|
|
||||||
$phar = new Phar(
|
|
||||||
$dist.'/random_compat.phar',
|
|
||||||
FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::KEY_AS_FILENAME,
|
|
||||||
'random_compat.phar'
|
|
||||||
);
|
|
||||||
rename(
|
|
||||||
dirname(__DIR__).'/lib/random.php',
|
|
||||||
dirname(__DIR__).'/lib/index.php'
|
|
||||||
);
|
|
||||||
$phar->buildFromDirectory(dirname(__DIR__).'/lib');
|
|
||||||
rename(
|
|
||||||
dirname(__DIR__).'/lib/index.php',
|
|
||||||
dirname(__DIR__).'/lib/random.php'
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If we pass an (optional) path to a private key as a second argument, we will
|
|
||||||
* sign the Phar with OpenSSL.
|
|
||||||
*
|
|
||||||
* If you leave this out, it will produce an unsigned .phar!
|
|
||||||
*/
|
|
||||||
if ($argc > 1) {
|
|
||||||
if (!@is_readable($argv[1])) {
|
|
||||||
echo 'Could not read the private key file:', $argv[1], "\n";
|
|
||||||
exit(255);
|
|
||||||
}
|
|
||||||
$pkeyFile = file_get_contents($argv[1]);
|
|
||||||
|
|
||||||
$private = openssl_get_privatekey($pkeyFile);
|
|
||||||
if ($private !== false) {
|
|
||||||
$pkey = '';
|
|
||||||
openssl_pkey_export($private, $pkey);
|
|
||||||
$phar->setSignatureAlgorithm(Phar::OPENSSL, $pkey);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save the corresponding public key to the file
|
|
||||||
*/
|
|
||||||
if (!@is_readable($dist.'/random_compat.phar.pubkey')) {
|
|
||||||
$details = openssl_pkey_get_details($private);
|
|
||||||
file_put_contents(
|
|
||||||
$dist.'/random_compat.phar.pubkey',
|
|
||||||
$details['key']
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
echo 'An error occurred reading the private key from OpenSSL.', "\n";
|
|
||||||
exit(255);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
require_once 'lib/byte_safe_strings.php';
|
|
||||||
require_once 'lib/cast_to_int.php';
|
|
||||||
require_once 'lib/error_polyfill.php';
|
|
||||||
require_once 'other/ide_stubs/libsodium.php';
|
|
||||||
require_once 'lib/random.php';
|
|
||||||
|
|
||||||
$int = random_int(0, 65536);
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<psalm
|
|
||||||
autoloader="psalm-autoload.php"
|
|
||||||
stopOnFirstError="false"
|
|
||||||
useDocblockTypes="true"
|
|
||||||
>
|
|
||||||
<projectFiles>
|
|
||||||
<directory name="lib" />
|
|
||||||
</projectFiles>
|
|
||||||
<issueHandlers>
|
|
||||||
<DuplicateClass errorLevel="info" />
|
|
||||||
<InvalidOperand errorLevel="info" />
|
|
||||||
<UndefinedConstant errorLevel="info" />
|
|
||||||
<MissingReturnType errorLevel="info" />
|
|
||||||
</issueHandlers>
|
|
||||||
</psalm>
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
vendor
|
|
||||||
|
|
@ -22,8 +22,8 @@ interface LoggerInterface
|
||||||
/**
|
/**
|
||||||
* System is unusable.
|
* System is unusable.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
@ -35,8 +35,8 @@ interface LoggerInterface
|
||||||
* Example: Entire website down, database unavailable, etc. This should
|
* Example: Entire website down, database unavailable, etc. This should
|
||||||
* trigger the SMS alerts and wake you up.
|
* trigger the SMS alerts and wake you up.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
@ -47,8 +47,8 @@ interface LoggerInterface
|
||||||
*
|
*
|
||||||
* Example: Application component unavailable, unexpected exception.
|
* Example: Application component unavailable, unexpected exception.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
@ -58,8 +58,8 @@ interface LoggerInterface
|
||||||
* Runtime errors that do not require immediate action but should typically
|
* Runtime errors that do not require immediate action but should typically
|
||||||
* be logged and monitored.
|
* be logged and monitored.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
@ -71,8 +71,8 @@ interface LoggerInterface
|
||||||
* Example: Use of deprecated APIs, poor use of an API, undesirable things
|
* Example: Use of deprecated APIs, poor use of an API, undesirable things
|
||||||
* that are not necessarily wrong.
|
* that are not necessarily wrong.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
@ -81,8 +81,8 @@ interface LoggerInterface
|
||||||
/**
|
/**
|
||||||
* Normal but significant events.
|
* Normal but significant events.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
@ -93,8 +93,8 @@ interface LoggerInterface
|
||||||
*
|
*
|
||||||
* Example: User logs in, SQL logs.
|
* Example: User logs in, SQL logs.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
@ -103,8 +103,8 @@ interface LoggerInterface
|
||||||
/**
|
/**
|
||||||
* Detailed debug information.
|
* Detailed debug information.
|
||||||
*
|
*
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
@ -113,9 +113,9 @@ interface LoggerInterface
|
||||||
/**
|
/**
|
||||||
* Logs with an arbitrary level.
|
* Logs with an arbitrary level.
|
||||||
*
|
*
|
||||||
* @param mixed $level
|
* @param mixed $level
|
||||||
* @param string $message
|
* @param string $message
|
||||||
* @param array $context
|
* @param mixed[] $context
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Psr\Log\Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class is internal and does not follow the BC promise.
|
||||||
|
*
|
||||||
|
* Do NOT use this class in any way.
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
class DummyTest
|
||||||
|
{
|
||||||
|
public function __toString()
|
||||||
|
{
|
||||||
|
return 'DummyTest';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -136,11 +136,3 @@ abstract class LoggerInterfaceTest extends TestCase
|
||||||
$this->assertEquals($expected, $this->getLogs());
|
$this->assertEquals($expected, $this->getLogs());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class DummyTest
|
|
||||||
{
|
|
||||||
public function __toString()
|
|
||||||
{
|
|
||||||
return 'DummyTest';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -545,7 +545,14 @@ final class Mbstring
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('UTF-8' === $encoding = self::getEncoding($encoding)) {
|
if ('UTF-8' === $encoding = self::getEncoding($encoding)) {
|
||||||
return preg_split("/(.{{$split_length}})/u", $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
|
$rx = '/(';
|
||||||
|
while (65535 < $split_length) {
|
||||||
|
$rx .= '.{65535}';
|
||||||
|
$split_length -= 65535;
|
||||||
|
}
|
||||||
|
$rx .= '.{'.$split_length.'})/us';
|
||||||
|
|
||||||
|
return preg_split($rx, $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = array();
|
$result = array();
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ Symfony Polyfill / Mbstring
|
||||||
===========================
|
===========================
|
||||||
|
|
||||||
This component provides a partial, native PHP implementation for the
|
This component provides a partial, native PHP implementation for the
|
||||||
[Mbstring](http://php.net/mbstring) extension.
|
[Mbstring](https://php.net/mbstring) extension.
|
||||||
|
|
||||||
More information can be found in the
|
More information can be found in the
|
||||||
[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
|
[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
|
||||||
|
|
|
||||||
|
|
@ -11,52 +11,131 @@
|
||||||
|
|
||||||
use Symfony\Polyfill\Mbstring as p;
|
use Symfony\Polyfill\Mbstring as p;
|
||||||
|
|
||||||
if (!function_exists('mb_strlen')) {
|
if (!function_exists('mb_convert_encoding')) {
|
||||||
define('MB_CASE_UPPER', 0);
|
|
||||||
define('MB_CASE_LOWER', 1);
|
|
||||||
define('MB_CASE_TITLE', 2);
|
|
||||||
|
|
||||||
function mb_convert_encoding($s, $to, $from = null) { return p\Mbstring::mb_convert_encoding($s, $to, $from); }
|
function mb_convert_encoding($s, $to, $from = null) { return p\Mbstring::mb_convert_encoding($s, $to, $from); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_decode_mimeheader')) {
|
||||||
function mb_decode_mimeheader($s) { return p\Mbstring::mb_decode_mimeheader($s); }
|
function mb_decode_mimeheader($s) { return p\Mbstring::mb_decode_mimeheader($s); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_encode_mimeheader')) {
|
||||||
function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent); }
|
function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_decode_numericentity')) {
|
||||||
function mb_decode_numericentity($s, $convmap, $enc = null) { return p\Mbstring::mb_decode_numericentity($s, $convmap, $enc); }
|
function mb_decode_numericentity($s, $convmap, $enc = null) { return p\Mbstring::mb_decode_numericentity($s, $convmap, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_encode_numericentity')) {
|
||||||
function mb_encode_numericentity($s, $convmap, $enc = null, $is_hex = false) { return p\Mbstring::mb_encode_numericentity($s, $convmap, $enc, $is_hex); }
|
function mb_encode_numericentity($s, $convmap, $enc = null, $is_hex = false) { return p\Mbstring::mb_encode_numericentity($s, $convmap, $enc, $is_hex); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_convert_case')) {
|
||||||
function mb_convert_case($s, $mode, $enc = null) { return p\Mbstring::mb_convert_case($s, $mode, $enc); }
|
function mb_convert_case($s, $mode, $enc = null) { return p\Mbstring::mb_convert_case($s, $mode, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_internal_encoding')) {
|
||||||
function mb_internal_encoding($enc = null) { return p\Mbstring::mb_internal_encoding($enc); }
|
function mb_internal_encoding($enc = null) { return p\Mbstring::mb_internal_encoding($enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_language')) {
|
||||||
function mb_language($lang = null) { return p\Mbstring::mb_language($lang); }
|
function mb_language($lang = null) { return p\Mbstring::mb_language($lang); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_list_encodings')) {
|
||||||
function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
|
function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_encoding_aliases')) {
|
||||||
function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
|
function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_check_encoding')) {
|
||||||
function mb_check_encoding($var = null, $encoding = null) { return p\Mbstring::mb_check_encoding($var, $encoding); }
|
function mb_check_encoding($var = null, $encoding = null) { return p\Mbstring::mb_check_encoding($var, $encoding); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_detect_encoding')) {
|
||||||
function mb_detect_encoding($str, $encodingList = null, $strict = false) { return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict); }
|
function mb_detect_encoding($str, $encodingList = null, $strict = false) { return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_detect_order')) {
|
||||||
function mb_detect_order($encodingList = null) { return p\Mbstring::mb_detect_order($encodingList); }
|
function mb_detect_order($encodingList = null) { return p\Mbstring::mb_detect_order($encodingList); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_parse_str')) {
|
||||||
function mb_parse_str($s, &$result = array()) { parse_str($s, $result); }
|
function mb_parse_str($s, &$result = array()) { parse_str($s, $result); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strlen')) {
|
||||||
function mb_strlen($s, $enc = null) { return p\Mbstring::mb_strlen($s, $enc); }
|
function mb_strlen($s, $enc = null) { return p\Mbstring::mb_strlen($s, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strpos')) {
|
||||||
function mb_strpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strpos($s, $needle, $offset, $enc); }
|
function mb_strpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strpos($s, $needle, $offset, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strtolower')) {
|
||||||
function mb_strtolower($s, $enc = null) { return p\Mbstring::mb_strtolower($s, $enc); }
|
function mb_strtolower($s, $enc = null) { return p\Mbstring::mb_strtolower($s, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strtoupper')) {
|
||||||
function mb_strtoupper($s, $enc = null) { return p\Mbstring::mb_strtoupper($s, $enc); }
|
function mb_strtoupper($s, $enc = null) { return p\Mbstring::mb_strtoupper($s, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_substitute_character')) {
|
||||||
function mb_substitute_character($char = null) { return p\Mbstring::mb_substitute_character($char); }
|
function mb_substitute_character($char = null) { return p\Mbstring::mb_substitute_character($char); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_substr')) {
|
||||||
function mb_substr($s, $start, $length = 2147483647, $enc = null) { return p\Mbstring::mb_substr($s, $start, $length, $enc); }
|
function mb_substr($s, $start, $length = 2147483647, $enc = null) { return p\Mbstring::mb_substr($s, $start, $length, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_stripos')) {
|
||||||
function mb_stripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_stripos($s, $needle, $offset, $enc); }
|
function mb_stripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_stripos($s, $needle, $offset, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_stristr')) {
|
||||||
function mb_stristr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_stristr($s, $needle, $part, $enc); }
|
function mb_stristr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_stristr($s, $needle, $part, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strrchr')) {
|
||||||
function mb_strrchr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrchr($s, $needle, $part, $enc); }
|
function mb_strrchr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrchr($s, $needle, $part, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strrichr')) {
|
||||||
function mb_strrichr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrichr($s, $needle, $part, $enc); }
|
function mb_strrichr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrichr($s, $needle, $part, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strripos')) {
|
||||||
function mb_strripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strripos($s, $needle, $offset, $enc); }
|
function mb_strripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strripos($s, $needle, $offset, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strrpos')) {
|
||||||
function mb_strrpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc); }
|
function mb_strrpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strstr')) {
|
||||||
function mb_strstr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strstr($s, $needle, $part, $enc); }
|
function mb_strstr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strstr($s, $needle, $part, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_get_info')) {
|
||||||
function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
|
function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_http_output')) {
|
||||||
function mb_http_output($enc = null) { return p\Mbstring::mb_http_output($enc); }
|
function mb_http_output($enc = null) { return p\Mbstring::mb_http_output($enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_strwidth')) {
|
||||||
function mb_strwidth($s, $enc = null) { return p\Mbstring::mb_strwidth($s, $enc); }
|
function mb_strwidth($s, $enc = null) { return p\Mbstring::mb_strwidth($s, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_substr_count')) {
|
||||||
function mb_substr_count($haystack, $needle, $enc = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $enc); }
|
function mb_substr_count($haystack, $needle, $enc = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_output_handler')) {
|
||||||
function mb_output_handler($contents, $status) { return p\Mbstring::mb_output_handler($contents, $status); }
|
function mb_output_handler($contents, $status) { return p\Mbstring::mb_output_handler($contents, $status); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_http_input')) {
|
||||||
function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); }
|
function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_convert_variables')) {
|
||||||
function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f); }
|
function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f); }
|
||||||
}
|
}
|
||||||
if (!function_exists('mb_chr')) {
|
if (!function_exists('mb_ord')) {
|
||||||
function mb_ord($s, $enc = null) { return p\Mbstring::mb_ord($s, $enc); }
|
function mb_ord($s, $enc = null) { return p\Mbstring::mb_ord($s, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_chr')) {
|
||||||
function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); }
|
function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); }
|
||||||
|
}
|
||||||
|
if (!function_exists('mb_scrub')) {
|
||||||
function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
|
function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!function_exists('mb_str_split')) {
|
if (!function_exists('mb_str_split')) {
|
||||||
function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); }
|
function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (extension_loaded('mbstring')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!defined('MB_CASE_UPPER')) {
|
||||||
|
define('MB_CASE_UPPER', 0);
|
||||||
|
}
|
||||||
|
if (!defined('MB_CASE_LOWER')) {
|
||||||
|
define('MB_CASE_LOWER', 1);
|
||||||
|
}
|
||||||
|
if (!defined('MB_CASE_TITLE')) {
|
||||||
|
define('MB_CASE_TITLE', 2);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.13-dev"
|
"dev-master": "1.17-dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue