dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f80e50f
)
Avoid PHP 7.2 warnings in DBConRefTest about count() on non-Countable
author
Aaron Schulz
<aschulz@wikimedia.org>
Sat, 26 May 2018 00:29:17 +0000
(17:29 -0700)
committer
Legoktm
<legoktm@member.fsf.org>
Tue, 16 Oct 2018 00:39:29 +0000
(
00:39
+0000)
Change-Id: Ida81bf998b462f2f6bb2b708df1f15bbc1933db1
(cherry picked from commit
b172aff090b7c59c2f602931d469cf3ac5e9e74a
)
includes/libs/rdbms/database/DBConnRef.php
patch
|
blob
|
history
diff --git
a/includes/libs/rdbms/database/DBConnRef.php
b/includes/libs/rdbms/database/DBConnRef.php
index
c94f62f
..
decd9bf
100644
(file)
--- a/
includes/libs/rdbms/database/DBConnRef.php
+++ b/
includes/libs/rdbms/database/DBConnRef.php
@@
-33,7
+33,7
@@
class DBConnRef implements IDatabase {
$this->lb = $lb;
if ( $conn instanceof Database ) {
$this->conn = $conn; // live handle
- } elseif ( count( $conn ) >= 4 && $conn[self::FLD_DOMAIN] !== false ) {
+ } elseif (
is_array( $conn ) &&
count( $conn ) >= 4 && $conn[self::FLD_DOMAIN] !== false ) {
$this->params = $conn;
} else {
throw new InvalidArgumentException( "Missing lazy connection arguments." );