diff options
| author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2023-09-30 06:16:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-30 06:16:36 +0000 |
| commit | 8d14c184effa2f8ab837d0ee23bf2e3ba1e0c646 (patch) | |
| tree | 56b9dd6b93c7d1ee6f7b2390ab0783e28a0e730a | |
| parent | f40d184a260af01a5476854f2263846635876427 (diff) | |
| parent | 62ee2f55107c78ce40496bbbab78dbb020c03807 (diff) | |
Merge pull request #10623 from nextcloud/dependabot/composer/vendor-bin/csfixer/friendsofphp/php-cs-fixer-3.34.0
| -rw-r--r-- | vendor-bin/csfixer/composer.lock | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/vendor-bin/csfixer/composer.lock b/vendor-bin/csfixer/composer.lock index 232d2f1fd..f96607179 100644 --- a/vendor-bin/csfixer/composer.lock +++ b/vendor-bin/csfixer/composer.lock @@ -227,16 +227,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.30.0", + "version": "v3.34.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "95c64693b2f149966a2bc05a7a4981b0343ea52f" + "reference": "7c7a4ad2ed8fe50df3e25528218b13d383608f23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/95c64693b2f149966a2bc05a7a4981b0343ea52f", - "reference": "95c64693b2f149966a2bc05a7a4981b0343ea52f", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7c7a4ad2ed8fe50df3e25528218b13d383608f23", + "reference": "7c7a4ad2ed8fe50df3e25528218b13d383608f23", "shasum": "" }, "require": { @@ -257,6 +257,9 @@ "symfony/process": "^5.4 || ^6.0", "symfony/stopwatch": "^5.4 || ^6.0" }, + "conflict": { + "stevebauman/unfinalize": "*" + }, "require-dev": { "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", @@ -310,7 +313,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.30.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.34.0" }, "funding": [ { @@ -318,7 +321,7 @@ "type": "github" } ], - "time": "2023-09-26T22:10:43+00:00" + "time": "2023-09-29T15:34:26+00:00" }, { "name": "nextcloud/coding-standard", @@ -1976,5 +1979,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } |