jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344052 )
Change subject: Fix space indenting to tabs in flow.sql
......................................................................
Fix space indenting to tabs in flow.sql
else if to elseif in PHP
Fix return types in DbFactory to match MW Core changes
Change-Id: I1a413df3666e6d1a5bbb35e62cd88217b7a22287
---
M flow.sql
M includes/Data/ObjectLocator.php
M includes/DbFactory.php
M includes/Dump/Importer.php
M includes/Model/UUID.php
5 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
Mattflaschen: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/flow.sql b/flow.sql
index ccb7d32..cdabadf 100644
--- a/flow.sql
+++ b/flow.sql
@@ -7,7 +7,7 @@
workflow_namespace int not null,
workflow_page_id int unsigned not null,
workflow_title_text varchar(255) binary not null,
- workflow_name varchar(255) binary not null,
+ workflow_name varchar(255) binary not null,
workflow_last_update_timestamp binary(14) not null,
-- TODO: is this useful as a bitfield? may be premature optimization,
a string
-- or list of strings may be simpler and use only a little more space.
diff --git a/includes/Data/ObjectLocator.php b/includes/Data/ObjectLocator.php
index f44cbc2..6c61c18 100644
--- a/includes/Data/ObjectLocator.php
+++ b/includes/Data/ObjectLocator.php
@@ -281,7 +281,7 @@
$current = $index;
// Find the smallest matching index
- } else if ( isset( $options['limit'] ) ) {
+ } elseif ( isset( $options['limit'] ) ) {
$current = $index->getLimit() <
$current->getLimit() ? $index : $current;
// if no limit specified, find biggest matching index
diff --git a/includes/DbFactory.php b/includes/DbFactory.php
index 4f97c56..4ecebab 100644
--- a/includes/DbFactory.php
+++ b/includes/DbFactory.php
@@ -47,7 +47,7 @@
* Gets a database connection for the Flow-specific database.
*
* @param integer $db index of the connection to get.
DB_MASTER|DB_SLAVE.
- * @return \DatabaseBase
+ * @return \Database
*/
public function getDB( $db ) {
return $this->getLB()->getConnection( $this->forceMaster ?
DB_MASTER : $db, array(), $this->wiki );
@@ -56,7 +56,7 @@
/**
* Gets a load balancer for the Flow-specific database.
*
- * @return \LoadBalancer
+ * @return \Wikimedia\Rdbms\LoadBalancer
*/
public function getLB() {
if ( $this->cluster !== false ) {
diff --git a/includes/Dump/Importer.php b/includes/Dump/Importer.php
index 0c8607c..31d219a 100644
--- a/includes/Dump/Importer.php
+++ b/includes/Dump/Importer.php
@@ -296,7 +296,7 @@
}
$attribs[ $userField . 'id' ] =
$localUser->getId();
$attribs[ $userField . 'wiki' ] =
wfWikiID();
- } else if ( isset( $attribs[ $userField . 'ip'
] ) ) {
+ } elseif ( isset( $attribs[ $userField . 'ip' ]
) ) {
// make anons local users
$attribs[ $userField . 'wiki' ] =
wfWikiID();
}
diff --git a/includes/Model/UUID.php b/includes/Model/UUID.php
index 4298fa2..f33759e 100644
--- a/includes/Model/UUID.php
+++ b/includes/Model/UUID.php
@@ -187,7 +187,7 @@
return new static( $value, $type );
}
}
- } else if ( is_object( $input ) ) {
+ } elseif ( is_object( $input ) ) {
if ( $input instanceof UUID ) {
return $input;
} elseif ( $input instanceof Blob ) {
--
To view, visit https://gerrit.wikimedia.org/r/344052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a413df3666e6d1a5bbb35e62cd88217b7a22287
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
