Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/220942
Change subject: Update Wikibase: Use SELECT FOR UPDATE in SqlIdGenerator ...................................................................... Update Wikibase: Use SELECT FOR UPDATE in SqlIdGenerator Change-Id: I527bcdaf38facbc0537cae9f718f85ce9f081f3c --- M composer.lock D extensions/Wikibase/Wikibase.composer.php M extensions/Wikibase/Wikibase.php M extensions/Wikibase/composer.json M extensions/Wikibase/repo/includes/store/sql/SqlIdGenerator.php M vendor/composer/autoload_files.php M vendor/composer/installed.json 7 files changed, 31 insertions(+), 42 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/42/220942/1 diff --git a/composer.lock b/composer.lock index 6e8f08d..68a2cbf 100644 --- a/composer.lock +++ b/composer.lock @@ -1213,12 +1213,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "335f05ba25d402852ef85f2fd17394418c234895" + "reference": "bacf6c07b3dfe028550db6566cd8dbcd18920f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/335f05ba25d402852ef85f2fd17394418c234895", - "reference": "335f05ba25d402852ef85f2fd17394418c234895", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/bacf6c07b3dfe028550db6566cd8dbcd18920f41", + "reference": "bacf6c07b3dfe028550db6566cd8dbcd18920f41", "shasum": "" }, "require": { @@ -1245,11 +1245,11 @@ "conflict": { "mediawiki/mediawiki": "<1.23" }, + "require-dev": { + "squizlabs/php_codesniffer": "~2.1" + }, "type": "mediawiki-extension", "autoload": { - "files": [ - "Wikibase.composer.php" - ], "classmap": [ "client/includes/", "client/WikibaseClient.hooks.php", @@ -1286,7 +1286,7 @@ "wikibaserepo", "wikidata" ], - "time": "2015-06-15 09:45:54" + "time": "2015-06-25 19:28:25" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/Wikibase.composer.php b/extensions/Wikibase/Wikibase.composer.php deleted file mode 100644 index ec45160..0000000 --- a/extensions/Wikibase/Wikibase.composer.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php - -// Component loader for Composer. -// This entry point is not to be used by anything else then Composer. -// It might well be removed at a future point. - -// Config: -// wgEnableWikibaseRepo - defaults to true -// wgEnableWikibaseClient - defaults to true - -if ( !array_key_exists( 'wgEnableWikibaseRepo', $GLOBALS ) || $GLOBALS['wgEnableWikibaseRepo'] ) { - require_once __DIR__ . '/repo/Wikibase.php'; -} - -if ( !array_key_exists( 'wgEnableWikibaseClient', $GLOBALS ) || $GLOBALS['wgEnableWikibaseClient'] ) { - require_once __DIR__ . '/client/WikibaseClient.php'; -} diff --git a/extensions/Wikibase/Wikibase.php b/extensions/Wikibase/Wikibase.php index bd5b7eb..f449ed0 100644 --- a/extensions/Wikibase/Wikibase.php +++ b/extensions/Wikibase/Wikibase.php @@ -30,9 +30,11 @@ * @licence GNU GPL v2+ */ -//TODO: Use a different file for jenkins, use this for a standard repo+client setup. - -if ( !isset( $wgWikimediaJenkinsCI ) || !$wgWikimediaJenkinsCI ) { - die( "This entry point is for use by the Jenkins testing framework only.\n" - . "Use repo/Wikibase.php resp. client/WikibaseClient.php instead.\n" ); +if ( !array_key_exists( 'wgEnableWikibaseRepo', $GLOBALS ) || $GLOBALS['wgEnableWikibaseRepo'] ) { + require_once __DIR__ . '/repo/Wikibase.php'; } + +if ( !array_key_exists( 'wgEnableWikibaseClient', $GLOBALS ) || $GLOBALS['wgEnableWikibaseClient'] ) { + require_once __DIR__ . '/client/WikibaseClient.php'; +} + diff --git a/extensions/Wikibase/composer.json b/extensions/Wikibase/composer.json index 2ed5674..ee01bbe 100644 --- a/extensions/Wikibase/composer.json +++ b/extensions/Wikibase/composer.json @@ -44,13 +44,13 @@ "diff/diff": "~2.0|~1.0" }, + "require-dev": { + "squizlabs/php_codesniffer": "~2.1" + }, "conflict": { "mediawiki/mediawiki": "<1.23" }, "autoload": { - "files" : [ - "Wikibase.composer.php" - ], "classmap": [ "client/includes/", "client/WikibaseClient.hooks.php", @@ -72,6 +72,9 @@ } }, "scripts": { - "phpcs": "phpcs $PHPCS_ARGS -s --standard=phpcs.xml --ignore=extensions/ValueView,vendor --encoding=utf-8 --extensions=php" + "test": [ + "composer phpcs" + ], + "phpcs": "vendor/bin/phpcs -sp --standard=phpcs.xml --extensions=php --ignore=extensions/ValueView,vendor ." } } diff --git a/extensions/Wikibase/repo/includes/store/sql/SqlIdGenerator.php b/extensions/Wikibase/repo/includes/store/sql/SqlIdGenerator.php index 6b33d4c..5e7cbfc 100644 --- a/extensions/Wikibase/repo/includes/store/sql/SqlIdGenerator.php +++ b/extensions/Wikibase/repo/includes/store/sql/SqlIdGenerator.php @@ -73,7 +73,9 @@ $currentId = $database->selectRow( 'wb_id_counters', 'id_value', - array( 'id_type' => $type ) + array( 'id_type' => $type ), + __METHOD__, + array( 'FOR UPDATE' ) ); if ( is_object( $currentId ) ) { diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 980cbe4..c1388ee 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -23,5 +23,4 @@ $vendorDir . '/data-values/data-types/DataTypes.php', $vendorDir . '/data-values/validators/Validators.php', $baseDir . '/extensions/WikimediaBadges/WikimediaBadges.php', - $baseDir . '/extensions/Wikibase/Wikibase.composer.php', ); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 1158ef8..6d81057 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1303,12 +1303,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "335f05ba25d402852ef85f2fd17394418c234895" + "reference": "bacf6c07b3dfe028550db6566cd8dbcd18920f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/335f05ba25d402852ef85f2fd17394418c234895", - "reference": "335f05ba25d402852ef85f2fd17394418c234895", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/bacf6c07b3dfe028550db6566cd8dbcd18920f41", + "reference": "bacf6c07b3dfe028550db6566cd8dbcd18920f41", "shasum": "" }, "require": { @@ -1335,13 +1335,13 @@ "conflict": { "mediawiki/mediawiki": "<1.23" }, - "time": "2015-06-15 09:45:54", + "require-dev": { + "squizlabs/php_codesniffer": "~2.1" + }, + "time": "2015-06-25 19:28:25", "type": "mediawiki-extension", "installation-source": "dist", "autoload": { - "files": [ - "Wikibase.composer.php" - ], "classmap": [ "client/includes/", "client/WikibaseClient.hooks.php", -- To view, visit https://gerrit.wikimedia.org/r/220942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I527bcdaf38facbc0537cae9f718f85ce9f081f3c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: wmf/1.26wmf9 Gerrit-Owner: Hoo man <h...@online.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits