diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index c7db8f189..141560b5f 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -17,6 +17,8 @@ jobs: swoole: "5.1.6" - php: "8.3" swoole: "5.1.6" + - php: "8.4" + swoole: "6.0.2" name: PHP ${{ matrix.php }} (swoole-${{ matrix.swoole }}) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 99b0fc7ec..aab39105b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,6 +17,8 @@ jobs: swoole: "5.1.6" - php: "8.3" swoole: "5.1.6" + - php: "8.4" + swoole: "6.0.2" name: PHP ${{ matrix.php }} (swoole-${{ matrix.swoole }}) diff --git a/composer.json b/composer.json index ca345e0cf..67630d0b9 100644 --- a/composer.json +++ b/composer.json @@ -122,7 +122,8 @@ "tijsverkoyen/css-to-inline-styles": "^2.2.5", "symfony/process": "^6.2", "dragonmantank/cron-expression": "^3.3.2", - "friendsofhyperf/redis-subscriber": "~3.1.0" + "friendsofhyperf/redis-subscriber": "~3.1.0", + "hypervel/laminas-mime": "^0.1.0" }, "replace": { "hypervel/auth": "self.version", @@ -172,7 +173,7 @@ }, "require-dev": { "ably/ably-php": "^1.0", - "fakerphp/faker": "^2.0", + "fakerphp/faker": "^1.24.1", "filp/whoops": "^2.15", "friendsofphp/php-cs-fixer": "^3.57.2", "hyperf/devtool": "~3.1.0", @@ -184,7 +185,7 @@ "league/flysystem-google-cloud-storage": "^3.0", "league/flysystem-path-prefixing": "^3.3", "league/flysystem-read-only": "^3.3", - "mockery/mockery": "^1.5.1", + "mockery/mockery": "1.6.x-dev", "nunomaduro/collision": "^8.5", "pda/pheanstalk": "v5.0.9", "phpstan/phpstan": "^1.11.5", diff --git a/src/cache/src/LimitedMaxHeap.php b/src/cache/src/LimitedMaxHeap.php index 6fbe0ef87..493c3faff 100644 --- a/src/cache/src/LimitedMaxHeap.php +++ b/src/cache/src/LimitedMaxHeap.php @@ -12,18 +12,19 @@ public function __construct(protected int $limit) { } - public function insert(mixed $value): bool + public function insert(mixed $value): true { if ($this->count() < $this->limit) { - return parent::insert($value); + parent::insert($value); + return true; } if ($this->compare($value, $this->top()) < 0) { $this->extract(); - - return parent::insert($value); } - return false; + parent::insert($value); + + return true; } }