diff --git a/composer.json b/composer.json index 0ee849d4..7f0b079e 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,14 @@ { - "name": "sof3/libasynql", - "type": "library", - "require": { - "pocketmine/bedrock-block-upgrade-schema": "dev-master", - "pocketmine/bedrock-data": "dev-modern-world-support", - "pocketmine/bedrock-item-upgrade-schema": "dev-master", - "pocketmine/pocketmine-mp": "^5.0.0-ALPHA" - }, - "license": "Apache-2.0", + "name": "sof3/libasynql", + "type": "library", + "require": { + "pocketmine/pocketmine-mp": "^5.0.0-ALPHA8@dev", + "pocketmine/bedrock-block-upgrade-schema": "dev-master@dev", + "pocketmine/bedrock-data": "dev-modern-world-support@dev", + "pocketmine/bedrock-item-upgrade-schema": "dev-master@dev", + "ext-pthreads": "^5.1.0" + }, + "license": "Apache-2.0", "autoload": { "psr-0": { "poggit\\libasynql\\": "libasynql/src/" diff --git a/composer.lock b/composer.lock index e5880d09..ea647a50 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "084a010ab6e51a38a610e8304ff8cd28", + "content-hash": "c89017f68fa083c2df2284f4482da6f4", "packages": [ { "name": "adhocore/json-comment", - "version": "1.1.2", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/adhocore/php-json-comment.git", - "reference": "fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7" + "reference": "651023f9fe52e9efa2198cbaf6e481d1968e2377" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7", - "reference": "fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7", + "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/651023f9fe52e9efa2198cbaf6e481d1968e2377", + "reference": "651023f9fe52e9efa2198cbaf6e481d1968e2377", "shasum": "" }, "require": { @@ -51,15 +51,19 @@ ], "support": { "issues": "https://github.com/adhocore/php-json-comment/issues", - "source": "https://github.com/adhocore/php-json-comment/tree/1.1.2" + "source": "https://github.com/adhocore/php-json-comment/tree/1.2.1" }, "funding": [ { "url": "https://paypal.me/ji10", "type": "custom" + }, + { + "url": "https://github.com/adhocore", + "type": "github" } ], - "time": "2021-04-09T03:06:06+00:00" + "time": "2022-10-02T11:22:07+00:00" }, { "name": "brick/math", @@ -119,24 +123,24 @@ }, { "name": "fgrosse/phpasn1", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296" + "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/eef488991d53e58e60c9554b09b1201ca5ba9296", - "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296", + "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/42060ed45344789fb9f21f9f1864fc47b9e3507b", + "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b", "shasum": "" }, "require": { - "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "~2.0", - "phpunit/phpunit": "^6.3 || ^7.0 || ^8.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "suggest": { "ext-bcmath": "BCmath is the fallback extension for big integer calculations", @@ -188,22 +192,23 @@ ], "support": { "issues": "https://github.com/fgrosse/PHPASN1/issues", - "source": "https://github.com/fgrosse/PHPASN1/tree/v2.4.0" + "source": "https://github.com/fgrosse/PHPASN1/tree/v2.5.0" }, - "time": "2021-12-11T12:41:06+00:00" + "abandoned": true, + "time": "2022-12-19T11:08:26+00:00" }, { "name": "netresearch/jsonmapper", - "version": "v4.0.0", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" + "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", - "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", "shasum": "" }, "require": { @@ -239,9 +244,36 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" }, - "time": "2020-12-01T19:48:11+00:00" + "time": "2022-12-08T20:46:14+00:00" + }, + { + "name": "pocketmine/bedrock-block-upgrade-schema", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git", + "reference": "b0cc441e029cf5a6de5b05dd0f5657208855232b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/b0cc441e029cf5a6de5b05dd0f5657208855232b", + "reference": "b0cc441e029cf5a6de5b05dd0f5657208855232b", + "shasum": "" + }, + "default-branch": true, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "CC0-1.0" + ], + "description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves", + "support": { + "issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues", + "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/master" + }, + "time": "2023-02-01T21:11:39+00:00" }, { "name": "pocketmine/bedrock-block-upgrade-schema", @@ -276,12 +308,12 @@ "source": { "type": "git", "url": "https://github.com/pmmp/BedrockData.git", - "reference": "6f480c67ed03abb1b2641802879f5c1aeda11cc2" + "reference": "6a735f1c6bf11fd100db1de9be029a4e1fd11558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/6f480c67ed03abb1b2641802879f5c1aeda11cc2", - "reference": "6f480c67ed03abb1b2641802879f5c1aeda11cc2", + "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/6a735f1c6bf11fd100db1de9be029a4e1fd11558", + "reference": "6a735f1c6bf11fd100db1de9be029a4e1fd11558", "shasum": "" }, "type": "library", @@ -294,7 +326,7 @@ "issues": "https://github.com/pmmp/BedrockData/issues", "source": "https://github.com/pmmp/BedrockData/tree/modern-world-support" }, - "time": "2022-08-09T17:47:56+00:00" + "time": "2023-01-31T23:58:53+00:00" }, { "name": "pocketmine/bedrock-item-upgrade-schema", @@ -302,12 +334,12 @@ "source": { "type": "git", "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git", - "reference": "d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f" + "reference": "7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f", - "reference": "d984d2ee7283bc52e8733e7c7da1d0f6b6dc501f", + "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7", + "reference": "7e53f77ea34ba30b1f94d3c24e64e19d3c4296e7", "shasum": "" }, "default-branch": true, @@ -319,22 +351,22 @@ "description": "JSON schemas for upgrading items found in older Minecraft: Bedrock world saves", "support": { "issues": "https://github.com/pmmp/BedrockItemUpgradeSchema/issues", - "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/master" + "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.0.0" }, - "time": "2022-06-08T13:47:48+00:00" + "time": "2023-02-01T22:50:02+00:00" }, { "name": "pocketmine/bedrock-protocol", - "version": "12.0.0+bedrock-1.19.20", + "version": "18.0.0+bedrock-1.19.50", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockProtocol.git", - "reference": "c2778039544fa0c7c5bd3af7963149e7552f4215" + "reference": "b558ec883bd967dd3339f513cba62d2fbcd63349" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/c2778039544fa0c7c5bd3af7963149e7552f4215", - "reference": "c2778039544fa0c7c5bd3af7963149e7552f4215", + "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/b558ec883bd967dd3339f513cba62d2fbcd63349", + "reference": "b558ec883bd967dd3339f513cba62d2fbcd63349", "shasum": "" }, "require": { @@ -342,13 +374,13 @@ "netresearch/jsonmapper": "^4.0", "php": "^8.0", "pocketmine/binaryutils": "^0.2.0", - "pocketmine/color": "^0.2.0", + "pocketmine/color": "^0.2.0 || ^0.3.0", "pocketmine/math": "^0.3.0 || ^0.4.0", "pocketmine/nbt": "^0.3.0", "ramsey/uuid": "^4.1" }, "require-dev": { - "phpstan/phpstan": "1.8.0", + "phpstan/phpstan": "1.9.4", "phpstan/phpstan-phpunit": "^1.0.0", "phpstan/phpstan-strict-rules": "^1.0.0", "phpunit/phpunit": "^9.5" @@ -366,9 +398,9 @@ "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP", "support": { "issues": "https://github.com/pmmp/BedrockProtocol/issues", - "source": "https://github.com/pmmp/BedrockProtocol/tree/bedrock-1.19.20" + "source": "https://github.com/pmmp/BedrockProtocol/tree/18.0.0+bedrock-1.19.50" }, - "time": "2022-08-09T17:57:29+00:00" + "time": "2023-01-06T21:47:35+00:00" }, { "name": "pocketmine/binaryutils", @@ -464,20 +496,20 @@ }, { "name": "pocketmine/classloader", - "version": "0.2.0", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/pmmp/ClassLoader.git", - "reference": "49ea303993efdfb39cd302e2156d50aa78209e78" + "reference": "407caf521186ec1f03024f39031cc681ad491026" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/49ea303993efdfb39cd302e2156d50aa78209e78", - "reference": "49ea303993efdfb39cd302e2156d50aa78209e78", + "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/407caf521186ec1f03024f39031cc681ad491026", + "reference": "407caf521186ec1f03024f39031cc681ad491026", "shasum": "" }, "require": { - "ext-pthreads": "~3.2.0 || ^4.0", + "ext-pthreads": "^5.0", "ext-reflection": "*", "php": "^8.0" }, @@ -486,8 +518,8 @@ }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "0.12.99", - "phpstan/phpstan-strict-rules": "^0.12.4", + "phpstan/phpstan": "1.9.4", + "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5" }, "type": "library", @@ -503,30 +535,30 @@ "description": "Ad-hoc autoloading components used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/ClassLoader/issues", - "source": "https://github.com/pmmp/ClassLoader/tree/0.2.0" + "source": "https://github.com/pmmp/ClassLoader/tree/0.3.0" }, - "time": "2021-11-01T20:17:27+00:00" + "time": "2023-01-23T19:46:53+00:00" }, { "name": "pocketmine/color", - "version": "0.2.0", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/pmmp/Color.git", - "reference": "09be6ea6d76f2e33d6813c39d29c22c46c17e1d2" + "reference": "8cb346d0a21ad3287cc8d7175e4b643416607249" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Color/zipball/09be6ea6d76f2e33d6813c39d29c22c46c17e1d2", - "reference": "09be6ea6d76f2e33d6813c39d29c22c46c17e1d2", + "url": "https://api.github.com/repos/pmmp/Color/zipball/8cb346d0a21ad3287cc8d7175e4b643416607249", + "reference": "8cb346d0a21ad3287cc8d7175e4b643416607249", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^8.0" }, "require-dev": { - "phpstan/phpstan": "0.12.59", - "phpstan/phpstan-strict-rules": "^0.12.2" + "phpstan/phpstan": "1.9.4", + "phpstan/phpstan-strict-rules": "^1.2.0" }, "type": "library", "autoload": { @@ -541,9 +573,9 @@ "description": "Color handling library used by PocketMine-MP and related projects", "support": { "issues": "https://github.com/pmmp/Color/issues", - "source": "https://github.com/pmmp/Color/tree/0.2.0" + "source": "https://github.com/pmmp/Color/tree/0.3.0" }, - "time": "2020-12-11T01:24:32+00:00" + "time": "2022-12-18T19:49:21+00:00" }, { "name": "pocketmine/errorhandler", @@ -586,16 +618,16 @@ }, { "name": "pocketmine/locale-data", - "version": "2.8.9", + "version": "2.18.3", "source": { "type": "git", "url": "https://github.com/pmmp/Language.git", - "reference": "27637272e5230511e3b6568192d0422e5e97a571" + "reference": "da25bfe9ee4822a84feb9b7e620c56ad4000aed0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Language/zipball/27637272e5230511e3b6568192d0422e5e97a571", - "reference": "27637272e5230511e3b6568192d0422e5e97a571", + "url": "https://api.github.com/repos/pmmp/Language/zipball/da25bfe9ee4822a84feb9b7e620c56ad4000aed0", + "reference": "da25bfe9ee4822a84feb9b7e620c56ad4000aed0", "shasum": "" }, "type": "library", @@ -603,9 +635,10 @@ "description": "Language resources used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/Language/issues", - "source": "https://github.com/pmmp/Language/tree/2.8.9" + "source": "https://github.com/pmmp/Language/tree/2.18.3" }, - "time": "2022-08-25T18:54:39+00:00" + "time": "2023-01-17T21:43:36+00:00" + }, { "name": "pocketmine/log", @@ -650,21 +683,21 @@ }, { "name": "pocketmine/log-pthreads", - "version": "0.4.0", + "version": "0.5.0", "source": { "type": "git", "url": "https://github.com/pmmp/LogPthreads.git", - "reference": "61f709e8cf36bcc24e4efe02acded680a1ce23cd" + "reference": "0ecfea6dcfc9a9f5c86e126ac1661732de5c5666" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/LogPthreads/zipball/61f709e8cf36bcc24e4efe02acded680a1ce23cd", - "reference": "61f709e8cf36bcc24e4efe02acded680a1ce23cd", + "url": "https://api.github.com/repos/pmmp/LogPthreads/zipball/0ecfea6dcfc9a9f5c86e126ac1661732de5c5666", + "reference": "0ecfea6dcfc9a9f5c86e126ac1661732de5c5666", "shasum": "" }, "require": { - "ext-pthreads": "~3.2.0 || ^4.0", - "php": "^7.4 || ^8.0", + "ext-pthreads": "^5.0", + "php": "^8.0", "pocketmine/log": "^0.4.0" }, "conflict": { @@ -672,8 +705,8 @@ }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "0.12.88", - "phpstan/phpstan-strict-rules": "^0.12.4" + "phpstan/phpstan": "1.8.11", + "phpstan/phpstan-strict-rules": "^1.0" }, "type": "library", "autoload": { @@ -688,9 +721,9 @@ "description": "Logging components specialized for pthreads used by PocketMine-MP and related projects", "support": { "issues": "https://github.com/pmmp/LogPthreads/issues", - "source": "https://github.com/pmmp/LogPthreads/tree/0.4.0" + "source": "https://github.com/pmmp/LogPthreads/tree/0.5.0" }, - "time": "2021-11-01T21:42:09+00:00" + "time": "2023-01-23T19:52:12+00:00" }, { "name": "pocketmine/math", @@ -777,16 +810,16 @@ }, { "name": "pocketmine/pocketmine-mp", - "version": "5.0.0-ALPHA3", + "version": "5.0.0-ALPHA8", "source": { "type": "git", "url": "https://github.com/pmmp/PocketMine-MP.git", - "reference": "eeb95872ea54c18404c283be030d295248ac0572" + "reference": "5aa8b953a817491ea04f33cb1bc1e17e94796acf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/PocketMine-MP/zipball/eeb95872ea54c18404c283be030d295248ac0572", - "reference": "eeb95872ea54c18404c283be030d295248ac0572", + "url": "https://api.github.com/repos/pmmp/PocketMine-MP/zipball/5aa8b953a817491ea04f33cb1bc1e17e94796acf", + "reference": "5aa8b953a817491ea04f33cb1bc1e17e94796acf", "shasum": "" }, "require": { @@ -807,7 +840,7 @@ "ext-openssl": "*", "ext-pcre": "*", "ext-phar": "*", - "ext-pthreads": "^4.0", + "ext-pthreads": "^5.1", "ext-reflection": "*", "ext-simplexml": "*", "ext-sockets": "*", @@ -822,25 +855,25 @@ "pocketmine/bedrock-block-upgrade-schema": "dev-master@dev", "pocketmine/bedrock-data": "dev-modern-world-support@dev", "pocketmine/bedrock-item-upgrade-schema": "dev-master", - "pocketmine/bedrock-protocol": "~12.0.0+bedrock-1.19.20", + "pocketmine/bedrock-protocol": "~18.0.0+bedrock-1.19.50", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", - "pocketmine/classloader": "^0.2.0", - "pocketmine/color": "^0.2.0", + "pocketmine/classloader": "^0.3.0", + "pocketmine/color": "^0.3.0", "pocketmine/errorhandler": "^0.6.0", - "pocketmine/locale-data": "~2.8.0", + "pocketmine/locale-data": "~2.18.0", "pocketmine/log": "^0.4.0", - "pocketmine/log-pthreads": "^0.4.0", + "pocketmine/log-pthreads": "^0.5.0", "pocketmine/math": "^0.4.0", "pocketmine/nbt": "^0.3.2", "pocketmine/raklib": "^0.14.2", "pocketmine/raklib-ipc": "^0.1.0", - "pocketmine/snooze": "^0.3.0", + "pocketmine/snooze": "^0.4.0", "ramsey/uuid": "^4.1", - "webmozart/path-util": "^2.3" + "symfony/filesystem": "^5.4" }, "require-dev": { - "phpstan/phpstan": "1.8.2", + "phpstan/phpstan": "1.9.13", "phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.2.0", "phpunit/phpunit": "^9.2" @@ -862,7 +895,7 @@ "homepage": "https://pmmp.io", "support": { "issues": "https://github.com/pmmp/PocketMine-MP/issues", - "source": "https://github.com/pmmp/PocketMine-MP/tree/5.0.0-ALPHA3" + "source": "https://github.com/pmmp/PocketMine-MP/tree/5.0.0-ALPHA8" }, "funding": [ { @@ -874,7 +907,7 @@ "type": "patreon" } ], - "time": "2022-08-14T19:12:24+00:00" + "time": "2023-01-23T20:38:35+00:00" }, { "name": "pocketmine/raklib", @@ -962,26 +995,26 @@ }, { "name": "pocketmine/snooze", - "version": "0.3.1", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/pmmp/Snooze.git", - "reference": "0ac8fc2a781c419a1f64ebca4d5835028f59e29b" + "reference": "6b1d6cc645d674590ff9be2438ac00032f9ee292" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Snooze/zipball/0ac8fc2a781c419a1f64ebca4d5835028f59e29b", - "reference": "0ac8fc2a781c419a1f64ebca4d5835028f59e29b", + "url": "https://api.github.com/repos/pmmp/Snooze/zipball/6b1d6cc645d674590ff9be2438ac00032f9ee292", + "reference": "6b1d6cc645d674590ff9be2438ac00032f9ee292", "shasum": "" }, "require": { - "ext-pthreads": "~3.2.0 || ^4.0", - "php-64bit": "^7.3 || ^8.0" + "ext-pthreads": "^5.0", + "php-64bit": "^8.0" }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "0.12.99", - "phpstan/phpstan-strict-rules": "^0.12.4" + "phpstan/phpstan": "1.9.14", + "phpstan/phpstan-strict-rules": "^1.0" }, "type": "library", "autoload": { @@ -996,48 +1029,58 @@ "description": "Thread notification management library for code using the pthreads extension", "support": { "issues": "https://github.com/pmmp/Snooze/issues", - "source": "https://github.com/pmmp/Snooze/tree/0.3.1" + "source": "https://github.com/pmmp/Snooze/tree/0.4.0" }, - "time": "2021-11-01T20:50:08+00:00" + "time": "2023-01-23T19:43:19+00:00" }, { "name": "ramsey/collection", - "version": "1.2.2", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a" + "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a", - "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a", + "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", + "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", "shasum": "" }, "require": { - "php": "^7.3 || ^8", - "symfony/polyfill-php81": "^1.23" + "php": "^8.1" }, "require-dev": { - "captainhook/captainhook": "^5.3", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "ergebnis/composer-normalize": "^2.6", - "fakerphp/faker": "^1.5", - "hamcrest/hamcrest-php": "^2", - "jangregor/phpstan-prophecy": "^0.8", - "mockery/mockery": "^1.3", + "captainhook/plugin-composer": "^5.3", + "ergebnis/composer-normalize": "^2.28.3", + "fakerphp/faker": "^1.21", + "hamcrest/hamcrest-php": "^2.0", + "jangregor/phpstan-prophecy": "^1.0", + "mockery/mockery": "^1.5", + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpcsstandards/phpcsutils": "^1.0.0-rc1", "phpspec/prophecy-phpunit": "^2.0", - "phpstan/extension-installer": "^1", - "phpstan/phpstan": "^0.12.32", - "phpstan/phpstan-mockery": "^0.12.5", - "phpstan/phpstan-phpunit": "^0.12.11", - "phpunit/phpunit": "^8.5 || ^9", - "psy/psysh": "^0.10.4", - "slevomat/coding-standard": "^6.3", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.4" + "phpstan/extension-installer": "^1.2", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5", + "psalm/plugin-mockery": "^1.1", + "psalm/plugin-phpunit": "^0.18.4", + "ramsey/coding-standard": "^2.0.3", + "ramsey/conventional-commits": "^1.3", + "vimeo/psalm": "^5.4" }, "type": "library", + "extra": { + "captainhook": { + "force-install": true + }, + "ramsey/conventional-commits": { + "configFile": "conventional-commits.json" + } + }, "autoload": { "psr-4": { "Ramsey\\Collection\\": "src/" @@ -1065,7 +1108,7 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/1.2.2" + "source": "https://github.com/ramsey/collection/tree/2.0.0" }, "funding": [ { @@ -1077,28 +1120,27 @@ "type": "tidelift" } ], - "time": "2021-10-10T03:01:02+00:00" + "time": "2022-12-31T21:50:55+00:00" }, { "name": "ramsey/uuid", - "version": "4.4.0", + "version": "4.7.3", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "373f7bacfcf3de038778ff27dcce5672ddbf4c8a" + "reference": "433b2014e3979047db08a17a205f410ba3869cf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/373f7bacfcf3de038778ff27dcce5672ddbf4c8a", - "reference": "373f7bacfcf3de038778ff27dcce5672ddbf4c8a", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2", + "reference": "433b2014e3979047db08a17a205f410ba3869cf2", "shasum": "" }, "require": { - "brick/math": "^0.8 || ^0.9 || ^0.10", - "ext-ctype": "*", + "brick/math": "^0.8.8 || ^0.9 || ^0.10", "ext-json": "*", "php": "^8.0", - "ramsey/collection": "^1.0" + "ramsey/collection": "^1.2 || ^2.0" }, "replace": { "rhumsaa/uuid": "self.version" @@ -1115,18 +1157,18 @@ "php-mock/php-mock-mockery": "^1.3", "php-parallel-lint/php-parallel-lint": "^1.1", "phpbench/phpbench": "^1.0", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-mockery": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.1", "phpunit/phpunit": "^8.5 || ^9", - "slevomat/coding-standard": "^7.0", + "ramsey/composer-repl": "^1.4", + "slevomat/coding-standard": "^8.4", "squizlabs/php_codesniffer": "^3.5", "vimeo/psalm": "^4.9" }, "suggest": { "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", - "ext-ctype": "Enables faster processing of character classification using ctype functions.", "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.", "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.", "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", @@ -1158,7 +1200,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.4.0" + "source": "https://github.com/ramsey/uuid/tree/4.7.3" }, "funding": [ { @@ -1170,29 +1212,99 @@ "type": "tidelift" } ], - "time": "2022-08-05T17:58:37+00:00" + "time": "2023-01-12T18:13:24+00:00" }, { - "name": "symfony/polyfill-php81", - "version": "v1.26.0", + "name": "symfony/filesystem", + "version": "v5.4.19", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + "url": "https://github.com/symfony/filesystem.git", + "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/648bfaca6a494f3e22378123bcee2894045dc9d8", + "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v5.4.19" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-14T19:14:44+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1204,11 +1316,8 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, - "classmap": [ - "Resources/stubs" - ] + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1216,24 +1325,24 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "description": "Symfony polyfill for ctype functions", "homepage": "https://symfony.com", "keywords": [ "compatibility", + "ctype", "polyfill", - "portable", - "shim" + "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -1249,42 +1358,47 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { - "name": "webmozart/assert", - "version": "1.11.0", + "name": "symfony/polyfill-mbstring", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { - "ext-ctype": "*", - "php": "^7.2 || ^8.0" + "php": ">=7.1" }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" + "provide": { + "ext-mbstring": "*" }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" + "suggest": { + "ext-mbstring": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Webmozart\\Assert\\": "src/" + "Symfony\\Polyfill\\Mbstring\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1293,54 +1407,79 @@ ], "authors": [ { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Assertions to validate method input/output with nice error messages.", + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", "keywords": [ - "assert", - "check", - "validate" + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" ], "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, - "time": "2022-06-03T18:03:27+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" }, { - "name": "webmozart/path-util", - "version": "2.3.0", + "name": "symfony/polyfill-php80", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/webmozart/path-util.git", - "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725", - "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { - "php": ">=5.3.3", - "webmozart/assert": "~1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Webmozart\\PathUtil\\": "src/" - } + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1348,31 +1487,60 @@ ], "authors": [ { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], "support": { - "issues": "https://github.com/webmozart/path-util/issues", - "source": "https://github.com/webmozart/path-util/tree/2.3.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, - "abandoned": "symfony/filesystem", - "time": "2015-12-17T08:42:14+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", "stability-flags": { + "pocketmine/pocketmine-mp": 20, "pocketmine/bedrock-block-upgrade-schema": 20, "pocketmine/bedrock-data": 20, - "pocketmine/bedrock-item-upgrade-schema": 20, - "pocketmine/pocketmine-mp": 15 + "pocketmine/bedrock-item-upgrade-schema": 20 }, "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "ext-pthreads": "^5.1.0" + }, "platform-dev": [], "plugin-api-version": "2.3.0" } diff --git a/libasynql/src/poggit/libasynql/base/QueryRecvQueue.php b/libasynql/src/poggit/libasynql/base/QueryRecvQueue.php index 11d86c38..beccf84d 100644 --- a/libasynql/src/poggit/libasynql/base/QueryRecvQueue.php +++ b/libasynql/src/poggit/libasynql/base/QueryRecvQueue.php @@ -24,33 +24,35 @@ use poggit\libasynql\SqlError; use poggit\libasynql\SqlResult; -use Threaded; use function is_string; use function serialize; use function unserialize; -class QueryRecvQueue extends Threaded{ +class QueryRecvQueue extends \ThreadedBase{ private int $availableThreads = 0; + + /** @var \ThreadedArray*/ + private \ThreadedArray $results; /** * @param SqlResult[] $results */ public function publishResult(int $queryId, array $results) : void{ $this->synchronized(function() use ($queryId, $results) : void{ - $this[] = serialize([$queryId, $results]); + $this->results[] = serialize([$queryId, $results]); $this->notify(); }); } public function publishError(int $queryId, SqlError $error) : void{ $this->synchronized(function() use ($error, $queryId) : void{ - $this[] = serialize([$queryId, $error]); + $this->results[] = serialize([$queryId, $error]); $this->notify(); }); } public function fetchResults(&$queryId, &$results) : bool{ - $row = $this->shift(); + $row = $this->results->shift(); if(is_string($row)){ [$queryId, $results] = unserialize($row, ["allowed_classes" => true]); return true; @@ -63,7 +65,7 @@ public function fetchResults(&$queryId, &$results) : bool{ */ public function waitForResults(?int &$queryId, SqlError|array|null &$results) : bool{ return $this->synchronized(function() use (&$queryId, &$results) : bool{ - while($this->count() === 0 && $this->availableThreads > 0){ + while($this->results->count() === 0 && $this->availableThreads > 0){ $this->wait(); } return $this->fetchResults($queryId, $results); diff --git a/libasynql/src/poggit/libasynql/base/QuerySendQueue.php b/libasynql/src/poggit/libasynql/base/QuerySendQueue.php index a6d597c4..d4dcbf98 100644 --- a/libasynql/src/poggit/libasynql/base/QuerySendQueue.php +++ b/libasynql/src/poggit/libasynql/base/QuerySendQueue.php @@ -22,17 +22,16 @@ namespace poggit\libasynql\base; -use Threaded; use function serialize; -class QuerySendQueue extends Threaded{ +class QuerySendQueue extends \ThreadedBase{ /** @var bool */ private $invalidated = false; - /** @var Threaded */ - private $queries; + /** @var \ThreadedArray */ + private \ThreadedArray $queries; public function __construct(){ - $this->queries = new Threaded(); + $this->queries = new \ThreadedArray(); } public function scheduleQuery(int $queryId, array $modes, array $queries, array $params) : void{ diff --git a/libasynql/virion.yml b/libasynql/virion.yml index adda9a13..b35908aa 100644 --- a/libasynql/virion.yml +++ b/libasynql/virion.yml @@ -4,4 +4,4 @@ authors: antigen: poggit\libasynql version: 4.1.1 api: - - 4.0.0 + - 5.0.0