Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246710
Change subject: Fix jenkins test extension test fails
......................................................................
Fix jenkins test extension test fails
This fixes the problem.
Change-Id: I31e61145467811440b4185ad7b8138b6d6e2faaa
---
M .gitignore
M WebPlatformAuth.php
M composer.json
M composer.lock
A vendor/autoload.php
5 files changed, 83 insertions(+), 86 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WebPlatformAuth
refs/changes/10/246710/1
diff --git a/.gitignore b/.gitignore
index 26a012b..cf2d630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
*~
*.kate-swp
.*.swp
-vendor/*
+vendor/**
diff --git a/WebPlatformAuth.php b/WebPlatformAuth.php
index 3c8033b..0b16eb4 100644
--- a/WebPlatformAuth.php
+++ b/WebPlatformAuth.php
@@ -24,7 +24,6 @@
if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
$loader = require( __DIR__ . '/vendor/autoload.php' );
- $loader->add( 'Guzzle\\', $dir . '/vendor/guzzlehttp/guzzle/src/Guzzle/' );
} else {
die('You MUST install Composer dependencies');
}
diff --git a/composer.json b/composer.json
index b71dcf8..bf320a5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,51 +1,54 @@
{
- "name": "webplatform/mediawiki-fxa-sso",
- "type": "mediawiki-extension",
- "license": "MIT",
- "description": "WebPlatform Docs SSO Extension communicating with
WebPlatorm’s own Firefox Accounts server",
- "keywords": [
- "MediaWiki",
- "WebPlatform",
- "authentication",
- "Firefox Accounts",
- "OAuth2",
- "FxA"
- ],
- "homepage":
"http://docs.webplatform.org/wiki/WPD:Projects/SSO/MediaWikiExtension";,
- "authors": [
- {
- "name": "Renoir Boulanger",
- "email": "ren...@w3.org",
- "role": "Maintainer",
- "homepage": "https://renoirboulanger.com";
- },
- {
- "name": "Doug Schepers",
- "email": "schep...@w3.org",
- "role": "Project lead"
- }
- ],
- "support": {
- "issues": "https://github.com/webplatform/mediawiki-fxa-sso/issues";,
- "email": "team-webplatform-syst...@w3.org",
- "irc": "irc://irc.freenode.net/webplatform",
- "source": "https://github.com/webplatform/mediawiki-fxa-sso";
- },
- "require": {
- "guzzlehttp/guzzle": "~3.8"
- },
- "autoload": {
- "files" : [
- "WebPlatformAuth.php"
- ],
- "classmap":[
- "includes/"
- ]
- },
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.com/webplatform/mediawiki-fxa-sso";
- }
- ]
+ "name": "webplatform/mediawiki-fxa-sso",
+ "type": "mediawiki-extension",
+ "license": "MIT",
+ "description": "WebPlatform Docs SSO Extension communicating with
WebPlatorm’s own Firefox Accounts server",
+ "keywords": [
+ "MediaWiki",
+ "WebPlatform",
+ "authentication",
+ "Firefox Accounts",
+ "OAuth2",
+ "FxA"
+ ],
+ "homepage":
"http://docs.webplatform.org/wiki/WPD:Projects/SSO/MediaWikiExtension";,
+ "authors": [
+ {
+ "name": "Renoir Boulanger",
+ "email": "ren...@w3.org",
+ "role": "Maintainer",
+ "homepage": "https://renoirboulanger.com";
+ },
+ {
+ "name": "Doug Schepers",
+ "email": "schep...@w3.org",
+ "role": "Project lead"
+ }
+ ],
+ "support": {
+ "issues":
"https://github.com/webplatform/mediawiki-fxa-sso/issues";,
+ "email": "team-webplatform-syst...@w3.org",
+ "irc": "irc://irc.freenode.net/webplatform",
+ "source": "https://github.com/webplatform/mediawiki-fxa-sso";
+ },
+ "require": {
+ "guzzlehttp/guzzle": "~3.8"
+ },
+ "autoload": {
+ "psr-4": {
+ "Guzzle\\": "vendor/guzzlehttp/guzzle/src/Guzzle/"
+ },
+ "files" : [
+ "WebPlatformAuth.php"
+ ],
+ "classmap":[
+ "includes/"
+ ]
+ },
+ "repositories": [
+ {
+ "type": "vcs",
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WebPlatformAuth";
+ }
+ ]
}
diff --git a/composer.lock b/composer.lock
index 4aba2e3..8805dac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,9 +1,11 @@
{
"_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";
+ "Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
+ "This file is @generated automatically"
],
- "hash": "c635d4c923295de15a39b2d5cc345712",
+ "hash": "156d8056217e65d4c26ea853728eaa82",
+ "content-hash": "4fb0e7969e54f7a88709bb7a7abe1f2c",
"packages": [
{
"name": "guzzlehttp/guzzle",
@@ -99,27 +101,28 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.5.0",
- "target-dir": "Symfony/Component/EventDispatcher",
+ "version": "v2.7.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/EventDispatcher.git";,
- "reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8"
+ "url": "https://github.com/symfony/event-dispatcher.git";,
+ "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/EventDispatcher/zipball/cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8";,
- "reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
+ "url":
"https://api.github.com/repos/symfony/event-dispatcher/zipball/ae4dcc2a8d3de98bd794167a3ccda1311597c5d9";,
+ "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.0",
- "symfony/dependency-injection": "~2.0",
- "symfony/stopwatch": "~2.2"
+ "symfony/config": "~2.0,>=2.0.5",
+ "symfony/dependency-injection": "~2.6",
+ "symfony/expression-language": "~2.6",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/stopwatch": "~2.3"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -128,11 +131,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\EventDispatcher\\": ""
}
},
@@ -143,34 +146,24 @@
"authors": [
{
"name": "Fabien Potencier",
- "email": "fab...@symfony.com",
- "homepage": "http://fabien.potencier.org";,
- "role": "Lead Developer"
+ "email": "fab...@symfony.com"
},
{
"name": "Symfony Community",
- "homepage": "http://symfony.com/contributors";
+ "homepage": "https://symfony.com/contributors";
}
],
"description": "Symfony EventDispatcher Component",
- "homepage": "http://symfony.com";,
- "time": "2014-04-29 10:13:57"
+ "homepage": "https://symfony.com";,
+ "time": "2015-09-22 13:49:29"
}
],
- "packages-dev": [
-
- ],
- "aliases": [
-
- ],
+ "packages-dev": [],
+ "aliases": [],
"minimum-stability": "stable",
- "stability-flags": [
-
- ],
- "platform": [
-
- ],
- "platform-dev": [
-
- ]
+ "stability-flags": [],
+ "prefer-stable": false,
+ "prefer-lowest": false,
+ "platform": [],
+ "platform-dev": []
}
diff --git a/vendor/autoload.php b/vendor/autoload.php
new file mode 100644
index 0000000..33df710
--- /dev/null
+++ b/vendor/autoload.php
@@ -0,0 +1,2 @@
+<?php
+// This file will be over written. Please see task T115061.
--
To view, visit https://gerrit.wikimedia.org/r/246710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I31e61145467811440b4185ad7b8138b6d6e2faaa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WebPlatformAuth
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
