From 53b15b6124b237c8b57ee8f8e07932840c796755 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Mar 2022 00:49:17 +0000 Subject: [PATCH 1/2] Bump guzzlehttp/psr7 from 2.0.0 to 2.2.1 Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 2.0.0 to 2.2.1. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/master/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/2.0.0...2.2.1) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 83 +++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/composer.lock b/composer.lock index c18e493f..b7e5e359 100644 --- a/composer.lock +++ b/composer.lock @@ -1816,23 +1816,17 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.0.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "1dc8d9cba3897165e16d12bb13d813afb1eb3fe7" + "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/1dc8d9cba3897165e16d12bb13d813afb1eb3fe7", - "reference": "1dc8d9cba3897165e16d12bb13d813afb1eb3fe7", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2", + "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2", + "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", @@ -1855,7 +1849,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -1868,13 +1862,34 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" }, { @@ -1896,9 +1911,23 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.0.0" + "source": "https://github.com/guzzle/psr7/tree/2.2.1" }, - "time": "2021-06-30T20:03:07+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2022-03-20T21:55:58+00:00" }, { "name": "jaybizzle/crawler-detect", @@ -4283,13 +4312,7 @@ "type": "zip", "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=7.0.0", @@ -4344,13 +4367,7 @@ "type": "zip", "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3.0" @@ -4597,13 +4614,7 @@ "type": "zip", "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", "reference": "120b605dfeb996808c31b6477290a714d356e822", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.6" @@ -12158,5 +12169,5 @@ "ext-mbstring": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } From 1c4d258ec239b6cc498afe08a96c536fd3e75fb7 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Wed, 30 Mar 2022 00:49:28 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- app/Http/Middleware/WechatAuthMiddleware.php | 2 +- config/querydetector.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Middleware/WechatAuthMiddleware.php b/app/Http/Middleware/WechatAuthMiddleware.php index c0345f75..9cdfe107 100644 --- a/app/Http/Middleware/WechatAuthMiddleware.php +++ b/app/Http/Middleware/WechatAuthMiddleware.php @@ -27,7 +27,7 @@ public function handle($request, Closure $next, $account = 'default', $scope = n return $next($request); } - //保证兼容性 + // 保证兼容性 $class = ('work' !== $type) ? 'wechat' : 'work'; $prefix = ('work' !== $type) ? 'official_account' : 'work'; $sessionKey = \sprintf('%s.oauth_user.%s', $class, $account); diff --git a/config/querydetector.php b/config/querydetector.php index 2ea6c376..19a353e6 100644 --- a/config/querydetector.php +++ b/config/querydetector.php @@ -23,10 +23,10 @@ * the "posts" attribute and the "Post::class", since the relation can get resolved in multiple ways. */ 'except' => [ - //Author::class => [ + // Author::class => [ // Post::class, // 'posts', - //] + // ] ], /*