Update to pthreads 5.0

pmmp · Jan 23, 2023 · 0ecfea6 · 0ecfea6
1 parent 33ca8fa
commit 0ecfea6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,10 +18,11 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
-        uses: pmmp/setup-php-action@87cc7c2f65e10e0e64be54a3e41a62a4c61bd1a9
+        uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256
         with:
           php-version: ${{ matrix.php }}
           install-path: "./bin"
+          pm-version-major: "5"
 
       - name: Cache Composer packages
         id: composer-cache

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "license": "LGPL-3.0",
     "require": {
         "php": "^8.0",
-        "ext-pthreads": "~3.2.0 || ^4.0",
+        "ext-pthreads": "^5.0",
         "pocketmine/log": "^0.4.0"
     },
     "require-dev": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,5 +2,3 @@ parameters:
 	level: 9
 	paths:
 		- src
-	stubFiles:
-		- tests/phpstan/stubs/pthreads.stub
diff --git a/src/AttachableThreadedLogger.php b/src/AttachableThreadedLogger.php
@@ -17,11 +17,14 @@
 
 abstract class AttachableThreadedLogger extends \ThreadedLogger{
 
-	/** @var \Volatile|\ThreadedLoggerAttachment[] */
+	/**
+	 * @var \ThreadedArray|\ThreadedLoggerAttachment[]
+	 * @phpstan-var \ThreadedArray<int, \ThreadedLoggerAttachment>
+	 */
 	protected $attachments;
 
 	public function __construct(){
-		$this->attachments = new \Volatile();
+		$this->attachments = new \ThreadedArray();
 	}
 
 	/**

diff --git a/src/ThreadedLogger.php b/src/ThreadedLogger.php
@@ -15,6 +15,6 @@
  * GNU General Public License for more details.
 */
 
-abstract class ThreadedLogger extends \Threaded implements Logger{
+abstract class ThreadedLogger extends \ThreadedBase implements Logger{
 
 }
diff --git a/src/ThreadedLoggerAttachment.php b/src/ThreadedLoggerAttachment.php
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
 */
 
-abstract class ThreadedLoggerAttachment extends \Volatile{
+abstract class ThreadedLoggerAttachment extends \ThreadedBase{
 
 	/**
 	 * @param mixed $level

diff --git a/tests/phpstan/stubs/pthreads.stub b/tests/phpstan/stubs/pthreads.stub