X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fdb%2FDatabaseOracle.php;h=4aab8111c2c22af3bc9c43066ecb1eb653277d80;hb=019fa7cb9c3aca1c80ec7e76e725dbc40a34f562;hp=d8ed7a949c91138d9ed912ee7c709d8b0757fa2f;hpb=bfb3679d151e0b470cc6c4e50090b5798f1151d3;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index d8ed7a949c..4aab8111c2 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -20,6 +20,7 @@ * @file * @ingroup Database */ +use Wikimedia\Rdbms\Blob; /** * The oci8 extension is fairly weak and doesn't support oci_num_rows, among @@ -1085,24 +1086,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 );