mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into minor-next

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-06-01 14:52:28 +01:00
commit c95c600100
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 60 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.json
View File

@ -33,7 +33,7 @@
"composer-runtime-api": "^2.0", "composer-runtime-api": "^2.0",
"adhocore/json-comment": "^1.1", "adhocore/json-comment": "^1.1",
"fgrosse/phpasn1": "^2.3", "fgrosse/phpasn1": "^2.3",
"netresearch/jsonmapper": "dev-array-in-string-property-error as 4.2.0", "pocketmine/netresearch-jsonmapper": "~v4.2.999",
"pocketmine/bedrock-block-upgrade-schema": "~2.1.0+bedrock-1.19.80", "pocketmine/bedrock-block-upgrade-schema": "~2.1.0+bedrock-1.19.80",
"pocketmine/bedrock-data": "~2.2.0+bedrock-1.19.80", "pocketmine/bedrock-data": "~2.2.0+bedrock-1.19.80",
"pocketmine/bedrock-item-upgrade-schema": "~1.2.0+bedrock-1.19.80", "pocketmine/bedrock-item-upgrade-schema": "~1.2.0+bedrock-1.19.80",
@ -93,11 +93,5 @@
"update-translation-apis": [ "update-translation-apis": [
"@php build/generate-known-translation-apis.php" "@php build/generate-known-translation-apis.php"
] ]
}, }
"repositories": [
{
"type": "vcs",
"url": "https://github.com/dktapps/JsonMapper.git"
}
]
} }

119
composer.lock generated
View File

@ -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": "41d697de292e1b730bb9aba724193317", "content-hash": "71b219a28dbaa295fae2d3e61141c66a",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -196,56 +196,6 @@
"abandoned": true, "abandoned": true,
"time": "2022-12-19T11:08:26+00:00" "time": "2022-12-19T11:08:26+00:00"
}, },
{
"name": "netresearch/jsonmapper",
"version": "dev-array-in-string-property-error",
"source": {
"type": "git",
"url": "https://github.com/dktapps/jsonmapper.git",
"reference": "4a82d1b98b99d682b660d6caa9b3816b2abc794c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dktapps/jsonmapper/zipball/4a82d1b98b99d682b660d6caa9b3816b2abc794c",
"reference": "4a82d1b98b99d682b660d6caa9b3816b2abc794c",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-pcre": "*",
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=7.1"
},
"require-dev": {
"phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
"squizlabs/php_codesniffer": "~3.5"
},
"type": "library",
"autoload": {
"psr-0": {
"JsonMapper": "src/"
}
},
"license": [
"OSL-3.0"
],
"authors": [
{
"name": "Christian Weiske",
"email": "cweiske@cweiske.de",
"homepage": "http://github.com/cweiske/jsonmapper/",
"role": "Developer"
}
],
"description": "Map nested JSON structures onto PHP classes",
"support": {
"email": "cweiske@cweiske.de",
"issues": "https://github.com/cweiske/jsonmapper/issues",
"source": "https://github.com/dktapps/jsonmapper/tree/array-in-string-property-error"
},
"time": "2023-05-30T13:10:31+00:00"
},
{ {
"name": "pocketmine/bedrock-block-upgrade-schema", "name": "pocketmine/bedrock-block-upgrade-schema",
"version": "2.1.0", "version": "2.1.0",
@ -778,6 +728,60 @@
}, },
"time": "2023-04-10T11:31:20+00:00" "time": "2023-04-10T11:31:20+00:00"
}, },
{
"name": "pocketmine/netresearch-jsonmapper",
"version": "v4.2.999",
"source": {
"type": "git",
"url": "https://github.com/pmmp/netresearch-jsonmapper.git",
"reference": "f700806dec756ed825a8200dc2950ead98265956"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/netresearch-jsonmapper/zipball/f700806dec756ed825a8200dc2950ead98265956",
"reference": "f700806dec756ed825a8200dc2950ead98265956",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-pcre": "*",
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=7.1"
},
"replace": {
"netresearch/jsonmapper": "~4.2.0"
},
"require-dev": {
"phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
"squizlabs/php_codesniffer": "~3.5"
},
"type": "library",
"autoload": {
"psr-0": {
"JsonMapper": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"OSL-3.0"
],
"authors": [
{
"name": "Christian Weiske",
"email": "cweiske@cweiske.de",
"homepage": "http://github.com/cweiske/jsonmapper/",
"role": "Developer"
}
],
"description": "Fork of netresearch/jsonmapper with security fixes needed by pocketmine/pocketmine-mp",
"support": {
"email": "cweiske@cweiske.de",
"issues": "https://github.com/cweiske/jsonmapper/issues",
"source": "https://github.com/pmmp/netresearch-jsonmapper/tree/v4.2.999"
},
"time": "2023-06-01T13:43:01+00:00"
},
{ {
"name": "pocketmine/raklib", "name": "pocketmine/raklib",
"version": "0.14.6", "version": "0.14.6",
@ -3193,18 +3197,9 @@
"time": "2021-07-28T10:34:58+00:00" "time": "2021-07-28T10:34:58+00:00"
} }
], ],
"aliases": [ "aliases": [],
{
"package": "netresearch/jsonmapper",
"version": "dev-array-in-string-property-error",
"alias": "4.2.0",
"alias_normalized": "4.2.0.0"
}
],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": [],
"netresearch/jsonmapper": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {

2
tests/plugins/DevTools

@ -1 +1 @@
Subproject commit a67f9af8d6cff1615975c68a9b171a8f09aac0c4 Subproject commit a2f36e8dbf2eb048826f5381f8b5215118eed03c