Merge branch 'release/3.4'

This commit is contained in:
Dylan K. Taylor 2018-12-03 16:17:26 +00:00
commit 302c509b9f

49
composer.lock generated
View File

@ -8,27 +8,27 @@
"packages": [ "packages": [
{ {
"name": "fgrosse/phpasn1", "name": "fgrosse/phpasn1",
"version": "2.0.1", "version": "v2.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fgrosse/PHPASN1.git", "url": "https://github.com/fgrosse/PHPASN1.git",
"reference": "0e27e71e3d0a8d5c3f1471d727fd9574d920f33c" "reference": "7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/0e27e71e3d0a8d5c3f1471d727fd9574d920f33c", "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8",
"reference": "0e27e71e3d0a8d5c3f1471d727fd9574d920f33c", "reference": "7ebf2a09084a7bbdb7b879c66fdf7ad80461bbe8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-gmp": "*",
"php": ">=7.0.0" "php": ">=7.0.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~6.3", "phpunit/phpunit": "~6.3",
"satooshi/php-coveralls": "dev-master" "satooshi/php-coveralls": "~2.0"
}, },
"suggest": { "suggest": {
"ext-gmp": "GMP is the preferred extension for big integer calculations",
"php-curl": "For loading OID information from the web if they have not bee defined statically" "php-curl": "For loading OID information from the web if they have not bee defined statically"
}, },
"type": "library", "type": "library",
@ -73,31 +73,31 @@
"x509", "x509",
"x690" "x690"
], ],
"time": "2017-12-17T10:21:51+00:00" "time": "2018-12-02T01:34:34+00:00"
}, },
{ {
"name": "mdanter/ecc", "name": "mdanter/ecc",
"version": "v0.5.0", "version": "v0.5.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpecc/phpecc.git", "url": "https://github.com/phpecc/phpecc.git",
"reference": "ed5c6d496f5310de1b7071b8375fafa3559a1344" "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpecc/phpecc/zipball/ed5c6d496f5310de1b7071b8375fafa3559a1344", "url": "https://api.github.com/repos/phpecc/phpecc/zipball/9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b",
"reference": "ed5c6d496f5310de1b7071b8375fafa3559a1344", "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-gmp": "*", "ext-gmp": "*",
"fgrosse/phpasn1": "v2.0.x", "fgrosse/phpasn1": "^2.0",
"php": ">=7.0" "php": "^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.0", "phpunit/phpunit": "^6.0",
"squizlabs/php_codesniffer": "~2", "squizlabs/php_codesniffer": "^2.0",
"symfony/yaml": "~2.6|~3.0" "symfony/yaml": "^2.6|^3.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -145,7 +145,7 @@
"secp256k1", "secp256k1",
"secp256r1" "secp256r1"
], ],
"time": "2017-10-09T16:05:37+00:00" "time": "2018-12-01T23:35:23+00:00"
}, },
{ {
"name": "pocketmine/binaryutils", "name": "pocketmine/binaryutils",
@ -187,12 +187,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/Math.git", "url": "https://github.com/pmmp/Math.git",
"reference": "82401b6c79404fa2e102596dfc3e59a0e4449158" "reference": "5bb6facf8c46212bdb78d6bb1be6fbd2891b200d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/Math/zipball/82401b6c79404fa2e102596dfc3e59a0e4449158", "url": "https://api.github.com/repos/pmmp/Math/zipball/5bb6facf8c46212bdb78d6bb1be6fbd2891b200d",
"reference": "82401b6c79404fa2e102596dfc3e59a0e4449158", "reference": "5bb6facf8c46212bdb78d6bb1be6fbd2891b200d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -218,7 +218,7 @@
"source": "https://github.com/pmmp/Math/tree/master", "source": "https://github.com/pmmp/Math/tree/master",
"issues": "https://github.com/pmmp/Math/issues" "issues": "https://github.com/pmmp/Math/issues"
}, },
"time": "2018-11-24T14:16:58+00:00" "time": "2018-12-02T11:40:31+00:00"
}, },
{ {
"name": "pocketmine/nbt", "name": "pocketmine/nbt",
@ -226,15 +226,16 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/NBT.git", "url": "https://github.com/pmmp/NBT.git",
"reference": "db491f3309231e56f2640a047f665a0131c23538" "reference": "91b6a158d06032e9029b9a87be64a12c3b93aa14"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/NBT/zipball/db491f3309231e56f2640a047f665a0131c23538", "url": "https://api.github.com/repos/pmmp/NBT/zipball/91b6a158d06032e9029b9a87be64a12c3b93aa14",
"reference": "db491f3309231e56f2640a047f665a0131c23538", "reference": "91b6a158d06032e9029b9a87be64a12c3b93aa14",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-zlib": "*",
"php": ">=7.2.0", "php": ">=7.2.0",
"php-64bit": "*", "php-64bit": "*",
"pocketmine/binaryutils": "^0.1.0" "pocketmine/binaryutils": "^0.1.0"
@ -258,7 +259,7 @@
"source": "https://github.com/pmmp/NBT/tree/master", "source": "https://github.com/pmmp/NBT/tree/master",
"issues": "https://github.com/pmmp/NBT/issues" "issues": "https://github.com/pmmp/NBT/issues"
}, },
"time": "2018-10-23T15:23:36+00:00" "time": "2018-12-03T16:12:37+00:00"
}, },
{ {
"name": "pocketmine/raklib", "name": "pocketmine/raklib",