From 6bc6f7498d706adcc40cc86292ae650a545745f5 Mon Sep 17 00:00:00 2001 From: Timon Heuser Date: Fri, 6 Nov 2020 16:26:48 +0100 Subject: [PATCH 1/4] Add symfony/finder ^5.0 as OR dependency --- CHANGELOG.md | 4 ++++ composer.json | 2 +- src/Console/Application.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 515ebfb..b9b3345 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,3 +14,7 @@ This is the list of changes for the Version 1.0 release series. ## Version 1.0.2 * Bump library version + +## Version 1.0.7 + +* Add symfony/finder ^5.0 as OR dependency diff --git a/composer.json b/composer.json index 2d809bc..7f566b4 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "php": ">=5.6", "symfony/console": "^3.0 || ^4.0", - "symfony/finder": "^3.0 || ^4.0", + "symfony/finder": "^3.0 || ^4.0 || ^5.0", "theseer/fdomdocument": "1.6.*" }, "require-dev": { diff --git a/src/Console/Application.php b/src/Console/Application.php index a586826..7723e34 100644 --- a/src/Console/Application.php +++ b/src/Console/Application.php @@ -55,7 +55,7 @@ class Application extends ConsoleApplication */ public function __construct() { - parent::__construct('phpjunitmerge', '1.0.6'); + parent::__construct('phpjunitmerge', '1.0.7'); } /** From e40ab94fffe8f2e374877db0c2be5db4611aac8e Mon Sep 17 00:00:00 2001 From: Timon Heuser <53174153+oneserv-heuser@users.noreply.github.com> Date: Mon, 9 Nov 2020 09:17:56 +0100 Subject: [PATCH 2/4] chore: update composer.json for fork --- composer.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 7f566b4..15ab566 100644 --- a/composer.json +++ b/composer.json @@ -1,18 +1,23 @@ { - "name": "andreas-weber/php-junit-merge", + "name": "oneserv/php-junit-merge", "type": "library", "description": "PHP-Unit J-Unit XML File Merger", - "homepage": "https://github.com/andreas-weber/php-junit-merge", + "homepage": "https://github.com/oneserv/php-junit-merge", "license": "MIT", "authors": [ { "name": "Andreas Weber", "email": "code@andreas-weber.me", "role": "lead" + }, + { + "name": "Timon Heuser", + "email": "heuser@bueromoebel-experte.de", + "role": "lead" } ], "support": { - "issues": "https://github.com/andreas-weber/php-junit-merge/issues" + "issues": "https://github.com/oneserv/php-junit-merge/issues" }, "require": { "php": ">=5.6", From 71210787819c8a3c0b4033714ac5070f277a3083 Mon Sep 17 00:00:00 2001 From: Timon Heuser <53174153+oneserv-heuser@users.noreply.github.com> Date: Mon, 9 Nov 2020 09:21:58 +0100 Subject: [PATCH 3/4] docs: update version in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ec6afd..16822e5 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Simply add a dependency on `andreas-weber/php-junit-merge` to your project's `co After updating dependencies by composer a new binary `php-junit-merge` is available for usage. root@dev:~/projects/sample/vendor/bin ./phpjunitmerge - phpjunitmerge 1.0.5 by Andreas Weber + phpjunitmerge 1.0.7 by Andreas Weber Usage: phpjunitmerge [--names="..."] [--ignore="..."] dir file From 39297f1062ba142f80ec380457583af1eb08e960 Mon Sep 17 00:00:00 2001 From: Timon Heuser Date: Mon, 9 Nov 2020 09:32:07 +0100 Subject: [PATCH 4/4] revert: "chore: update composer.json for fork" This reverts commit e40ab94fffe8f2e374877db0c2be5db4611aac8e. --- composer.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 15ab566..7f566b4 100644 --- a/composer.json +++ b/composer.json @@ -1,23 +1,18 @@ { - "name": "oneserv/php-junit-merge", + "name": "andreas-weber/php-junit-merge", "type": "library", "description": "PHP-Unit J-Unit XML File Merger", - "homepage": "https://github.com/oneserv/php-junit-merge", + "homepage": "https://github.com/andreas-weber/php-junit-merge", "license": "MIT", "authors": [ { "name": "Andreas Weber", "email": "code@andreas-weber.me", "role": "lead" - }, - { - "name": "Timon Heuser", - "email": "heuser@bueromoebel-experte.de", - "role": "lead" } ], "support": { - "issues": "https://github.com/oneserv/php-junit-merge/issues" + "issues": "https://github.com/andreas-weber/php-junit-merge/issues" }, "require": { "php": ">=5.6",