Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67621
Change subject: Update loading code to work with Composer
......................................................................
Update loading code to work with Composer
Change-Id: I9159179855e6cd099e725fe67185caa5271bc1ee
---
M .gitignore
M SemanticMediaWiki.php
M composer.json
3 files changed, 19 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/21/67621/1
diff --git a/.gitignore b/.gitignore
index e264939..89ec4b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
vendor/
composer.phar
+composer.lock
!.gitignore
!.gitreview
diff --git a/SemanticMediaWiki.php b/SemanticMediaWiki.php
index b51f532..b697593 100644
--- a/SemanticMediaWiki.php
+++ b/SemanticMediaWiki.php
@@ -19,7 +19,15 @@
die( 'Not an entry point.' );
}
-global $smwgIP;
+// Do not load SMW more then once
+if ( defined( 'SMW_VERSION' ) ) {
+ return;
+}
+
+// The SMW version number.
+define( 'SMW_VERSION', '1.9 alpha' );
+
+global $smwgIP, $wgResourceModules, $wgServer, $wgVersion, $wgExtensionCredits;
if ( version_compare( $wgVersion, '1.19c', '<' ) ) {
die( '<b>Error:</b> This version of Semantic MediaWiki requires
MediaWiki 1.19 or above; use SMW 1.8.x for MediaWiki 1.18.x or 1.17.x.' );
@@ -30,22 +38,23 @@
@include_once( __DIR__ . '/../Validator/Validator.php' );
}
+if ( !defined( 'Validator_VERSION' ) && is_readable( __DIR__ .
'/vendor/autoload.php' ) ) {
+ include_once( __DIR__ . '/vendor/autoload.php' );
+}
+
// Only initialize the extension when all dependencies are present.
if ( !defined( 'Validator_VERSION' ) ) {
- die( '<b>Error:</b> You need to have <a
href="https://www.mediawiki.org/wiki/Extension:Validator";>Validator</a>
installed in order to use <a href="https://www.semantic-mediawiki.org";>Semantic
MediaWiki</a>.<br />' );
+ throw new Exception( 'You need to have
https://www.mediawiki.org/wiki/Extension:ParamProcessor installed in order to
use SMW' );
}
// Version check for Validator, which needs to be at 1.0 or greater.
if ( version_compare( Validator_VERSION, '1.0c', '<' ) ) {
- die(
- '<b>Error:</b> This version of SMW needs <a
href="https://www.mediawiki.org/wiki/Extension:Validator";>Validator</a> 1.0 or
later.
+ throw new Exception(
+ 'This version of SMW needs
https://www.mediawiki.org/wiki/Extension:ParamProcessor 1.0 or later.
You are currently using version ' . Validator_VERSION . '.
If for any reason you are stuck at Validator 0.5.x, you can use
SMW 1.8.x<br />'
);
}
-
-// The SMW version number.
-define( 'SMW_VERSION', '1.9 alpha' );
// Registration of the extension credits, see Special:Version.
$wgExtensionCredits['semantic'][] = array(
diff --git a/composer.json b/composer.json
index 561dbac..97c07b2 100644
--- a/composer.json
+++ b/composer.json
@@ -33,5 +33,6 @@
"require": {
"php": ">=5.3.0",
"param-processor/param-processor": "dev-master"
- }
+ },
+ "minimum-stability" : "dev"
}
--
To view, visit https://gerrit.wikimedia.org/r/67621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9159179855e6cd099e725fe67185caa5271bc1ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
