Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67639
Change subject: Updated entry point to not run stuff twice when using Composer
and composer.lock
......................................................................
Updated entry point to not run stuff twice when using Composer and composer.lock
Change-Id: I9e6a81584aebb01bb7dffa67aa32dd47b3dd227b
---
M Ask.php
M composer.lock
2 files changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask
refs/changes/39/67639/1
diff --git a/Ask.php b/Ask.php
index 68296ec..49e5838 100644
--- a/Ask.php
+++ b/Ask.php
@@ -28,6 +28,13 @@
* @ingroup Test
*/
+if ( defined( 'Ask_VERSION' ) ) {
+ // Do not initialize more then once.
+ return;
+}
+
+define( 'Ask_VERSION', '0.1 alpha' );
+
// Attempt to include the DataValues lib if that hasn't been done yet.
// This is the path the DataValues entry point will be at when loaded as
MediaWiki extension.
if ( !defined( 'DataValues_VERSION' ) && file_exists( __DIR__ .
'/../DataValues/DataValues.php' ) ) {
@@ -44,8 +51,6 @@
if ( !defined( 'DataValues_VERSION' ) ) {
throw new Exception( 'You need to have the DataValues library loaded in
order to use Ask' );
}
-
-define( 'Ask_VERSION', '0.1 alpha' );
// @codeCoverageIgnoreStart
spl_autoload_register( function ( $className ) {
diff --git a/composer.lock b/composer.lock
index 0dacdeb..b58f2b8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"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";
],
- "hash": "977b38a5f65a2a828f2a6043dc562f23",
+ "hash": "5a8b04bbdaa06aea066546dd9c92b40a",
"packages": [
{
"name": "mediawiki/data-values",
@@ -11,12 +11,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-DataValues.git";,
- "reference": "20c8d63added92ee830981ed90a42cb1361dc0ea"
+ "reference": "40214eb0f64b346cf0b8c3dd03e017caf135cbf2"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-DataValues/zipball/20c8d63added92ee830981ed90a42cb1361dc0ea";,
- "reference": "20c8d63added92ee830981ed90a42cb1361dc0ea",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-DataValues/zipball/40214eb0f64b346cf0b8c3dd03e017caf135cbf2";,
+ "reference": "40214eb0f64b346cf0b8c3dd03e017caf135cbf2",
"shasum": ""
},
"require": {
@@ -49,7 +49,7 @@
"valueparsers",
"valuevalidators"
],
- "time": "2013-06-06 21:21:50"
+ "time": "2013-06-07 19:00:06"
}
],
"packages-dev": [
--
To view, visit https://gerrit.wikimedia.org/r/67639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e6a81584aebb01bb7dffa67aa32dd47b3dd227b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
