diff --git a/build/php b/build/php index 9a042c559..58ea62d7c 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit 9a042c55932564907c36ae454feeaac4b5213773 +Subproject commit 58ea62d7cab244edf4cf79db586118bb4a994eba diff --git a/composer.json b/composer.json index 0a17466fd..14f5046be 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "ext-openssl": "*", "ext-pcre": "*", "ext-phar": "*", - "ext-pthreads": "~3.2.0", + "ext-pthreads": "^4.0", "ext-reflection": "*", "ext-simplexml": "*", "ext-sockets": "*", @@ -37,7 +37,7 @@ "pocketmine/bedrock-protocol": "dev-master", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", - "pocketmine/classloader": "dev-master", + "pocketmine/classloader": "^0.2.0", "pocketmine/color": "^0.2.0", "pocketmine/errorhandler": "^0.3.0", "pocketmine/log": "^0.3.0", diff --git a/composer.lock b/composer.lock index 13b94ceaa..ece09d478 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bdecbde60deb48450d1aa54d8839e692", + "content-hash": "3aab4c7b78ea85bf5e68e8b953cd9e1f", "packages": [ { "name": "adhocore/json-comment", @@ -387,31 +387,31 @@ }, { "name": "pocketmine/classloader", - "version": "dev-master", + "version": "0.2.0", "source": { "type": "git", "url": "https://github.com/pmmp/ClassLoader.git", - "reference": "80226e0917be79ac3230606113e25134a31e6a85" + "reference": "49ea303993efdfb39cd302e2156d50aa78209e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/80226e0917be79ac3230606113e25134a31e6a85", - "reference": "80226e0917be79ac3230606113e25134a31e6a85", + "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/49ea303993efdfb39cd302e2156d50aa78209e78", + "reference": "49ea303993efdfb39cd302e2156d50aa78209e78", "shasum": "" }, "require": { - "ext-pthreads": "~3.2.0", + "ext-pthreads": "~3.2.0 || ^4.0", "ext-reflection": "*", - "php": "^7.2 || ^8.0" + "php": "^8.0" }, "conflict": { "pocketmine/spl": "<0.4" }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "0.12.80", + "phpstan/phpstan": "0.12.99", "phpstan/phpstan-strict-rules": "^0.12.4", - "phpunit/phpunit": "^8.5 || ^9.5" + "phpunit/phpunit": "^9.5" }, "type": "library", "autoload": { @@ -426,9 +426,9 @@ "description": "Ad-hoc autoloading components used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/ClassLoader/issues", - "source": "https://github.com/pmmp/ClassLoader/tree/master" + "source": "https://github.com/pmmp/ClassLoader/tree/0.2.0" }, - "time": "2021-05-29T23:09:32+00:00" + "time": "2021-11-01T20:17:27+00:00" }, { "name": "pocketmine/color", @@ -549,20 +549,20 @@ }, { "name": "pocketmine/log-pthreads", - "version": "0.2.0", + "version": "0.2.1", "source": { "type": "git", "url": "https://github.com/pmmp/LogPthreads.git", - "reference": "6be3445c48c62eba3922f987f000bb20c81d161f" + "reference": "26f51ed44b1884f6dd72c06a883d9d07613af4f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/LogPthreads/zipball/6be3445c48c62eba3922f987f000bb20c81d161f", - "reference": "6be3445c48c62eba3922f987f000bb20c81d161f", + "url": "https://api.github.com/repos/pmmp/LogPthreads/zipball/26f51ed44b1884f6dd72c06a883d9d07613af4f1", + "reference": "26f51ed44b1884f6dd72c06a883d9d07613af4f1", "shasum": "" }, "require": { - "ext-pthreads": "~3.2.0", + "ext-pthreads": "~3.2.0 || ^4.0", "php": "^7.4 || ^8.0", "pocketmine/log": "^0.2.0 || ^0.3.0" }, @@ -587,9 +587,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.2.0" + "source": "https://github.com/pmmp/LogPthreads/tree/0.2.1" }, - "time": "2021-05-18T22:15:28+00:00" + "time": "2021-11-01T20:41:37+00:00" }, { "name": "pocketmine/math", @@ -760,25 +760,25 @@ }, { "name": "pocketmine/snooze", - "version": "0.3.0", + "version": "0.3.1", "source": { "type": "git", "url": "https://github.com/pmmp/Snooze.git", - "reference": "fe5b1dbf0d6267da882d1f67924772bd93db833d" + "reference": "0ac8fc2a781c419a1f64ebca4d5835028f59e29b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Snooze/zipball/fe5b1dbf0d6267da882d1f67924772bd93db833d", - "reference": "fe5b1dbf0d6267da882d1f67924772bd93db833d", + "url": "https://api.github.com/repos/pmmp/Snooze/zipball/0ac8fc2a781c419a1f64ebca4d5835028f59e29b", + "reference": "0ac8fc2a781c419a1f64ebca4d5835028f59e29b", "shasum": "" }, "require": { - "ext-pthreads": ">=3.1.7dev", + "ext-pthreads": "~3.2.0 || ^4.0", "php-64bit": "^7.3 || ^8.0" }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "0.12.88", + "phpstan/phpstan": "0.12.99", "phpstan/phpstan-strict-rules": "^0.12.4" }, "type": "library", @@ -794,9 +794,9 @@ "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.0" + "source": "https://github.com/pmmp/Snooze/tree/0.3.1" }, - "time": "2021-06-13T13:57:47+00:00" + "time": "2021-11-01T20:50:08+00:00" }, { "name": "pocketmine/spl", @@ -3494,7 +3494,6 @@ "minimum-stability": "stable", "stability-flags": { "pocketmine/bedrock-protocol": 20, - "pocketmine/classloader": 20, "pocketmine/spl": 20 }, "prefer-stable": false, @@ -3517,7 +3516,7 @@ "ext-openssl": "*", "ext-pcre": "*", "ext-phar": "*", - "ext-pthreads": "~3.2.0", + "ext-pthreads": "^4.0", "ext-reflection": "*", "ext-simplexml": "*", "ext-sockets": "*", diff --git a/src/PocketMine.php b/src/PocketMine.php index f944d445d..551585bbb 100644 --- a/src/PocketMine.php +++ b/src/PocketMine.php @@ -116,8 +116,8 @@ namespace pocketmine { if(substr_count($pthreads_version, ".") < 2){ $pthreads_version = "0.$pthreads_version"; } - if(version_compare($pthreads_version, "3.2.0") < 0){ - $messages[] = "pthreads >= 3.2.0 is required, while you have $pthreads_version."; + if(version_compare($pthreads_version, "4.0.0") < 0 || version_compare($pthreads_version, "5.0.0") > 0){ + $messages[] = "pthreads ^4.0.0 is required, while you have $pthreads_version."; } } diff --git a/tests/gh-actions/build.sh b/tests/gh-actions/build.sh index 2176d81bb..d70be7980 100755 --- a/tests/gh-actions/build.sh +++ b/tests/gh-actions/build.sh @@ -50,7 +50,7 @@ echo '"leveldb",,"https://github.com/pmmp/php-leveldb.git",,"--with-leveldb='$IN echo '"chunkutils2",,"https://github.com/pmmp/ext-chunkutils2.git",,,"extension",' >> share/php-build/extension/definition echo '"morton",,"https://github.com/pmmp/ext-morton.git",,,"extension",' >> share/php-build/extension/definition PHP_BUILD_INSTALL_EXTENSION="\ -pthreads=@a6afc0434f91c1e9541444aef6ac7a1f16c595be \ +pthreads=@4.0.0 \ yaml=2.2.1 \ leveldb=@60763a09bf5c7a10376d16e25b078b99a35c5c37 \ chunkutils2=@0.3.1 \