Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/308927
Change subject: Remove return-by-reference PHP4-ism from getExternalLB() ...................................................................... Remove return-by-reference PHP4-ism from getExternalLB() Change-Id: Id6184a4a543196c4253dc9d930ac8ac0a9a5b0b0 --- M includes/db/loadbalancer/LBFactory.php M includes/db/loadbalancer/LBFactoryFake.php M includes/db/loadbalancer/LBFactoryMulti.php M includes/db/loadbalancer/LBFactorySimple.php M includes/db/loadbalancer/LBFactorySingle.php 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/27/308927/1 diff --git a/includes/db/loadbalancer/LBFactory.php b/includes/db/loadbalancer/LBFactory.php index 2d91bb7..a3e5cb6 100644 --- a/includes/db/loadbalancer/LBFactory.php +++ b/includes/db/loadbalancer/LBFactory.php @@ -185,7 +185,7 @@ * @param bool|string $wiki Wiki ID, or false for the current wiki * @return LoadBalancer */ - abstract public function &getExternalLB( $cluster, $wiki = false ); + abstract public function getExternalLB( $cluster, $wiki = false ); /** * Execute a function for each tracked load balancer diff --git a/includes/db/loadbalancer/LBFactoryFake.php b/includes/db/loadbalancer/LBFactoryFake.php index 33ee250..5cd1d4b 100644 --- a/includes/db/loadbalancer/LBFactoryFake.php +++ b/includes/db/loadbalancer/LBFactoryFake.php @@ -40,7 +40,7 @@ throw new DBAccessError; } - public function &getExternalLB( $cluster, $wiki = false ) { + public function getExternalLB( $cluster, $wiki = false ) { throw new DBAccessError; } diff --git a/includes/db/loadbalancer/LBFactoryMulti.php b/includes/db/loadbalancer/LBFactoryMulti.php index 17e01b9..e56631d 100644 --- a/includes/db/loadbalancer/LBFactoryMulti.php +++ b/includes/db/loadbalancer/LBFactoryMulti.php @@ -293,7 +293,7 @@ * @param bool|string $wiki Wiki ID, or false for the current wiki * @return LoadBalancer */ - public function &getExternalLB( $cluster, $wiki = false ) { + public function getExternalLB( $cluster, $wiki = false ) { if ( !isset( $this->extLBs[$cluster] ) ) { $this->extLBs[$cluster] = $this->newExternalLB( $cluster, $wiki ); $this->extLBs[$cluster]->parentInfo( [ 'id' => "ext-$cluster" ] ); diff --git a/includes/db/loadbalancer/LBFactorySimple.php b/includes/db/loadbalancer/LBFactorySimple.php index 262b0d9..4632b0a 100644 --- a/includes/db/loadbalancer/LBFactorySimple.php +++ b/includes/db/loadbalancer/LBFactorySimple.php @@ -122,7 +122,7 @@ * @param bool|string $wiki * @return array */ - public function &getExternalLB( $cluster, $wiki = false ) { + public function getExternalLB( $cluster, $wiki = false ) { if ( !isset( $this->extLBs[$cluster] ) ) { $this->extLBs[$cluster] = $this->newExternalLB( $cluster, $wiki ); $this->extLBs[$cluster]->parentInfo( [ 'id' => "ext-$cluster" ] ); diff --git a/includes/db/loadbalancer/LBFactorySingle.php b/includes/db/loadbalancer/LBFactorySingle.php index 14c1c28..14cec0e 100644 --- a/includes/db/loadbalancer/LBFactorySingle.php +++ b/includes/db/loadbalancer/LBFactorySingle.php @@ -73,7 +73,7 @@ * @param bool|string $wiki Wiki ID, or false for the current wiki * @return LoadBalancerSingle */ - public function &getExternalLB( $cluster, $wiki = false ) { + public function getExternalLB( $cluster, $wiki = false ) { return $this->lb; } -- To view, visit https://gerrit.wikimedia.org/r/308927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6184a4a543196c4253dc9d930ac8ac0a9a5b0b0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits