diff --git a/build/php b/build/php index fab0cbeaa..365356dec 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit fab0cbeaae7de58ea78a02c7505719d04a0325a3 +Subproject commit 365356dec1d184b858907d1208fe84d824b6541e diff --git a/composer.json b/composer.json index b835e1124..fccbfaccc 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,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/composer.lock b/composer.lock index 9250f7dfb..399d6141b 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": "83afdaf7b072e11090279f87f57bebb5", + "content-hash": "c55df4140fb828ab8add33e0a0e84136", "packages": [ { "name": "adhocore/json-comment", @@ -153,20 +153,20 @@ }, { "name": "pocketmine/classloader", - "version": "0.1.2", + "version": "0.1.3", "source": { "type": "git", "url": "https://github.com/pmmp/ClassLoader.git", - "reference": "9757928424652393b178a3760073113aa7c9911b" + "reference": "3c484a27787f7732ce842ed694928a29ba340961" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/9757928424652393b178a3760073113aa7c9911b", - "reference": "9757928424652393b178a3760073113aa7c9911b", + "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/3c484a27787f7732ce842ed694928a29ba340961", + "reference": "3c484a27787f7732ce842ed694928a29ba340961", "shasum": "" }, "require": { - "ext-pthreads": "~3.2.0", + "ext-pthreads": "~3.2.0 || ^4.0", "ext-reflection": "*", "php": "^7.2 || ^8.0" }, @@ -175,7 +175,7 @@ }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "0.12.66", + "phpstan/phpstan": "0.12.99", "phpstan/phpstan-strict-rules": "^0.12.4" }, "type": "library", @@ -191,9 +191,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/0.1.2" + "source": "https://github.com/pmmp/ClassLoader/tree/0.1.3" }, - "time": "2021-01-15T00:40:47+00:00" + "time": "2021-11-01T20:13:55+00:00" }, { "name": "pocketmine/log", @@ -238,20 +238,20 @@ }, { "name": "pocketmine/log-pthreads", - "version": "0.1.3", + "version": "0.1.4", "source": { "type": "git", "url": "https://github.com/pmmp/LogPthreads.git", - "reference": "e477ecf6ec214fdd4415ea1da3fdd9d73bf699ea" + "reference": "01620c3628cdaa6b4a21122cff4c5d2f70b5c1d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/LogPthreads/zipball/e477ecf6ec214fdd4415ea1da3fdd9d73bf699ea", - "reference": "e477ecf6ec214fdd4415ea1da3fdd9d73bf699ea", + "url": "https://api.github.com/repos/pmmp/LogPthreads/zipball/01620c3628cdaa6b4a21122cff4c5d2f70b5c1d3", + "reference": "01620c3628cdaa6b4a21122cff4c5d2f70b5c1d3", "shasum": "" }, "require": { - "ext-pthreads": "~3.2.0", + "ext-pthreads": "~3.2.0 || ^4.0", "php": "^7.2 || ^8.0", "pocketmine/log": "^0.2.0" }, @@ -260,7 +260,7 @@ }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "0.12.66", + "phpstan/phpstan": "0.12.80", "phpstan/phpstan-strict-rules": "^0.12.4" }, "type": "library", @@ -276,9 +276,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.1.3" + "source": "https://github.com/pmmp/LogPthreads/tree/0.1.4" }, - "time": "2021-01-15T00:35:49+00:00" + "time": "2021-11-01T20:36:53+00:00" }, { "name": "pocketmine/math", @@ -365,20 +365,20 @@ }, { "name": "pocketmine/raklib", - "version": "0.12.11", + "version": "0.12.12", "source": { "type": "git", "url": "https://github.com/pmmp/RakLib.git", - "reference": "9cce458b8bfde3e4dfdbf70c659fc7b7fe26b5c4" + "reference": "5abe22043352e94099e4edfcef5fb3644578ddc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/RakLib/zipball/9cce458b8bfde3e4dfdbf70c659fc7b7fe26b5c4", - "reference": "9cce458b8bfde3e4dfdbf70c659fc7b7fe26b5c4", + "url": "https://api.github.com/repos/pmmp/RakLib/zipball/5abe22043352e94099e4edfcef5fb3644578ddc1", + "reference": "5abe22043352e94099e4edfcef5fb3644578ddc1", "shasum": "" }, "require": { - "ext-pthreads": "~3.2.0", + "ext-pthreads": "~3.2.0 || ^4.0", "ext-sockets": "*", "php": "^7.2 || ^8.0", "php-64bit": "*", @@ -389,7 +389,7 @@ "pocketmine/snooze": "^0.1.0" }, "require-dev": { - "phpstan/phpstan": "0.12.76", + "phpstan/phpstan": "0.12.87", "phpstan/phpstan-strict-rules": "^0.12.2" }, "type": "library", @@ -405,26 +405,26 @@ "description": "A RakNet server implementation written in PHP", "support": { "issues": "https://github.com/pmmp/RakLib/issues", - "source": "https://github.com/pmmp/RakLib/tree/0.12.11" + "source": "https://github.com/pmmp/RakLib/tree/0.12.12" }, - "time": "2021-02-15T11:21:05+00:00" + "time": "2021-11-01T20:52:51+00:00" }, { "name": "pocketmine/snooze", - "version": "0.1.5", + "version": "0.1.6", "source": { "type": "git", "url": "https://github.com/pmmp/Snooze.git", - "reference": "70b5e7937a06878dd321a3182ceb76d56298f2cd" + "reference": "92abf1e988c71635d466abb777f61f89e5a9c990" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Snooze/zipball/70b5e7937a06878dd321a3182ceb76d56298f2cd", - "reference": "70b5e7937a06878dd321a3182ceb76d56298f2cd", + "url": "https://api.github.com/repos/pmmp/Snooze/zipball/92abf1e988c71635d466abb777f61f89e5a9c990", + "reference": "92abf1e988c71635d466abb777f61f89e5a9c990", "shasum": "" }, "require": { - "ext-pthreads": ">=3.1.7dev", + "ext-pthreads": "~3.2.0 || ^4.0", "php-64bit": "^7.2 || ^8.0" }, "require-dev": { @@ -445,9 +445,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.1.5" + "source": "https://github.com/pmmp/Snooze/tree/0.1.6" }, - "time": "2021-02-22T16:16:12+00:00" + "time": "2021-11-01T20:48:46+00:00" }, { "name": "pocketmine/spl", @@ -2769,7 +2769,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/PocketMine.php b/src/pocketmine/PocketMine.php index fd648140d..d9bb9cde7 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -103,8 +103,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 4dd13b8fe..89638dd0a 100755 --- a/tests/gh-actions/build.sh +++ b/tests/gh-actions/build.sh @@ -21,5 +21,5 @@ git clone https://github.com/pmmp/php-build.git cd php-build ./install-dependencies.sh echo '"pthreads",,"https://github.com/pmmp/pthreads.git",,,"extension",' >> share/php-build/extension/definition -PHP_BUILD_INSTALL_EXTENSION='pthreads=@a6afc0434f91c1e9541444aef6ac7a1f16c595be yaml=2.2.1' PHP_BUILD_ZTS_ENABLE=on ./bin/php-build "$VERSION" "$INSTALL_DIR" || exit 1 +PHP_BUILD_INSTALL_EXTENSION='pthreads=@4.0.0 yaml=2.2.1' PHP_BUILD_ZTS_ENABLE=on ./bin/php-build "$VERSION" "$INSTALL_DIR" || exit 1 rm "$INSTALL_DIR/etc/conf.d/xdebug.ini" || true