Aude has submitted this change and it was merged.
Change subject: improvements to resource loader module registration
......................................................................
improvements to resource loader module registration
Change-Id: I5fdf4bc877289d3f7d638efc84b4969cc0d88d16
---
M Wikibase/composer.json
M Wikibase/composer.lock
D Wikibase/repo/Wikibase.classes.php
M Wikibase/vendor/autoload.php
M Wikibase/vendor/composer/autoload_classmap.php
M Wikibase/vendor/composer/autoload_namespaces.php
M Wikibase/vendor/composer/autoload_real.php
M Wikibase/vendor/composer/installed.json
M Wikibase/vendor/data-values/data-types/DataTypes.mw.php
M Wikibase/vendor/data-values/javascript/DataValues.resources.mw.php
M Wikibase/vendor/data-values/javascript/DataValues.resources.php
M Wikibase/vendor/data-values/javascript/DataValuesJavascript.php
M Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.mw.php
M Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.php
M Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.mw.php
M Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.php
16 files changed, 72 insertions(+), 273 deletions(-)
Approvals:
Aude: Verified; Looks good to me, approved
diff --git a/Wikibase/composer.json b/Wikibase/composer.json
index 6662711..f2f2676 100644
--- a/Wikibase/composer.json
+++ b/Wikibase/composer.json
@@ -54,6 +54,9 @@
"repo/maintenance/",
"repo/tests/phpunit/",
"repo/Wikibase.hooks.php"
- ]
+ ],
+ "psr-0": {
+ "EasyRdf_": "contrib/easyRdf/"
+ }
}
}
diff --git a/Wikibase/composer.lock b/Wikibase/composer.lock
index e9b3b32..f2dd3d5 100644
--- a/Wikibase/composer.lock
+++ b/Wikibase/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";
],
- "hash": "fb665916a42704542bf6d3164790dee9",
+ "hash": "72c6394451dc78f230ac347ba6354689",
"packages": [
{
"name": "composer/installers",
@@ -149,12 +149,12 @@
"source": {
"type": "git",
"url": "https://github.com/wmde/DataTypes.git";,
- "reference": "4b97e96ed68242cccf5a302353b0c39f8b706b5d"
+ "reference": "4764951f007b52c32c7c78dd0e9ebdd673d5d9a8"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/DataTypes/zipball/4b97e96ed68242cccf5a302353b0c39f8b706b5d";,
- "reference": "4b97e96ed68242cccf5a302353b0c39f8b706b5d",
+ "url":
"https://api.github.com/repos/wmde/DataTypes/zipball/4764951f007b52c32c7c78dd0e9ebdd673d5d9a8";,
+ "reference": "4764951f007b52c32c7c78dd0e9ebdd673d5d9a8",
"shasum": ""
},
"require": {
@@ -189,7 +189,7 @@
"datatypes",
"datavalues"
],
- "time": "2014-01-27 21:16:13"
+ "time": "2014-01-28 12:10:11"
},
{
"name": "data-values/data-values",
@@ -363,12 +363,12 @@
"source": {
"type": "git",
"url": "https://github.com/wmde/DataValuesJavascript.git";,
- "reference": "7d8016eb91f018ba61d4c1e4ebb95384a6789caf"
+ "reference": "70121e9ad22832eff39dc0fedbef10a2b2d436a5"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/7d8016eb91f018ba61d4c1e4ebb95384a6789caf";,
- "reference": "7d8016eb91f018ba61d4c1e4ebb95384a6789caf",
+ "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/70121e9ad22832eff39dc0fedbef10a2b2d436a5";,
+ "reference": "70121e9ad22832eff39dc0fedbef10a2b2d436a5",
"shasum": ""
},
"require": {
@@ -394,7 +394,7 @@
"name": "Jeroen De Dauw",
"email": "[email protected]",
"homepage": "http://jeroendedauw.com";,
- "role": "Developer"
+ "role": "Core developer"
},
{
"name": "Daniel Werner",
@@ -414,7 +414,7 @@
"datavalues",
"wikidata"
],
- "time": "2014-01-27 21:23:02"
+ "time": "2014-01-28 09:42:54"
},
{
"name": "data-values/number",
diff --git a/Wikibase/repo/Wikibase.classes.php
b/Wikibase/repo/Wikibase.classes.php
deleted file mode 100644
index a4ce367..0000000
--- a/Wikibase/repo/Wikibase.classes.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-/**
- * Class registration file for the WikibaseRepo extension.
- *
- * @since 0.4
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw < [email protected] >
- */
-return call_user_func( function() {
-
- $classes = array(
- 'Wikibase\RepoHooks' => 'Wikibase.hooks.php',
-
- // includes
- 'Wikibase\ClaimSummaryBuilder' =>
'includes/ClaimSummaryBuilder.php',
- 'Wikibase\ContentRetriever' => 'includes/ContentRetriever.php',
- 'Wikibase\CopyrightMessageBuilder' =>
'includes/CopyrightMessageBuilder.php',
- 'Wikibase\DataTypeSelector' => 'includes/DataTypeSelector.php',
- 'Wikibase\EditEntity' => 'includes/EditEntity.php',
- 'Wikibase\EntityContentDiffView' =>
'includes/EntityContentDiffView.php',
- 'Wikibase\ItemContentDiffView' =>
'includes/ItemContentDiffView.php',
- 'Wikibase\ItemDisambiguation' =>
'includes/ItemDisambiguation.php',
- 'Wikibase\EntityView' => 'includes/EntityView.php',
- 'Wikibase\EntityViewPlaceholderExpander' =>
'includes/EntityViewPlaceholderExpander.php',
- 'Wikibase\ExceptionWithCode' =>
'includes/ExceptionWithCode.php',
- 'Wikibase\ItemView' => 'includes/ItemView.php',
- 'Wikibase\LabelDescriptionDuplicateDetector' =>
'includes/LabelDescriptionDuplicateDetector.php',
- 'Wikibase\MultiLangConstraintDetector' =>
'includes/MultiLangConstraintDetector.php',
- 'Wikibase\NamespaceUtils' => 'includes/NamespaceUtils.php',
- 'Wikibase\PropertyView' => 'includes/PropertyView.php',
- 'Wikibase\Repo\EntitySearchTextGenerator' =>
'includes/EntitySearchTextGenerator.php',
- 'Wikibase\Repo\ItemSearchTextGenerator' =>
'includes/ItemSearchTextGenerator.php',
- 'Wikibase\SummaryFormatter' => 'includes/SummaryFormatter.php',
- 'Wikibase\Repo\WikibaseRepo' => 'includes/WikibaseRepo.php',
- 'Wikibase\ClaimHtmlGenerator' =>
'includes/ClaimHtmlGenerator.php',
- 'Wikibase\UserLanguageLookup' =>
'includes/UserLanguageLookup.php',
-
- // includes/view
- 'Wikibase\SectionEditLinkGenerator' =>
'includes/view/SectionEditLinkGenerator.php',
- 'Wikibase\TermBoxView' => 'includes/view/TermBoxView.php',
- 'Wikibase\TextInjector' => 'includes/view/TextInjector.php',
-
- // includes/ChangeOp
- 'Wikibase\ChangeOp\ChangeOps' =>
'includes/ChangeOp/ChangeOps.php',
- 'Wikibase\ChangeOp\ChangeOpsMerge' =>
'includes/ChangeOp/ChangeOpsMerge.php',
- 'Wikibase\ChangeOp\ChangeOp' =>
'includes/ChangeOp/ChangeOp.php',
- 'Wikibase\ChangeOp\ChangeOpBase' =>
'includes/ChangeOp/ChangeOpBase.php',
- 'Wikibase\ChangeOp\ChangeOpLabel' =>
'includes/ChangeOp/ChangeOpLabel.php',
- 'Wikibase\ChangeOp\ChangeOpDescription' =>
'includes/ChangeOp/ChangeOpDescription.php',
- 'Wikibase\ChangeOp\ChangeOpAliases' =>
'includes/ChangeOp/ChangeOpAliases.php',
- 'Wikibase\ChangeOp\ChangeOpSiteLink' =>
'includes/ChangeOp/ChangeOpSiteLink.php',
- 'Wikibase\ChangeOp\ChangeOpMainSnak' =>
'includes/ChangeOp/ChangeOpMainSnak.php',
- 'Wikibase\ChangeOp\ChangeOpClaim' =>
'includes/ChangeOp/ChangeOpClaim.php',
- 'Wikibase\ChangeOp\ChangeOpClaimRemove' =>
'includes/ChangeOp/ChangeOpClaimRemove.php',
- 'Wikibase\ChangeOp\ChangeOpQualifier' =>
'includes/ChangeOp/ChangeOpQualifier.php',
- 'Wikibase\ChangeOp\ChangeOpQualifierRemove' =>
'includes/ChangeOp/ChangeOpQualifierRemove.php',
- 'Wikibase\ChangeOp\ChangeOpReference' =>
'includes/ChangeOp/ChangeOpReference.php',
- 'Wikibase\ChangeOp\ChangeOpReferenceRemove' =>
'includes/ChangeOp/ChangeOpReferenceRemove.php',
- 'Wikibase\ChangeOp\ChangeOpStatementRank' =>
'includes/ChangeOp/ChangeOpStatementRank.php',
- 'Wikibase\ChangeOp\ChangeOpException' =>
'includes/ChangeOp/ChangeOpException.php',
-
- // includes/actions
- 'Wikibase\HistoryEntityAction' =>
'includes/actions/HistoryEntityAction.php',
- 'Wikibase\HistoryItemAction' =>
'includes/actions/HistoryItemAction.php',
- 'Wikibase\HistoryPropertyAction' =>
'includes/actions/HistoryPropertyAction.php',
- 'Wikibase\EditEntityAction' =>
'includes/actions/EditEntityAction.php',
- 'Wikibase\EditItemAction' =>
'includes/actions/EditItemAction.php',
- 'Wikibase\EditPropertyAction' =>
'includes/actions/EditPropertyAction.php',
- 'Wikibase\ViewEntityAction' =>
'includes/actions/ViewEntityAction.php',
- 'Wikibase\ViewItemAction' =>
'includes/actions/ViewItemAction.php',
- 'Wikibase\ViewPropertyAction' =>
'includes/actions/ViewPropertyAction.php',
- 'Wikibase\SubmitEntityAction' =>
'includes/actions/SubmitEntityAction.php',
- 'Wikibase\SubmitItemAction' =>
'includes/actions/SubmitItemAction.php',
- 'Wikibase\SubmitPropertyAction' =>
'includes/actions/SubmitPropertyAction.php',
-
- // includes/api
- 'Wikibase\Api\ApiWikibase' => 'includes/api/ApiWikibase.php',
- 'Wikibase\Api\ItemByTitleHelper' =>
'includes/api/ItemByTitleHelper.php',
- 'Wikibase\Api\EditEntity' => 'includes/api/EditEntity.php',
- 'Wikibase\Api\GetEntities' => 'includes/api/GetEntities.php',
- 'Wikibase\Api\LinkTitles' => 'includes/api/LinkTitles.php',
- 'Wikibase\Api\ModifyEntity' => 'includes/api/ModifyEntity.php',
- 'Wikibase\Api\ModifyTerm' => 'includes/api/ModifyTerm.php',
- 'Wikibase\Api\SearchEntities' =>
'includes/api/SearchEntities.php',
- 'Wikibase\Api\SetAliases' => 'includes/api/SetAliases.php',
- 'Wikibase\Api\SetDescription' =>
'includes/api/SetDescription.php',
- 'Wikibase\Api\SetLabel' => 'includes/api/SetLabel.php',
- 'Wikibase\Api\SetSiteLink' => 'includes/api/SetSiteLink.php',
- 'Wikibase\Api\MergeItems' => 'includes/api/MergeItems.php',
- 'Wikibase\Api\CreateClaim' => 'includes/api/CreateClaim.php',
- 'Wikibase\Api\GetClaims' => 'includes/api/GetClaims.php',
- 'Wikibase\Api\RemoveClaims' => 'includes/api/RemoveClaims.php',
- 'Wikibase\Api\SetClaimValue' =>
'includes/api/SetClaimValue.php',
- 'Wikibase\Api\SetReference' => 'includes/api/SetReference.php',
- 'Wikibase\Api\RemoveReferences' =>
'includes/api/RemoveReferences.php',
- 'Wikibase\Api\SetClaim' => 'includes/api/SetClaim.php',
- 'Wikibase\Api\RemoveQualifiers' =>
'includes/api/RemoveQualifiers.php',
- 'Wikibase\Api\SetQualifier' => 'includes/api/SetQualifier.php',
- 'Wikibase\Api\SnakValidationHelper' =>
'includes/api/SnakValidationHelper.php',
- 'Wikibase\Api\ModifyClaim' => 'includes/api/ModifyClaim.php',
- 'Wikibase\Api\ClaimModificationHelper' =>
'includes/api/ClaimModificationHelper.php',
- 'Wikibase\Api\ResultBuilder' =>
'includes/api/ResultBuilder.php',
- 'Wikibase\Api\SiteLinkTargetProvider' =>
'includes/api/SiteLinkTargetProvider.php',
- 'Wikibase\Api\FormatSnakValue' =>
'includes/api/FormatSnakValue.php',
-
- // includes/serializers
- 'Wikibase\Serializers\EntityRevisionSerializer' =>
'includes/serializers/EntityRevisionSerializer.php',
- 'Wikibase\Serializers\EntityRevisionSerializationOptions' =>
'includes/serializers/EntityRevisionSerializationOptions.php',
-
- // includes/content
- 'Wikibase\EntityContent' =>
'includes/content/EntityContent.php',
- 'Wikibase\EntityContentFactory' =>
'includes/content/EntityContentFactory.php',
- 'Wikibase\EntityHandler' =>
'includes/content/EntityHandler.php',
- 'Wikibase\ItemContent' => 'includes/content/ItemContent.php',
- 'Wikibase\ItemHandler' => 'includes/content/ItemHandler.php',
- 'Wikibase\PropertyContent' =>
'includes/content/PropertyContent.php',
- 'Wikibase\PropertyHandler' =>
'includes/content/PropertyHandler.php',
- 'Wikibase\RdfBuilder' => 'includes/rdf/RdfBuilder.php',
- 'Wikibase\RdfSerializer' => 'includes/rdf/RdfSerializer.php',
-
- // includes/specials
- 'Wikibase\Repo\Specials\SpecialPageCopyrightView' =>
'includes/specials/SpecialPageCopyrightView.php',
- 'Wikibase\Repo\Specials\SpecialNewEntity' =>
'includes/specials/SpecialNewEntity.php',
- 'Wikibase\Repo\Specials\SpecialNewItem' =>
'includes/specials/SpecialNewItem.php',
- 'Wikibase\Repo\Specials\SpecialNewProperty' =>
'includes/specials/SpecialNewProperty.php',
- 'Wikibase\Repo\Specials\SpecialItemByTitle' =>
'includes/specials/SpecialItemByTitle.php',
- 'Wikibase\Repo\Specials\SpecialItemResolver' =>
'includes/specials/SpecialItemResolver.php',
- 'Wikibase\Repo\Specials\SpecialItemDisambiguation' =>
'includes/specials/SpecialItemDisambiguation.php',
- 'Wikibase\Repo\Specials\SpecialModifyEntity' =>
'includes/specials/SpecialModifyEntity.php',
- 'Wikibase\Repo\Specials\SpecialModifyTerm' =>
'includes/specials/SpecialModifyTerm.php',
- 'Wikibase\Repo\Specials\SpecialSetLabel' =>
'includes/specials/SpecialSetLabel.php',
- 'Wikibase\Repo\Specials\SpecialSetDescription' =>
'includes/specials/SpecialSetDescription.php',
- 'Wikibase\Repo\Specials\SpecialSetAliases' =>
'includes/specials/SpecialSetAliases.php',
- 'Wikibase\Repo\Specials\SpecialSetSiteLink' =>
'includes/specials/SpecialSetSiteLink.php',
- 'Wikibase\Repo\Specials\SpecialEntitiesWithoutPage' =>
'includes/specials/SpecialEntitiesWithoutPage.php',
- 'Wikibase\Repo\Specials\SpecialEntitiesWithoutLabel' =>
'includes/specials/SpecialEntitiesWithoutLabel.php',
- 'Wikibase\Repo\Specials\SpecialEntitiesWithoutDescription' =>
'includes/specials/SpecialEntitiesWithoutDescription.php',
- 'Wikibase\Repo\Specials\SpecialItemsWithoutSitelinks' =>
'includes/specials/SpecialItemsWithoutSitelinks.php',
- 'Wikibase\Repo\Specials\SpecialListDatatypes' =>
'includes/specials/SpecialListDatatypes.php',
- 'Wikibase\Repo\Specials\SpecialDispatchStats' =>
'includes/specials/SpecialDispatchStats.php',
- 'Wikibase\Repo\Specials\SpecialEntityData' =>
'includes/specials/SpecialEntityData.php',
- 'Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain' =>
'includes/specials/SpecialMyLanguageFallbackChain.php',
- 'Wikibase\LinkedData\EntityDataSerializationService' =>
'includes/LinkedData/EntityDataSerializationService.php',
- 'Wikibase\LinkedData\EntityDataRequestHandler' =>
'includes/LinkedData/EntityDataRequestHandler.php',
- 'Wikibase\LinkedData\EntityDataUriManager' =>
'includes/LinkedData/EntityDataUriManager.php',
-
- // includes/store
- 'Wikibase\EntityPerPage' => 'includes/store/EntityPerPage.php',
- 'Wikibase\IdGenerator' => 'includes/store/IdGenerator.php',
- 'Wikibase\Store' => 'includes/store/Store.php',
- 'Wikibase\StoreFactory' => 'includes/store/StoreFactory.php',
-
- // includes/store/sql
- 'Wikibase\SqlIdGenerator' =>
'includes/store/sql/SqlIdGenerator.php',
- 'Wikibase\SqlStore' => 'includes/store/sql/SqlStore.php',
- 'Wikibase\EntityPerPageBuilder' =>
'includes/store/sql/EntityPerPageBuilder.php',
- 'Wikibase\EntityPerPageTable' =>
'includes/store/sql/EntityPerPageTable.php',
- 'Wikibase\DispatchStats' =>
'includes/store/sql/DispatchStats.php',
- 'Wikibase\TermSearchKeyBuilder' =>
'includes/store/sql/TermSearchKeyBuilder.php',
- 'Wikibase\PropertyInfoTableBuilder' =>
'includes/store/sql/PropertyInfoTableBuilder.php',
- 'Wikibase\ConvertingResultWrapper' =>
'includes/store/sql/ConvertingResultWrapper.php',
- 'Wikibase\DatabaseRowEntityIdIterator' =>
'includes/store/sql/DatabaseRowEntityIdIterator.php',
-
- // includes/updates
- 'Wikibase\EntityDeletionUpdate' =>
'includes/updates/EntityDeletionUpdate.php',
- 'Wikibase\EntityModificationUpdate' =>
'includes/updates/EntityModificationUpdate.php',
- 'Wikibase\ItemDeletionUpdate' =>
'includes/updates/ItemDeletionUpdate.php',
- 'Wikibase\ItemModificationUpdate' =>
'includes/updates/ItemModificationUpdate.php',
- 'Wikibase\PropertyInfoUpdate' =>
'includes/updates/PropertyInfoUpdate.php',
- 'Wikibase\PropertyInfoDeletion' =>
'includes/updates/PropertyInfoDeletion.php',
-
- // includes/Validators
- 'Wikibase\Validators\SnakValidator' =>
'includes/Validators/SnakValidator.php',
-
- // maintenance
- 'Wikibase\RebuildTermsSearchKey' =>
'maintenance/rebuildTermsSearchKey.php',
- 'Wikibase\RebuildEntityPerPage' =>
'maintenance/rebuildEntityPerPage.php',
- 'Wikibase\RebuildPropertyInfo' =>
'maintenance/rebuildPropertyInfo.php',
-
- // tests
- 'Wikibase\Test\TestItemContents' =>
'tests/phpunit/TestItemContents.php',
- 'Wikibase\Test\ActionTestCase' =>
'tests/phpunit/includes/actions/ActionTestCase.php',
- 'Wikibase\Test\Api\WikibaseApiTestCase' =>
'tests/phpunit/includes/api/WikibaseApiTestCase.php',
- 'Wikibase\Test\Api\ModifyTermTestCase' =>
'tests/phpunit/includes/api/ModifyTermTestCase.php',
- 'Wikibase\Test\Api\PermissionsTestCase' =>
'tests/phpunit/includes/api/PermissionsTestCase.php',
- 'Wikibase\Test\Api\TermTestHelper' =>
'tests/phpunit/includes/api/TermTestHelper.php',
- 'Wikibase\Test\Api\EntityTestHelper' =>
'tests/phpunit/includes/api/EntityTestHelper.php',
- 'Wikibase\Test\PermissionsHelper' =>
'tests/phpunit/includes/PermissionsHelper.php',
- 'Wikibase\Test\EntityContentTest' =>
'tests/phpunit/includes/content/EntityContentTest.php',
- 'Wikibase\Test\EntityHandlerTest' =>
'tests/phpunit/includes/content/EntityHandlerTest.php',
- 'Wikibase\Test\EntityViewTest' =>
'tests/phpunit/includes/EntityViewTest.php',
- 'Wikibase\Test\RdfBuilderTest' =>
'tests/phpunit/includes/rdf/RdfBuilderTest.php',
-
- 'Wikibase\Test\EntityDataSerializationServiceTest' =>
'tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php',
- 'Wikibase\Test\EntityDataRequestHandlerTest' =>
'tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php',
- 'Wikibase\Test\EntityDataTestProvider' =>
'tests/phpunit/includes/LinkedData/EntityDataTestProvider.php',
- 'Wikibase\Test\TestValidator' =>
'tests/phpunit/includes/Validators/TestValidator.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/Wikibase/vendor/autoload.php b/Wikibase/vendor/autoload.php
index 453f440..98716b4 100644
--- a/Wikibase/vendor/autoload.php
+++ b/Wikibase/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit5ada1fae9a12dd9f7d8f9e4794de2b4a::getLoader();
+return ComposerAutoloaderInita283df67f1494459d15feb9be705b63a::getLoader();
diff --git a/Wikibase/vendor/composer/autoload_classmap.php
b/Wikibase/vendor/composer/autoload_classmap.php
index 71a4803..bff549b 100644
--- a/Wikibase/vendor/composer/autoload_classmap.php
+++ b/Wikibase/vendor/composer/autoload_classmap.php
@@ -77,6 +77,29 @@
'Deserializers\\TypedDeserializationStrategy' => $vendorDir .
'/serialization/serialization/src/Deserializers/TypedDeserializationStrategy.php',
'Deserializers\\TypedObjectDeserializer' => $vendorDir .
'/serialization/serialization/src/Deserializers/TypedObjectDeserializer.php',
'Disposable' => $baseDir . '/lib/includes/Disposable.php',
+ 'EasyRdf_Exception' => $baseDir . '/contrib/easyRdf/EasyRdf/Exception.php',
+ 'EasyRdf_Format' => $baseDir . '/contrib/easyRdf/EasyRdf/Format.php',
+ 'EasyRdf_Graph' => $baseDir . '/contrib/easyRdf/EasyRdf/Graph.php',
+ 'EasyRdf_Literal' => $baseDir . '/contrib/easyRdf/EasyRdf/Literal.php',
+ 'EasyRdf_Literal_Boolean' => $baseDir .
'/contrib/easyRdf/EasyRdf/Literal/Boolean.php',
+ 'EasyRdf_Literal_Date' => $baseDir .
'/contrib/easyRdf/EasyRdf/Literal/Date.php',
+ 'EasyRdf_Literal_DateTime' => $baseDir .
'/contrib/easyRdf/EasyRdf/Literal/DateTime.php',
+ 'EasyRdf_Literal_Decimal' => $baseDir .
'/contrib/easyRdf/EasyRdf/Literal/Decimal.php',
+ 'EasyRdf_Literal_HexBinary' => $baseDir .
'/contrib/easyRdf/EasyRdf/Literal/HexBinary.php',
+ 'EasyRdf_Literal_Integer' => $baseDir .
'/contrib/easyRdf/EasyRdf/Literal/Integer.php',
+ 'EasyRdf_Namespace' => $baseDir . '/contrib/easyRdf/EasyRdf/Namespace.php',
+ 'EasyRdf_Resource' => $baseDir . '/contrib/easyRdf/EasyRdf/Resource.php',
+ 'EasyRdf_Serialiser' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser.php',
+ 'EasyRdf_Serialiser_Arc' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser/Arc.php',
+ 'EasyRdf_Serialiser_GraphViz' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser/GraphViz.php',
+ 'EasyRdf_Serialiser_Json' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser/Json.php',
+ 'EasyRdf_Serialiser_Ntriples' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser/Ntriples.php',
+ 'EasyRdf_Serialiser_Rapper' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser/Rapper.php',
+ 'EasyRdf_Serialiser_RdfPhp' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser/RdfPhp.php',
+ 'EasyRdf_Serialiser_RdfXml' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser/RdfXml.php',
+ 'EasyRdf_Serialiser_Turtle' => $baseDir .
'/contrib/easyRdf/EasyRdf/Serialiser/Turtle.php',
+ 'EasyRdf_TypeMapper' => $baseDir .
'/contrib/easyRdf/EasyRdf/TypeMapper.php',
+ 'EasyRdf_Utils' => $baseDir . '/contrib/easyRdf/EasyRdf/Utils.php',
'ExceptionHandler' => $baseDir . '/lib/includes/ExceptionHandler.php',
'Hashable' => $vendorDir .
'/data-values/data-values/src/interfaces/Hashable.php',
'Immutable' => $vendorDir .
'/data-values/data-values/src/interfaces/Immutable.php',
diff --git a/Wikibase/vendor/composer/autoload_namespaces.php
b/Wikibase/vendor/composer/autoload_namespaces.php
index 7b24345..f35951e 100644
--- a/Wikibase/vendor/composer/autoload_namespaces.php
+++ b/Wikibase/vendor/composer/autoload_namespaces.php
@@ -10,6 +10,7 @@
'ValueValidators\\' => array($vendorDir . '/data-values/interfaces/src',
$vendorDir . '/data-values/validators/src'),
'ValueParsers\\' => array($vendorDir . '/data-values/interfaces/src',
$vendorDir . '/data-values/common/src', $vendorDir . '/data-values/number/src',
$vendorDir . '/data-values/geo/src'),
'ValueFormatters\\' => array($vendorDir . '/data-values/interfaces/src',
$vendorDir . '/data-values/time/src', $vendorDir . '/data-values/common/src',
$vendorDir . '/data-values/number/src', $vendorDir . '/data-values/geo/src'),
+ 'EasyRdf_' => array($baseDir . '/contrib/easyRdf'),
'DataValues\\Serializers\\' => array($vendorDir .
'/data-values/serialization/src'),
'DataValues\\Deserializers\\' => array($vendorDir .
'/data-values/serialization/src'),
'DataValues\\' => array($vendorDir . '/data-values/data-values/src',
$vendorDir . '/data-values/time/src', $vendorDir . '/data-values/common/src',
$vendorDir . '/data-values/number/src', $vendorDir . '/data-values/geo/src'),
diff --git a/Wikibase/vendor/composer/autoload_real.php
b/Wikibase/vendor/composer/autoload_real.php
index 097f877..2c788c2 100644
--- a/Wikibase/vendor/composer/autoload_real.php
+++ b/Wikibase/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit5ada1fae9a12dd9f7d8f9e4794de2b4a
+class ComposerAutoloaderInita283df67f1494459d15feb9be705b63a
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInit5ada1fae9a12dd9f7d8f9e4794de2b4a',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInita283df67f1494459d15feb9be705b63a',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInit5ada1fae9a12dd9f7d8f9e4794de2b4a',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInita283df67f1494459d15feb9be705b63a',
'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/Wikibase/vendor/composer/installed.json
b/Wikibase/vendor/composer/installed.json
index 877f8bf..0acc96a 100644
--- a/Wikibase/vendor/composer/installed.json
+++ b/Wikibase/vendor/composer/installed.json
@@ -259,12 +259,12 @@
"source": {
"type": "git",
"url": "https://github.com/wmde/DataTypes.git";,
- "reference": "4b97e96ed68242cccf5a302353b0c39f8b706b5d"
+ "reference": "4764951f007b52c32c7c78dd0e9ebdd673d5d9a8"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/DataTypes/zipball/4b97e96ed68242cccf5a302353b0c39f8b706b5d";,
- "reference": "4b97e96ed68242cccf5a302353b0c39f8b706b5d",
+ "url":
"https://api.github.com/repos/wmde/DataTypes/zipball/4764951f007b52c32c7c78dd0e9ebdd673d5d9a8";,
+ "reference": "4764951f007b52c32c7c78dd0e9ebdd673d5d9a8",
"shasum": ""
},
"require": {
@@ -272,7 +272,7 @@
"data-values/interfaces": "~0.1",
"php": ">=5.3.0"
},
- "time": "2014-01-27 21:16:13",
+ "time": "2014-01-28 12:10:11",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -309,12 +309,12 @@
"source": {
"type": "git",
"url": "https://github.com/wmde/DataValuesJavascript.git";,
- "reference": "7d8016eb91f018ba61d4c1e4ebb95384a6789caf"
+ "reference": "70121e9ad22832eff39dc0fedbef10a2b2d436a5"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/7d8016eb91f018ba61d4c1e4ebb95384a6789caf";,
- "reference": "7d8016eb91f018ba61d4c1e4ebb95384a6789caf",
+ "url":
"https://api.github.com/repos/wmde/DataValuesJavascript/zipball/70121e9ad22832eff39dc0fedbef10a2b2d436a5";,
+ "reference": "70121e9ad22832eff39dc0fedbef10a2b2d436a5",
"shasum": ""
},
"require": {
@@ -322,7 +322,7 @@
"data-values/data-types": "dev-0.1.1-mw1.23wmf11",
"data-values/interfaces": "~0.1"
},
- "time": "2014-01-27 21:23:02",
+ "time": "2014-01-28 09:42:54",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -342,7 +342,7 @@
"name": "Jeroen De Dauw",
"email": "[email protected]",
"homepage": "http://jeroendedauw.com";,
- "role": "Developer"
+ "role": "Core developer"
},
{
"name": "Daniel Werner",
diff --git a/Wikibase/vendor/data-values/data-types/DataTypes.mw.php
b/Wikibase/vendor/data-values/data-types/DataTypes.mw.php
index 8719065..ebf2e1e 100644
--- a/Wikibase/vendor/data-values/data-types/DataTypes.mw.php
+++ b/Wikibase/vendor/data-values/data-types/DataTypes.mw.php
@@ -52,7 +52,7 @@
$moduleTemplate = array(
'localBasePath' => __DIR__ . '/tests/qunit',
- 'remoteExtPath' => $remoteExtPathParts . '/tests/qunit',
+ 'remoteExtPath' => $remoteExtPathParts[1] . '/tests/qunit',
);
$testModules['qunit']['dataTypes.tests'] = $moduleTemplate + array(
diff --git a/Wikibase/vendor/data-values/javascript/DataValues.resources.mw.php
b/Wikibase/vendor/data-values/javascript/DataValues.resources.mw.php
index 626e2f8..142b968 100644
--- a/Wikibase/vendor/data-values/javascript/DataValues.resources.mw.php
+++ b/Wikibase/vendor/data-values/javascript/DataValues.resources.mw.php
@@ -14,6 +14,7 @@
* @codeCoverageIgnoreStart
*/
return call_user_func( function() {
+ $remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
$moduleTemplate = array(
'localBasePath' => __DIR__ . '/resources',
diff --git a/Wikibase/vendor/data-values/javascript/DataValues.resources.php
b/Wikibase/vendor/data-values/javascript/DataValues.resources.php
index 9a91e30..2087023 100644
--- a/Wikibase/vendor/data-values/javascript/DataValues.resources.php
+++ b/Wikibase/vendor/data-values/javascript/DataValues.resources.php
@@ -22,8 +22,8 @@
$remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
$moduleTemplate = array(
- 'localBasePath' => __DIR__,
- 'remoteExtPath' => $remoteExtPathParts[1],
+ 'localBasePath' => __DIR__ . '/resources',
+ 'remoteExtPath' => $remoteExtPathParts[1] . '/resources',
);
return array(
diff --git a/Wikibase/vendor/data-values/javascript/DataValuesJavascript.php
b/Wikibase/vendor/data-values/javascript/DataValuesJavascript.php
index 3ed03cd..83b61f3 100644
--- a/Wikibase/vendor/data-values/javascript/DataValuesJavascript.php
+++ b/Wikibase/vendor/data-values/javascript/DataValuesJavascript.php
@@ -51,11 +51,14 @@
$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] = function ( array
&$testModules, \ResourceLoader &$resourceLoader ) {
// Register DataValue QUnit tests. Take the predefined test definitions
and make them
// suitable for registration with MediaWiki's resource loader.
+ $remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
+
$ownModules = include( __DIR__ . '/DataValues.tests.qunit.php' );
$ownModulesTemplate = array(
'localBasePath' => __DIR__,
- 'remoteExtPath' => '..' . substr( __DIR__, strlen(
$GLOBALS['IP'] ) ),
+ 'remoteExtPath' => $remoteExtPathParts[1],
);
+
foreach( $ownModules as $ownModuleName => $ownModule ) {
$testModules['qunit'][ $ownModuleName ] = $ownModule +
$ownModulesTemplate;
}
@@ -73,9 +76,11 @@
*/
$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] = function ( array
&$testModules, \ResourceLoader &$resourceLoader ) {
// @codeCoverageIgnoreStart
+ $remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
+
$moduleTemplate = array(
'localBasePath' => __DIR__ . '/js/tests/ValueParsers',
- 'remoteExtPath' => '..' . substr( __DIR__, strlen(
$GLOBALS['IP'] ) ) . '/js/tests/ValueParsers',
+ 'remoteExtPath' => $remoteExtPathParts[1] .
'/js/tests/ValueParsers',
);
$testModules['qunit']['ext.valueParsers.tests'] = $moduleTemplate +
array(
@@ -136,7 +141,7 @@
$moduleTemplate = array(
'localBasePath' => __DIR__ . '/test',
- 'remoteExtPath' => $resourceExtPathParts[1] . '/tests',
+ 'remoteExtPath' => $remoteExtPathParts[1] . '/tests',
);
$testModules['qunit']['ext.valueFormatters.tests'] = $moduleTemplate +
array(
@@ -173,4 +178,4 @@
return true;
// @codeCoverageIgnoreEnd
-};
\ No newline at end of file
+};
diff --git
a/Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.mw.php
b/Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.mw.php
index ac5ee44..876c19b 100644
--- a/Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.mw.php
+++ b/Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.mw.php
@@ -13,8 +13,8 @@
$remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
$moduleTemplate = array(
- 'localBasePath' => __DIR__,
- 'remoteExtPath' => $remoteExtPathParts[1],
+ 'localBasePath' => __DIR__ . '/src/ValueFormatters',
+ 'remoteExtPath' => $remoteExtPathParts[1] .
'/src/ValueFormatters',
);
$mwVfResources = array(
diff --git
a/Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.php
b/Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.php
index aa74bbe..adb6ed0 100644
--- a/Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.php
+++ b/Wikibase/vendor/data-values/javascript/js/ValueFormatters.resources.php
@@ -14,8 +14,8 @@
$remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
$moduleTemplate = array(
- 'localBasePath' => __DIR__,
- 'remoteExtPath' => $remoteExtPathParts[1],
+ 'localBasePath' => __DIR__ . '/src/ValueFormatters',
+ 'remoteExtPath' => $remoteExtPathParts[1] .
'/src/ValueFormatters',
);
return array(
diff --git
a/Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.mw.php
b/Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.mw.php
index 75b37f0..93edc22 100644
--- a/Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.mw.php
+++ b/Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.mw.php
@@ -13,8 +13,8 @@
$remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
$moduleTemplate = array(
- 'localBasePath' => __DIR__,
- 'remoteExtPath' => $resourceExtPathParts[1],
+ 'localBasePath' => __DIR__ . '/src/ValueParsers',
+ 'remoteExtPath' => $remoteExtPathParts[1] . '/src/ValueParsers',
);
$mwVpResources = array(
diff --git
a/Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.php
b/Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.php
index e1aa6a1..8ce1118 100644
--- a/Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.php
+++ b/Wikibase/vendor/data-values/javascript/js/ValueParsers.resources.php
@@ -18,8 +18,8 @@
$remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
$moduleTemplate = array(
- 'localBasePath' => __DIR__ . '/src/valueParsers',
- 'remoteExtPath' => $remoteExtPathParts[1],
+ 'localBasePath' => __DIR__ . '/src/ValueParsers',
+ 'remoteExtPath' => $remoteExtPathParts[1] . '/src/ValueParsers',
);
return array(
--
To view, visit https://gerrit.wikimedia.org/r/109874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fdf4bc877289d3f7d638efc84b4969cc0d88d16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.23-wmf11
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
