Tobias Gritschacher has submitted this change and it was merged.
Change subject: Move RDF stuff into separate directory.
......................................................................
Move RDF stuff into separate directory.
This gives classes for RDF handling a separate directory and moves
the external EasyRdf module into a central contribs directory.
Change-Id: I5947c4b4945c0fd22a2d0ca3881b272cefaa489b
---
M .gitmodules
A contrib/easyRdf
M repo/Wikibase.classes.php
M repo/Wikibase.hooks.php
D repo/includes/content/easyRdf
R repo/includes/rdf/RdfBuilder.php
R repo/includes/rdf/RdfSerializer.php
R repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
R repo/tests/phpunit/includes/rdf/RdfSerializerTest.php
9 files changed, 44 insertions(+), 32 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitmodules b/.gitmodules
index 794faa1..9a6942a 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "repo/includes/content/easyRdf"]
- path = repo/includes/content/easyRdf
+ path = contrib/easyRdf
url = https://github.com/Wikidata/easyrdf_lite.git
diff --git a/contrib/easyRdf b/contrib/easyRdf
new file mode 160000
index 0000000..d32c9ee
--- /dev/null
+++ b/contrib/easyRdf
+Subproject commit d32c9ee9a0bc8867d758209cc4cf2055409b9bc3
diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index 4982b70..945ff67 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -96,31 +96,8 @@
'Wikibase\ItemHandler' => 'includes/content/ItemHandler.php',
'Wikibase\PropertyContent' =>
'includes/content/PropertyContent.php',
'Wikibase\PropertyHandler' =>
'includes/content/PropertyHandler.php',
- 'Wikibase\RdfBuilder' => 'includes/content/RdfBuilder.php',
- 'Wikibase\RdfSerializer' =>
'includes/content/RdfSerializer.php',
-
- // EasyRdf
- 'EasyRdf_Exception' =>
'includes/content/easyRdf/EasyRdf/Exception.php',
- 'EasyRdf_Format' =>
'includes/content/easyRdf/EasyRdf/Format.php',
- 'EasyRdf_Graph' => 'includes/content/easyRdf/EasyRdf/Graph.php',
- 'EasyRdf_Namespace' =>
'includes/content/easyRdf/EasyRdf/Namespace.php',
- 'EasyRdf_Literal' =>
'includes/content/easyRdf/EasyRdf/Literal.php',
- 'EasyRdf_Literal_Boolean' =>
'includes/content/easyRdf/EasyRdf/Literal/Boolean.php',
- 'EasyRdf_Literal_Date' =>
'includes/content/easyRdf/EasyRdf/Literal/Date.php',
- 'EasyRdf_Literal_DateTime' =>
'includes/content/easyRdf/EasyRdf/Literal/DateTime.php',
- 'EasyRdf_Literal_Decimal' =>
'includes/content/easyRdf/EasyRdf/Literal/Decimal.php',
- 'EasyRdf_Literal_HexBinary' =>
'includes/content/easyRdf/EasyRdf/Literal/HexBinary.php',
- 'EasyRdf_Literal_Integer' =>
'includes/content/easyRdf/EasyRdf/Literal/Integer.php',
- 'EasyRdf_Resource' =>
'includes/content/easyRdf/EasyRdf/Resource.php',
- 'EasyRdf_Serialiser' =>
'includes/content/easyRdf/EasyRdf/Serialiser.php',
- 'EasyRdf_Serialiser_GraphViz' =>
'includes/content/easyRdf/EasyRdf/Serialiser/GraphViz.php',
- 'EasyRdf_Serialiser_RdfPhp' =>
'includes/content/easyRdf/EasyRdf/Serialiser/RdfPhp.php',
- 'EasyRdf_Serialiser_Ntriples' =>
'includes/content/easyRdf/EasyRdf/Serialiser/Ntriples.php',
- 'EasyRdf_Serialiser_Json' =>
'includes/content/easyRdf/EasyRdf/Serialiser/Json.php',
- 'EasyRdf_Serialiser_RdfXml' =>
'includes/content/easyRdf/EasyRdf/Serialiser/RdfXml.php',
- 'EasyRdf_Serialiser_Turtle' =>
'includes/content/easyRdf/EasyRdf/Serialiser/Turtle.php',
- 'EasyRdf_TypeMapper' =>
'includes/content/easyRdf/EasyRdf/TypeMapper.php',
- 'EasyRdf_Utils' => 'includes/content/easyRdf/EasyRdf/Utils.php',
+ 'Wikibase\RdfBuilder' => 'includes/rdf/RdfBuilder.php',
+ 'Wikibase\RdfSerializer' => 'includes/rdf/RdfSerializer.php',
// includes/specials
'SpecialNewEntity' => 'includes/specials/SpecialNewEntity.php',
@@ -168,13 +145,43 @@
'Wikibase\Test\Api\LangAttributeBase' =>
'tests/phpunit/includes/api/LangAttributeBase.php',
'Wikibase\Test\EntityContentTest' =>
'tests/phpunit/includes/content/EntityContentTest.php',
'Wikibase\Test\EntityHandlerTest' =>
'tests/phpunit/includes/content/EntityHandlerTest.php',
- 'Wikibase\Test\RdfBuilderTest' =>
'tests/phpunit/includes/content/RdfBuilderTest.php',
+ 'Wikibase\Test\RdfBuilderTest' =>
'tests/phpunit/includes/rdf/RdfBuilderTest.php',
'MessageReporter' => 'includes/MessageReporter.php',
'ObservableMessageReporter' => 'includes/MessageReporter.php',
'NullMessageReporter' => 'includes/MessageReporter.php',
);
+
+ // EasyRdf
+ if ( file_exists( __DIR__ . '/../contrib/easyRdf/EasyRdf' ) ) {
+ $rdfClasses = array(
+ 'EasyRdf_Exception' =>
'../contrib/easyRdf/EasyRdf/Exception.php',
+ 'EasyRdf_Format' =>
'../contrib/easyRdf/EasyRdf/Format.php',
+ 'EasyRdf_Graph' =>
'../contrib/easyRdf/EasyRdf/Graph.php',
+ 'EasyRdf_Namespace' =>
'../contrib/easyRdf/EasyRdf/Namespace.php',
+ 'EasyRdf_Literal' =>
'../contrib/easyRdf/EasyRdf/Literal.php',
+ 'EasyRdf_Literal_Boolean' =>
'../contrib/easyRdf/EasyRdf/Literal/Boolean.php',
+ 'EasyRdf_Literal_Date' =>
'../contrib/easyRdf/EasyRdf/Literal/Date.php',
+ 'EasyRdf_Literal_DateTime' =>
'../contrib/easyRdf/EasyRdf/Literal/DateTime.php',
+ 'EasyRdf_Literal_Decimal' =>
'../contrib/easyRdf/EasyRdf/Literal/Decimal.php',
+ 'EasyRdf_Literal_HexBinary' =>
'../contrib/easyRdf/EasyRdf/Literal/HexBinary.php',
+ 'EasyRdf_Literal_Integer' =>
'../contrib/easyRdf/EasyRdf/Literal/Integer.php',
+ 'EasyRdf_Resource' =>
'../contrib/easyRdf/EasyRdf/Resource.php',
+ 'EasyRdf_Serialiser' =>
'../contrib/easyRdf/EasyRdf/Serialiser.php',
+ 'EasyRdf_Serialiser_GraphViz' =>
'../contrib/easyRdf/EasyRdf/Serialiser/GraphViz.php',
+ 'EasyRdf_Serialiser_RdfPhp' =>
'../contrib/easyRdf/EasyRdf/Serialiser/RdfPhp.php',
+ 'EasyRdf_Serialiser_Ntriples' =>
'../contrib/easyRdf/EasyRdf/Serialiser/Ntriples.php',
+ 'EasyRdf_Serialiser_Json' =>
'../contrib/easyRdf/EasyRdf/Serialiser/Json.php',
+ 'EasyRdf_Serialiser_RdfXml' =>
'../contrib/easyRdf/EasyRdf/Serialiser/RdfXml.php',
+ 'EasyRdf_Serialiser_Turtle' =>
'../contrib/easyRdf/EasyRdf/Serialiser/Turtle.php',
+ 'EasyRdf_TypeMapper' =>
'../contrib/easyRdf/EasyRdf/TypeMapper.php',
+ 'EasyRdf_Utils' =>
'../contrib/easyRdf/EasyRdf/Utils.php',
+ );
+
+ $classes = array_merge( $classes, $rdfClasses );
+ }
+
return $classes;
} );
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 6905fb0..f5f2e59 100755
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -190,8 +190,9 @@
'content/ItemHandler',
'content/PropertyContent',
'content/PropertyHandler',
- 'content/RdfBuilder',
- 'content/RdfSerializer',
+
+ 'rdf/RdfBuilder',
+ 'rdf/RdfSerializer',
'specials/SpecialNewItem',
'specials/SpecialNewProperty',
diff --git a/repo/includes/content/easyRdf b/repo/includes/content/easyRdf
deleted file mode 160000
index f74a880..0000000
--- a/repo/includes/content/easyRdf
+++ /dev/null
-Subproject commit f74a88084d3a0f8e15a6e5d5a311e8d4876cc7c5
diff --git a/repo/includes/content/RdfBuilder.php
b/repo/includes/rdf/RdfBuilder.php
similarity index 98%
rename from repo/includes/content/RdfBuilder.php
rename to repo/includes/rdf/RdfBuilder.php
index 60df0dd..09c51e3 100755
--- a/repo/includes/content/RdfBuilder.php
+++ b/repo/includes/rdf/RdfBuilder.php
@@ -120,8 +120,7 @@
*/
public static function isSupported() {
// check that the submodule is present
- $file = __DIR__ . '/easyRdf/EasyRdf.php';
- return file_exists( $file ) && class_exists( 'EasyRdf_Graph' );
+ return class_exists( 'EasyRdf_Graph' );
}
/**
diff --git a/repo/includes/content/RdfSerializer.php
b/repo/includes/rdf/RdfSerializer.php
similarity index 100%
rename from repo/includes/content/RdfSerializer.php
rename to repo/includes/rdf/RdfSerializer.php
diff --git a/repo/tests/phpunit/includes/content/RdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
similarity index 97%
rename from repo/tests/phpunit/includes/content/RdfBuilderTest.php
rename to repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
index 47827ad..f786b1e 100644
--- a/repo/tests/phpunit/includes/content/RdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
@@ -126,7 +126,7 @@
}
/**
- * @return \EasyRdf_Graph[]
+ * @return \EasyRdf_Graph[]|null
*/
public static function getTestGraphs() {
static $graphs = array();
@@ -135,6 +135,11 @@
return $graphs;
}
+ if ( !RdfBuilder::isSupported() ) {
+ // test will be skipped anyway
+ return null;
+ }
+
$builder = self::newRdfBuilder( 'rdf' ); //XXX: ugh, dummy
object
foreach ( $builder->getNamespaces() as $gname => $uri ) {
diff --git a/repo/tests/phpunit/includes/content/RdfSerializerTest.php
b/repo/tests/phpunit/includes/rdf/RdfSerializerTest.php
similarity index 100%
rename from repo/tests/phpunit/includes/content/RdfSerializerTest.php
rename to repo/tests/phpunit/includes/rdf/RdfSerializerTest.php
--
To view, visit https://gerrit.wikimedia.org/r/62465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5947c4b4945c0fd22a2d0ca3881b272cefaa489b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Daniel Werner <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
