jenkins-bot has submitted this change and it was merged.
Change subject: T104744: fix data types for wikibase-item properties
......................................................................
T104744: fix data types for wikibase-item properties
Change-Id: I86156844791d11bd4ad9e2dbb3801feb0bcf50d7
---
M repo/includes/rdf/RdfBuilder.php
M repo/tests/phpunit/data/rdf/Q4_props.nt
M repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
3 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/rdf/RdfBuilder.php b/repo/includes/rdf/RdfBuilder.php
index fb9200d..c7f58bd 100644
--- a/repo/includes/rdf/RdfBuilder.php
+++ b/repo/includes/rdf/RdfBuilder.php
@@ -349,7 +349,7 @@
*/
private function propertyIsLink( Property $property ) {
// For now, it's very simple but can be more complex later
- return $property->getDataTypeId() == 'wikibase-entityid';
+ return in_array( $property->getDataTypeId(),
array('wikibase-item', 'wikibase-property', 'url', 'commonsMedia') );
}
/**
diff --git a/repo/tests/phpunit/data/rdf/Q4_props.nt
b/repo/tests/phpunit/data/rdf/Q4_props.nt
index e5abb8b..8917378 100644
--- a/repo/tests/phpunit/data/rdf/Q4_props.nt
+++ b/repo/tests/phpunit/data/rdf/Q4_props.nt
@@ -93,7 +93,7 @@
<http://acme.test/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://wikiba.se/ontology-beta#Property> .
<http://acme.test/P9> <http://www.w3.org/2000/01/rdf-schema#label>
"Property9"@en .
<http://acme.test/P9> <http://www.w3.org/2004/02/skos/core#prefLabel>
"Property9"@en .
-<http://acme.test/P2> <http://wikiba.se/ontology-beta#propertyType>
<http://wikiba.se/ontology-beta#WikibaseEntityid> .
+<http://acme.test/P2> <http://wikiba.se/ontology-beta#propertyType>
<http://wikiba.se/ontology-beta#WikibaseItem> .
<http://acme.test/P3> <http://wikiba.se/ontology-beta#propertyType>
<http://wikiba.se/ontology-beta#CommonsMedia> .
<http://acme.test/P4> <http://wikiba.se/ontology-beta#propertyType>
<http://wikiba.se/ontology-beta#Globecoordinate> .
<http://acme.test/P5> <http://wikiba.se/ontology-beta#propertyType>
<http://wikiba.se/ontology-beta#Monolingualtext> .
@@ -222,12 +222,12 @@
<http://acme.test/prop/statement/P2>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/statement/value/P2>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
-<http://acme.test/prop/direct/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
-<http://acme.test/prop/qualifier/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
+<http://acme.test/prop/direct/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
+<http://acme.test/prop/qualifier/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/qualifier/value/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
-<http://acme.test/prop/reference/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
+<http://acme.test/prop/reference/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/reference/value/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
-<http://acme.test/prop/statement/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
+<http://acme.test/prop/statement/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/statement/value/P3>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/direct/P4>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
@@ -270,10 +270,10 @@
<http://acme.test/prop/statement/P8>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
<http://acme.test/prop/statement/value/P8>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
-<http://acme.test/prop/direct/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
-<http://acme.test/prop/qualifier/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
+<http://acme.test/prop/direct/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
+<http://acme.test/prop/qualifier/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/qualifier/value/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
-<http://acme.test/prop/reference/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
+<http://acme.test/prop/reference/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/reference/value/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
-<http://acme.test/prop/statement/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#DatatypeProperty> .
+<http://acme.test/prop/statement/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
<http://acme.test/prop/statement/value/P9>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://www.w3.org/2002/07/owl#ObjectProperty> .
diff --git a/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
index 90b9791..9ac37ed 100644
--- a/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
@@ -187,7 +187,7 @@
*/
private static function getTestProperties() {
return array(
- array( 2, 'wikibase-entityid' ),
+ array( 2, 'wikibase-item' ),
array( 3, 'commonsMedia' ),
array( 4, 'globecoordinate' ),
array( 5, 'monolingualtext' ),
--
To view, visit https://gerrit.wikimedia.org/r/224657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86156844791d11bd4ad9e2dbb3801feb0bcf50d7
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
