Merge "db: Use variable functions/callbacks instead of call_user_func()"

diff --combined includes/db/DatabaseOracle.php
index bc3873d,cfc9e29..5effb32
--- 1/includes/db/DatabaseOracle.php
--- 2/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@@ -700,6 -700,14 +700,6 @@@ class DatabaseOracle extends Database 
                return new Blob( $b );
        }
  
 -      function decodeBlob( $b ) {
 -              if ( $b instanceof Blob ) {
 -                      $b = $b->fetch();
 -              }
 -
 -              return $b;
 -      }
 -
        function unionQueries( $sqls, $all ) {
                $glue = ' UNION ALL ';
  
@@@ -961,7 -969,7 +961,7 @@@
                // Defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}';
                while ( !feof( $fp ) ) {
                        if ( $lineCallback ) {
-                               call_user_func( $lineCallback );
+                               $lineCallback();
                        }
                        $line = trim( fgets( $fp, 1024 ) );
                        $sl = strlen( $line ) - 1;
@@@ -1007,7 -1015,7 +1007,7 @@@
  
                                        $cmd = $this->replaceVars( $cmd );
                                        if ( $inputCallback ) {
-                                               call_user_func( $inputCallback, $cmd );
+                                               $inputCallback( $cmd );
                                        }
                                        $res = $this->doQuery( $cmd );
                                        if ( $resultCallback ) {
@@@ -1342,6 -1350,10 +1342,6 @@@
                return 'BITOR(' . $fieldLeft . ', ' . $fieldRight . ')';
        }
  
 -      function getServer() {
 -              return $this->server;
 -      }
 -
        public function buildGroupConcatField(
                $delim, $table, $field, $conds = '', $join_conds = []
        ) {