From 0300b9baf333495a8d6e0cfe1d0f9e48c18c8d46 Mon Sep 17 00:00:00 2001 From: myadream <40756102+myadream@users.noreply.github.com> Date: Thu, 29 Jul 2021 16:50:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A72.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 8 ++++---- src/Hash.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index f795758..d9d6295 100644 --- a/composer.json +++ b/composer.json @@ -31,13 +31,13 @@ "require": { "php": ">=7.3", "ext-swoole": ">=4.5", - "hyperf/config": "~2.1.0", - "hyperf/di": "~2.1.0", - "hyperf/framework": "~2.1.0" + "hyperf/config": "2.2.*", + "hyperf/di": "2.2.*", + "hyperf/framework": "2.2.*" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", - "hyperf/testing": "~2.1.0", + "hyperf/testing": "2.2.*", "phpstan/phpstan": "^0.12", "swoole/ide-helper": "dev-master" }, diff --git a/src/Hash.php b/src/Hash.php index e47a89f..18e88f2 100644 --- a/src/Hash.php +++ b/src/Hash.php @@ -38,6 +38,6 @@ public static function check(string $value, string $hashedValue, array $options public static function needsRehash(string $hashedValue, array $options = [], ?string $driverName = null): bool { - return static::getDriver($driverName)->needsRehash($hashedValue . $options); + return static::getDriver($driverName)->needsRehash($hashedValue, $options); } } From 6cf9b8bf2d0b3ffc1704c75bbfc9423889fbe3f9 Mon Sep 17 00:00:00 2001 From: myadream <40756102+myadream@users.noreply.github.com> Date: Sat, 31 Jul 2021 09:35:37 +0800 Subject: [PATCH 2/2] update composer.json --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index d9d6295..852ed61 100644 --- a/composer.json +++ b/composer.json @@ -31,13 +31,13 @@ "require": { "php": ">=7.3", "ext-swoole": ">=4.5", - "hyperf/config": "2.2.*", - "hyperf/di": "2.2.*", - "hyperf/framework": "2.2.*" + "hyperf/config": "~2.2.0", + "hyperf/di": "~2.2.0", + "hyperf/framework": "~2.2.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.14", - "hyperf/testing": "2.2.*", + "friendsofphp/php-cs-fixer": "^3.0", + "hyperf/testing": "~2.2.0", "phpstan/phpstan": "^0.12", "swoole/ide-helper": "dev-master" }, @@ -45,7 +45,7 @@ "sort-packages": true }, "scripts": { - "test": "co-phpunit -c phpunit.xml --colors=always", + "test": "co-phpunit --prepend tests/bootstrap.php -c phpunit.xml --colors=always", "analyse": "phpstan analyse --memory-limit 1024M -l 0 ./src", "cs-fix": "php-cs-fixer fix $1" },