From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 3 Oct 2016 17:48:58 +0000 (-0700)
Subject: Fix Database IDEA warnings about callable parameters
X-Git-Tag: 1.31.0-rc.0~5238^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=c71fde92ad0a9edce65a41b5482d7e4e54eb127f;p=lhc%2Fweb%2Fwiklou.git

Fix Database IDEA warnings about callable parameters

Change-Id: Ia9ccc86bb9cbd78b5890ceaedce8cca8d6bb7fe4
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 4f1f38ec6a..16d30d7b5e 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -3037,10 +3037,10 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
 	public function sourceFile(
 		$filename,
-		$lineCallback = false,
-		$resultCallback = false,
+		callable $lineCallback = null,
+		callable $resultCallback = null,
 		$fname = false,
-		$inputCallback = false
+		callable $inputCallback = null
 	) {
 		MediaWiki\suppressWarnings();
 		$fp = fopen( $filename, 'r' );
@@ -3073,10 +3073,10 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
 	public function sourceStream(
 		$fp,
-		$lineCallback = false,
-		$resultCallback = false,
+		callable $lineCallback = null,
+		callable $resultCallback = null,
 		$fname = __METHOD__,
-		$inputCallback = false
+		callable $inputCallback = null
 	) {
 		$cmd = '';
 
diff --git a/includes/libs/rdbms/database/IMaintainableDatabase.php b/includes/libs/rdbms/database/IMaintainableDatabase.php
index f65e0dd31f..83953596f1 100644
--- a/includes/libs/rdbms/database/IMaintainableDatabase.php
+++ b/includes/libs/rdbms/database/IMaintainableDatabase.php
@@ -96,21 +96,21 @@ interface IMaintainableDatabase extends IDatabase {
 	 * on object's error ignore settings).
 	 *
 	 * @param string $filename File name to open
-	 * @param bool|callable $lineCallback Optional function called before reading each line
-	 * @param bool|callable $resultCallback Optional function called for each MySQL result
+	 * @param callable|null $lineCallback Optional function called before reading each line
+	 * @param callable|null $resultCallback Optional function called for each MySQL result
 	 * @param bool|string $fname Calling function name or false if name should be
 	 *   generated dynamically using $filename
-	 * @param bool|callable $inputCallback Optional function called for each
+	 * @param callable|null $inputCallback Optional function called for each
 	 *   complete line sent
 	 * @return bool|string
 	 * @throws Exception
 	 */
 	public function sourceFile(
 		$filename,
-		$lineCallback = false,
-		$resultCallback = false,
+		callable $lineCallback = null,
+		callable $resultCallback = null,
 		$fname = false,
-		$inputCallback = false
+		callable $inputCallback = null
 	);
 
 	/**
@@ -120,18 +120,18 @@ interface IMaintainableDatabase extends IDatabase {
 	 * on object's error ignore settings).
 	 *
 	 * @param resource $fp File handle
-	 * @param bool|callable $lineCallback Optional function called before reading each query
-	 * @param bool|callable $resultCallback Optional function called for each MySQL result
+	 * @param callable|null $lineCallback Optional function called before reading each query
+	 * @param callable|null $resultCallback Optional function called for each MySQL result
 	 * @param string $fname Calling function name
-	 * @param bool|callable $inputCallback Optional function called for each complete query sent
+	 * @param callable|null $inputCallback Optional function called for each complete query sent
 	 * @return bool|string
 	 */
 	public function sourceStream(
 		$fp,
-		$lineCallback = false,
-		$resultCallback = false,
+		callable $lineCallback = null,
+		callable $resultCallback = null,
 		$fname = __METHOD__,
-		$inputCallback = false
+		callable $inputCallback = null
 	);
 
 	/**
diff --git a/maintenance/sql.php b/maintenance/sql.php
index a9a982ce50..cc976ed97f 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -91,7 +91,7 @@ class MwSql extends Maintenance {
 				$this->error( "Unable to open input file", true );
 			}
 
-			$error = $db->sourceStream( $file, false, [ $this, 'sqlPrintResult' ] );
+			$error = $db->sourceStream( $file, null, [ $this, 'sqlPrintResult' ] );
 			if ( $error !== true ) {
 				$this->error( $error, true );
 			} else {