Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/344052 )
Change subject: Fix space indenting to tabs in flow.sql
......................................................................
Fix space indenting to tabs in flow.sql
2 x else if to elseif in PHP
Fix return types in DbFactory to match MW Core changes
Change-Id: I1a413df3666e6d1a5bbb35e62cd88217b7a22287
---
M flow.sql
M includes/DbFactory.php
M includes/Model/UUID.php
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/52/344052/1
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/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/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: newchange
Gerrit-Change-Id: I1a413df3666e6d1a5bbb35e62cd88217b7a22287
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
