Skip to content

Commit

Permalink
Merge pull request #13 from sakharovmaksim/addSupportForSymfony4
Browse files Browse the repository at this point in the history
Update dependences: phpUnit to 5 and add support for symfony 4
  • Loading branch information
andreaskweber committed Apr 27, 2018
2 parents b628e09 + 1b87cf3 commit 75bc713
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"issues": "https://github.com/andreas-weber/php-junit-merge/issues"
},
"require": {
"php": ">=5.3.3",
"symfony/console": "~2.4|^3.0",
"symfony/finder": "~2.4|^3.0",
"php": ">=5.6",
"symfony/console": "^3.0 || ^4.0",
"symfony/finder": "^3.0 || ^4.0",
"theseer/fdomdocument": "1.6.*"
},
"require-dev": {
"phpunit/phpunit": "4.1.*",
"phploc/phploc": "2.0.*",
"phpunit/phpunit": "^5.0",
"phploc/phploc": "4.*",
"squizlabs/php_codesniffer": "1.5.*",
"phpmd/phpmd": "2.0.*",
"phpmd/phpmd": "2.*",
"sebastian/phpcpd": "2.0.*"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Application extends ConsoleApplication
*/
public function __construct()
{
parent::__construct('phpjunitmerge', '1.0.5');
parent::__construct('phpjunitmerge', '1.0.6');
}

/**
Expand Down

0 comments on commit 75bc713

Please sign in to comment.