Merge remote-tracking branch 'origin' into dev-sql-escape

This commit is contained in:
Dave Mc Nicoll committed 2020-04-09 10:00:48 -04:00
commit def8decb4e
18 files changed
+246 -26

No files matched your search

+7 -1
View File
@@ -29,6 +29,7 @@ abstract class Ulmus
}
$statement->closeCursor();
$queryBuilder->reset();
return [
@@ -70,12 +71,17 @@ abstract class Ulmus
{
return ( static::$objectInstanciator ?? static::$objectInstanciator = new Entity\ObjectInstanciator() )->instanciate($type, $arguments);
}
public static function convertObject(object $obj)
{
return ( static::$objectInstanciator ?? static::$objectInstanciator = new Entity\ObjectInstanciator() )->convert($obj);
}
public static function encodeArray(array $array)
{
return json_encode($array);
}
public static function registerAdapter(ConnectionAdapter $adapter, bool $default = false) : void
{
if ($default) {