Merge branch 'master' of https://github.com/mcNdave/ulmus
This commit is contained in:
commit
f98cb2ded0
|
@ -39,7 +39,7 @@ class EntityResolver {
|
|||
public function field($name, $fieldKey = self::KEY_ENTITY_NAME, $throwException = true) : ? array
|
||||
{
|
||||
try{
|
||||
return $this->fieldList($fieldKey)[$name];
|
||||
return $this->fieldList($fieldKey)[$name] ?? null;
|
||||
}
|
||||
catch(\Throwable $e) {
|
||||
if ( $throwException) {
|
||||
|
|
|
@ -46,12 +46,13 @@ class PdoObject extends PDO {
|
|||
}
|
||||
|
||||
return $statement;
|
||||
}
|
||||
}
|
||||
else {
|
||||
throw new \PDOException($statement->errorCode() . " - " . json_encode($statement->errorInfo()));
|
||||
}
|
||||
} catch (\PDOException $e) {
|
||||
$this->rollback();
|
||||
|
||||
throw $e;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue