tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-27 07:44:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

DbObject: allow arrays in fromDbRow, handle errors

Browse Source
This commit is contained in:
Thomas Gelf 2021-10-05 23:27:07 +02:00
parent 6a68a2c3d8
commit 2994403aa8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/Director/Data/Db/DbObject.php
View File

@ -3,6 +3,7 @@
namespace Icinga\Module\Director\Data\Db; namespace Icinga\Module\Director\Data\Db;
use Icinga\Exception\NotFoundError; use Icinga\Exception\NotFoundError;
use Icinga\Module\Director\Data\InvalidDataException;
use Icinga\Module\Director\Db; use Icinga\Module\Director\Db;
use Icinga\Module\Director\Exception\DuplicateKeyException; use Icinga\Module\Director\Exception\DuplicateKeyException;
use InvalidArgumentException; use InvalidArgumentException;
@ -696,15 +697,22 @@ abstract class DbObject
} }
/** /**
* @param object $row * @param object|array $row
* @param Db $db * @param Db $db
* @return self * @return self
*/ */
public static function fromDbRow($row, Db $db) public static function fromDbRow($row, Db $db)
{ {
return (new static()) $self = (new static())->setConnection($db);
->setConnection($db) if (is_object($row)) {
->setDbProperties($row); return $self->setDbProperties((array) $row);
}
if (is_array($row)) {
return $self->setDbProperties($row);
}
throw new InvalidDataException('array or object', $row);
} }
protected function setDbProperties($properties) protected function setDbProperties($properties)