jenkins-bot has submitted this change and it was merged. Change subject: New deployment build, fix change dispatcher ......................................................................
New deployment build, fix change dispatcher Change-Id: Iea8bbabaa888f3ade51b03e6d2156612d9ae530e --- M composer.lock M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/includes/UpdateRepo.php M extensions/Wikibase/lib/maintenance/dispatchChanges.php M vendor/autoload.php M vendor/composer/autoload_real.php M vendor/composer/installed.json 7 files changed, 37 insertions(+), 20 deletions(-) Approvals: Hoo man: Looks good to me, approved WikidataJenkins: Verified jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index 19d0aa6..e4aef5b 100644 --- a/composer.lock +++ b/composer.lock @@ -869,12 +869,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "d9cc64a2dfdcf0762c811d4806cfe5f22b444366" + "reference": "78b613745ff09ed23f86479d3c32e0f4c0758dcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d9cc64a2dfdcf0762c811d4806cfe5f22b444366", - "reference": "d9cc64a2dfdcf0762c811d4806cfe5f22b444366", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/78b613745ff09ed23f86479d3c32e0f4c0758dcc", + "reference": "78b613745ff09ed23f86479d3c32e0f4c0758dcc", "shasum": "" }, "require": { @@ -934,7 +934,7 @@ "wikibaserepo", "wikidata" ], - "time": "2014-05-01 13:45:53" + "time": "2014-05-09 08:41:58" } ], "packages-dev": [ diff --git a/extensions/Wikibase/client/WikibaseClient.hooks.php b/extensions/Wikibase/client/WikibaseClient.hooks.php index 38912f4..c7b319b 100644 --- a/extensions/Wikibase/client/WikibaseClient.hooks.php +++ b/extensions/Wikibase/client/WikibaseClient.hooks.php @@ -10,6 +10,7 @@ use JobQueueGroup; use Message; use MovePageForm; +use MWException; use OutputPage; use Parser; use ParserOutput; @@ -30,7 +31,6 @@ use User; use Wikibase\Client\Hooks\BaseTemplateAfterPortletHandler; use Wikibase\Client\Hooks\BeforePageDisplayHandler; -use Wikibase\Client\Hooks\BeforePageDisplayJsConfigHandler; use Wikibase\Client\Hooks\InfoActionHookHandler; use Wikibase\Client\Hooks\SpecialWatchlistQueryHandler; use Wikibase\Client\MovePageNotice; @@ -826,11 +826,14 @@ // To be able to find out about this in the SpecialMovepageAfterMove hook $newTitle->wikibasePushedMoveToRepo = true; - } catch( RuntimeException $e ) { + } catch( MWException $e ) { // This is not a reason to let an exception bubble up, we just // show a message to the user that the Wikibase item needs to be // manually updated. wfLogWarning( $e->getMessage() ); + } catch( RuntimeException $e ) { + // B/C for MediaWiki 1.23 + wfLogWarning( $e->getMessage() ); } wfProfileOut( __METHOD__ ); diff --git a/extensions/Wikibase/client/includes/UpdateRepo.php b/extensions/Wikibase/client/includes/UpdateRepo.php index ef87113..2d07d86 100644 --- a/extensions/Wikibase/client/includes/UpdateRepo.php +++ b/extensions/Wikibase/client/includes/UpdateRepo.php @@ -135,10 +135,17 @@ $job = $this->createJob(); wfProfileIn( __METHOD__ . '#push' ); - $ok = $jobQueueGroup->push( $job ); + $result = $jobQueueGroup->push( $job ); wfProfileOut( __METHOD__ . '#push' ); - if ( !$ok ) { + // MediaWiki 1.24+ throws exceptions on error instead of returning false, + // but JobQueueGroup::push returns a useless true value. + // + // We do explicit check for false, for backwards compatibility with MediaWiki 1.23 + // and to make robust in case the useless true return value is removed in core. + // + // @todo The check can be removed when we do not support 1.23 anymore. + if ( $result === false ) { wfProfileOut( __METHOD__ ); throw new RuntimeException( "Failed to push job to job queue" ); } diff --git a/extensions/Wikibase/lib/maintenance/dispatchChanges.php b/extensions/Wikibase/lib/maintenance/dispatchChanges.php index bce8860..b660a13 100644 --- a/extensions/Wikibase/lib/maintenance/dispatchChanges.php +++ b/extensions/Wikibase/lib/maintenance/dispatchChanges.php @@ -958,10 +958,17 @@ wfProfileOut( __METHOD__ . '#job' ); wfProfileIn( __METHOD__ . '#push' ); - $ok = $qgroup->push( $job ); + $result = $qgroup->push( $job ); wfProfileOut( __METHOD__ . '#push' ); - if ( !$ok ) { + // MediaWiki 1.24+ throws exceptions on error instead of returning false, + // but JobQueueGroup::push returns a useless true value. + // + // We do explicit check for false, for backwards compatibility with MediaWiki 1.23 + // and to make robust in case the useless true return value is removed in core. + // + // @todo The check can be removed when we do not support 1.23 anymore. + if ( $result === false ) { wfProfileOut( __METHOD__ ); throw new \MWException( "Failed to push to job queue for $wikiDB" ); } diff --git a/vendor/autoload.php b/vendor/autoload.php index 13580fa..8a3fe70 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit72107e0b9f3029498ae073fbeed4bb24::getLoader(); +return ComposerAutoloaderInit516cc16712bfc0370c5f72e02825c3a1::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 8ce1b76..d0822ce 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit72107e0b9f3029498ae073fbeed4bb24 +class ComposerAutoloaderInit516cc16712bfc0370c5f72e02825c3a1 { private static $loader; @@ -19,9 +19,9 @@ return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit72107e0b9f3029498ae073fbeed4bb24', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit516cc16712bfc0370c5f72e02825c3a1', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit72107e0b9f3029498ae073fbeed4bb24', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit516cc16712bfc0370c5f72e02825c3a1', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); @@ -45,14 +45,14 @@ $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequire72107e0b9f3029498ae073fbeed4bb24($file); + composerRequire516cc16712bfc0370c5f72e02825c3a1($file); } return $loader; } } -function composerRequire72107e0b9f3029498ae073fbeed4bb24($file) +function composerRequire516cc16712bfc0370c5f72e02825c3a1($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 16fa3c2..dcfeec9 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -896,12 +896,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "d9cc64a2dfdcf0762c811d4806cfe5f22b444366" + "reference": "78b613745ff09ed23f86479d3c32e0f4c0758dcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d9cc64a2dfdcf0762c811d4806cfe5f22b444366", - "reference": "d9cc64a2dfdcf0762c811d4806cfe5f22b444366", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/78b613745ff09ed23f86479d3c32e0f4c0758dcc", + "reference": "78b613745ff09ed23f86479d3c32e0f4c0758dcc", "shasum": "" }, "require": { @@ -921,7 +921,7 @@ "wikibase/data-model": "~0.7.3", "wikibase/easyrdf_lite": "~0.8.1" }, - "time": "2014-05-01 13:45:53", + "time": "2014-05-09 08:41:58", "type": "mediawiki-extension", "installation-source": "dist", "autoload": { -- To view, visit https://gerrit.wikimedia.org/r/132357 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea8bbabaa888f3ade51b03e6d2156612d9ae530e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: mw1.24-wmf2 Gerrit-Owner: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits