From b172aff090b7c59c2f602931d469cf3ac5e9e74a Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 25 May 2018 17:29:17 -0700 Subject: [PATCH] Avoid PHP 7.2 warnings in DBConRefTest about count() on non-Countable Change-Id: Ida81bf998b462f2f6bb2b708df1f15bbc1933db1 --- includes/libs/rdbms/database/DBConnRef.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php index 9de16c4a46..7fed3e1cab 100644 --- 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." ); -- 2.20.1