Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/269990
Change subject: New Wikidata build - with fix for broken qunit test ...................................................................... New Wikidata build - with fix for broken qunit test Change-Id: Ic096739c89ac2fc28306e77e4eef6f30961977fb --- M composer.lock A extensions/ArticlePlaceholder/i18n/he.json M extensions/Wikibase/client/WikibaseClient.php R extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php R extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableBuilderTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php M extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php M extensions/Wikibase/lib/tests/phpunit/store/BufferingTermLookupTest.php M extensions/Wikibase/lib/tests/phpunit/store/EntityTermLookupTest.php M extensions/Wikibase/repo/i18n/ps.json D extensions/Wikibase/repo/tests/browser A extensions/Wikibase/repo/tests/browser M extensions/Wikibase/tests/browser/features/support/pages/non_existing_item_page.rb M extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js M extensions/Wikibase/view/resources/wikibase/wikibase.getLanguageNameByCode.js M extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js M vendor/composer/ClassLoader.php M vendor/composer/autoload_classmap.php M vendor/composer/autoload_files.php M vendor/composer/autoload_real.php M vendor/composer/installed.json 25 files changed, 288 insertions(+), 204 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/90/269990/1 diff --git a/composer.lock b/composer.lock index d857dd2..88435f5 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,11 @@ { "_readme": [ "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", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "c8e8090c015b32a80000f8771ce88e7e", + "content-hash": "3279be965e622cfcf4afa7a1795b2a96", "packages": [ { "name": "composer/installers", @@ -777,12 +778,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git", - "reference": "d3fff7b3144c9ba020380f08018c225e42ce49d7" + "reference": "1ee5134feab8e42a52fc91c4712f2d9f248092c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/d3fff7b3144c9ba020380f08018c225e42ce49d7", - "reference": "d3fff7b3144c9ba020380f08018c225e42ce49d7", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/1ee5134feab8e42a52fc91c4712f2d9f248092c2", + "reference": "1ee5134feab8e42a52fc91c4712f2d9f248092c2", "shasum": "" }, "require-dev": { @@ -801,7 +802,7 @@ ], "description": "Provides a special page with Wikibase information about a certain topic, with invitation to create an article for the topic", "homepage": "https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder", - "time": "2016-02-08 12:46:34" + "time": "2016-02-10 20:08:26" }, { "name": "propertysuggester/property-suggester", @@ -997,7 +998,7 @@ "support": { "issues": "https://phabricator.wikimedia.org/project/profile/1202/" }, - "time": "2016-01-30 14:05:40" + "time": "2016-01-30 14:04:29" }, { "name": "wikibase/data-model", @@ -1481,12 +1482,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "f6e6987bb06f1b73694033c8428e39b05274056e" + "reference": "ef7910c636664ff5e64ab609f37d0db4145b4db3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f6e6987bb06f1b73694033c8428e39b05274056e", - "reference": "f6e6987bb06f1b73694033c8428e39b05274056e", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ef7910c636664ff5e64ab609f37d0db4145b4db3", + "reference": "ef7910c636664ff5e64ab609f37d0db4145b4db3", "shasum": "" }, "require": { @@ -1558,7 +1559,7 @@ "wikibaserepo", "wikidata" ], - "time": "2016-02-10 09:53:16" + "time": "2016-02-11 13:36:27" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/ArticlePlaceholder/i18n/he.json b/extensions/ArticlePlaceholder/i18n/he.json new file mode 100644 index 0000000..7abe259 --- /dev/null +++ b/extensions/ArticlePlaceholder/i18n/he.json @@ -0,0 +1,22 @@ +{ + "@metadata": { + "authors": [ + "Amire80" + ] + }, + "articleplaceholder-desc": "אספקת דף מיוחד עם מידע מתוך {{WBREPONAME}} על נושא מסוים, עם הזמנה ליצור ערך על הנושא", + "articleplaceholder-abouttopic": "על נושא", + "articleplaceholder-abouttopic-intro": "הדף המיוחד הזה מחולל דף תוכן על נושא מסוים עם מידע מתוך {{WBREPONAME}}", + "articleplaceholder-abouttopic-entityid": "נא להזין מזהה ישות כדי לקבל ערך ממלא מקום.", + "articleplaceholder-abouttopic-submit": "לחולל", + "articleplaceholder-abouttopic-no-entity-error": "זה לא ישות תקין.", + "articleplaceholder-abouttopic-create-article": "יצירת ערך חדש עם הכותרת", + "articleplaceholder-abouttopic-create-article-button": "יצירת ערך", + "articleplaceholder-abouttopic-create-article-submit-button": "שליחה", + "articleplaceholder-abouttopic-article-exists-error": "ערך בשם כזה כבר קיים", + "articleplaceholder-abouttopic-lua-entity": "ישות", + "articleplaceholder-abouttopic-lua-reference": "אסמכתאות", + "articleplaceholder-abouttopic-lua-qualifier": "מבחין", + "articleplaceholder-abouttopic-lua-identifier": "מזהה", + "articleplaceholder-search-header": "לגלות נתונים על הנושא" +} diff --git a/extensions/Wikibase/client/WikibaseClient.php b/extensions/Wikibase/client/WikibaseClient.php index 9a679e3..3b4867f 100644 --- a/extensions/Wikibase/client/WikibaseClient.php +++ b/extensions/Wikibase/client/WikibaseClient.php @@ -128,8 +128,8 @@ $wgHooks['FormatAutocomments'][] = '\Wikibase\ClientHooks::onFormat'; // recent changes / watchlist hooks - $wgHooks['ChangesListSpecialPageFilters'][] = '\Wikibase\Client\Hooks\ChangesListSpecialPageHooksHandler::onChangesListSpecialPageFilters'; - $wgHooks['ChangesListSpecialPageQuery'][] = '\Wikibase\Client\Hooks\ChangesListSpecialPageHooksHandler::onChangesListSpecialPageQuery'; + $wgHooks['ChangesListSpecialPageFilters'][] = '\Wikibase\Client\Hooks\ChangesListSpecialPageHookHandlers::onChangesListSpecialPageFilters'; + $wgHooks['ChangesListSpecialPageQuery'][] = '\Wikibase\Client\Hooks\ChangesListSpecialPageHookHandlers::onChangesListSpecialPageQuery'; // update hooks $wgHooks['LoadExtensionSchemaUpdates'][] = '\Wikibase\Client\Usage\Sql\SqlUsageTrackerSchemaUpdater::onSchemaUpdate'; diff --git a/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHooksHandler.php b/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php similarity index 96% rename from extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHooksHandler.php rename to extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php index dd42ad3..d7981b0 100644 --- a/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHooksHandler.php +++ b/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php @@ -20,7 +20,7 @@ * @licence GNU GPL v2+ * @author Katie Filbert < aude.w...@gmail.com > */ -class ChangesListSpecialPageHooksHandler { +class ChangesListSpecialPageHookHandlers { /** * @var WebRequest @@ -48,7 +48,7 @@ private $showExternalChanges; /** - * @var ChangesListSpecialPageHooksHandler + * @var ChangesListSpecialPageHookHandlers */ private static $instance = null; @@ -77,7 +77,7 @@ * @param IContextSource $context * @param string $specialPageName * - * @return ChangesListSpecialPageHooksHandler + * @return ChangesListSpecialPageHookHandlers */ private static function newFromGlobalState( IContextSource $context, @@ -100,7 +100,7 @@ * @param IContextSource $context * @param string $specialPageName * - * @return ChangesListSpecialPageHooksHandler + * @return ChangesListSpecialPageHookHandlers */ private static function getInstance( IContextSource $context, diff --git a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php index a5c6321..831a7df 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/WikibaseDataAccessTestItemSetUpHelper.php @@ -2,7 +2,6 @@ namespace Wikibase\Client\Tests\DataAccess; -use DataValues\DataValue; use DataValues\StringValue; use Wikibase\Client\WikibaseClient; use Wikibase\DataModel\Entity\EntityIdValue; diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php similarity index 92% rename from extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php rename to extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php index a32497d..5d3feda 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php @@ -5,16 +5,16 @@ use FauxRequest; use FormOptions; use SpecialPageFactory; -use Wikibase\Client\Hooks\ChangesListSpecialPageHooksHandler; +use Wikibase\Client\Hooks\ChangesListSpecialPageHookHandlers; /** - * @covers Wikibase\Client\Hooks\ChangesListSpecialPageHooksHandler + * @covers Wikibase\Client\Hooks\ChangesListSpecialPageHookHandlers * * @group WikibaseClientHooks * @group WikibaseClient * @group Wikibase */ -class ChangesListSpecialPageHooksHandlerTest extends \PHPUnit_Framework_TestCase { +class ChangesListSpecialPageHookHandlersTest extends \PHPUnit_Framework_TestCase { public function testOnChangesListSpecialPageFilters() { $user = $this->getUser( @@ -28,7 +28,7 @@ $filters = array(); - ChangesListSpecialPageHooksHandler::onChangesListSpecialPageFilters( + ChangesListSpecialPageHookHandlers::onChangesListSpecialPageFilters( $specialPage, $filters ); @@ -52,7 +52,7 @@ $opts = new FormOptions(); - ChangesListSpecialPageHooksHandler::onChangesListSpecialPageQuery( + ChangesListSpecialPageHookHandlers::onChangesListSpecialPageQuery( 'RecentChanges', $tables, $fields, @@ -74,7 +74,7 @@ array $userOptions, $optionDefault ) { - $hookHandler = new ChangesListSpecialPageHooksHandler( + $hookHandler = new ChangesListSpecialPageHookHandlers( $this->getRequest( array() ), $this->getUser( $userOptions ), $this->getLoadBalancer(), @@ -107,7 +107,7 @@ } public function testAddWikibaseConditions_wikibaseChangesDisabled() { - $hookHandler = new ChangesListSpecialPageHooksHandler( + $hookHandler = new ChangesListSpecialPageHookHandlers( $this->getRequest( array() ), $this->getUser( array( 'usenewrc' => 1 ) ), $this->getLoadBalancer(), @@ -132,7 +132,7 @@ $pageName, $message ) { - $hookHandler = new ChangesListSpecialPageHooksHandler( + $hookHandler = new ChangesListSpecialPageHookHandlers( $this->getRequest( $requestParams ), $this->getUser( $userOptions ), $this->getLoadBalancer(), @@ -197,7 +197,7 @@ $expectedToggleDefault, $specialPageName ) { - $hookHandler = new ChangesListSpecialPageHooksHandler( + $hookHandler = new ChangesListSpecialPageHookHandlers( $this->getRequest( $requestParams ), $this->getUser( $userOptions ), $this->getLoadBalancer(), @@ -275,7 +275,7 @@ $expectedToggleDefault, $specialPageName ) { - $hookHandler = new ChangesListSpecialPageHooksHandler( + $hookHandler = new ChangesListSpecialPageHookHandlers( $this->getRequest( $requestParams ), $this->getUser( $userOptions ), $this->getLoadBalancer(), @@ -340,7 +340,7 @@ * @dataProvider filterNotAddedWhenExternalRecentChangesDisabledProvider() { */ public function testFilterNotAddedWhenExternalRecentChangesDisabled( $specialPageName ) { - $hookHandler = new ChangesListSpecialPageHooksHandler( + $hookHandler = new ChangesListSpecialPageHookHandlers( $this->getRequest( array() ), $this->getUser( array( 'usenewrc' => 0 ) ), $this->getLoadBalancer(), diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableBuilderTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableBuilderTest.php index f4a3770..81a1d37 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableBuilderTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableBuilderTest.php @@ -5,7 +5,6 @@ use PHPUnit_Framework_MockObject_Matcher_Invocation; use Wikibase\Client\Usage\Sql\EntityUsageTable; use Wikibase\Client\Usage\Sql\EntityUsageTableBuilder; -use Wikibase\Client\WikibaseClient; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\Lib\Reporting\ExceptionHandler; use Wikibase\Lib\Reporting\MessageReporter; diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php index 48365f9..91ffb23 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php @@ -6,7 +6,6 @@ use Wikibase\Client\Usage\EntityUsage; use Wikibase\Client\Usage\PageEntityUsages; use Wikibase\Client\Usage\Sql\EntityUsageTable; -use Wikibase\Client\WikibaseClient; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\BasicEntityIdParser; diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php index a4881e9..838e214 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php @@ -4,7 +4,6 @@ use Wikibase\Client\Store\Sql\ConsistentReadConnectionManager; use Wikibase\Client\Usage\Sql\SqlSubscriptionManager; -use Wikibase\Client\WikibaseClient; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\PropertyId; diff --git a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php index 00c995c..b1cc68d 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php @@ -7,7 +7,6 @@ use Wikibase\Client\Tests\Usage\UsageTrackerContractTester; use Wikibase\Client\Usage\Sql\EntityUsageTable; use Wikibase\Client\Usage\Sql\SqlUsageTracker; -use Wikibase\Client\WikibaseClient; use Wikibase\DataModel\Entity\BasicEntityIdParser; /** diff --git a/extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php b/extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php index 577c5ca..34dc320 100644 --- a/extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php +++ b/extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php @@ -6,7 +6,6 @@ use Wikibase\Client\Store\Sql\BulkSubscriptionUpdater; use Wikibase\Client\Store\Sql\ConsistentReadConnectionManager; use Wikibase\Client\Usage\Sql\EntityUsageTable; -use Wikibase\Client\WikibaseClient; use Wikibase\DataModel\Entity\ItemId; use Wikibase\Lib\Reporting\ExceptionHandler; use Wikibase\Lib\Reporting\MessageReporter; diff --git a/extensions/Wikibase/lib/tests/phpunit/store/BufferingTermLookupTest.php b/extensions/Wikibase/lib/tests/phpunit/store/BufferingTermLookupTest.php index ef41415..4d76eeb 100644 --- a/extensions/Wikibase/lib/tests/phpunit/store/BufferingTermLookupTest.php +++ b/extensions/Wikibase/lib/tests/phpunit/store/BufferingTermLookupTest.php @@ -10,6 +10,7 @@ /** * @covers Wikibase\Store\BufferingTermLookup + * @covers Wikibase\Lib\Store\EntityTermLookupBase * * @group Wikibase * @group WikibaseLib diff --git a/extensions/Wikibase/lib/tests/phpunit/store/EntityTermLookupTest.php b/extensions/Wikibase/lib/tests/phpunit/store/EntityTermLookupTest.php index 9022f6e..30df994 100644 --- a/extensions/Wikibase/lib/tests/phpunit/store/EntityTermLookupTest.php +++ b/extensions/Wikibase/lib/tests/phpunit/store/EntityTermLookupTest.php @@ -8,6 +8,7 @@ /** * @covers Wikibase\Lib\Store\EntityTermLookup + * @covers Wikibase\Lib\Store\EntityTermLookupBase * * @group Wikibase * @group WikibaseLib diff --git a/extensions/Wikibase/repo/i18n/ps.json b/extensions/Wikibase/repo/i18n/ps.json index 8c486fb..adfde21 100644 --- a/extensions/Wikibase/repo/i18n/ps.json +++ b/extensions/Wikibase/repo/i18n/ps.json @@ -14,6 +14,7 @@ "wikibase-entitytermsforlanguagelistview-description": "څرگندونه", "wikibase-entitytermsforlanguagelistview-language": "ژبه", "wikibase-entitytermsforlanguagelistview-more": "نورې ژبې", + "wikibase-entitytermsforlanguagelistview-less": "لږې ژبې", "wikibase-label-empty": "کوم لېبل نه دی څرگند شوی", "wikibase-description-empty": "کوم تعريف نه دی څرگند شوی", "wikibase-diffview-rank": "پوړ", diff --git a/extensions/Wikibase/repo/tests/browser b/extensions/Wikibase/repo/tests/browser deleted file mode 100644 index c377a0f..0000000 --- a/extensions/Wikibase/repo/tests/browser +++ /dev/null @@ -1 +0,0 @@ -../../tests/browser/ \ No newline at end of file diff --git a/extensions/Wikibase/repo/tests/browser b/extensions/Wikibase/repo/tests/browser new file mode 120000 index 0000000..c377a0f --- /dev/null +++ b/extensions/Wikibase/repo/tests/browser @@ -0,0 +1 @@ +../../tests/browser/ \ No newline at end of file diff --git a/extensions/Wikibase/tests/browser/features/support/pages/non_existing_item_page.rb b/extensions/Wikibase/tests/browser/features/support/pages/non_existing_item_page.rb index c91c14d..0df749d 100644 --- a/extensions/Wikibase/tests/browser/features/support/pages/non_existing_item_page.rb +++ b/extensions/Wikibase/tests/browser/features/support/pages/non_existing_item_page.rb @@ -10,7 +10,6 @@ include PageObject page_url ENV['WIKIDATA_REPO_URL'] + ENV['ITEM_NAMESPACE'] + ENV['ITEM_ID_PREFIX'] + 'xy' - h1(:first_heading, id: 'firstHeading') - link(:special_log_link, css: 'div#mw-content-text > div > p > span > a:nth-child(1)') - link(:special_create_new_item_link, css: 'div#mw-content-text > div > p > a:nth-child(2)') + h1(:first_heading, class: 'firstHeading') + link(:special_log_link, css: '.noarticletext a:nth-child(1)') end diff --git a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js index 90f43b7..dcbdd13 100644 --- a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js +++ b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js @@ -353,7 +353,7 @@ // Collapse references if there is at least one. var visible = this._referencesListview.items().length === 0; - this.$references.toggleClass( 'wikibase-initially-hidden', !visible ); + this.$references.toggleClass( 'wikibase-initially-collapsed', !visible ); // toggle for references section: this._$toggler = $( '<a/>' ).toggler( { diff --git a/extensions/Wikibase/view/resources/wikibase/wikibase.getLanguageNameByCode.js b/extensions/Wikibase/view/resources/wikibase/wikibase.getLanguageNameByCode.js index 3d23bd6..cf244c9 100644 --- a/extensions/Wikibase/view/resources/wikibase/wikibase.getLanguageNameByCode.js +++ b/extensions/Wikibase/view/resources/wikibase/wikibase.getLanguageNameByCode.js @@ -5,8 +5,9 @@ * * @licence GNU GPL v2+ * @author Daniel Werner < daniel.werner at wikimedia.de > + * @author Adrian Heine <adrian.he...@wikimedia.de> */ -( function ( wb, mw, $ ) { +( function ( wb, $ ) { 'use strict'; /** @@ -44,9 +45,9 @@ * @return {string} */ wb.getLanguageNameByCode = function( langCode ) { - var ulsLanguages = mw.config.get( 'wgULSLanguages' ); + var ulsLanguages = $.fn.uls && $.fn.uls.defaults.languages; return ulsLanguages && Object.prototype.hasOwnProperty.call( ulsLanguages, langCode ) && ulsLanguages[ langCode ] || getNativeLanguageName( langCode ); }; -} )( wikibase, mediaWiki, jQuery ); +} )( wikibase, jQuery ); diff --git a/extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js b/extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js index 38151ce..a6b5ddd 100644 --- a/extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js +++ b/extensions/Wikibase/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js @@ -13,11 +13,17 @@ // Better might be to turn this into a LanguageNameLookup service and set language // name in getEntityTermsView in ViewFactory. Then, all places that need language name // would then have it. - if ( $.uls !== undefined ) { + if ( $.fn.uls ) { assert.strictEqual( wb.getLanguageNameByCode( 'de' ), - mw.config.get( 'wgULSLanguages' ).de, - 'getLanguageNameByCode() returns language name.' + $.fn.uls.defaults.languages.de, + 'getLanguageNameByCode() returns localized language name.' + ); + } else if ( $.uls ) { + assert.strictEqual( + wb.getLanguageNameByCode( 'de' ), + 'Deutsch', + 'getLanguageNameByCode() returns native language name.' ); } else { assert.strictEqual( diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 5e1469e..ff6ecfb 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -13,9 +13,7 @@ namespace Composer\Autoload; /** - * ClassLoader implements a PSR-0 class loader - * - * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md + * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. * * $loader = new \Composer\Autoload\ClassLoader(); * @@ -39,6 +37,8 @@ * * @author Fabien Potencier <fab...@symfony.com> * @author Jordi Boggiano <j.boggi...@seld.be> + * @see http://www.php-fig.org/psr/psr-0/ + * @see http://www.php-fig.org/psr/psr-4/ */ class ClassLoader { @@ -147,7 +147,7 @@ * appending or prepending to the ones previously set for this namespace. * * @param string $prefix The prefix/namespace, with trailing '\\' - * @param array|string $paths The PSR-0 base directories + * @param array|string $paths The PSR-4 base directories * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 847428b..fc114fe 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -255,6 +255,10 @@ 'WikibaseQuality\\ConstraintReport\\ConstraintRepository' => $baseDir . '/extensions/Constraints/includes/ConstraintRepository.php', 'WikibaseQuality\\ConstraintReport\\Maintenance\\UpdateConstraintsTable' => $baseDir . '/extensions/Constraints/maintenance/UpdateConstraintsTable.php', 'WikibaseQuality\\ConstraintReport\\Specials\\SpecialConstraintReport' => $baseDir . '/extensions/Constraints/specials/SpecialConstraintReport.php', + 'WikibaseQuality\\ConstraintReport\\Tests\\ConstraintRepositoryTest' => $baseDir . '/extensions/Constraints/tests/phpunit/ConstraintRepositoryTest.php', + 'WikibaseQuality\\ConstraintReport\\Tests\\ConstraintTest' => $baseDir . '/extensions/Constraints/tests/phpunit/ConstraintTest.php', + 'WikibaseQuality\\ConstraintReport\\Tests\\Maintenance\\UpdateConstraintsTableTest' => $baseDir . '/extensions/Constraints/tests/phpunit/Maintenance/UpdateConstraintsTableTest.php', + 'WikibaseQuality\\ConstraintReport\\Tests\\Specials\\SpecialConstraintReport\\SpecialConstraintReportTest' => $baseDir . '/extensions/Constraints/tests/phpunit/Specials/SpecialConstraintReportTest.php', 'WikibaseQuality\\ExternalValidation\\Api\\RunCrossCheck' => $baseDir . '/extensions/ExternalValidation/api/RunCrossCheck.php', 'WikibaseQuality\\ExternalValidation\\CrossCheck\\Comparer\\DataValueComparer' => $baseDir . '/extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparer.php', 'WikibaseQuality\\ExternalValidation\\CrossCheck\\Comparer\\DataValueComparerFactory' => $baseDir . '/extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparerFactory.php', @@ -294,9 +298,44 @@ 'WikibaseQuality\\ExternalValidation\\Serializer\\SerializerFactory' => $baseDir . '/extensions/ExternalValidation/includes/Serializer/SerializerFactory.php', 'WikibaseQuality\\ExternalValidation\\Specials\\SpecialCrossCheck' => $baseDir . '/extensions/ExternalValidation/specials/SpecialCrossCheck.php', 'WikibaseQuality\\ExternalValidation\\Specials\\SpecialExternalDbs' => $baseDir . '/extensions/ExternalValidation/specials/SpecialExternalDbs.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Api\\RunCrossCheckTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Api/RunCrossCheckTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\DataValueComparerFactoryTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php', 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\DataValueComparerTestBase' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/DataValueComparerTestBase.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\DispatchingDataValueComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\EntityIdValueComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\GlobeCoordinateValueComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\MonolingualTextValueComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\MultilingualTextValueComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\QuantityValueComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\StringComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/StringComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\StringValueComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Comparer\\TimeValueComparerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\CrossCheckInteractorTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/CrossCheckInteractorTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\CrossCheckerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/CrossCheckerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\ReferenceCheckerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/ReferenceCheckerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Result\\ComparisonResultTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Result/ComparisonResultTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Result\\CrossCheckResultListTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Result\\CrossCheckResultTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\Result\\ReferenceResultTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/Result/ReferenceResultTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\ValueParser\\ComparativeValueParserFactoryTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\ValueParser\\MultilingualTextValueParserTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\ValueParser\\StringValueParserTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php', 'WikibaseQuality\\ExternalValidation\\Tests\\CrossCheck\\ValueParser\\ValueParserTestBase' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\DumpMetaInformation\\DumpMetaInformationTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\DumpMetaInformation\\SqlDumpMetaInformationRepoTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\ExternalDataRepoTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/ExternalDataRepoTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\ExternalValidationServicesTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/ExternalValidationServicesTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Serializer\\ComparisonResultSerializerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Serializer/ComparisonResultSerializerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Serializer\\CrossCheckResultListSerializerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Serializer\\CrossCheckResultSerializerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Serializer\\DumpMetaInformationSerializerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Serializer\\ReferenceResultSerializerTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Serializer/ReferenceResultSerializerTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Serializer\\SerializerFactoryTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Serializer/SerializerFactoryTest.php', 'WikibaseQuality\\ExternalValidation\\Tests\\Serializer\\SerializerTestBase' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Serializer/SerializerTestBase.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Specials\\SpecialCrossCheck\\SpecialCrossCheckTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Specials/SpecialCrossCheckTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\Specials\\SpecialExternalDbs\\SpecialExternalDbsTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/Specials/SpecialExternalDbsTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\UpdateExternalData\\CsvImportSettingsTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/UpdateExternalData/CsvImportSettingsTest.php', + 'WikibaseQuality\\ExternalValidation\\Tests\\UpdateExternalData\\UpdateExternalDataTest' => $baseDir . '/extensions/ExternalValidation/tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php', 'WikibaseQuality\\ExternalValidation\\UpdateExternalData\\CsvImportSettings' => $baseDir . '/extensions/ExternalValidation/includes/UpdateExternalData/CsvImportSettings.php', 'WikibaseQuality\\ExternalValidation\\UpdateExternalData\\ExternalDataImporter' => $baseDir . '/extensions/ExternalValidation/includes/UpdateExternalData/ExternalDataImporter.php', 'WikibaseQuality\\Html\\HtmlTableBuilder' => $baseDir . '/extensions/Quality/includes/Html/HtmlTableBuilder.php', @@ -362,7 +401,7 @@ 'Wikibase\\Client\\ForbiddenSerializer' => $baseDir . '/extensions/Wikibase/client/includes/ForbiddenSerializer.php', 'Wikibase\\Client\\Hooks\\BaseTemplateAfterPortletHandler' => $baseDir . '/extensions/Wikibase/client/includes/Hooks/BaseTemplateAfterPortletHandler.php', 'Wikibase\\Client\\Hooks\\BeforePageDisplayHandler' => $baseDir . '/extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php', - 'Wikibase\\Client\\Hooks\\ChangesListSpecialPageHooksHandler' => $baseDir . '/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHooksHandler.php', + 'Wikibase\\Client\\Hooks\\ChangesListSpecialPageHookHandlers' => $baseDir . '/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php', 'Wikibase\\Client\\Hooks\\DataUpdateHookHandlers' => $baseDir . '/extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php', 'Wikibase\\Client\\Hooks\\DeletePageNoticeCreator' => $baseDir . '/extensions/Wikibase/client/includes/Hooks/DeletePageNoticeCreator.php', 'Wikibase\\Client\\Hooks\\InfoActionHookHandler' => $baseDir . '/extensions/Wikibase/client/includes/Hooks/InfoActionHookHandler.php', @@ -428,7 +467,7 @@ 'Wikibase\\Client\\Tests\\ForbiddenSerializerTest' => $baseDir . '/extensions/Wikibase/client/tests/phpunit/includes/ForbiddenSerializerTest.php', 'Wikibase\\Client\\Tests\\Hooks\\BaseTemplateAfterPortletHandlerTest' => $baseDir . '/extensions/Wikibase/client/tests/phpunit/includes/Hooks/BaseTemplateAfterPortalHandlerTest.php', 'Wikibase\\Client\\Tests\\Hooks\\BeforePageDisplayHandlerTest' => $baseDir . '/extensions/Wikibase/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php', - 'Wikibase\\Client\\Tests\\Hooks\\ChangesListSpecialPageHooksHandlerTest' => $baseDir . '/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php', + 'Wikibase\\Client\\Tests\\Hooks\\ChangesListSpecialPageHookHandlersTest' => $baseDir . '/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php', 'Wikibase\\Client\\Tests\\Hooks\\DataUpdateHookHandlersTest' => $baseDir . '/extensions/Wikibase/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php', 'Wikibase\\Client\\Tests\\Hooks\\DeletePageNoticeCreatorTest' => $baseDir . '/extensions/Wikibase/client/tests/phpunit/includes/Hooks/DeletePageNoticeCreatorTest.php', 'Wikibase\\Client\\Tests\\Hooks\\InfoActionHookHandlerTest' => $baseDir . '/extensions/Wikibase/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php', @@ -1491,6 +1530,24 @@ 'Wikibase\\View\\Template\\Template' => $baseDir . '/extensions/Wikibase/view/src/Template/Template.php', 'Wikibase\\View\\Template\\TemplateFactory' => $baseDir . '/extensions/Wikibase/view/src/Template/TemplateFactory.php', 'Wikibase\\View\\Template\\TemplateRegistry' => $baseDir . '/extensions/Wikibase/view/src/Template/TemplateRegistry.php', + 'Wikibase\\View\\Tests\\ClaimHtmlGeneratorTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/ClaimHtmlGeneratorTest.php', + 'Wikibase\\View\\Tests\\EmptyEditSectionGeneratorTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/EmptyEditSectionGeneratorTest.php', + 'Wikibase\\View\\Tests\\EntityTermsViewTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/EntityTermsViewTest.php', + 'Wikibase\\View\\Tests\\EntityViewFactoryTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/EntityViewFactoryTest.php', + 'Wikibase\\View\\Tests\\EntityViewPlaceholderExpanderTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php', + 'Wikibase\\View\\Tests\\EntityViewTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/EntityViewTest.php', + 'Wikibase\\View\\Tests\\ItemViewTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/ItemViewTest.php', + 'Wikibase\\View\\Tests\\Module\\TemplateModuleTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/Module/TemplateModuleTest.php', + 'Wikibase\\View\\Tests\\PropertyViewTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/PropertyViewTest.php', + 'Wikibase\\View\\Tests\\SiteLinksViewTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/SiteLinksViewTest.php', + 'Wikibase\\View\\Tests\\SnakHtmlGeneratorTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/SnakHtmlGeneratorTest.php', + 'Wikibase\\View\\Tests\\StatementGroupListViewTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/StatementGroupListViewTest.php', + 'Wikibase\\View\\Tests\\StatementSectionsViewTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/StatementSectionsViewTest.php', + 'Wikibase\\View\\Tests\\Template\\TemplateFactoryTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/Template/TemplateFactoryTest.php', + 'Wikibase\\View\\Tests\\Template\\TemplateRegistryTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/Template/TemplateRegistryTest.php', + 'Wikibase\\View\\Tests\\Template\\TemplateTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/Template/TemplateTest.php', + 'Wikibase\\View\\Tests\\TextInjectorTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/TextInjectorTest.php', + 'Wikibase\\View\\Tests\\ToolbarEditSectionGeneratorTest' => $baseDir . '/extensions/Wikibase/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php', 'Wikibase\\View\\TextInjector' => $baseDir . '/extensions/Wikibase/view/src/TextInjector.php', 'Wikibase\\View\\ToolbarEditSectionGenerator' => $baseDir . '/extensions/Wikibase/view/src/ToolbarEditSectionGenerator.php', 'WikidataOrg\\Hooks' => $baseDir . '/extensions/Wikidata.org/WikidataOrg.hooks.php', @@ -1506,7 +1563,14 @@ 'Wikimedia\\Purtle\\RdfWriter' => $baseDir . '/extensions/Wikibase/purtle/src/RdfWriter.php', 'Wikimedia\\Purtle\\RdfWriterBase' => $baseDir . '/extensions/Wikibase/purtle/src/RdfWriterBase.php', 'Wikimedia\\Purtle\\RdfWriterFactory' => $baseDir . '/extensions/Wikibase/purtle/src/RdfWriterFactory.php', + 'Wikimedia\\Purtle\\Tests\\BNodeLabelerTest' => $baseDir . '/extensions/Wikibase/purtle/tests/phpunit/BNodeLabelerTest.php', + 'Wikimedia\\Purtle\\Tests\\N3QuoterTest' => $baseDir . '/extensions/Wikibase/purtle/tests/phpunit/N3QuoterTest.php', + 'Wikimedia\\Purtle\\Tests\\NTriplesRdfWriterTest' => $baseDir . '/extensions/Wikibase/purtle/tests/phpunit/NTriplesRdfWriterTest.php', + 'Wikimedia\\Purtle\\Tests\\RdfWriterFactoryTest' => $baseDir . '/extensions/Wikibase/purtle/tests/phpunit/RdfWriterFactoryTest.php', 'Wikimedia\\Purtle\\Tests\\RdfWriterTestBase' => $baseDir . '/extensions/Wikibase/purtle/tests/phpunit/RdfWriterTestBase.php', + 'Wikimedia\\Purtle\\Tests\\TurtleRdfWriterTest' => $baseDir . '/extensions/Wikibase/purtle/tests/phpunit/TurtleRdfWriterTest.php', + 'Wikimedia\\Purtle\\Tests\\UnicodeEscaperTest' => $baseDir . '/extensions/Wikibase/purtle/tests/phpunit/UnicodeEscaperTest.php', + 'Wikimedia\\Purtle\\Tests\\XmlRdfWriterTest' => $baseDir . '/extensions/Wikibase/purtle/tests/phpunit/XmlRdfWriterTest.php', 'Wikimedia\\Purtle\\TurtleRdfWriter' => $baseDir . '/extensions/Wikibase/purtle/src/TurtleRdfWriter.php', 'Wikimedia\\Purtle\\UnicodeEscaper' => $baseDir . '/extensions/Wikibase/purtle/src/UnicodeEscaper.php', 'Wikimedia\\Purtle\\XmlRdfWriter' => $baseDir . '/extensions/Wikibase/purtle/src/XmlRdfWriter.php', diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 8f5dd68..8f78466 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -6,23 +6,23 @@ $baseDir = dirname($vendorDir); return array( - $vendorDir . '/data-values/data-values/DataValues.php', - $vendorDir . '/data-values/interfaces/Interfaces.php', - $vendorDir . '/data-values/common/Common.php', - $vendorDir . '/wikibase/data-model/WikibaseDataModel.php', - $vendorDir . '/serialization/serialization/Serialization.php', - $vendorDir . '/data-values/javascript/DataValuesJavaScript.php', - $vendorDir . '/data-values/time/Time.php', - $vendorDir . '/data-values/number/Number.php', - $vendorDir . '/data-values/geo/Geo.php', - $vendorDir . '/diff/diff/Diff.php', - $vendorDir . '/wikibase/data-model-serialization/mediawiki.php', - $vendorDir . '/wikibase/data-model-javascript/init.php', - $baseDir . '/extensions/ValueView/ValueView.php', - $vendorDir . '/wikibase/serialization-javascript/init.php', - $vendorDir . '/wikibase/internal-serialization/mediawiki.php', - $vendorDir . '/data-values/data-types/DataTypes.php', - $vendorDir . '/wikibase/javascript-api/WikibaseJavaScriptApi.php', - $vendorDir . '/data-values/validators/Validators.php', - $baseDir . '/extensions/WikimediaBadges/WikimediaBadges.php', + '7cb394c3af2b1ae832979b0368e0da62' => $vendorDir . '/data-values/data-values/DataValues.php', + 'd1715cacc3c23b16a030645514266a76' => $vendorDir . '/data-values/interfaces/Interfaces.php', + '90559502573a0d473dc66fde5c0ff7e2' => $vendorDir . '/data-values/common/Common.php', + 'dc2c047038b9f5c71759f55f00aba99b' => $vendorDir . '/wikibase/data-model/WikibaseDataModel.php', + 'f4c767faab43077fd89ff7cf99ffb4b8' => $vendorDir . '/serialization/serialization/Serialization.php', + '214ce90e7d14f0df3f891aa32034c535' => $vendorDir . '/data-values/javascript/DataValuesJavaScript.php', + '908a529187e4aa80293c8aa78e1ec48d' => $vendorDir . '/data-values/time/Time.php', + 'c15f8000750e4e04ba559d9745044427' => $vendorDir . '/data-values/number/Number.php', + '5a494680c593293bd6035e42e2a6825c' => $vendorDir . '/data-values/geo/Geo.php', + '3ef87127dc6892a0a78f223558a0b940' => $vendorDir . '/diff/diff/Diff.php', + '449657c0add2acfae5f5a189e215d1ad' => $vendorDir . '/wikibase/data-model-serialization/mediawiki.php', + '4b37f72a623577cc8b75c6a738dc9d30' => $vendorDir . '/wikibase/data-model-javascript/init.php', + '499fed5dd24a6329f26a3973b04c5440' => $baseDir . '/extensions/ValueView/ValueView.php', + '3a1322766b0dbc9cf396163859b9f864' => $vendorDir . '/wikibase/serialization-javascript/init.php', + 'e47bdf5a503f90444b98ecdcab719841' => $vendorDir . '/wikibase/internal-serialization/mediawiki.php', + 'b27615ec50616984e4b07db5658aba0d' => $vendorDir . '/data-values/data-types/DataTypes.php', + 'f44e0a54bf5f0864879c4d3e46950b49' => $vendorDir . '/wikibase/javascript-api/WikibaseJavaScriptApi.php', + '0dd9431cbbfa9ed9cb9d565d7129dbaf' => $vendorDir . '/data-values/validators/Validators.php', + '6b49d0287e368cb66263e04ca7d9699f' => $baseDir . '/extensions/WikimediaBadges/WikimediaBadges.php', ); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index a3e2db2..e39db27 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -23,16 +23,6 @@ self::$loader = $loader = new \Composer\Autoload\ClassLoader(); spl_autoload_unregister(array('ComposerAutoloaderInit_mediawiki_extension_wikidata', 'loadClassLoader')); - $map = require __DIR__ . '/autoload_namespaces.php'; - foreach ($map as $namespace => $path) { - $loader->set($namespace, $path); - } - - $map = require __DIR__ . '/autoload_psr4.php'; - foreach ($map as $namespace => $path) { - $loader->setPsr4($namespace, $path); - } - $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { $loader->addClassMap($classMap); @@ -42,15 +32,19 @@ $loader->register(false); $includeFiles = require __DIR__ . '/autoload_files.php'; - foreach ($includeFiles as $file) { - composerRequire_mediawiki_extension_wikidata($file); + foreach ($includeFiles as $fileIdentifier => $file) { + composerRequire_mediawiki_extension_wikidata($fileIdentifier, $file); } return $loader; } } -function composerRequire_mediawiki_extension_wikidata($file) +function composerRequire_mediawiki_extension_wikidata($fileIdentifier, $file) { - require $file; + if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { + require $file; + + $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + } } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 3b47be2..0f395a2 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -100,40 +100,6 @@ ] }, { - "name": "mediawiki/article-placeholder", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git", - "reference": "d3fff7b3144c9ba020380f08018c225e42ce49d7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/d3fff7b3144c9ba020380f08018c225e42ce49d7", - "reference": "d3fff7b3144c9ba020380f08018c225e42ce49d7", - "shasum": "" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.5.1" - }, - "time": "2016-02-08 12:46:34", - "type": "mediawiki-extension", - "installation-source": "dist", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Lucie-Aimée Kaffee" - } - ], - "description": "Provides a special page with Wikibase information about a certain topic, with invitation to create an article for the topic", - "homepage": "https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder" - }, - { "name": "data-values/javascript", "version": "0.8.0", "version_normalized": "0.8.0.0", @@ -1265,93 +1231,6 @@ ] }, { - "name": "wikibase/wikibase", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "f6e6987bb06f1b73694033c8428e39b05274056e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f6e6987bb06f1b73694033c8428e39b05274056e", - "reference": "f6e6987bb06f1b73694033c8428e39b05274056e", - "shasum": "" - }, - "require": { - "data-values/common": "~0.3.0", - "data-values/data-types": "~0.5.0", - "data-values/data-values": "~1.0", - "data-values/geo": "~1.0", - "data-values/interfaces": "~0.2.0|~0.1.5", - "data-values/javascript": "~0.8.0", - "data-values/number": "~0.6.0", - "data-values/serialization": "~1.0", - "data-values/time": "~0.8.2", - "data-values/validators": "~0.1.0", - "data-values/value-view": "~0.15.11", - "diff/diff": "~2.0", - "php": ">=5.3.2", - "wikibase/data-model": "~4.0", - "wikibase/data-model-javascript": "~2.0.0", - "wikibase/data-model-serialization": "~2.0", - "wikibase/data-model-services": "^3.2.0", - "wikibase/internal-serialization": "~2.0", - "wikibase/javascript-api": "~1.0", - "wikibase/serialization-javascript": "~2.0.5" - }, - "conflict": { - "mediawiki/mediawiki": "<1.25" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0" - }, - "time": "2016-02-10 09:53:16", - "type": "mediawiki-extension", - "installation-source": "dist", - "autoload": { - "classmap": [ - "client/includes/", - "client/WikibaseClient.hooks.php", - "client/tests/phpunit/", - "lib/includes/", - "lib/WikibaseLib.hooks.php", - "lib/maintenance/", - "lib/tests/phpunit/", - "repo/includes/", - "repo/maintenance/", - "repo/tests/phpunit/", - "repo/Wikibase.hooks.php" - ], - "psr-4": { - "Wikibase\\View\\": "view/src", - "Wikibase\\View\\Tests\\": "view/tests/phpunit", - "Wikimedia\\Purtle\\": "purtle/src", - "Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "The Wikidata team" - } - ], - "description": "Structured data repository for MediaWiki", - "homepage": "http://wikiba.se", - "keywords": [ - "wikibase", - "wikibaseclient", - "wikibaselib", - "wikibaserepo", - "wikidata" - ] - }, - { "name": "wikibase/wikimedia-badges", "version": "dev-master", "version_normalized": "9999999-dev", @@ -1652,5 +1531,126 @@ "wikibase", "wikidata" ] + }, + { + "name": "mediawiki/article-placeholder", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git", + "reference": "1ee5134feab8e42a52fc91c4712f2d9f248092c2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/1ee5134feab8e42a52fc91c4712f2d9f248092c2", + "reference": "1ee5134feab8e42a52fc91c4712f2d9f248092c2", + "shasum": "" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "0.5.1" + }, + "time": "2016-02-10 20:08:26", + "type": "mediawiki-extension", + "installation-source": "dist", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Lucie-Aimée Kaffee" + } + ], + "description": "Provides a special page with Wikibase information about a certain topic, with invitation to create an article for the topic", + "homepage": "https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder" + }, + { + "name": "wikibase/wikibase", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", + "reference": "ef7910c636664ff5e64ab609f37d0db4145b4db3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ef7910c636664ff5e64ab609f37d0db4145b4db3", + "reference": "ef7910c636664ff5e64ab609f37d0db4145b4db3", + "shasum": "" + }, + "require": { + "data-values/common": "~0.3.0", + "data-values/data-types": "~0.5.0", + "data-values/data-values": "~1.0", + "data-values/geo": "~1.0", + "data-values/interfaces": "~0.2.0|~0.1.5", + "data-values/javascript": "~0.8.0", + "data-values/number": "~0.6.0", + "data-values/serialization": "~1.0", + "data-values/time": "~0.8.2", + "data-values/validators": "~0.1.0", + "data-values/value-view": "~0.15.11", + "diff/diff": "~2.0", + "php": ">=5.3.2", + "wikibase/data-model": "~4.0", + "wikibase/data-model-javascript": "~2.0.0", + "wikibase/data-model-serialization": "~2.0", + "wikibase/data-model-services": "^3.2.0", + "wikibase/internal-serialization": "~2.0", + "wikibase/javascript-api": "~1.0", + "wikibase/serialization-javascript": "~2.0.5" + }, + "conflict": { + "mediawiki/mediawiki": "<1.25" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0" + }, + "time": "2016-02-11 13:36:27", + "type": "mediawiki-extension", + "installation-source": "dist", + "autoload": { + "classmap": [ + "client/includes/", + "client/WikibaseClient.hooks.php", + "client/tests/phpunit/", + "lib/includes/", + "lib/WikibaseLib.hooks.php", + "lib/maintenance/", + "lib/tests/phpunit/", + "repo/includes/", + "repo/maintenance/", + "repo/tests/phpunit/", + "repo/Wikibase.hooks.php" + ], + "psr-4": { + "Wikibase\\View\\": "view/src", + "Wikibase\\View\\Tests\\": "view/tests/phpunit", + "Wikimedia\\Purtle\\": "purtle/src", + "Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "The Wikidata team" + } + ], + "description": "Structured data repository for MediaWiki", + "homepage": "http://wikiba.se", + "keywords": [ + "wikibase", + "wikibaseclient", + "wikibaselib", + "wikibaserepo", + "wikidata" + ] } ] -- To view, visit https://gerrit.wikimedia.org/r/269990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic096739c89ac2fc28306e77e4eef6f30961977fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: Aude <aude.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits