Update to pthreads 5.0

.github/workflows/main.yml

@@ -18,10 +18,11 @@ jobs:
  - uses: actions/checkout@v2
 
  - name: Setup PHP
- uses: pmmp/setup-php-action@7e0f5f0a95e9d45d1d5fab0e1ee7555fa3b04339
+ uses: pmmp/setup-php-action@6dd74c145250109942b08fc63cd5118edd2fd256
  with:
  php-version: ${{ matrix.php }}
  install-path: ${{ github.workspace}}/php
+ pm-version-major: "5"
 
  - name: Cache Composer packages
  id: composer-cache

composer.json

@@ -4,10 +4,10 @@
  "type": "library",
  "require": {
  "php-64bit": "^8.0",
- "ext-pthreads": "^4.0"
+ "ext-pthreads": "^5.0"
  },
  "require-dev": {
- "phpstan/phpstan": "1.8.11",
+ "phpstan/phpstan": "1.9.14",
  "phpstan/extension-installer": "^1.0",
  "phpstan/phpstan-strict-rules": "^1.0"
  },

src/SleeperHandler.php

@@ -31,7 +31,10 @@
  * notifications are received from the notifiers.
  */
 class SleeperHandler{
- /** @var \Threaded */
+ /**
+ * @var \ThreadedArray
+ * @phpstan-var \ThreadedArray<int, int>
+ */
  private $sharedObject;
 
  /**
@@ -44,7 +47,7 @@ class SleeperHandler{
  private $nextSleeperId = 0;
 
  public function __construct(){
- $this->sharedObject = new \Threaded();
+ $this->sharedObject = new \ThreadedArray();
  }
 
  /**

src/SleeperNotifier.php

@@ -28,14 +28,20 @@
 /**
  * Notifiers are Threaded objects which can be attached to threaded sleepers in order to wake them up.
  */
-class SleeperNotifier extends \Threaded{
- /** @var \Threaded */
+class SleeperNotifier extends \ThreadedBase{
+ /**
+ * @var \ThreadedArray
+ * @phpstan-var \ThreadedArray<int, int>
+ */
  private $sharedObject;
 
  /** @var int */
  private $sleeperId;
 
- final public function attachSleeper(\Threaded $sharedObject, int $id) : void{
+ /**
+ * @phpstan-param \ThreadedArray<int, int> $sharedObject
+ */
+ final public function attachSleeper(\ThreadedArray $sharedObject, int $id) : void{
  $this->sharedObject = $sharedObject;
  $this->sleeperId = $id;
  }

tests/phpstan/configs/phpstan-bugs.neon

@@ -6,7 +6,6 @@ parameters:
  path: ../../../src/SleeperNotifier.php
 
  -
- message: "#^Strict comparison using \\!\\=\\= between Threaded and null will always evaluate to true\\.$#"
+ message: "#^Strict comparison using \\!\\=\\= between ThreadedArray\\<int, int\\> and null will always evaluate to true\\.$#"
  count: 1
  path: ../../../src/SleeperNotifier.php
-

tests/phpstan/stubs/pthreads.stub

@@ -1,15 +1,33 @@
 <?php
 
 /**
- * @implements \Traversable<array-key, mixed>
+ * @implements \IteratorAggregate<array-key, mixed>
  */
-class Threaded implements \Traversable{
+abstract class ThreadedBase implements \IteratorAggregate{
 
  /**
  * @template TReturn
- * @param callable() : TReturn $function
+ * @param \Closure() : TReturn $function
  * @param mixed ...$args
  * @return TReturn
  */
- public function synchronized(callable $function, ...$args){}
+ public function synchronized(\Closure $function, mixed ...$args) : mixed{}
 }
+
+/**
+ * @template TKey of array-key
+ * @template TValue
+ * @implements ArrayAccess<TKey, TValue>
+ */
+final class ThreadedArray extends ThreadedBase implements Countable, ArrayAccess{
+
+ /**
+ * @return TValue|null
+ */
+ public function pop() : mixed{}
+
+ /**
+ * @return TValue|null
+ */
+ public function shift() : mixed{}
+}