mcndave
/
ulmus
1
0
Fork 0
Code Issues 16 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' of https://github.com/mcNdave/ulmus

This commit is contained in:
Dave Mc Nicoll 2020-03-28 22:16:45 -04:00
parent 938639a590 6e84fc7195
commit f98cb2ded0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/EntityResolver.php
View File

@ -39,7 +39,7 @@ class EntityResolver {
public function field($name, $fieldKey = self::KEY_ENTITY_NAME, $throwException = true) : ? array public function field($name, $fieldKey = self::KEY_ENTITY_NAME, $throwException = true) : ? array
{ {
try{ try{
return $this->fieldList($fieldKey)[$name]; return $this->fieldList($fieldKey)[$name] ?? null;
} }
catch(\Throwable $e) { catch(\Throwable $e) {
if ( $throwException) { if ( $throwException) {

3
src/Common/PdoObject.php
View File

@ -46,12 +46,13 @@ class PdoObject extends PDO {
} }
return $statement; return $statement;
} }
else { else {
throw new \PDOException($statement->errorCode() . " - " . json_encode($statement->errorInfo())); throw new \PDOException($statement->errorCode() . " - " . json_encode($statement->errorInfo()));
} }
} catch (\PDOException $e) { } catch (\PDOException $e) {
$this->rollback(); $this->rollback();
throw $e; throw $e;
} }