diff --git a/.travis.yml b/.travis.yml
index b6c75bbf58..7f8463e04c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
- |
diff --git a/classes/phing/tasks/ext/phpunit/PHPUnitTestRunner8.php b/classes/phing/tasks/ext/phpunit/PHPUnitTestRunner8.php
index 1ceec3c9cf..0a7ce57ba2 100644
--- a/classes/phing/tasks/ext/phpunit/PHPUnitTestRunner8.php
+++ b/classes/phing/tasks/ext/phpunit/PHPUnitTestRunner8.php
@@ -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);
}
/**
diff --git a/composer.json b/composer.json
index 439ddf76f0..14bee17f02 100644
--- a/composer.json
+++ b/composer.json
@@ -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": {
@@ -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": [
diff --git a/composer.lock b/composer.lock
index 14346da4fb..70ba1ace9e 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": "6ac3d21d6f842c7a5482ede79f21d181",
+ "content-hash": "3deee308cf1edebc981b374e3a69e1c7",
"packages": [
{
"name": "mehr-als-nix/parallel",
@@ -44,16 +44,16 @@
},
{
"name": "psr/log",
- "version": "1.1.0",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
"shasum": ""
},
"require": {
@@ -62,7 +62,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
@@ -87,7 +87,7 @@
"psr",
"psr-3"
],
- "time": "2018-11-20T15:27:04+00:00"
+ "time": "2019-11-01T11:05:21+00:00"
},
{
"name": "sebastian/version",
@@ -134,7 +134,7 @@
},
{
"name": "symfony/console",
- "version": "v2.8.50",
+ "version": "v2.8.52",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
@@ -252,16 +252,16 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.12.0",
+ "version": "v1.13.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+ "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
+ "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
"shasum": ""
},
"require": {
@@ -273,7 +273,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.13-dev"
}
},
"autoload": {
@@ -307,7 +307,7 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2019-11-27T14:18:11+00:00"
},
{
"name": "symfony/yaml",
@@ -368,16 +368,16 @@
"packages-dev": [
{
"name": "aws/aws-sdk-php",
- "version": "3.112.33",
+ "version": "3.123.0",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "9d8735e4eb252ea8fa3dd1bc11bfcd01f3fa6d6c"
+ "reference": "3bf671629a3b2a5a5694f8dfee15686e586b33b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9d8735e4eb252ea8fa3dd1bc11bfcd01f3fa6d6c",
- "reference": "9d8735e4eb252ea8fa3dd1bc11bfcd01f3fa6d6c",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3bf671629a3b2a5a5694f8dfee15686e586b33b6",
+ "reference": "3bf671629a3b2a5a5694f8dfee15686e586b33b6",
"shasum": ""
},
"require": {
@@ -447,7 +447,7 @@
"s3",
"sdk"
],
- "time": "2019-10-31T18:10:59+00:00"
+ "time": "2019-11-26T19:08:40+00:00"
},
{
"name": "cilex/cilex",
@@ -596,6 +596,7 @@
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"homepage": "https://github.com/container-interop/container-interop",
+ "abandoned": "psr/container",
"time": "2017-02-14T19:40:03+00:00"
},
{
@@ -668,16 +669,16 @@
},
{
"name": "doctrine/instantiator",
- "version": "1.2.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+ "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+ "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
"shasum": ""
},
"require": {
@@ -720,7 +721,7 @@
"constructor",
"instantiate"
],
- "time": "2019-03-17T17:37:11+00:00"
+ "time": "2019-10-21T16:45:58+00:00"
},
{
"name": "doctrine/lexer",
@@ -1509,16 +1510,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.25.1",
+ "version": "1.25.2",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf"
+ "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
- "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
+ "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
"shasum": ""
},
"require": {
@@ -1583,7 +1584,7 @@
"logging",
"psr-3"
],
- "time": "2019-09-06T13:49:17+00:00"
+ "time": "2019-11-13T10:00:05+00:00"
},
{
"name": "mtdowling/jmespath.php",
@@ -1841,16 +1842,16 @@
},
{
"name": "pear/console_getopt",
- "version": "v1.4.2",
+ "version": "v1.4.3",
"source": {
"type": "git",
"url": "https://github.com/pear/Console_Getopt.git",
- "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0"
+ "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/6c77aeb625b32bd752e89ee17972d103588b90c0",
- "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0",
+ "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0",
+ "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0",
"shasum": ""
},
"type": "library",
@@ -1867,11 +1868,6 @@
"BSD-2-Clause"
],
"authors": [
- {
- "name": "Greg Beaver",
- "email": "cellog@php.net",
- "role": "Helper"
- },
{
"name": "Andrei Zmievski",
"email": "andrei@php.net",
@@ -1881,10 +1877,15 @@
"name": "Stig Bakken",
"email": "stig@php.net",
"role": "Developer"
+ },
+ {
+ "name": "Greg Beaver",
+ "email": "cellog@php.net",
+ "role": "Helper"
}
],
"description": "More info available on: http://pear.php.net/package/Console_Getopt",
- "time": "2019-02-06T16:52:33+00:00"
+ "time": "2019-11-20T18:27:48+00:00"
},
{
"name": "pear/http_request2",
@@ -2064,16 +2065,16 @@
},
{
"name": "pear/pear-core-minimal",
- "version": "v1.10.9",
+ "version": "v1.10.10",
"source": {
"type": "git",
"url": "https://github.com/pear/pear-core-minimal.git",
- "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f"
+ "reference": "625a3c429d9b2c1546438679074cac1b089116a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/742be8dd68c746a01e4b0a422258e9c9cae1c37f",
- "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f",
+ "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7",
+ "reference": "625a3c429d9b2c1546438679074cac1b089116a7",
"shasum": ""
},
"require": {
@@ -2104,7 +2105,7 @@
}
],
"description": "Minimal set of PEAR core files to be used as composer dependency",
- "time": "2019-03-13T18:15:44+00:00"
+ "time": "2019-11-19T19:00:24+00:00"
},
{
"name": "pear/pear_exception",
@@ -2242,13 +2243,13 @@
"authors": [
{
"name": "Michiel Rook",
- "email": "mrook@php.net",
- "role": "Lead"
+ "role": "Lead",
+ "email": "mrook@php.net"
},
{
"name": "Clay Loveless",
- "email": "clay@loveless.net",
- "role": "Lead"
+ "role": "Lead",
+ "email": "clay@loveless.net"
}
],
"description": "More info available on: http://pear.php.net/package/VersionControl_SVN",
@@ -2493,12 +2494,12 @@
"version": "v2.9.0",
"source": {
"type": "git",
- "url": "https://github.com/phpDocumentor/phpDocumentor2.git",
+ "url": "https://github.com/phpDocumentor/phpDocumentor.git",
"reference": "be607da0eef9b9249c43c5b4820d25d631c73667"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor2/zipball/be607da0eef9b9249c43c5b4820d25d631c73667",
+ "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor/zipball/be607da0eef9b9249c43c5b4820d25d631c73667",
"reference": "be607da0eef9b9249c43c5b4820d25d631c73667",
"shasum": ""
},
@@ -2799,43 +2800,47 @@
},
{
"name": "phpoption/phpoption",
- "version": "1.5.0",
+ "version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
+ "reference": "f4e7a6a1382183412246f0d361078c29fb85089e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
- "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/f4e7a6a1382183412246f0d361078c29fb85089e",
+ "reference": "f4e7a6a1382183412246f0d361078c29fb85089e",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": "^5.5.9 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "4.7.*"
+ "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.6-dev"
}
},
"autoload": {
- "psr-0": {
- "PhpOption\\": "src/"
+ "psr-4": {
+ "PhpOption\\": "src/PhpOption/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "Apache2"
+ "Apache-2.0"
],
"authors": [
{
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com"
+ },
+ {
+ "name": "Graham Campbell",
+ "email": "graham@alt-three.com"
}
],
"description": "Option Type for PHP",
@@ -2845,7 +2850,7 @@
"php",
"type"
],
- "time": "2015-07-25T16:39:46+00:00"
+ "time": "2019-11-30T20:20:49+00:00"
},
{
"name": "phpspec/prophecy",
@@ -3753,16 +3758,16 @@
},
{
"name": "sebastian/environment",
- "version": "4.2.2",
+ "version": "4.2.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404"
+ "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
- "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
+ "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
"shasum": ""
},
"require": {
@@ -3802,7 +3807,7 @@
"environment",
"hhvm"
],
- "time": "2019-05-05T09:05:15+00:00"
+ "time": "2019-11-20T08:46:58+00:00"
},
{
"name": "sebastian/exporter",
@@ -4201,16 +4206,16 @@
},
{
"name": "seld/jsonlint",
- "version": "1.7.1",
+ "version": "1.7.2",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
+ "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
- "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
+ "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
"shasum": ""
},
"require": {
@@ -4246,7 +4251,7 @@
"parser",
"validator"
],
- "time": "2018-01-24T12:46:19+00:00"
+ "time": "2019-10-24T14:27:39+00:00"
},
{
"name": "siad007/versioncontrol_hg",
@@ -4349,7 +4354,7 @@
},
{
"name": "symfony/config",
- "version": "v2.8.50",
+ "version": "v2.8.52",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
@@ -4406,28 +4411,28 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v3.2.14",
+ "version": "v2.8.52",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761"
+ "reference": "c306198fee8f872a8f5f031e6e4f6f83086992d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761",
- "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c306198fee8f872a8f5f031e6e4f6f83086992d8",
+ "reference": "c306198fee8f872a8f5f031e6e4f6f83086992d8",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": ">=5.3.9"
},
"conflict": {
- "symfony/yaml": "<3.2"
+ "symfony/expression-language": "<2.6"
},
"require-dev": {
- "symfony/config": "~2.8|~3.0",
- "symfony/expression-language": "~2.8|~3.0",
- "symfony/yaml": "~3.2"
+ "symfony/config": "~2.2|~3.0.0",
+ "symfony/expression-language": "~2.6|~3.0.0",
+ "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7"
},
"suggest": {
"symfony/config": "",
@@ -4438,7 +4443,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
@@ -4465,11 +4470,11 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2017-07-28T15:22:55+00:00"
+ "time": "2019-04-16T11:33:46+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.50",
+ "version": "v2.8.52",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -4578,7 +4583,7 @@
},
{
"name": "symfony/finder",
- "version": "v2.8.50",
+ "version": "v2.8.52",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -4627,16 +4632,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.12.0",
+ "version": "v1.13.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+ "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
+ "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
"shasum": ""
},
"require": {
@@ -4648,7 +4653,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.13-dev"
}
},
"autoload": {
@@ -4681,11 +4686,11 @@
"polyfill",
"portable"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2019-11-27T13:56:44+00:00"
},
{
"name": "symfony/process",
- "version": "v2.8.50",
+ "version": "v2.8.52",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -4734,7 +4739,7 @@
},
{
"name": "symfony/stopwatch",
- "version": "v2.8.50",
+ "version": "v2.8.52",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
@@ -4847,7 +4852,7 @@
},
{
"name": "symfony/validator",
- "version": "v2.8.50",
+ "version": "v2.8.52",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
@@ -5047,16 +5052,16 @@
},
{
"name": "twig/twig",
- "version": "v1.42.3",
+ "version": "v1.42.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e"
+ "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e",
- "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152",
+ "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152",
"shasum": ""
},
"require": {
@@ -5109,7 +5114,7 @@
"keywords": [
"templating"
],
- "time": "2019-08-24T12:51:03+00:00"
+ "time": "2019-11-11T16:49:32+00:00"
},
{
"name": "zendframework/zend-cache",
@@ -5429,19 +5434,20 @@
},
{
"name": "zendframework/zend-i18n",
- "version": "2.9.2",
+ "version": "2.10.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-i18n.git",
- "reference": "e17a54b3aee333ab156958f570cde630acee8b07"
+ "reference": "561a815ce32c86b0f1de11135477e637926d56b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/e17a54b3aee333ab156958f570cde630acee8b07",
- "reference": "e17a54b3aee333ab156958f570cde630acee8b07",
+ "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/561a815ce32c86b0f1de11135477e637926d56b6",
+ "reference": "561a815ce32c86b0f1de11135477e637926d56b6",
"shasum": ""
},
"require": {
+ "ext-intl": "*",
"php": "^5.6 || ^7.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
@@ -5457,7 +5463,6 @@
"zendframework/zend-view": "^2.6.3"
},
"suggest": {
- "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
"zendframework/zend-cache": "Zend\\Cache component",
"zendframework/zend-config": "Zend\\Config component",
"zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
@@ -5470,8 +5475,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev",
- "dev-develop": "2.10.x-dev"
+ "dev-master": "2.10.x-dev",
+ "dev-develop": "2.11.x-dev"
},
"zf": {
"component": "Zend\\I18n",
@@ -5493,7 +5498,7 @@
"i18n",
"zf"
],
- "time": "2019-09-30T12:04:37+00:00"
+ "time": "2019-11-18T20:31:29+00:00"
},
{
"name": "zendframework/zend-json",
@@ -5838,12 +5843,12 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
- "php": "^7.1.3"
+ "php": "^7.1 || ^7.2 || ^7.3 || ^7.4"
},
"platform-dev": {
"ext-pdo_sqlite": "*"
},
"platform-overrides": {
- "php": "7.1.3"
+ "php": "7.1.33"
}
}
diff --git a/test/classes/phing/PhingTest.php b/test/classes/phing/PhingTest.php
index b3b8cf16c7..48a44a1fd9 100644
--- a/test/classes/phing/PhingTest.php
+++ b/test/classes/phing/PhingTest.php
@@ -100,6 +100,9 @@ public function testGetPhingVersion()
$this->assertStringStartsWith('Phing ', Phing::getPhingVersion());
}
+ /**
+ * @requires PHP >= 7.2
+ */
public function testPrintTargets()
{
$target = $this->getMockBuilder(Target::class)->getMock();
@@ -111,6 +114,9 @@ public function testPrintTargets()
$this->assertNull($phing->printTargets($project));
}
+ /**
+ * @requires PHP >= 7.2
+ */
public function testPrintUsage(): void
{
$phing = new Phing();
diff --git a/test/classes/phing/regression/PearPkg2CompatibilityTest.php b/test/classes/phing/regression/PearPkg2CompatibilityTest.php
index 4807cd6d92..74332fd3dc 100644
--- a/test/classes/phing/regression/PearPkg2CompatibilityTest.php
+++ b/test/classes/phing/regression/PearPkg2CompatibilityTest.php
@@ -64,20 +64,20 @@ public function testInactiveMaintainers()
{
$this->executeTarget("inactive");
$content = file_get_contents(PHING_TEST_BASE . '/etc/regression/524/out/package2.xml');
- $this->assertContains('no', $content);
+ $this->assertStringContainsString('no', $content);
}
public function testActiveMaintainers()
{
$this->executeTarget("active");
$content = file_get_contents(PHING_TEST_BASE . '/etc/regression/524/out/package2.xml');
- $this->assertContains('yes', $content);
+ $this->assertStringContainsString('yes', $content);
}
public function testNotSetMaintainers()
{
$this->executeTarget("notset");
$content = file_get_contents(PHING_TEST_BASE . '/etc/regression/524/out/package2.xml');
- $this->assertContains('yes', $content);
+ $this->assertStringContainsString('yes', $content);
}
}
diff --git a/test/classes/phing/system/lang/CharacterTest.php b/test/classes/phing/system/lang/CharacterTest.php
index 1c6da17bd6..451d104126 100644
--- a/test/classes/phing/system/lang/CharacterTest.php
+++ b/test/classes/phing/system/lang/CharacterTest.php
@@ -28,12 +28,12 @@ class CharacterTest extends \PHPUnit\Framework\TestCase
/** @var Character */
private $char;
- public function setUp()
+ public function setUp(): void
{
$this->char = new Character();
}
- public function tearDown()
+ public function tearDown(): void
{
$this->char = null;
}
diff --git a/test/classes/phing/tasks/ext/FileHashTaskTest.php b/test/classes/phing/tasks/ext/FileHashTaskTest.php
index f6f47ec86e..33cf679135 100644
--- a/test/classes/phing/tasks/ext/FileHashTaskTest.php
+++ b/test/classes/phing/tasks/ext/FileHashTaskTest.php
@@ -28,7 +28,7 @@ public function setUp(): void
$this->configureProject(PHING_TEST_BASE . "/etc/tasks/ext/filehash.xml");
}
- public function tearDown()
+ public function tearDown(): void
{
if (file_exists(PHING_TEST_BASE . "/etc/tasks/ext/filehash.bin.crc32")) {
unlink(PHING_TEST_BASE . "/etc/tasks/ext/filehash.bin.crc32");
diff --git a/test/classes/phing/tasks/ext/PDO/PDODelimitersTest.php b/test/classes/phing/tasks/ext/PDO/PDODelimitersTest.php
index b79123682b..0a08ac73a5 100644
--- a/test/classes/phing/tasks/ext/PDO/PDODelimitersTest.php
+++ b/test/classes/phing/tasks/ext/PDO/PDODelimitersTest.php
@@ -56,6 +56,9 @@ public function storeQuery($query)
}
}
+ /**
+ * @requires PHP >= 7.2
+ */
public function testDelimiterTypeNormal()
{
// for some reason default splitter mangles spaces on subsequent lines
@@ -99,6 +102,9 @@ public function testDelimiterTypeNormal()
$this->assertEquals($expected, $this->queries);
}
+ /**
+ * @requires PHP >= 7.2
+ */
public function testDelimiterTypeRow()
{
// for some reason default splitter mangles spaces on subsequent lines
@@ -136,6 +142,7 @@ public function testDelimiterTypeRow()
*
* @link http://www.phing.info/trac/ticket/499
* @link http://www.postgresql.org/docs/9.0/interactive/sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING
+ * @requires PHP >= 7.2
*/
public function testRequest499()
{
diff --git a/test/classes/phing/tasks/ext/PHPCPDTaskTest.php b/test/classes/phing/tasks/ext/PHPCPDTaskTest.php
index b2e0d179e9..a7d6f8369e 100644
--- a/test/classes/phing/tasks/ext/PHPCPDTaskTest.php
+++ b/test/classes/phing/tasks/ext/PHPCPDTaskTest.php
@@ -53,6 +53,6 @@ public function testFormatterNoFile()
ob_start();
$this->executeTarget(__FUNCTION__);
$output = ob_get_clean();
- $this->assertContains("No clones found.\n\n", $output);
+ $this->assertStringContainsString("No clones found.\n\n", $output);
}
}
diff --git a/test/classes/phing/tasks/ext/PearPackageTest.php b/test/classes/phing/tasks/ext/PearPackageTest.php
index 7695319642..b884732798 100644
--- a/test/classes/phing/tasks/ext/PearPackageTest.php
+++ b/test/classes/phing/tasks/ext/PearPackageTest.php
@@ -51,6 +51,6 @@ public function testRoleSet()
{
$this->executeTarget("main");
$content = file_get_contents(PHING_TEST_BASE . '/etc/tasks/ext/package.xml');
- $this->assertContains('', $content);
+ $this->assertStringContainsString('', $content);
}
}
diff --git a/test/classes/phing/tasks/ext/PhpCodeSnifferTaskTest.php b/test/classes/phing/tasks/ext/PhpCodeSnifferTaskTest.php
index 976912416c..090c869db5 100644
--- a/test/classes/phing/tasks/ext/PhpCodeSnifferTaskTest.php
+++ b/test/classes/phing/tasks/ext/PhpCodeSnifferTaskTest.php
@@ -39,7 +39,7 @@ public function testNestedFormatters()
ob_start();
$this->executeTarget(__FUNCTION__);
$output = ob_get_clean();
- $this->assertContains("PHP CODE SNIFFER REPORT SUMMARY", $output);
+ $this->assertStringContainsString("PHP CODE SNIFFER REPORT SUMMARY", $output);
$this->assertFileExists(
PHING_TEST_BASE . '/etc/tasks/ext/phpcs/report.txt'
);
@@ -51,7 +51,7 @@ public function testCustomStandard()
ob_start();
$this->executeTarget(__FUNCTION__);
$output = ob_get_clean();
- $this->assertContains("PHP CODE SNIFFER REPORT SUMMARY", $output);
+ $this->assertStringContainsString("PHP CODE SNIFFER REPORT SUMMARY", $output);
$this->assertFileExists(
PHING_TEST_BASE . '/etc/tasks/ext/phpcs/report.txt'
);
diff --git a/test/classes/phing/tasks/ext/WikiPublishTaskTest.php b/test/classes/phing/tasks/ext/WikiPublishTaskTest.php
index 6149fa32ae..e15a81e31c 100644
--- a/test/classes/phing/tasks/ext/WikiPublishTaskTest.php
+++ b/test/classes/phing/tasks/ext/WikiPublishTaskTest.php
@@ -24,9 +24,8 @@
*/
class WikiPublishTaskTest extends BuildFileTest
{
-
/**
- * Test Wiki api success request and response sequence
+ * @requires PHP >= 7.2
*/
public function testApiEdit()
{
@@ -46,7 +45,7 @@ public function testApiEdit()
'action=login',
['lgname' => 'testUser', 'lgpassword' => 'testPassword']
)
- ->will($this->returnValue(['login' => ['result' => 'NeedToken', 'token' => 'testLgToken']]));
+ ->willReturn(['login' => ['result' => 'NeedToken', 'token' => 'testLgToken']]);
$task->expects($this->at(1))
->method('callApi')
@@ -54,12 +53,12 @@ public function testApiEdit()
'action=login',
['lgname' => 'testUser', 'lgpassword' => 'testPassword', 'lgtoken' => 'testLgToken']
)
- ->will($this->returnValue(['login' => ['result' => 'Success']]));
+ ->willReturn(['login' => ['result' => 'Success']]);
$task->expects($this->at(2))
->method('callApi')
->with('action=tokens&type=edit')
- ->will($this->returnValue(['tokens' => ['edittoken' => 'testEditToken+/']]));
+ ->willReturn(['tokens' => ['edittoken' => 'testEditToken+/']]);
$task->expects($this->at(3))
->method('callApi')
@@ -67,13 +66,13 @@ public function testApiEdit()
'action=edit&token=testEditToken%2B%2F',
['minor' => '', 'title' => 'some page', 'prependtext' => 'some content']
)
- ->will($this->returnValue(['edit' => ['result' => 'Success']]));
+ ->willReturn(['edit' => ['result' => 'Success']]);
$task->main();
}
/**
- * Test invalid input attributes
+ * @requires PHP >= 7.2
*/
public function testInvalidAttributes()
{
@@ -95,7 +94,7 @@ public function testInvalidAttributes()
/**
* Creates WikiPublishTask mock
- * @return WikiPublishTask
+ * @return \PHPUnit\Framework\MockObject\MockObject|WikiPublishTask
*/
private function getWikiPublishMock()
{
diff --git a/test/classes/phing/tasks/ext/rST/RSTTaskTest.php b/test/classes/phing/tasks/ext/rST/RSTTaskTest.php
index 1d30f74da1..b0d39cbb33 100644
--- a/test/classes/phing/tasks/ext/rST/RSTTaskTest.php
+++ b/test/classes/phing/tasks/ext/rST/RSTTaskTest.php
@@ -100,7 +100,7 @@ public function testGetToolPathCustom()
$ref = new ReflectionClass($rt);
$method = $ref->getMethod('getToolPath');
$method->setAccessible(true);
- $this->assertContains('/true', $method->invoke($rt, 'foo'));
+ $this->assertStringContainsString('/true', $method->invoke($rt, 'foo'));
}
public function testSetToolpathNotExisting()
@@ -133,7 +133,7 @@ public function testGetToolPathHtmlFormat()
$ref = new ReflectionClass($rt);
$method = $ref->getMethod('getToolPath');
$method->setAccessible(true);
- $this->assertContains('rst2html', $method->invoke($rt, 'html'));
+ $this->assertStringContainsString('rst2html', $method->invoke($rt, 'html'));
}
public function testSingleFileParameterFile()
@@ -284,7 +284,7 @@ public function testFilterChain()
$file = PHING_TEST_BASE . '/etc/tasks/ext/rst/files/filterchain.html';
$this->assertFileExists($file);
$cont = file_get_contents($file);
- $this->assertContains('This is a bar.', $cont);
+ $this->assertStringContainsString('This is a bar.', $cont);
unlink($file);
}
@@ -295,8 +295,8 @@ public function testCustomParameter()
$this->assertFileExists('files/single.html');
$file = PHING_TEST_BASE . '/etc/tasks/ext/rst/files/single.html';
$cont = file_get_contents($file);
- $this->assertContains('this is a custom css file', $cont);
- $this->assertContains('#FF8000', $cont);
+ $this->assertStringContainsString('this is a custom css file', $cont);
+ $this->assertStringContainsString('#FF8000', $cont);
unlink($file);
}
}
diff --git a/test/classes/phing/tasks/ext/sonar/SonarConfigurationFileParserTest.php b/test/classes/phing/tasks/ext/sonar/SonarConfigurationFileParserTest.php
index f4ec5c6c3f..4f060be2fd 100644
--- a/test/classes/phing/tasks/ext/sonar/SonarConfigurationFileParserTest.php
+++ b/test/classes/phing/tasks/ext/sonar/SonarConfigurationFileParserTest.php
@@ -75,7 +75,7 @@ public function testEmptyFile()
if (method_exists($this, 'assertIsArray')) {
$this->assertIsArray($properties);
} else {
- $this->assertInternalType('array', $properties);
+ $this->assertIsArray($properties);
}
$this->assertEmpty($properties);
}
diff --git a/test/classes/phing/tasks/system/AppendTaskTest.php b/test/classes/phing/tasks/system/AppendTaskTest.php
index 93f5ae6e2f..e7caaaf585 100644
--- a/test/classes/phing/tasks/system/AppendTaskTest.php
+++ b/test/classes/phing/tasks/system/AppendTaskTest.php
@@ -149,7 +149,7 @@ public function testfilterinline()
public function testfixlastline()
{
$this->executeTarget("testfixlastline");
- $this->assertContains(
+ $this->assertStringContainsString(
"end of line" . $this->getProject()->getProperty("line.separator") . "This has",
file_get_contents($this->getProject()->getProperty("basedir") . 'concat.line4')
);
@@ -158,7 +158,7 @@ public function testfixlastline()
public function testfixlastlineeol()
{
$this->executeTarget("testfixlastlineeol");
- $this->assertContains(
+ $this->assertStringContainsString(
"end of line\rThis has",
file_get_contents($this->getProject()->getProperty("basedir") . 'concat.linecr')
);
diff --git a/test/classes/phing/tasks/system/ExecTaskTest.php b/test/classes/phing/tasks/system/ExecTaskTest.php
index 6f887fbb70..c7d49f39b1 100644
--- a/test/classes/phing/tasks/system/ExecTaskTest.php
+++ b/test/classes/phing/tasks/system/ExecTaskTest.php
@@ -312,7 +312,7 @@ public function testOutput()
$file = tempnam(FileUtils::getTempDir(), 'phing-exectest-');
$this->project->setProperty('execTmpFile', $file);
$this->executeTarget(__FUNCTION__);
- $this->assertContains('outfoo', file_get_contents($file));
+ $this->assertStringContainsString('outfoo', file_get_contents($file));
unlink($file);
}
@@ -321,7 +321,7 @@ public function testError()
$file = tempnam(FileUtils::getTempDir(), 'phing-exectest-');
$this->project->setProperty('execTmpFile', $file);
$this->executeTarget(__FUNCTION__);
- $this->assertContains('errfoo', file_get_contents($file));
+ $this->assertStringContainsString('errfoo', file_get_contents($file));
unlink($file);
}