[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make DeferredUpdates::execute() protected

2016-09-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Make DeferredUpdates::execute() protected
..


Make DeferredUpdates::execute() protected

Update the only caller, which is a deprecated wrapper method.
Locking down this internal method makes it secure against
misuse with regards to recursion checks.

Change-Id: I3ed52dbe4c0ad52c7b5de92e81bfdc98a1737bcf
---
M includes/deferred/DataUpdate.php
M includes/deferred/DeferredUpdates.php
2 files changed, 7 insertions(+), 4 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  Addshore: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/deferred/DataUpdate.php b/includes/deferred/DataUpdate.php
index 8d26460..d2d8bd7 100644
--- a/includes/deferred/DataUpdate.php
+++ b/includes/deferred/DataUpdate.php
@@ -45,11 +45,12 @@
 * Convenience method, calls doUpdate() on every DataUpdate in the 
array.
 *
 * @param DataUpdate[] $updates A list of DataUpdate instances
-* @param string $mode Use "enqueue" to use the job queue when possible 
[Default: run]
 * @throws Exception
 * @deprecated Since 1.28 Use DeferredUpdates::execute()
 */
-   public static function runUpdates( array $updates, $mode = 'run' ) {
-   DeferredUpdates::execute( $updates, $mode, DeferredUpdates::ALL 
);
+   public static function runUpdates( array $updates ) {
+   foreach ( $updates as $update ) {
+   $update->doUpdate();
+   }
}
 }
diff --git a/includes/deferred/DeferredUpdates.php 
b/includes/deferred/DeferredUpdates.php
index 2b2b2b7..6921b66 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -146,13 +146,15 @@
}
 
/**
+* Immediately run/queue a list of updates
+*
 * @param DeferrableUpdate[] &$queue List of DeferrableUpdate objects
 * @param string $mode Use "enqueue" to use the job queue when possible
 * @param integer $stage Class constant (PRESEND, POSTSEND) (since 1.28)
 * @throws ErrorPageError Happens on top-level calls
 * @throws Exception Happens on second-level calls
 */
-   public static function execute( array &$queue, $mode, $stage ) {
+   protected static function execute( array &$queue, $mode, $stage ) {
$services = MediaWikiServices::getInstance();
$stats = $services->getStatsdDataFactory();
$lbFactory = $services->getDBLoadBalancerFactory();

-- 
To view, visit https://gerrit.wikimedia.org/r/309831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ed52dbe4c0ad52c7b5de92e81bfdc98a1737bcf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make DeferredUpdates::execute() protected

2016-09-11 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/309831

Change subject: Make DeferredUpdates::execute() protected
..

Make DeferredUpdates::execute() protected

Update the only caller, which is a deprecated wrapper method.
Locking down this internal method makes it secure against
misuse with regards to recursion checks.

Change-Id: I3ed52dbe4c0ad52c7b5de92e81bfdc98a1737bcf
---
M includes/deferred/DataUpdate.php
M includes/deferred/DeferredUpdates.php
2 files changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/309831/1

diff --git a/includes/deferred/DataUpdate.php b/includes/deferred/DataUpdate.php
index 8d26460..d2d8bd7 100644
--- a/includes/deferred/DataUpdate.php
+++ b/includes/deferred/DataUpdate.php
@@ -45,11 +45,12 @@
 * Convenience method, calls doUpdate() on every DataUpdate in the 
array.
 *
 * @param DataUpdate[] $updates A list of DataUpdate instances
-* @param string $mode Use "enqueue" to use the job queue when possible 
[Default: run]
 * @throws Exception
 * @deprecated Since 1.28 Use DeferredUpdates::execute()
 */
-   public static function runUpdates( array $updates, $mode = 'run' ) {
-   DeferredUpdates::execute( $updates, $mode, DeferredUpdates::ALL 
);
+   public static function runUpdates( array $updates ) {
+   foreach ( $updates as $update ) {
+   $update->doUpdate();
+   }
}
 }
diff --git a/includes/deferred/DeferredUpdates.php 
b/includes/deferred/DeferredUpdates.php
index 2b2b2b7..8537c37 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -146,13 +146,15 @@
}
 
/**
+* Immediately run a queue of updates
+*
 * @param DeferrableUpdate[] &$queue List of DeferrableUpdate objects
 * @param string $mode Use "enqueue" to use the job queue when possible
 * @param integer $stage Class constant (PRESEND, POSTSEND) (since 1.28)
 * @throws ErrorPageError Happens on top-level calls
 * @throws Exception Happens on second-level calls
 */
-   public static function execute( array &$queue, $mode, $stage ) {
+   protected static function execute( array &$queue, $mode, $stage ) {
$services = MediaWikiServices::getInstance();
$stats = $services->getStatsdDataFactory();
$lbFactory = $services->getDBLoadBalancerFactory();

-- 
To view, visit https://gerrit.wikimedia.org/r/309831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ed52dbe4c0ad52c7b5de92e81bfdc98a1737bcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits