[信息] 正使用 git pull 同步项目
========
From https://ghproxy.com/https://github.com/lkeme/BiliHelper-personal
523ed79..2ee4ca5 master -> origin/master
Updating 523ed79..2ee4ca5
Fast-forward
composer.json | 15 +++++++--------
docs/CAPTCHA.md | 2 ++
plugin/Login/Login.php | 1 +
src/Task/Task.php | 16 +++++++++-------
src/TaskQueue/TaskQueue.php | 2 --
src/TimeLock/TimeLock.php | 19 +++++++++----------
src/User/User.php | 4 ++--
7 files changed, 30 insertions(+), 29 deletions(-)
========
[信息] 安装/更新 项目运行依赖
========
Installing dependencies from lock file (including require-dev)
Verifying lock file contents can be installed on current platform.
Warning: The lock file is not up to date with the latest changes in composer.json. You may be getting outdated dependencies. It is recommended that you run `composer update` or `composer update <package name>`.
- Required package "monolog/monolog" is in the lock file as "2.x-dev" but that does not satisfy your constraint "dev-main".
- Required package "amphp/amp" is in the lock file as "v2.6.2" but that does not satisfy your constraint "3.x-dev".
- Required package "guzzlehttp/guzzle" is in the lock file as "7.5.0" but that does not satisfy your constraint "dev-master".
- Required package "toolkit/pflag" is in the lock file as "v2.0.6" but that does not satisfy your constraint "dev-main".
- Required package "malios/php-to-ascii-table" is in the lock file as "v3.0.0" but that does not satisfy your constraint "dev-master".
This usually happens when composer files are incorrectly merged or the composer.json file is manually edited.
Read more about correctly resolving merge conflicts https://getcomposer.org/doc/articles/resolving-merge-conflicts.md
and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require-r
重新拉取项目后提示