From 090d6342a132f6b12ef32bdc3084d51d3eef6768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= Date: Wed, 17 Sep 2025 09:21:38 +0200 Subject: [PATCH] Update Jira Security Issues Patch lesstif/php-jira-rest-client --- .gitignore | 1 + composer.json | 17 ++++++-- composer.lock | 108 ++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 98 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 42bf534..7388f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /vendor/ /.env +/.phpunit.cache /.phpunit.result.cache diff --git a/composer.json b/composer.json index ad1e373..2a94f62 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "symfony/http-client": "^7.1", "ext-openssl": "*", "veewee/xml": "^4", - "reload/jira-security-issue": "^2", + "reload/jira-security-issue": "^2.0.10", "composer/semver": "^3.2", "vlucas/phpdotenv": "^5.5", "thecodingmachine/safe": "^2.5", @@ -28,13 +28,24 @@ "phpunit/phpunit": "^12.0", "phpstan/phpstan-phpunit": "^1.3" }, + "extra": { + "composer-exit-on-patch-failure": true, + "patches": { + "lesstif/php-jira-rest-client": { + "#554: fix deprecated search to search/jql": "https://github.com/lesstif/php-jira-rest-client/pull/554/commits/0823afc040b752007cb2217a722bf3f4d4fccc5d.patch" + } + } + }, "config": { "platform" : { "php": "8.4" }, "allow-plugins": { "phpro/grumphp-shim": true, - "phpstan/extension-installer": true + "phpstan/extension-installer": true, + "cweagans/composer-patches": true } - } + }, + "minimum-stability": "dev", + "prefer-stable": true } diff --git a/composer.lock b/composer.lock index eeec61e..159db50 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": "74bd3f962e6315a45ee6273c6e409187", + "content-hash": "a968f38a0d2026b0a32d54103893d03b", "packages": [ { "name": "azjezz/psl", @@ -157,6 +157,54 @@ ], "time": "2025-08-20T19:15:30+00:00" }, + { + "name": "cweagans/composer-patches", + "version": "1.7.3", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.3.0" + }, + "require-dev": { + "composer/composer": "~1.0 || ~2.0", + "phpunit/phpunit": "~4.6" + }, + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Patches" + }, + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "support": { + "issues": "https://github.com/cweagans/composer-patches/issues", + "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" + }, + "time": "2022-12-20T22:53:13+00:00" + }, { "name": "graham-campbell/result-type", "version": "v1.1.3", @@ -221,16 +269,16 @@ }, { "name": "lesstif/php-jira-rest-client", - "version": "5.10.0", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/lesstif/php-jira-rest-client.git", - "reference": "46b20408c34138615acbdd58a86b8b624d864d0c" + "reference": "a6a96c02023c73e915a2e4f31f1e2beefa1f64c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lesstif/php-jira-rest-client/zipball/46b20408c34138615acbdd58a86b8b624d864d0c", - "reference": "46b20408c34138615acbdd58a86b8b624d864d0c", + "url": "https://api.github.com/repos/lesstif/php-jira-rest-client/zipball/a6a96c02023c73e915a2e4f31f1e2beefa1f64c1", + "reference": "a6a96c02023c73e915a2e4f31f1e2beefa1f64c1", "shasum": "" }, "require": { @@ -249,6 +297,7 @@ "suggest": { "vlucas/phpdotenv": "^5.0|^6.0" }, + "default-branch": true, "type": "library", "extra": { "laravel": { @@ -282,9 +331,9 @@ ], "support": { "issues": "https://github.com/lesstif/php-jira-rest-client/issues", - "source": "https://github.com/lesstif/php-jira-rest-client/tree/5.10.0" + "source": "https://github.com/lesstif/php-jira-rest-client/tree/main" }, - "time": "2025-04-05T12:50:11+00:00" + "time": "2025-04-05T13:08:01+00:00" }, { "name": "monolog/monolog", @@ -620,21 +669,22 @@ }, { "name": "reload/jira-security-issue", - "version": "v2.0.8", + "version": "v2.0.10", "source": { "type": "git", "url": "https://github.com/reload/jira-security-issue.git", - "reference": "532ae7700ad94d2a1f0e0987d74b40392d051191" + "reference": "4005be6438d383bc7ac8c902db1c147dac0e31b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reload/jira-security-issue/zipball/532ae7700ad94d2a1f0e0987d74b40392d051191", - "reference": "532ae7700ad94d2a1f0e0987d74b40392d051191", + "url": "https://api.github.com/repos/reload/jira-security-issue/zipball/4005be6438d383bc7ac8c902db1c147dac0e31b3", + "reference": "4005be6438d383bc7ac8c902db1c147dac0e31b3", "shasum": "" }, "require": { - "lesstif/php-jira-rest-client": "^5", - "php": ">=8.2.0", + "cweagans/composer-patches": "^1.7", + "lesstif/php-jira-rest-client": "dev-main", + "php": ">=8.3.0", "webignition/symfony-console-typed-input": "^0.6" }, "require-dev": { @@ -644,14 +694,22 @@ "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.3", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^11.0", + "phpunit/phpunit": "^12.3", "sempro/phpunit-pretty-print": "^1.2", "symfony/console": "^5.0" }, "type": "library", + "extra": { + "patches": { + "lesstif/php-jira-rest-client": { + "#554: fix deprecated search to search/jql": "https://github.com/lesstif/php-jira-rest-client/pull/554/commits/0823afc040b752007cb2217a722bf3f4d4fccc5d.patch" + } + }, + "composer-exit-on-patch-failure": true + }, "autoload": { "psr-4": { - "Reload\\": "src/" + "Reload\\": "src/Reload/" } }, "notification-url": "https://packagist.org/downloads/", @@ -661,9 +719,9 @@ "description": "Create Jira issues if it doesn't exist", "support": { "issues": "https://github.com/reload/jira-security-issue/issues", - "source": "https://github.com/reload/jira-security-issue/tree/v2.0.8" + "source": "https://github.com/reload/jira-security-issue/tree/v2.0.10" }, - "time": "2025-08-25T04:07:02+00:00" + "time": "2025-09-17T07:02:18+00:00" }, { "name": "revolt/event-loop", @@ -1745,16 +1803,16 @@ }, { "name": "symfony/string", - "version": "v6.4.24", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f0ce0bd36a3accb4a225435be077b4b4875587f4" + "reference": "7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f0ce0bd36a3accb4a225435be077b4b4875587f4", - "reference": "f0ce0bd36a3accb4a225435be077b4b4875587f4", + "url": "https://api.github.com/repos/symfony/string/zipball/7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1", + "reference": "7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1", "shasum": "" }, "require": { @@ -1811,7 +1869,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.24" + "source": "https://github.com/symfony/string/tree/v6.4.25" }, "funding": [ { @@ -1831,7 +1889,7 @@ "type": "tidelift" } ], - "time": "2025-07-10T08:14:14+00:00" + "time": "2025-08-22T12:33:20+00:00" }, { "name": "thecodingmachine/safe", @@ -4269,9 +4327,9 @@ } ], "aliases": [], - "minimum-stability": "stable", + "minimum-stability": "dev", "stability-flags": {}, - "prefer-stable": false, + "prefer-stable": true, "prefer-lowest": false, "platform": { "ext-openssl": "*"