aboutsummaryrefslogtreecommitdiffstats
path: root/includes/db
diff options
context:
space:
mode:
authorAaron Schulz <aschulz@wikimedia.org>2017-02-11 18:12:42 -0800
committerAaron Schulz <aschulz@wikimedia.org>2017-02-11 18:12:42 -0800
commit58ecdd060cc7208b42310d29bc05195ee3851c23 (patch)
tree6248e896a4d1e59a99a02b98f308d31f8d53910c /includes/db
parentfd5747ea16fe50feefad3973bf3a78b9bfe749cc (diff)
downloadmediawikicore-58ecdd060cc7208b42310d29bc05195ee3851c23.tar.gz
mediawikicore-58ecdd060cc7208b42310d29bc05195ee3851c23.zip
Fix assortment of IDEA warnings
Change-Id: I3fb482232483f37bf73ebbeb405056794109e618
Diffstat (limited to 'includes/db')
-rw-r--r--includes/db/DatabaseOracle.php20
1 files changed, 7 insertions, 13 deletions
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index d8ed7a949c91..5dcb756929f9 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1085,24 +1085,18 @@ class DatabaseOracle extends Database {
}
}
- /**
- * defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}';
- *
- * @param resource $fp
- * @param bool|string $lineCallback
- * @param bool|callable $resultCallback
- * @param string $fname
- * @param bool|callable $inputCallback
- * @return bool|string
- */
- function sourceStream( $fp, $lineCallback = false, $resultCallback = false,
- $fname = __METHOD__, $inputCallback = false ) {
+ function sourceStream(
+ $fp,
+ callable $lineCallback = null,
+ callable $resultCallback = null,
+ $fname = __METHOD__, callable $inputCallback = null
+ ) {
$cmd = '';
$done = false;
$dollarquote = false;
$replacements = [];
-
+ // Defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}';
while ( !feof( $fp ) ) {
if ( $lineCallback ) {
call_user_func( $lineCallback );