Jeroen De Dauw has submitted this change and it was merged.
Change subject: Move stuff to src/ and remove duplicate testsuite
......................................................................
Move stuff to src/ and remove duplicate testsuite
Change-Id: Iba1710d21bcb255161130606d1a8783dfa900316
---
M WikibaseQueryEngine.php
M phpunit.xml.dist
R src/QueryEngine.php
R src/QueryEngineException.php
R src/QueryEngineResult.php
R src/QueryNotSupportedException.php
R src/QueryResult.php
R src/QueryStore.php
R src/QueryStoreWriter.php
R src/SQLStore/ClaimStore/ClaimInserter.php
R src/SQLStore/ClaimStore/ClaimRow.php
R src/SQLStore/ClaimStore/ClaimRowBuilder.php
R src/SQLStore/ClaimStore/ClaimsTable.php
R src/SQLStore/DVHandler/BooleanHandler.php
R src/SQLStore/DVHandler/EntityIdHandler.php
R src/SQLStore/DVHandler/GeoCoordinateHandler.php
R src/SQLStore/DVHandler/IriHandler.php
R src/SQLStore/DVHandler/MonolingualTextHandler.php
R src/SQLStore/DVHandler/NumberHandler.php
R src/SQLStore/DVHandler/StringHandler.php
R src/SQLStore/DataValueHandler.php
R src/SQLStore/DataValueHandlers.php
R src/SQLStore/DataValueTable.php
R src/SQLStore/Engine/DescriptionMatchFinder.php
R src/SQLStore/Engine/Engine.php
R src/SQLStore/EntityIdTransformer.php
R src/SQLStore/EntityInserter.php
R src/SQLStore/EntityRemover.php
R src/SQLStore/EntityTable.php
R src/SQLStore/EntityUpdater.php
R src/SQLStore/Factory.php
R src/SQLStore/InternalEntityIdFinder.php
R src/SQLStore/InternalEntityIdInterpreter.php
R src/SQLStore/PropertyDataValueTypeLookup.php
R src/SQLStore/Schema.php
R src/SQLStore/Setup.php
R src/SQLStore/SnakStore/SnakInserter.php
R src/SQLStore/SnakStore/SnakRemover.php
R src/SQLStore/SnakStore/SnakRow.php
R src/SQLStore/SnakStore/SnakRowBuilder.php
R src/SQLStore/SnakStore/SnakStore.php
R src/SQLStore/SnakStore/ValueSnakRow.php
R src/SQLStore/SnakStore/ValueSnakStore.php
R src/SQLStore/SnakStore/ValuelessSnakRow.php
R src/SQLStore/SnakStore/ValuelessSnakStore.php
R src/SQLStore/Store.php
R src/SQLStore/StoreConfig.php
R src/SQLStore/Writer.php
R src/SQLStore/dependencies.txt
49 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikibaseQueryEngine.php b/WikibaseQueryEngine.php
index f8103af..524bdf4 100644
--- a/WikibaseQueryEngine.php
+++ b/WikibaseQueryEngine.php
@@ -89,7 +89,7 @@
array_shift( $pathParts );
$fileName = implode( '/', $pathParts );
- require_once __DIR__ . '/includes/' . $fileName;
+ require_once __DIR__ . '/src/' . $fileName;
}
}
} );
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7c6f029..808cbf3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,9 +13,6 @@
strict="true"
verbose="true">
<testsuites>
- <testsuite name="QueryEngine">
- <directory>tests</directory>
- </testsuite>
<testsuite name="QueryEngineStandalone">
<directory>tests/phpunit</directory>
<exclude>tests/integration</exclude>
diff --git a/includes/QueryEngine.php b/src/QueryEngine.php
similarity index 100%
rename from includes/QueryEngine.php
rename to src/QueryEngine.php
diff --git a/includes/QueryEngineException.php b/src/QueryEngineException.php
similarity index 100%
rename from includes/QueryEngineException.php
rename to src/QueryEngineException.php
diff --git a/includes/QueryEngineResult.php b/src/QueryEngineResult.php
similarity index 100%
rename from includes/QueryEngineResult.php
rename to src/QueryEngineResult.php
diff --git a/includes/QueryNotSupportedException.php
b/src/QueryNotSupportedException.php
similarity index 100%
rename from includes/QueryNotSupportedException.php
rename to src/QueryNotSupportedException.php
diff --git a/includes/QueryResult.php b/src/QueryResult.php
similarity index 100%
rename from includes/QueryResult.php
rename to src/QueryResult.php
diff --git a/includes/QueryStore.php b/src/QueryStore.php
similarity index 100%
rename from includes/QueryStore.php
rename to src/QueryStore.php
diff --git a/includes/QueryStoreWriter.php b/src/QueryStoreWriter.php
similarity index 100%
rename from includes/QueryStoreWriter.php
rename to src/QueryStoreWriter.php
diff --git a/includes/SQLStore/ClaimStore/ClaimInserter.php
b/src/SQLStore/ClaimStore/ClaimInserter.php
similarity index 100%
rename from includes/SQLStore/ClaimStore/ClaimInserter.php
rename to src/SQLStore/ClaimStore/ClaimInserter.php
diff --git a/includes/SQLStore/ClaimStore/ClaimRow.php
b/src/SQLStore/ClaimStore/ClaimRow.php
similarity index 100%
rename from includes/SQLStore/ClaimStore/ClaimRow.php
rename to src/SQLStore/ClaimStore/ClaimRow.php
diff --git a/includes/SQLStore/ClaimStore/ClaimRowBuilder.php
b/src/SQLStore/ClaimStore/ClaimRowBuilder.php
similarity index 100%
rename from includes/SQLStore/ClaimStore/ClaimRowBuilder.php
rename to src/SQLStore/ClaimStore/ClaimRowBuilder.php
diff --git a/includes/SQLStore/ClaimStore/ClaimsTable.php
b/src/SQLStore/ClaimStore/ClaimsTable.php
similarity index 100%
rename from includes/SQLStore/ClaimStore/ClaimsTable.php
rename to src/SQLStore/ClaimStore/ClaimsTable.php
diff --git a/includes/SQLStore/DVHandler/BooleanHandler.php
b/src/SQLStore/DVHandler/BooleanHandler.php
similarity index 100%
rename from includes/SQLStore/DVHandler/BooleanHandler.php
rename to src/SQLStore/DVHandler/BooleanHandler.php
diff --git a/includes/SQLStore/DVHandler/EntityIdHandler.php
b/src/SQLStore/DVHandler/EntityIdHandler.php
similarity index 100%
rename from includes/SQLStore/DVHandler/EntityIdHandler.php
rename to src/SQLStore/DVHandler/EntityIdHandler.php
diff --git a/includes/SQLStore/DVHandler/GeoCoordinateHandler.php
b/src/SQLStore/DVHandler/GeoCoordinateHandler.php
similarity index 100%
rename from includes/SQLStore/DVHandler/GeoCoordinateHandler.php
rename to src/SQLStore/DVHandler/GeoCoordinateHandler.php
diff --git a/includes/SQLStore/DVHandler/IriHandler.php
b/src/SQLStore/DVHandler/IriHandler.php
similarity index 100%
rename from includes/SQLStore/DVHandler/IriHandler.php
rename to src/SQLStore/DVHandler/IriHandler.php
diff --git a/includes/SQLStore/DVHandler/MonolingualTextHandler.php
b/src/SQLStore/DVHandler/MonolingualTextHandler.php
similarity index 100%
rename from includes/SQLStore/DVHandler/MonolingualTextHandler.php
rename to src/SQLStore/DVHandler/MonolingualTextHandler.php
diff --git a/includes/SQLStore/DVHandler/NumberHandler.php
b/src/SQLStore/DVHandler/NumberHandler.php
similarity index 100%
rename from includes/SQLStore/DVHandler/NumberHandler.php
rename to src/SQLStore/DVHandler/NumberHandler.php
diff --git a/includes/SQLStore/DVHandler/StringHandler.php
b/src/SQLStore/DVHandler/StringHandler.php
similarity index 100%
rename from includes/SQLStore/DVHandler/StringHandler.php
rename to src/SQLStore/DVHandler/StringHandler.php
diff --git a/includes/SQLStore/DataValueHandler.php
b/src/SQLStore/DataValueHandler.php
similarity index 100%
rename from includes/SQLStore/DataValueHandler.php
rename to src/SQLStore/DataValueHandler.php
diff --git a/includes/SQLStore/DataValueHandlers.php
b/src/SQLStore/DataValueHandlers.php
similarity index 100%
rename from includes/SQLStore/DataValueHandlers.php
rename to src/SQLStore/DataValueHandlers.php
diff --git a/includes/SQLStore/DataValueTable.php
b/src/SQLStore/DataValueTable.php
similarity index 100%
rename from includes/SQLStore/DataValueTable.php
rename to src/SQLStore/DataValueTable.php
diff --git a/includes/SQLStore/Engine/DescriptionMatchFinder.php
b/src/SQLStore/Engine/DescriptionMatchFinder.php
similarity index 100%
rename from includes/SQLStore/Engine/DescriptionMatchFinder.php
rename to src/SQLStore/Engine/DescriptionMatchFinder.php
diff --git a/includes/SQLStore/Engine/Engine.php
b/src/SQLStore/Engine/Engine.php
similarity index 100%
rename from includes/SQLStore/Engine/Engine.php
rename to src/SQLStore/Engine/Engine.php
diff --git a/includes/SQLStore/EntityIdTransformer.php
b/src/SQLStore/EntityIdTransformer.php
similarity index 100%
rename from includes/SQLStore/EntityIdTransformer.php
rename to src/SQLStore/EntityIdTransformer.php
diff --git a/includes/SQLStore/EntityInserter.php
b/src/SQLStore/EntityInserter.php
similarity index 100%
rename from includes/SQLStore/EntityInserter.php
rename to src/SQLStore/EntityInserter.php
diff --git a/includes/SQLStore/EntityRemover.php
b/src/SQLStore/EntityRemover.php
similarity index 100%
rename from includes/SQLStore/EntityRemover.php
rename to src/SQLStore/EntityRemover.php
diff --git a/includes/SQLStore/EntityTable.php b/src/SQLStore/EntityTable.php
similarity index 100%
rename from includes/SQLStore/EntityTable.php
rename to src/SQLStore/EntityTable.php
diff --git a/includes/SQLStore/EntityUpdater.php
b/src/SQLStore/EntityUpdater.php
similarity index 100%
rename from includes/SQLStore/EntityUpdater.php
rename to src/SQLStore/EntityUpdater.php
diff --git a/includes/SQLStore/Factory.php b/src/SQLStore/Factory.php
similarity index 100%
rename from includes/SQLStore/Factory.php
rename to src/SQLStore/Factory.php
diff --git a/includes/SQLStore/InternalEntityIdFinder.php
b/src/SQLStore/InternalEntityIdFinder.php
similarity index 100%
rename from includes/SQLStore/InternalEntityIdFinder.php
rename to src/SQLStore/InternalEntityIdFinder.php
diff --git a/includes/SQLStore/InternalEntityIdInterpreter.php
b/src/SQLStore/InternalEntityIdInterpreter.php
similarity index 100%
rename from includes/SQLStore/InternalEntityIdInterpreter.php
rename to src/SQLStore/InternalEntityIdInterpreter.php
diff --git a/includes/SQLStore/PropertyDataValueTypeLookup.php
b/src/SQLStore/PropertyDataValueTypeLookup.php
similarity index 100%
rename from includes/SQLStore/PropertyDataValueTypeLookup.php
rename to src/SQLStore/PropertyDataValueTypeLookup.php
diff --git a/includes/SQLStore/Schema.php b/src/SQLStore/Schema.php
similarity index 100%
rename from includes/SQLStore/Schema.php
rename to src/SQLStore/Schema.php
diff --git a/includes/SQLStore/Setup.php b/src/SQLStore/Setup.php
similarity index 100%
rename from includes/SQLStore/Setup.php
rename to src/SQLStore/Setup.php
diff --git a/includes/SQLStore/SnakStore/SnakInserter.php
b/src/SQLStore/SnakStore/SnakInserter.php
similarity index 100%
rename from includes/SQLStore/SnakStore/SnakInserter.php
rename to src/SQLStore/SnakStore/SnakInserter.php
diff --git a/includes/SQLStore/SnakStore/SnakRemover.php
b/src/SQLStore/SnakStore/SnakRemover.php
similarity index 100%
rename from includes/SQLStore/SnakStore/SnakRemover.php
rename to src/SQLStore/SnakStore/SnakRemover.php
diff --git a/includes/SQLStore/SnakStore/SnakRow.php
b/src/SQLStore/SnakStore/SnakRow.php
similarity index 100%
rename from includes/SQLStore/SnakStore/SnakRow.php
rename to src/SQLStore/SnakStore/SnakRow.php
diff --git a/includes/SQLStore/SnakStore/SnakRowBuilder.php
b/src/SQLStore/SnakStore/SnakRowBuilder.php
similarity index 100%
rename from includes/SQLStore/SnakStore/SnakRowBuilder.php
rename to src/SQLStore/SnakStore/SnakRowBuilder.php
diff --git a/includes/SQLStore/SnakStore/SnakStore.php
b/src/SQLStore/SnakStore/SnakStore.php
similarity index 100%
rename from includes/SQLStore/SnakStore/SnakStore.php
rename to src/SQLStore/SnakStore/SnakStore.php
diff --git a/includes/SQLStore/SnakStore/ValueSnakRow.php
b/src/SQLStore/SnakStore/ValueSnakRow.php
similarity index 100%
rename from includes/SQLStore/SnakStore/ValueSnakRow.php
rename to src/SQLStore/SnakStore/ValueSnakRow.php
diff --git a/includes/SQLStore/SnakStore/ValueSnakStore.php
b/src/SQLStore/SnakStore/ValueSnakStore.php
similarity index 100%
rename from includes/SQLStore/SnakStore/ValueSnakStore.php
rename to src/SQLStore/SnakStore/ValueSnakStore.php
diff --git a/includes/SQLStore/SnakStore/ValuelessSnakRow.php
b/src/SQLStore/SnakStore/ValuelessSnakRow.php
similarity index 100%
rename from includes/SQLStore/SnakStore/ValuelessSnakRow.php
rename to src/SQLStore/SnakStore/ValuelessSnakRow.php
diff --git a/includes/SQLStore/SnakStore/ValuelessSnakStore.php
b/src/SQLStore/SnakStore/ValuelessSnakStore.php
similarity index 100%
rename from includes/SQLStore/SnakStore/ValuelessSnakStore.php
rename to src/SQLStore/SnakStore/ValuelessSnakStore.php
diff --git a/includes/SQLStore/Store.php b/src/SQLStore/Store.php
similarity index 100%
rename from includes/SQLStore/Store.php
rename to src/SQLStore/Store.php
diff --git a/includes/SQLStore/StoreConfig.php b/src/SQLStore/StoreConfig.php
similarity index 100%
rename from includes/SQLStore/StoreConfig.php
rename to src/SQLStore/StoreConfig.php
diff --git a/includes/SQLStore/Writer.php b/src/SQLStore/Writer.php
similarity index 100%
rename from includes/SQLStore/Writer.php
rename to src/SQLStore/Writer.php
diff --git a/includes/SQLStore/dependencies.txt b/src/SQLStore/dependencies.txt
similarity index 100%
rename from includes/SQLStore/dependencies.txt
rename to src/SQLStore/dependencies.txt
--
To view, visit https://gerrit.wikimedia.org/r/73961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba1710d21bcb255161130606d1a8783dfa900316
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQueryEngine
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[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
