Ejegg has submitted this change and it was merged.
Change subject: Add FineDiff and Stomp packages
......................................................................
Add FineDiff and Stomp packages
Change-Id: I30d34a76cfd1b6daa2d124e00be0f34c756d88c0
---
M composer.json
M composer.lock
M vendor
3 files changed, 172 insertions(+), 11 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 3899730..39706dc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,23 @@
{
"name": "Wikimedia Foundation donor CRM",
+ "authors": [
+ { "name": "Elliott Eggleston" },
+ { "name": "Peter Gehres" },
+ { "name": "Katie Horn" },
+ { "name": "Jeremy Postlethwaite" },
+ { "name": "Arthur Richards" },
+ { "name": "Matt Walker" },
+ { "name": "Adam Roses Wight" }
+ ],
"license": "GPL-2.0",
"type": "project",
"support": {
"irc": "irc://irc.freenode.org/wikimedia-fundraising"
},
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.com/phpseclib/phpseclib.git";
- }
- ],
"require": {
- "phpseclib/phpseclib": "0.3.7"
+ "cogpowered/finediff": "0.*",
+ "fusesource/stomp-php": "2.*",
+ "phpseclib/phpseclib": "0.3.7",
+ "twig/twig": "1.*"
}
}
diff --git a/composer.lock b/composer.lock
index 732af9c..09b46f0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,11 +1,110 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
- "This file is @generated automatically"
+ "Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";
],
- "hash": "6529246fb52fadfd93f8454a01436708",
+ "hash": "50b3012202b23ba07ac151c50d570a51",
"packages": [
+ {
+ "name": "cogpowered/finediff",
+ "version": "0.3.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/cogpowered/FineDiff.git";,
+ "reference": "339ddc8c3afb656efed4f2f0a80e5c3d026f8ea8"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/cogpowered/FineDiff/zipball/339ddc8c3afb656efed4f2f0a80e5c3d026f8ea8";,
+ "reference": "339ddc8c3afb656efed4f2f0a80e5c3d026f8ea8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "*",
+ "phpunit/phpunit": "*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "cogpowered\\FineDiff": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Rob Crowe",
+ "email": "r...@cogpowered.com"
+ },
+ {
+ "name": "Raymond Hill"
+ }
+ ],
+ "description": "PHP implementation of a Fine granularity Diff
engine",
+ "homepage": "https://github.com/cogpowered/FineDiff";,
+ "keywords": [
+ "diff",
+ "finediff",
+ "opcode",
+ "string",
+ "text"
+ ],
+ "time": "2014-05-19 10:25:02"
+ },
+ {
+ "name": "fusesource/stomp-php",
+ "version": "2.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/dejanb/stomp-php.git";,
+ "reference": "4ac51c0abee05078e198faf13f48c056a72f8f8c"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/dejanb/stomp-php/zipball/4ac51c0abee05078e198faf13f48c056a72f8f8c";,
+ "reference": "4ac51c0abee05078e198faf13f48c056a72f8f8c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "FuseSource": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Dejan Bosnanac",
+ "email": "de...@nighttale.net",
+ "homepage": "http://www.nighttale.net";
+ },
+ {
+ "name": "Sören Rohweder",
+ "email": "s.rohwe...@blage.net",
+ "homepage": "http://www.monofone.de";
+ }
+ ],
+ "description": "stomp support for PHP",
+ "homepage": "http://github.com/dejanb/stomp-php";,
+ "keywords": [
+ "activeMQ",
+ "jms",
+ "messaging",
+ "stomp"
+ ],
+ "time": "2013-02-23 17:34:44"
+ },
{
"name": "phpseclib/phpseclib",
"version": "0.3.7",
@@ -105,6 +204,63 @@
"issues": "https://github.com/phpseclib/phpseclib/issues";
},
"time": "2014-07-05 16:36:21"
+ },
+ {
+ "name": "twig/twig",
+ "version": "v1.16.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/fabpot/Twig.git";,
+ "reference": "8ce37115802e257a984a82d38254884085060024"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/fabpot/Twig/zipball/8ce37115802e257a984a82d38254884085060024";,
+ "reference": "8ce37115802e257a984a82d38254884085060024",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.2.4"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.16-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Twig_": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fab...@symfony.com",
+ "homepage": "http://fabien.potencier.org";,
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Armin Ronacher",
+ "email": "armin.ronac...@active-4.com",
+ "role": "Project Founder"
+ },
+ {
+ "name": "Twig Team",
+ "homepage":
"https://github.com/fabpot/Twig/graphs/contributors";,
+ "role": "Contributors"
+ }
+ ],
+ "description": "Twig, the flexible, fast, and secure template
language for PHP",
+ "homepage": "http://twig.sensiolabs.org";,
+ "keywords": [
+ "templating"
+ ],
+ "time": "2014-07-05 12:19:05"
}
],
"packages-dev": [
@@ -117,7 +273,6 @@
"stability-flags": [
],
- "prefer-stable": false,
"platform": [
],
diff --git a/vendor b/vendor
index a94bc9a..5456c54 160000
--- a/vendor
+++ b/vendor
-Subproject commit a94bc9a0f23eac04ec336164c6b53d967d4d4cd5
+Subproject commit 5456c54418fc0fc3757ad6a8e7b0dd9ce588c134
--
To view, visit https://gerrit.wikimedia.org/r/160229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30d34a76cfd1b6daa2d124e00be0f34c756d88c0
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
