jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363291 )
Change subject: Update phpunit to use 5.7
......................................................................
Update phpunit to use 5.7
This should be do-able now we are on php 5.6 & will help with Omnimail
& using guzzle. Also update phpsec for omnimail, used for ftp downloads
Change-Id: Iaba4d843643e7f198b9f7838d7ca87b4a02244ec
---
M composer.json
M composer.lock
2 files changed, 278 insertions(+), 90 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.json b/composer.json
index cabc736..345150b 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
"wikimedia/donation-interface": "dev-master",
"wikimedia/smash-pig": "dev-master",
"phpmailer/phpmailer": "5.2.*",
- "phpseclib/phpseclib": "0.3.7",
+ "phpseclib/phpseclib": "~2.0",
"predis/predis": "1.*",
"twig/twig": "1.*"
},
@@ -33,7 +33,7 @@
}
],
"require-dev": {
- "phpunit/phpunit": "4.*",
+ "phpunit/phpunit": "5.*",
"jakub-onderka/php-parallel-lint": "~0.9.2",
"jakub-onderka/php-console-highlighter": "~0.3.2"
},
diff --git a/composer.lock b/composer.lock
index bba239f..53b9a37 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "content-hash": "b4d5a67549742ecca7b33afc58860195",
+ "content-hash": "9d359779ffaa56b80b732235f55a98e9",
"packages": [
{
"name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -507,52 +507,43 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "0.3.7",
+ "version": "2.0.6",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git";,
- "reference": "8b8c62f278e363b75ddcacaf5803710232fbd3e4"
+ "reference": "34a7699e6f31b1ef4035ee36444407cecf9f56aa"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpseclib/phpseclib/zipball/8b8c62f278e363b75ddcacaf5803710232fbd3e4";,
- "reference": "8b8c62f278e363b75ddcacaf5803710232fbd3e4",
+ "url":
"https://api.github.com/repos/phpseclib/phpseclib/zipball/34a7699e6f31b1ef4035ee36444407cecf9f56aa";,
+ "reference": "34a7699e6f31b1ef4035ee36444407cecf9f56aa",
"shasum": ""
},
"require": {
- "php": ">=5.0.0"
+ "php": ">=5.3.3"
},
"require-dev": {
- "phing/phing": "2.7.*",
- "phpunit/phpunit": "4.0.*",
- "squizlabs/php_codesniffer": "1.*"
+ "phing/phing": "~2.7",
+ "phpunit/phpunit": "~4.0",
+ "sami/sami": "~2.0",
+ "squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension
in order to speed up arbitrary precision integer arithmetic operations.",
- "ext-mcrypt": "Install the Mcrypt extension in order to speed
up a wide variety of cryptographic operations.",
- "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib
working on PHP < 4.3.3."
+ "ext-libsodium": "SSH2/SFTP can make use of some algorithms
provided by the libsodium-php extension.",
+ "ext-mcrypt": "Install the Mcrypt extension in order to speed
up a few other cryptographic operations.",
+ "ext-openssl": "Install the OpenSSL extension in order to
speed up a wide variety of cryptographic operations."
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "0.3-dev"
+ "autoload": {
+ "files": [
+ "phpseclib/bootstrap.php"
+ ],
+ "psr-4": {
+ "phpseclib\\": "phpseclib/"
}
},
- "autoload": {
- "psr-0": {
- "Crypt": "phpseclib/",
- "File": "phpseclib/",
- "Math": "phpseclib/",
- "Net": "phpseclib/",
- "System": "phpseclib/"
- },
- "files": [
- "phpseclib/Crypt/Random.php"
- ]
- },
- "include-path": [
- "phpseclib/"
- ],
+ "notification-url": "https://packagist.org/downloads/";,
"license": [
"MIT"
],
@@ -575,6 +566,11 @@
{
"name": "Hans-Jürgen Petrich",
"email": "petr...@tronic-media.com",
+ "role": "Developer"
+ },
+ {
+ "name": "Graham Campbell",
+ "email": "gra...@alt-three.com",
"role": "Developer"
}
],
@@ -599,11 +595,7 @@
"x.509",
"x509"
],
- "support": {
- "source": "https://github.com/phpseclib/phpseclib/tree/0.3.7";,
- "issues": "https://github.com/phpseclib/phpseclib/issues";
- },
- "time": "2014-07-05T16:36:21+00:00"
+ "time": "2017-06-05T06:31:10+00:00"
},
{
"name": "predis/predis",
@@ -1491,6 +1483,48 @@
"time": "2015-12-15T10:42:16+00:00"
},
{
+ "name": "myclabs/deep-copy",
+ "version": "1.6.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/myclabs/DeepCopy.git";,
+ "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102";,
+ "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "doctrine/collections": "1.*",
+ "phpunit/phpunit": "~4.1"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "DeepCopy\\": "src/DeepCopy/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "description": "Create deep copies (clones) of your objects",
+ "homepage": "https://github.com/myclabs/DeepCopy";,
+ "keywords": [
+ "clone",
+ "copy",
+ "duplicate",
+ "object",
+ "object graph"
+ ],
+ "time": "2017-04-12T18:52:22+00:00"
+ },
+ {
"name": "phpdocumentor/reflection-common",
"version": "1.0",
"source": {
@@ -1701,39 +1735,40 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.2.4",
+ "version": "4.0.8",
"source": {
"type": "git",
"url":
"https://github.com/sebastianbergmann/php-code-coverage.git";,
- "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+ "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979";,
- "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+ "url":
"https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d";,
+ "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "phpunit/php-file-iterator": "~1.3",
- "phpunit/php-text-template": "~1.2",
- "phpunit/php-token-stream": "~1.3",
- "sebastian/environment": "^1.3.2",
- "sebastian/version": "~1.0"
+ "ext-dom": "*",
+ "ext-xmlwriter": "*",
+ "php": "^5.6 || ^7.0",
+ "phpunit/php-file-iterator": "^1.3",
+ "phpunit/php-text-template": "^1.2",
+ "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+ "sebastian/code-unit-reverse-lookup": "^1.0",
+ "sebastian/environment": "^1.3.2 || ^2.0",
+ "sebastian/version": "^1.0 || ^2.0"
},
"require-dev": {
- "ext-xdebug": ">=2.1.4",
- "phpunit/phpunit": "~4"
+ "ext-xdebug": "^2.1.4",
+ "phpunit/phpunit": "^5.7"
},
"suggest": {
- "ext-dom": "*",
- "ext-xdebug": ">=2.2.1",
- "ext-xmlwriter": "*"
+ "ext-xdebug": "^2.5.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2.x-dev"
+ "dev-master": "4.0.x-dev"
}
},
"autoload": {
@@ -1759,7 +1794,7 @@
"testing",
"xunit"
],
- "time": "2015-10-06T15:47:00+00:00"
+ "time": "2017-04-02T07:44:40+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -1851,25 +1886,30 @@
},
{
"name": "phpunit/php-timer",
- "version": "1.0.8",
+ "version": "1.0.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git";,
- "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+ "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260";,
- "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+ "url":
"https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f";,
+ "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4|~5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
"autoload": {
"classmap": [
"src/"
@@ -1891,20 +1931,20 @@
"keywords": [
"timer"
],
- "time": "2016-05-12T18:03:57+00:00"
+ "time": "2017-02-26T11:10:40+00:00"
},
{
"name": "phpunit/php-token-stream",
- "version": "1.4.9",
+ "version": "1.4.11",
"source": {
"type": "git",
"url":
"https://github.com/sebastianbergmann/php-token-stream.git";,
- "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
+ "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b";,
- "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
+ "url":
"https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7";,
+ "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
"shasum": ""
},
"require": {
@@ -1940,44 +1980,56 @@
"keywords": [
"tokenizer"
],
- "time": "2016-11-15T14:06:22+00:00"
+ "time": "2017-02-27T10:12:30+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "4.8.32",
+ "version": "5.6.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git";,
- "reference": "f5e1941a8dacf0d904753ff2895c6f68e54bcee1"
+ "reference": "4ddb822f1de421b4cadb47570a525fd7d9359493"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f5e1941a8dacf0d904753ff2895c6f68e54bcee1";,
- "reference": "f5e1941a8dacf0d904753ff2895c6f68e54bcee1",
+ "url":
"https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ddb822f1de421b4cadb47570a525fd7d9359493";,
+ "reference": "4ddb822f1de421b4cadb47570a525fd7d9359493",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-json": "*",
- "ext-pcre": "*",
- "ext-reflection": "*",
- "ext-spl": "*",
- "php": ">=5.3.3",
+ "ext-libxml": "*",
+ "ext-mbstring": "*",
+ "ext-xml": "*",
+ "myclabs/deep-copy": "~1.3",
+ "php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1",
- "phpunit/php-code-coverage": "~2.1",
+ "phpunit/php-code-coverage": "^4.0.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
- "phpunit/phpunit-mock-objects": "~2.3",
- "sebastian/comparator": "~1.2.2",
+ "phpunit/phpunit-mock-objects": "^3.2",
+ "sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
- "sebastian/environment": "~1.3",
+ "sebastian/environment": "^1.3 || ^2.0",
"sebastian/exporter": "~1.2",
"sebastian/global-state": "~1.0",
- "sebastian/version": "~1.0",
+ "sebastian/object-enumerator": "~1.0",
+ "sebastian/resource-operations": "~1.0",
+ "sebastian/version": "~1.0|~2.0",
"symfony/yaml": "~2.1|~3.0"
},
+ "conflict": {
+ "phpdocumentor/reflection-docblock": "3.0.2",
+ "sebastian/object-enumerator": "1.0.1",
+ "sebastian/recursion-context": "1.0.3 || 1.0.4"
+ },
+ "require-dev": {
+ "ext-pdo": "*"
+ },
"suggest": {
+ "ext-xdebug": "*",
"phpunit/php-invoker": "~1.1"
},
"bin": [
@@ -1986,7 +2038,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.8.x-dev"
+ "dev-master": "5.6.x-dev"
}
},
"autoload": {
@@ -2012,30 +2064,33 @@
"testing",
"xunit"
],
- "time": "2017-01-22T08:37:05+00:00"
+ "time": "2016-11-18T09:50:51+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "2.3.8",
+ "version": "3.4.4",
"source": {
"type": "git",
"url":
"https://github.com/sebastianbergmann/phpunit-mock-objects.git";,
- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+ "reference": "a23b761686d50a560cc56233b9ecf49597cc9118"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983";,
- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+ "url":
"https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118";,
+ "reference": "a23b761686d50a560cc56233b9ecf49597cc9118",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
- "php": ">=5.3.3",
- "phpunit/php-text-template": "~1.2",
- "sebastian/exporter": "~1.2"
+ "php": "^5.6 || ^7.0",
+ "phpunit/php-text-template": "^1.2",
+ "sebastian/exporter": "^1.2 || ^2.0"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.4"
+ "phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-soap": "*"
@@ -2043,7 +2098,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3.x-dev"
+ "dev-master": "3.2.x-dev"
}
},
"autoload": {
@@ -2068,7 +2123,52 @@
"mock",
"xunit"
],
- "time": "2015-10-02T06:51:40+00:00"
+ "time": "2017-06-30T09:13:00+00:00"
+ },
+ {
+ "name": "sebastian/code-unit-reverse-lookup",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/sebastianbergmann/code-unit-reverse-lookup.git";,
+ "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18";,
+ "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.6 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.7 || ^6.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebast...@phpunit.de"
+ }
+ ],
+ "description": "Looks up which function or method a line of code
belongs to",
+ "homepage":
"https://github.com/sebastianbergmann/code-unit-reverse-lookup/";,
+ "time": "2017-03-04T06:30:41+00:00"
},
{
"name": "sebastian/comparator",
@@ -2355,6 +2455,52 @@
"time": "2015-10-12T03:26:01+00:00"
},
{
+ "name": "sebastian/object-enumerator",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/sebastianbergmann/object-enumerator.git";,
+ "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26";,
+ "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6",
+ "sebastian/recursion-context": "~1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebast...@phpunit.de"
+ }
+ ],
+ "description": "Traverses array structures and object graphs to
enumerate all referenced objects",
+ "homepage":
"https://github.com/sebastianbergmann/object-enumerator/";,
+ "time": "2016-01-28T13:25:10+00:00"
+ },
+ {
"name": "sebastian/recursion-context",
"version": "1.0.2",
"source": {
@@ -2408,6 +2554,48 @@
"time": "2015-11-11T19:50:13+00:00"
},
{
+ "name": "sebastian/resource-operations",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/sebastianbergmann/resource-operations.git";,
+ "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52";,
+ "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebast...@phpunit.de"
+ }
+ ],
+ "description": "Provides a list of PHP built-in functions that
operate on resources",
+ "homepage":
"https://www.github.com/sebastianbergmann/resource-operations";,
+ "time": "2015-07-28T20:34:47+00:00"
+ },
+ {
"name": "sebastian/version",
"version": "1.0.6",
"source": {
--
To view, visit https://gerrit.wikimedia.org/r/363291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaba4d843643e7f198b9f7838d7ca87b4a02244ec
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
