jenkins-bot has submitted this change and it was merged.
Change subject: Remove hard dependency to Extension:GoogleAPIClient
......................................................................
Remove hard dependency to Extension:GoogleAPIClient
The long term goal would be, that the user runs composer update to install
the php api library for Google services or using the tarball release using
Special:ExtensionDistributor. For now, both ways (the extension and the
composer way) are supported.
Change-Id: Ie79035b71cd9565de492ff78b5da232bff972617
---
M composer.json
M extension.json
M includes/GoogleLogin.body.php
3 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 3bf13ef..54f41d8 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,9 @@
"name": "mediawiki/googlelogin",
"description": "Allow users to login to MediaWiki with their Google
Account",
"license": "MIT",
+ "require": {
+ "google/apiclient": "^2.0.0@RC"
+ },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.5.1"
diff --git a/extension.json b/extension.json
index 7a3e008..1b3fe4c 100644
--- a/extension.json
+++ b/extension.json
@@ -155,5 +155,6 @@
"GLShowRight": false,
"GLNeedsConfirmEmail": true
},
+ "load_composer_autoloader": true,
"manifest_version": 1
}
diff --git a/includes/GoogleLogin.body.php b/includes/GoogleLogin.body.php
index 6322a68..ab4114e 100644
--- a/includes/GoogleLogin.body.php
+++ b/includes/GoogleLogin.body.php
@@ -462,7 +462,7 @@
} else {
throw new MWException(
'GoogleLogin requires the PHP API Client, which
you
- can install with the
Extension:GoogleAPIClient.'
+ can install with the
Extension:GoogleAPIClient or by running composer update.'
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/256118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie79035b71cd9565de492ff78b5da232bff972617
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
