From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 2 Mar 2018 04:30:07 +0000 (-0800)
Subject: rdbms: avoid strange uses of empty()
X-Git-Tag: 1.31.0-rc.0~461^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=55ab84e17da1ffa49558584d0902fca55a8ba167;p=lhc%2Fweb%2Fwiklou.git

rdbms: avoid strange uses of empty()

Change-Id: Id1a8d1aae72cdee48e43ddb3227cd697516411e0
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index d5fc357f64..f1af074f8d 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2119,8 +2119,8 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		}
 
 		// We can't separate explicit JOIN clauses with ',', use ' ' for those
-		$implicitJoins = !empty( $ret ) ? implode( ',', $ret ) : "";
-		$explicitJoins = !empty( $retJOIN ) ? implode( ' ', $retJOIN ) : "";
+		$implicitJoins = $ret ? implode( ',', $ret ) : "";
+		$explicitJoins = $retJOIN ? implode( ' ', $retJOIN ) : "";
 
 		// Compile our final table clause
 		return implode( ' ', [ $implicitJoins, $explicitJoins ] );
diff --git a/includes/libs/rdbms/database/DatabaseMssql.php b/includes/libs/rdbms/database/DatabaseMssql.php
index b1c8909c30..771e2e5a21 100644
--- a/includes/libs/rdbms/database/DatabaseMssql.php
+++ b/includes/libs/rdbms/database/DatabaseMssql.php
@@ -569,7 +569,7 @@ class DatabaseMssql extends Database {
 			}
 		}
 
-		return empty( $result ) ? false : $result;
+		return $result ?: false;
 	}
 
 	/**
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 1e845e8d86..cfbe077ac1 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -668,7 +668,7 @@ abstract class DatabaseMysqlBase extends Database {
 			}
 		}
 
-		return empty( $result ) ? false : $result;
+		return $result ?: false;
 	}
 
 	/**
diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php
index 7d346410e5..38cc4aec60 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -394,7 +394,7 @@ class DatabasePostgres extends Database {
 			// Forced result for simulated queries
 			return $this->lastAffectedRowCount;
 		}
-		if ( empty( $this->lastResultHandle ) ) {
+		if ( !$this->lastResultHandle ) {
 			return 0;
 		}