|
@@ -98,7 +98,7 @@ discard block |
|
|
block discarded – undo |
|
98
|
98
|
if ($value instanceof DateTime) { |
|
99
|
99
|
$type = 'DateTime'; |
|
100
|
100
|
} |
|
101
|
|
- $method = [ $this, 'escape' . ucfirst($type) ]; |
|
|
101
|
+ $method = [$this, 'escape' . ucfirst($type)]; |
|
102
|
102
|
|
|
103
|
103
|
if (is_callable($method)) { |
|
104
|
104
|
return call_user_func($method, $value); |
|
@@ -303,7 +303,7 @@ discard block |
|
|
block discarded – undo |
|
303
|
303
|
$var = $entity::getPrimaryKeyVars()[0]; |
|
304
|
304
|
$column = $entity::getColumnName($var); |
|
305
|
305
|
|
|
306
|
|
- $entity->setOriginalData(array_merge($entity->getData(), [ $column => $value ])); |
|
|
306
|
+ $entity->setOriginalData(array_merge($entity->getData(), [$column => $value])); |
|
307
|
307
|
$entity->__set($var, $value); |
|
308
|
308
|
} |
|
309
|
309
|
|
|
@@ -320,8 +320,7 @@ discard block |
|
|
block discarded – undo |
|
320
|
320
|
$primary = array_combine($vars, $cols); |
|
321
|
321
|
|
|
322
|
322
|
$query = "SELECT * FROM " . $this->escapeIdentifier($entity::getTableName()) . " WHERE "; |
|
323
|
|
- $query .= count($cols) > 1 ? $this->buildCompositeWhereInStatement($cols, $entities) : |
|
324
|
|
- $this->escapeIdentifier($cols[0]) . ' IN (' . implode(',', array_map(function (Entity $entity) { |
|
|
323
|
+ $query .= count($cols) > 1 ? $this->buildCompositeWhereInStatement($cols, $entities) : $this->escapeIdentifier($cols[0]) . ' IN (' . implode(',', array_map(function (Entity $entity) { |
|
325
|
324
|
return $this->escapeValue(array_values($entity->getPrimaryKey())[0]); |
|
326
|
325
|
}, $entities)) . ')'; |
|
327
|
326
|
|