X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Fdatabase%2FDatabase.php;h=cf8d06461bef740b6407ec247ae19fa5239fdcf0;hb=8053bc9e0dc56d610305065cd1703dc2dfff3775;hp=e35e0827b0080da8df7909356f995b089b88656b;hpb=f5f625a4da35abcb4f578462efa8e9552eb2045d;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index e35e0827b0..cf8d06461b 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -266,7 +266,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware /** @var int[] Prior flags member variable values */ private $priorFlags = []; - /** @var object|string Class name or object With profileIn/profileOut methods */ + /** @var mixed Class name or object With profileIn/profileOut methods */ protected $profiler; /** @var TransactionProfiler */ protected $trxProfiler; @@ -3496,7 +3496,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware list( $phpCallback ) = $callback; $phpCallback( $this ); } catch ( Exception $ex ) { - $this->errorLogger( $ex ); + ( $this->errorLogger )( $ex ); $e = $e ?: $ex; } } @@ -4018,7 +4018,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware * a wrapper. Nowadays, raw database objects are never exposed to external * callers, so this is unnecessary in external code. * - * @param bool|ResultWrapper|resource|object $result + * @param bool|ResultWrapper|resource $result * @return bool|ResultWrapper */ protected function resultObject( $result ) {