jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329525 )
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
5db2b21 Clean up a couple unused things
78a59db Update payments_initial when donation completes
e181e46 Less noisy queue consumer logging
bbba45f reject some address_names
63d30e8 Update phpmailer for CVE-2016-10045 and CVE-2016-10033
7424e99 Revert "Update phpmailer for CVE-2016-10045 and CVE-2016-10033"
ae44b1a Update (only) PHPMailer
7bc3113 Revert "Update payments_initial when donation completes"
This just gets us out of cherry-pick hell
Everything except the libs and payments_initial update are already deployed.
Change-Id: I7815a05f5e7cf51d90fcdc6b9e95ff3bd25f8247
---
D PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
M composer.lock
2 files changed, 104 insertions(+), 260 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
deleted file mode 100644
index b2e4312..0000000
--- a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<<<<<<< HEAD (8597bd REVERT "DEPLOYMENT ONLY: Short-circuit everything to
disable)
-=======
-<?php
-namespace SmashPig\PaymentProviders\PayPal\Tests;
-
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
-use SmashPig\PaymentProviders\PayPal\Listener;
-use SmashPig\Tests\BaseSmashPigUnitTestCase;
-use SmashPig\Core\Http\Response;
-use SmashPig\Core\Http\Request;
-use SmashPig\Core\DataStores\KeyedOpaqueStorableObject;
-
-/**
- * Test the IPN listener which receives messages, stores and processes them.
- * @group PayPal
- */
-class CaptureIncomingMessageTest extends BaseSmashPigUnitTestCase {
-
- /**
- * @var Configuration
- */
- public $config;
-
- static $fail_verification = false;
- static $paypal_is_broken = false;
-
- // filename and the queue it should get dropped in
- static $message_data = array(
- 'web_accept.json' => 'verified',
- 'subscr_signup.json' => 'recurring',
- 'subscr_payment.json' => 'recurring',
- 'refund.json' => 'refund',
- 'chargeback_settlement.json' => 'refund',
- // this should not actually get written to
- // TODO 'new_case.json' => 'no-op',
- );
-
- static $messages = array();
-
- public function setUp() {
- parent::setUp();
- $this->config = PayPalTestConfiguration::get();
-
- // php-queue\PDO complains about pop() from non-existent table
- $this->config->object( 'data-store/jobs-paypal' )
- ->createTable( 'jobs-paypal' );
-
- Context::initWithLogger( $this->config );
- foreach ( self::$message_data as $file => $type ) {
- self::$messages[] = array(
- 'type' => $type,
- 'payload' => json_decode(
- file_get_contents( __DIR__ .
'/../Data/' . $file ),
- true
- )
- );
- }
- }
-
- public function tearDown() {
- self::$fail_verification = false;
- self::$paypal_is_broken = false;
- parent::tearDown();
- }
-
- private function capture( $msg ) {
- $request = new Request( $msg );
- $response = new Response;
- $listener = new Listener;
- return $listener->execute( $request, $response );
- }
-
- public function testCapture() {
- foreach ( self::$messages as $msg ) {
-
- $this->capture( $msg['payload'] );
-
- $jobQueue = $this->config->object(
'data-store/jobs-paypal' );
- $jobMessage = $jobQueue->pop();
-
- $this->assertEquals( $jobMessage['php-message-class'],
- 'SmashPig\PaymentProviders\PayPal\Job' );
-
- $this->assertEquals( $jobMessage['payload'],
$msg['payload'] );
- }
- }
-
- public function testBlankMessage() {
- $this->capture( array() );
- $jobQueue = $this->config->object( 'data-store/jobs-paypal' );
- $this->assertNull( $jobQueue->pop() );
- }
-
- public function testConsume() {
- foreach ( self::$messages as $msg ) {
- $this->capture( $msg['payload'] );
-
- $jobQueue = $this->config->object(
'data-store/jobs-paypal' );
- $jobMessage = $jobQueue->pop();
-
- $job = KeyedOpaqueStorableObject::fromJsonProxy(
- $jobMessage['php-message-class'],
- json_encode( $jobMessage )
- );
-
- $job->execute();
-
- $queue = $this->config->object( 'data-store/' .
$msg['type'] );
- $queue->createTable( $msg['type'] );
- $message = $queue->pop();
-
- if ( $job->is_reject() ) {
- $this->assertEmpty( $message );
- } else {
- $this->assertNotEmpty( $message );
- if ( isset(
$message['contribution_tracking_id'] ) ) {
- $this->assertEquals(
$message['contribution_tracking_id'], $message['order_id'] );
- }
-
- if ( isset( $message['supplemental_address_1']
) ) {
- $this->assertNotEquals(
-
$message['supplemental_address_1'],
- "{$message['first_name']}
{$message['last_name']}"
- );
- }
- }
-
- }
- }
-
- public function testFailedVerification() {
- self::$fail_verification = true;
- $jobMessage = array( 'txn_type' => 'fail' );
- $this->assertFalse( $this->capture( $jobMessage ) );
- }
-
- // FIXME: not really testing anything. Would like to verify that it
tried
- // N times. Bubble that information up somehow.
- public function testPayPalIsBroken() {
- self::$paypal_is_broken = true;
- $jobMessage = array( 'txn_type' => 'fail' );
- $this->assertFalse( $this->capture( $jobMessage ) );
- }
-
-}
->>>>>>> BRANCH (7bc311 Revert "Update payments_initial when donation
completes")
diff --git a/composer.lock b/composer.lock
index db64036..bd4ec82 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
"payment",
"payments"
],
- "time": "2016-02-17 00:44:20"
+ "time": "2016-02-17 00:53:20"
},
{
"name": "clio/clio",
@@ -93,7 +93,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git";,
- "reference": "8e15cbf9a46ef58ceeadb9b359fee925291a0173"
+ "reference": "14198ba1f7d4868933649a85621a3955965e83cd"
},
"require": {
"clio/clio": "0.1.*",
@@ -130,7 +130,8 @@
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor"
+ "parallel-lint . --exclude vendor",
+ "phpunit"
]
},
"license": [
@@ -148,7 +149,7 @@
"queue",
"transaction"
],
- "time": "2016-10-17 23:39:02"
+ "time": "2016-08-05 19:16:32"
},
{
"name": "fusesource/stomp-php",
@@ -244,16 +245,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.22.0",
+ "version": "1.21.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git";,
- "reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+ "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558";,
- "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+ "url":
"https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952";,
+ "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
"shasum": ""
},
"require": {
@@ -264,7 +265,7 @@
"psr/log-implementation": "1.0.0"
},
"require-dev": {
- "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+ "aws/aws-sdk-php": "^2.4.9",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9",
@@ -318,7 +319,7 @@
"logging",
"psr-3"
],
- "time": "2016-11-26 00:15:39"
+ "time": "2016-07-29 03:23:52"
},
{
"name": "phpmailer/phpmailer",
@@ -432,30 +433,22 @@
},
{
"name": "psr/log",
- "version": "1.0.2",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git";,
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d";,
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url":
"https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b";,
+ "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
"shasum": ""
},
- "require": {
- "php": ">=5.3.0"
- },
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
"autoload": {
- "psr-4": {
- "Psr\\Log\\": "Psr/Log/"
+ "psr-0": {
+ "Psr\\Log\\": ""
}
},
"notification-url": "https://packagist.org/downloads/";,
@@ -469,26 +462,25 @@
}
],
"description": "Common interface for logging libraries",
- "homepage": "https://github.com/php-fig/log";,
"keywords": [
"log",
"psr",
"psr-3"
],
- "time": "2016-10-10 12:19:37"
+ "time": "2012-12-21 11:40:51"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.15",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git";,
- "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934"
+ "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934";,
- "reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
+ "url":
"https://api.github.com/repos/symfony/event-dispatcher/zipball/889983a79a043dfda68f38c38b6dba092dd49cd8";,
+ "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8",
"shasum": ""
},
"require": {
@@ -535,20 +527,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com";,
- "time": "2016-10-13 01:43:15"
+ "time": "2016-07-28 16:56:28"
},
{
"name": "symfony/http-foundation",
- "version": "v2.8.15",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git";,
- "reference": "216c111ac427f5f773c6a8bfc0c15f0a7dd74876"
+ "reference": "f20bea598906c990eebe3c70a63ca5ed18cdbc11"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/http-foundation/zipball/216c111ac427f5f773c6a8bfc0c15f0a7dd74876";,
- "reference": "216c111ac427f5f773c6a8bfc0c15f0a7dd74876",
+ "url":
"https://api.github.com/repos/symfony/http-foundation/zipball/f20bea598906c990eebe3c70a63ca5ed18cdbc11";,
+ "reference": "f20bea598906c990eebe3c70a63ca5ed18cdbc11",
"shasum": ""
},
"require": {
@@ -590,20 +582,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com";,
- "time": "2016-11-27 04:20:28"
+ "time": "2016-07-30 07:20:35"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.3.0",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git";,
- "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+ "reference": "dff51f72b0706335131b00a7f49606168c582594"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4";,
- "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+ "url":
"https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594";,
+ "reference": "dff51f72b0706335131b00a7f49606168c582594",
"shasum": ""
},
"require": {
@@ -615,7 +607,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.2-dev"
}
},
"autoload": {
@@ -649,20 +641,20 @@
"portable",
"shim"
],
- "time": "2016-11-14 01:06:16"
+ "time": "2016-05-18 14:26:46"
},
{
"name": "symfony/polyfill-php54",
- "version": "v1.3.0",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php54.git";,
- "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0"
+ "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/polyfill-php54/zipball/90e085822963fdcc9d1c5b73deb3d2e5783b16a0";,
- "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0",
+ "url":
"https://api.github.com/repos/symfony/polyfill-php54/zipball/34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1";,
+ "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1",
"shasum": ""
},
"require": {
@@ -671,7 +663,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.2-dev"
}
},
"autoload": {
@@ -707,20 +699,20 @@
"portable",
"shim"
],
- "time": "2016-11-14 01:06:16"
+ "time": "2016-05-18 14:26:46"
},
{
"name": "symfony/polyfill-php55",
- "version": "v1.3.0",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git";,
- "reference": "03e3f0350bca2220e3623a0e340eef194405fc67"
+ "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67";,
- "reference": "03e3f0350bca2220e3623a0e340eef194405fc67",
+ "url":
"https://api.github.com/repos/symfony/polyfill-php55/zipball/bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d";,
+ "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d",
"shasum": ""
},
"require": {
@@ -730,7 +722,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.2-dev"
}
},
"autoload": {
@@ -763,20 +755,20 @@
"portable",
"shim"
],
- "time": "2016-11-14 01:06:16"
+ "time": "2016-05-18 14:26:46"
},
{
"name": "symfony/yaml",
- "version": "v2.8.15",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git";,
- "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
+ "reference": "0ceab136f43ed9d3e97b3eea32a7855dc50c121d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff";,
- "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
+ "url":
"https://api.github.com/repos/symfony/yaml/zipball/0ceab136f43ed9d3e97b3eea32a7855dc50c121d";,
+ "reference": "0ceab136f43ed9d3e97b3eea32a7855dc50c121d",
"shasum": ""
},
"require": {
@@ -812,7 +804,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com";,
- "time": "2016-11-14 16:15:57"
+ "time": "2016-07-17 09:06:15"
}
],
"packages-dev": [
@@ -973,16 +965,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "3.1.1",
+ "version": "3.1.0",
"source": {
"type": "git",
"url":
"https://github.com/phpDocumentor/ReflectionDocBlock.git";,
- "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+ "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e";,
- "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+ "url":
"https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd";,
+ "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
"shasum": ""
},
"require": {
@@ -1014,20 +1006,20 @@
}
],
"description": "With this component, a library can provide support
for annotations via DocBlocks or otherwise retrieve information that is
embedded in a DocBlock.",
- "time": "2016-09-30 07:12:33"
+ "time": "2016-06-10 09:48:41"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "0.2.1",
+ "version": "0.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git";,
- "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+ "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb";,
- "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+ "url":
"https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443";,
+ "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
"shasum": ""
},
"require": {
@@ -1061,20 +1053,20 @@
"email": "m...@mikevanriel.com"
}
],
- "time": "2016-11-25 06:54:22"
+ "time": "2016-06-10 07:14:17"
},
{
"name": "phpspec/prophecy",
- "version": "v1.6.2",
+ "version": "v1.6.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git";,
- "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+ "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb";,
- "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
+ "url":
"https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0";,
+ "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
"shasum": ""
},
"require": {
@@ -1082,11 +1074,10 @@
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
"sebastian/comparator": "^1.1",
- "sebastian/recursion-context": "^1.0|^2.0"
+ "sebastian/recursion-context": "^1.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.0",
- "phpunit/phpunit": "^4.8 || ^5.6.5"
+ "phpspec/phpspec": "^2.0"
},
"type": "library",
"extra": {
@@ -1124,7 +1115,7 @@
"spy",
"stub"
],
- "time": "2016-11-21 14:58:47"
+ "time": "2016-06-07 08:13:47"
},
{
"name": "phpunit/php-code-coverage",
@@ -1190,16 +1181,16 @@
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.4.2",
+ "version": "1.4.1",
"source": {
"type": "git",
"url":
"https://github.com/sebastianbergmann/php-file-iterator.git";,
- "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+ "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5";,
- "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+ "url":
"https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0";,
+ "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
"shasum": ""
},
"require": {
@@ -1233,7 +1224,7 @@
"filesystem",
"iterator"
],
- "time": "2016-10-03 07:40:28"
+ "time": "2015-06-21 13:08:43"
},
{
"name": "phpunit/php-text-template",
@@ -1322,16 +1313,16 @@
},
{
"name": "phpunit/php-token-stream",
- "version": "1.4.9",
+ "version": "1.4.8",
"source": {
"type": "git",
"url":
"https://github.com/sebastianbergmann/php-token-stream.git";,
- "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
+ "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
},
"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/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da";,
+ "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
"shasum": ""
},
"require": {
@@ -1367,20 +1358,20 @@
"keywords": [
"tokenizer"
],
- "time": "2016-11-15 14:06:22"
+ "time": "2015-09-15 10:49:45"
},
{
"name": "phpunit/phpunit",
- "version": "4.8.31",
+ "version": "4.8.27",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git";,
- "reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3"
+ "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/phpunit/zipball/98b2b39a520766bec663ff5b7ff1b729db9dbfe3";,
- "reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3",
+ "url":
"https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90";,
+ "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
"shasum": ""
},
"require": {
@@ -1396,7 +1387,7 @@
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "~2.3",
- "sebastian/comparator": "~1.2.2",
+ "sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
"sebastian/environment": "~1.3",
"sebastian/exporter": "~1.2",
@@ -1439,7 +1430,7 @@
"testing",
"xunit"
],
- "time": "2016-12-09 02:45:31"
+ "time": "2016-07-21 06:48:14"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -1499,22 +1490,22 @@
},
{
"name": "sebastian/comparator",
- "version": "1.2.2",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git";,
- "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f"
+ "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f";,
- "reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
+ "url":
"https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22";,
+ "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"sebastian/diff": "~1.2",
- "sebastian/exporter": "~1.2 || ~2.0"
+ "sebastian/exporter": "~1.2"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
@@ -1559,7 +1550,7 @@
"compare",
"equality"
],
- "time": "2016-11-19 09:18:40"
+ "time": "2015-07-26 15:48:44"
},
{
"name": "sebastian/diff",
@@ -1615,23 +1606,23 @@
},
{
"name": "sebastian/environment",
- "version": "1.3.8",
+ "version": "1.3.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git";,
- "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+ "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea";,
- "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+ "url":
"https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716";,
+ "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0"
+ "php": ">=5.3.3"
},
"require-dev": {
- "phpunit/phpunit": "^4.8 || ^5.0"
+ "phpunit/phpunit": "~4.4"
},
"type": "library",
"extra": {
@@ -1661,7 +1652,7 @@
"environment",
"hhvm"
],
- "time": "2016-08-18 05:49:44"
+ "time": "2016-05-17 03:18:57"
},
{
"name": "sebastian/exporter",
@@ -1871,20 +1862,20 @@
},
{
"name": "webmozart/assert",
- "version": "1.2.0",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git";,
- "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+ "reference": "bb2d123231c095735130cc8f6d31385a44c7b308"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f";,
- "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+ "url":
"https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308";,
+ "reference": "bb2d123231c095735130cc8f6d31385a44c7b308",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0"
+ "php": "^5.3.3|^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.6",
@@ -1893,7 +1884,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.2-dev"
}
},
"autoload": {
@@ -1917,7 +1908,7 @@
"check",
"validate"
],
- "time": "2016-11-23 20:04:58"
+ "time": "2016-08-09 15:02:57"
}
],
"aliases": [],
--
To view, visit https://gerrit.wikimedia.org/r/329525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7815a05f5e7cf51d90fcdc6b9e95ff3bd25f8247
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
