From 79285efeefca7d73ab43be1363c5d8bb953641f6 Mon Sep 17 00:00:00 2001 From: Maksim Sakharov Date: Fri, 27 Apr 2018 12:38:11 +0300 Subject: [PATCH 1/7] Change Synfony version from 3 to 4 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 35455de..a3aac23 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ }, "require": { "php": ">=5.3.3", - "symfony/console": "~2.4|^3.0", - "symfony/finder": "~2.4|^3.0", + "symfony/console": "^3.0|^4.0", + "symfony/finder": "^3.0|^4.0", "theseer/fdomdocument": "1.6.*" }, "require-dev": { From 7e9ea2392ec9a417f24b9528651984f6080c717f Mon Sep 17 00:00:00 2001 From: Maksim Sakharov Date: Fri, 27 Apr 2018 13:34:12 +0300 Subject: [PATCH 2/7] Change minimal php to 5.5 --- .travis.yml | 1 - composer.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb814a3..fe543f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.4 - 5.5 - 5.6 - 7.0 diff --git a/composer.json b/composer.json index a3aac23..90a36c8 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "issues": "https://github.com/andreas-weber/php-junit-merge/issues" }, "require": { - "php": ">=5.3.3", + "php": ">=5.5", "symfony/console": "^3.0|^4.0", "symfony/finder": "^3.0|^4.0", "theseer/fdomdocument": "1.6.*" From aa40dbb97e7487dba19a332211c9bd0aa2272e05 Mon Sep 17 00:00:00 2001 From: Maksim Sakharov Date: Fri, 27 Apr 2018 13:42:38 +0300 Subject: [PATCH 3/7] Update phpUnit to 5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 90a36c8..000e4a8 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "theseer/fdomdocument": "1.6.*" }, "require-dev": { - "phpunit/phpunit": "4.1.*", + "phpunit/phpunit": "^5.0", "phploc/phploc": "2.0.*", "squizlabs/php_codesniffer": "1.5.*", "phpmd/phpmd": "2.0.*", From 523818f6359eb4256996b18aa9526db943e38e18 Mon Sep 17 00:00:00 2001 From: Maksim Sakharov Date: Fri, 27 Apr 2018 13:47:44 +0300 Subject: [PATCH 4/7] phpUnit 5 needs minimum php 5.6 --- .travis.yml | 1 - composer.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe543f5..7ca3571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.5 - 5.6 - 7.0 - 7.1 diff --git a/composer.json b/composer.json index 000e4a8..20abe5d 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "issues": "https://github.com/andreas-weber/php-junit-merge/issues" }, "require": { - "php": ">=5.5", + "php": ">=5.6", "symfony/console": "^3.0|^4.0", "symfony/finder": "^3.0|^4.0", "theseer/fdomdocument": "1.6.*" From e6007c33ecaaff2c9ab50497bdcea9cbd8283d2c Mon Sep 17 00:00:00 2001 From: Maksim Sakharov Date: Fri, 27 Apr 2018 14:07:48 +0300 Subject: [PATCH 5/7] And finally update dev-dependences --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 20abe5d..08f6fa6 100644 --- a/composer.json +++ b/composer.json @@ -22,9 +22,9 @@ }, "require-dev": { "phpunit/phpunit": "^5.0", - "phploc/phploc": "2.0.*", + "phploc/phploc": "3.*", "squizlabs/php_codesniffer": "1.5.*", - "phpmd/phpmd": "2.0.*", + "phpmd/phpmd": "2.*", "sebastian/phpcpd": "2.0.*" }, "autoload": { From 92661cbf557bbaf943e5af9b9da12ba831121efc Mon Sep 17 00:00:00 2001 From: Maksim Sakharov Date: Fri, 27 Apr 2018 14:25:25 +0300 Subject: [PATCH 6/7] Dependences versions use OR --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 08f6fa6..2d809bc 100644 --- a/composer.json +++ b/composer.json @@ -16,13 +16,13 @@ }, "require": { "php": ">=5.6", - "symfony/console": "^3.0|^4.0", - "symfony/finder": "^3.0|^4.0", + "symfony/console": "^3.0 || ^4.0", + "symfony/finder": "^3.0 || ^4.0", "theseer/fdomdocument": "1.6.*" }, "require-dev": { "phpunit/phpunit": "^5.0", - "phploc/phploc": "3.*", + "phploc/phploc": "4.*", "squizlabs/php_codesniffer": "1.5.*", "phpmd/phpmd": "2.*", "sebastian/phpcpd": "2.0.*" From 1b87cf3502b8b2cfc4f5c9dd140815b010339a84 Mon Sep 17 00:00:00 2001 From: Maksim Sakharov Date: Fri, 27 Apr 2018 14:51:19 +0300 Subject: [PATCH 7/7] change version to 1.0.6 --- src/Console/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Console/Application.php b/src/Console/Application.php index a9a804b..a586826 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.5'); + parent::__construct('phpjunitmerge', '1.0.6'); } /**