From 3c783c028c229a3e6561500521800e1fac4383ba Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Thu, 24 Apr 2025 09:45:01 +0200 Subject: update overtrue/phplint to v9.6.2, fixes #5539 Closes #5539 Merge request studip/studip!4175 --- .gitlab-ci.yml | 6 ++++-- composer.json | 2 +- composer.lock | 35 ++++++++++++++++------------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 505280b..5b108c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,7 +111,8 @@ lint-php: - COMPOSER_MEMORY_LIMIT=-1 composer exec phplint -- - --log-json=$PHPLINT_JSON_REPORT + --output=$PHPLINT_JSON_REPORT + --format=json --cache=$CACHE_LOCATION after_script: - ./.gitlab/scripts/convert-phplint-report $PHPLINT_JSON_REPORT > $PHPLINT_CODE_QUALITY_REPORT @@ -141,7 +142,8 @@ lint-php-8.3: - COMPOSER_MEMORY_LIMIT=-1 composer exec phplint -- - --log-json=$PHPLINT_JSON_REPORT + --output=$PHPLINT_JSON_REPORT + --format=json --cache=$CACHE_LOCATION after_script: - ./.gitlab/scripts/convert-phplint-report $PHPLINT_JSON_REPORT > $PHPLINT_CODE_QUALITY_REPORT diff --git a/composer.json b/composer.json index d616402..683467d 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,7 @@ "woohoolabs/yang": "3.0.0", "codeception/codeception": "5.1.2", "codeception/module-asserts": "3.0.0", - "overtrue/phplint": "9.3.0", + "overtrue/phplint": "9.6.2", "phpstan/phpstan": "^2.0", "symfony/var-dumper": "6.4.7", "codeception/specify": "^2.0", diff --git a/composer.lock b/composer.lock index 177e599..56217ef 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f264372edd5c7644079b0a461a37c14a", + "content-hash": "20936b16a07c6b290560472bdb2c4824", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -7298,19 +7298,20 @@ }, { "name": "overtrue/phplint", - "version": "9.3.0", + "version": "9.6.2", "source": { "type": "git", "url": "https://github.com/overtrue/phplint.git", - "reference": "9cba6a16eb2cee04af67f852b80e914c549d1e73" + "reference": "e2ebdbac93fa6ffe45d724e350f77df34c1f8fb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/phplint/zipball/9cba6a16eb2cee04af67f852b80e914c549d1e73", - "reference": "9cba6a16eb2cee04af67f852b80e914c549d1e73", + "url": "https://api.github.com/repos/overtrue/phplint/zipball/e2ebdbac93fa6ffe45d724e350f77df34c1f8fb4", + "reference": "e2ebdbac93fa6ffe45d724e350f77df34c1f8fb4", "shasum": "" }, "require": { + "composer-runtime-api": "^2.0", "ext-dom": "*", "ext-json": "*", "ext-mbstring": "*", @@ -7325,9 +7326,8 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4", - "bartlett/sarif-php-sdk": "^1.2", - "brainmaestro/composer-git-hooks": "^2.8.5 || 3.0.0-alpha.1", - "jetbrains/phpstorm-stubs": "^2021.3 || ^2022.3 || ^2023.3 || ^2024.1", + "brainmaestro/composer-git-hooks": "^3.0.0", + "jetbrains/phpstorm-stubs": "^2024.1", "php-parallel-lint/php-console-highlighter": "^1.0" }, "bin": [ @@ -7335,22 +7335,19 @@ ], "type": "library", "extra": { - "bamarni-bin": { - "bin-links": true, - "target-directory": "vendor-bin", - "forward-command": true - }, "hooks": { "pre-commit": [ "composer style:fix", "composer code:check" - ], - "pre-push": [ - "composer qa:check" ] }, + "bamarni-bin": { + "bin-links": true, + "forward-command": true, + "target-directory": "vendor-bin" + }, "branch-alias": { - "dev-main": "9.3.x-dev" + "dev-main": "9.6.x-dev" } }, "autoload": { @@ -7382,7 +7379,7 @@ ], "support": { "issues": "https://github.com/overtrue/phplint/issues", - "source": "https://github.com/overtrue/phplint/tree/9.3.0" + "source": "https://github.com/overtrue/phplint/tree/9.6.2" }, "funding": [ { @@ -7390,7 +7387,7 @@ "type": "github" } ], - "time": "2024-05-16T06:42:55+00:00" + "time": "2025-04-10T13:12:51+00:00" }, { "name": "phar-io/manifest", -- cgit v1.0