Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated dependencies #1195

Merged
merged 13 commits into from
Dec 1, 2019
Merged

Updated dependencies #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
136984a
Updated dependencies
siad007 Nov 23, 2019
3c828ab
Fixed deps
siad007 Nov 23, 2019
e8abab5
Fixed 2
siad007 Nov 23, 2019
cfd34c6
phpunit compat
siad007 Nov 23, 2019
ebae99a
Merge branch 'master' into dependencies
siad007 Nov 24, 2019
9b9733a
Fixed test execution
siad007 Dec 1, 2019
f684109
Merge remote-tracking branch 'upstream/dependencies' into dependencies
siad007 Dec 1, 2019
91ff9e4
phpunit 8
siad007 Dec 1, 2019
c66006f
Fixed some warnings
siad007 Dec 1, 2019
8e6c7dd
onlyMethods instead of deprecated setMethods
siad007 Dec 1, 2019
cd6717d
some more fixes
siad007 Dec 1, 2019
be77391
small fixes
siad007 Dec 1, 2019
94caa73
setMethods
siad007 Dec 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ before_install:
- git config --global user.email "travis-ci-build@phing.info"
- git config --global user.name "Phing Travis Builder"
- composer self-update
- composer global require hirak/prestissimo

install:
- |
Expand Down
3 changes: 2 additions & 1 deletion classes/phing/tasks/ext/phpunit/PHPUnitTestRunner8.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ public function addListener($listener): void
*/
public function handleError($level, $message, $file, $line): bool
{
return PHPUnit\Util\ErrorHandler::handleError($level, $message, $file, $line);
$invoke = new PHPUnit\Util\ErrorHandler(true, true, true, true);
return $invoke($level, $message, $file, $line);
}

/**
Expand Down
13 changes: 7 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
},
"config": {
"platform": {
"php": "7.1.3"
"php": "7.1.33"
},
"bin-dir": "bin",
"preferred-install": "dist",
"sort-packages": true
},
"require": {
"php": "^7.1.3",
"php": "^7.1 || ^7.2 || ^7.3 || ^7.4",
"sebastian/version": "^2.0",
"symfony/console": "^2.8 || ^3.1 || ^4.0",
"symfony/yaml": "^2.8 || ^3.1 || ^4.0",
"symfony/console": "^2.8 || ^3.1 || ^4.0 || ^5.0",
"symfony/yaml": "^2.8 || ^3.1 || ^4.0 || ^5.0",
"mehr-als-nix/parallel": "^v1.0"
},
"require-dev": {
Expand All @@ -56,8 +56,9 @@
"sebastian/phpcpd": "^4.1",
"siad007/versioncontrol_hg": "^1.0",
"squizlabs/php_codesniffer": "^2.9 || ^3.5",
"symfony/stopwatch": "~2.8 || ^3.1 || ^4.0",
"tedivm/jshrink": "^1.3"
"symfony/stopwatch": "~2.8 || ^3.1 || ^4.0 || ^5.0",
"tedivm/jshrink": "^1.3",
"symfony/dependency-injection": "^2.8.50 || ^3.4.26 || ~4.1.12 || >4.2.7 <6.0.0"
},
"autoload": {
"classmap": [
Expand Down
Loading