Jeroen De Dauw has submitted this change and it was merged.
Change subject: Move Query related files into /query/ subdirectory
......................................................................
Move Query related files into /query/ subdirectory
Files that are query related and store independent have been
moved into /query/
Change-Id: Id2d698542c10ce74bfce4d5b6a5c312c03d17ec9
---
M SemanticMediaWiki.hooks.php
M includes/Setup.php
R includes/query/SMW_Description.php
R includes/query/SMW_PrintRequest.php
R includes/query/SMW_Query.php
R includes/query/SMW_QueryLanguage.php
R includes/query/SMW_QueryParser.php
R includes/query/SMW_QueryProcessor.php
R tests/phpunit/includes/query/QueryProcessorTest.php
9 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
diff --git a/SemanticMediaWiki.hooks.php b/SemanticMediaWiki.hooks.php
index 64f774c..a045183 100644
--- a/SemanticMediaWiki.hooks.php
+++ b/SemanticMediaWiki.hooks.php
@@ -236,7 +236,6 @@
'Subobject',
'RecurringEvents',
'Infolink',
- 'QueryProcessor',
'Hooks',
'DataValueFactory',
'Settings',
@@ -246,6 +245,8 @@
'api/ApiSMWInfo',
'api/ApiAsk',
+ 'query/QueryProcessor',
+
'dataitems/DI_Blob',
'dataitems/DI_Bool',
'dataitems/DI_Number',
diff --git a/includes/Setup.php b/includes/Setup.php
index eeda4a4..f29e027 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -124,7 +124,6 @@
$wgAutoloadClasses['SMWInfolink'] = $incDir .
'SMW_Infolink.php';
$wgAutoloadClasses['SMWOutputs'] = $incDir .
'SMW_Outputs.php';
$wgAutoloadClasses['SMW\ParserTextProcessor'] = $incDir .
'ParserTextProcessor.php';
- $wgAutoloadClasses['SMWQueryLanguage'] = $incDir .
'SMW_QueryLanguage.php';
$wgAutoloadClasses['SMWSemanticData'] = $incDir .
'SMW_SemanticData.php';
$wgAutoloadClasses['SMWPageLister'] = $incDir .
'SMW_PageLister.php';
@@ -245,11 +244,21 @@
// Query related classes
$qeDir = $smwgIP . 'includes/query/';
$wgAutoloadClasses['SMW\QueryData'] = $qeDir .
'QueryData.php';
+ $wgAutoloadClasses['SMWQueryProcessor'] = $qeDir .
'SMW_QueryProcessor.php';
+ $wgAutoloadClasses['SMWQueryParser'] = $qeDir .
'SMW_QueryParser.php';
+ $wgAutoloadClasses['SMWQueryLanguage'] = $qeDir .
'SMW_QueryLanguage.php';
+ $wgAutoloadClasses['SMWQuery'] = $qeDir .
'SMW_Query.php';
+ $wgAutoloadClasses['SMWPrintRequest'] = $qeDir .
'SMW_PrintRequest.php';
+ $wgAutoloadClasses['SMWThingDescription'] = $qeDir .
'SMW_Description.php';
+ $wgAutoloadClasses['SMWClassDescription'] = $qeDir .
'SMW_Description.php';
+ $wgAutoloadClasses['SMWConceptDescription'] = $qeDir .
'SMW_Description.php';
+ $wgAutoloadClasses['SMWNamespaceDescription'] = $qeDir .
'SMW_Description.php';
+ $wgAutoloadClasses['SMWValueDescription'] = $qeDir .
'SMW_Description.php';
+ $wgAutoloadClasses['SMWConjunction'] = $qeDir .
'SMW_Description.php';
+ $wgAutoloadClasses['SMWDisjunction'] = $qeDir .
'SMW_Description.php';
+ $wgAutoloadClasses['SMWSomeProperty'] = $qeDir .
'SMW_Description.php';
// Stores & queries
- $wgAutoloadClasses['SMWQueryProcessor'] = $smwgIP .
'includes/SMW_QueryProcessor.php';
- $wgAutoloadClasses['SMWQueryParser'] = $smwgIP .
'includes/SMW_QueryParser.php';
-
$wgAutoloadClasses['SMWSparqlDatabase'] = $smwgIP .
'includes/sparql/SMW_SparqlDatabase.php';
$wgAutoloadClasses['SMWSparqlDatabase4Store'] = $smwgIP .
'includes/sparql/SMW_SparqlDatabase4Store.php';
$wgAutoloadClasses['SMWSparqlDatabaseVirtuoso'] = $smwgIP .
'includes/sparql/SMW_SparqlDatabaseVirtuoso.php';
@@ -261,21 +270,11 @@
$wgAutoloadClasses['SMW\Store\PropertyStatisticsRebuilder']
= $stoDir . 'PropertyStatisticsRebuilder.php';
$wgAutoloadClasses['SMW\Store\PropertyStatisticsStore']
= $stoDir . 'PropertyStatisticsStore.php';
- $wgAutoloadClasses['SMWQuery'] = $stoDir .
'SMW_Query.php';
$wgAutoloadClasses['SMWQueryResult'] = $stoDir .
'SMW_QueryResult.php';
$wgAutoloadClasses['SMWResultArray'] = $stoDir .
'SMW_ResultArray.php';
$wgAutoloadClasses['SMWStore'] = $stoDir .
'SMW_Store.php';
$wgAutoloadClasses['SMWStringCondition'] = $stoDir .
'SMW_Store.php';
$wgAutoloadClasses['SMWRequestOptions'] = $stoDir .
'SMW_RequestOptions.php';
- $wgAutoloadClasses['SMWPrintRequest'] = $stoDir .
'SMW_PrintRequest.php';
- $wgAutoloadClasses['SMWThingDescription'] = $stoDir .
'SMW_Description.php';
- $wgAutoloadClasses['SMWClassDescription'] = $stoDir .
'SMW_Description.php';
- $wgAutoloadClasses['SMWConceptDescription'] = $stoDir .
'SMW_Description.php';
- $wgAutoloadClasses['SMWNamespaceDescription'] = $stoDir .
'SMW_Description.php';
- $wgAutoloadClasses['SMWValueDescription'] = $stoDir .
'SMW_Description.php';
- $wgAutoloadClasses['SMWConjunction'] = $stoDir .
'SMW_Description.php';
- $wgAutoloadClasses['SMWDisjunction'] = $stoDir .
'SMW_Description.php';
- $wgAutoloadClasses['SMWSomeProperty'] = $stoDir .
'SMW_Description.php';
$wgAutoloadClasses['SMWSparqlStore'] = $stoDir .
'SMW_SparqlStore.php';
$wgAutoloadClasses['SMWSparqlStoreQueryEngine'] = $stoDir .
'SMW_SparqlStoreQueryEngine.php';
$wgAutoloadClasses['SMWSQLHelpers'] = $stoDir .
'SMW_SQLHelpers.php';
diff --git a/includes/storage/SMW_Description.php
b/includes/query/SMW_Description.php
similarity index 100%
rename from includes/storage/SMW_Description.php
rename to includes/query/SMW_Description.php
diff --git a/includes/storage/SMW_PrintRequest.php
b/includes/query/SMW_PrintRequest.php
similarity index 100%
rename from includes/storage/SMW_PrintRequest.php
rename to includes/query/SMW_PrintRequest.php
diff --git a/includes/storage/SMW_Query.php b/includes/query/SMW_Query.php
similarity index 100%
rename from includes/storage/SMW_Query.php
rename to includes/query/SMW_Query.php
diff --git a/includes/SMW_QueryLanguage.php
b/includes/query/SMW_QueryLanguage.php
similarity index 100%
rename from includes/SMW_QueryLanguage.php
rename to includes/query/SMW_QueryLanguage.php
diff --git a/includes/SMW_QueryParser.php b/includes/query/SMW_QueryParser.php
similarity index 100%
rename from includes/SMW_QueryParser.php
rename to includes/query/SMW_QueryParser.php
diff --git a/includes/SMW_QueryProcessor.php
b/includes/query/SMW_QueryProcessor.php
similarity index 100%
rename from includes/SMW_QueryProcessor.php
rename to includes/query/SMW_QueryProcessor.php
diff --git a/tests/phpunit/includes/QueryProcessorTest.php
b/tests/phpunit/includes/query/QueryProcessorTest.php
similarity index 100%
rename from tests/phpunit/includes/QueryProcessorTest.php
rename to tests/phpunit/includes/query/QueryProcessorTest.php
--
To view, visit https://gerrit.wikimedia.org/r/61263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2d698542c10ce74bfce4d5b6a5c312c03d17ec9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
