@@ -67,7 +67,7 @@ |
||
| 67 | 67 | public static function otm($k = null) |
| 68 | 68 | { |
| 69 | 69 | $type = static::model_type(); |
| 70 | - $d = ['t' => $type . 's_models', 'k' => $type . '_id', 'a' => $type . 's_otm']; |
|
| 70 | + $d = ['t' => $type.'s_models', 'k' => $type.'_id', 'a' => $type.'s_otm']; |
|
| 71 | 71 | return is_null($k) ? $d : $d[$k]; |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | $extraction_table = $extraction_class::table(); |
| 14 | 14 | |
| 15 | 15 | foreach ($extraction_table->columns() as $column_name => $column) { |
| 16 | - $probe_name = $extraction_class::tableAlias() . '_' . $column_name; |
|
| 16 | + $probe_name = $extraction_class::tableAlias().'_'.$column_name; |
|
| 17 | 17 | |
| 18 | 18 | if (!is_null($probe_res = $from_model->get($probe_name))) { |
| 19 | 19 | $extract_model->set($column_name, $probe_res); |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | public function import($assoc_data) |
| 42 | 42 | { |
| 43 | 43 | if (!is_array($assoc_data)) { |
| 44 | - throw new \Exception(__FUNCTION__ . '(assoc_data) parm is not an array'); |
|
| 44 | + throw new \Exception(__FUNCTION__.'(assoc_data) parm is not an array'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | // shove it all up in model, god will sort them out |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | if ($table_name === false) { |
| 70 | 70 | $calling_class = $reflect->getShortName(); |
| 71 | - if (defined($const_name = 'TABLE_' . strtoupper($calling_class))) { |
|
| 71 | + if (defined($const_name = 'TABLE_'.strtoupper($calling_class))) { |
|
| 72 | 72 | $table_name = constant($const_name); |
| 73 | 73 | } else { |
| 74 | 74 | $table_name = strtolower($calling_class); |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | public function __toString() |
| 14 | 14 | { |
| 15 | - return static::class_short_name() . ' #' . $this->getId(); |
|
| 15 | + return static::class_short_name().' #'.$this->getId(); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | public function immortal(): bool |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | if (!empty($persistence_errors = $table_row->persist())) { // validate and persist |
| 84 | 84 | $errors = []; |
| 85 | 85 | foreach ($persistence_errors as $column_name => $err) { |
| 86 | - if(is_numeric($column_name)) |
|
| 87 | - $errors[]=$err; |
|
| 86 | + if (is_numeric($column_name)) |
|
| 87 | + $errors[] = $err; |
|
| 88 | 88 | else |
| 89 | 89 | $errors[sprintf('MODEL_%s_FIELD_%s', static::model_type(), $column_name)] = $err; |
| 90 | 90 | } |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | */ |
| 159 | 159 | public static function tableAlias(): string |
| 160 | 160 | { |
| 161 | - if (defined(get_called_class() . '::TABLE_ALIAS')) { |
|
| 161 | + if (defined(get_called_class().'::TABLE_ALIAS')) { |
|
| 162 | 162 | return get_called_class()::TABLE_ALIAS; |
| 163 | 163 | } |
| 164 | 164 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | public static function model_type(): string |
| 169 | 169 | { |
| 170 | - if (defined(get_called_class() . '::MODEL_TYPE')) { |
|
| 170 | + if (defined(get_called_class().'::MODEL_TYPE')) { |
|
| 171 | 171 | return get_called_class()::MODEL_TYPE; |
| 172 | 172 | } |
| 173 | 173 | |
@@ -83,10 +83,11 @@ |
||
| 83 | 83 | if (!empty($persistence_errors = $table_row->persist())) { // validate and persist |
| 84 | 84 | $errors = []; |
| 85 | 85 | foreach ($persistence_errors as $column_name => $err) { |
| 86 | - if(is_numeric($column_name)) |
|
| 87 | - $errors[]=$err; |
|
| 88 | - else |
|
| 89 | - $errors[sprintf('MODEL_%s_FIELD_%s', static::model_type(), $column_name)] = $err; |
|
| 86 | + if(is_numeric($column_name)) { |
|
| 87 | + $errors[]=$err; |
|
| 88 | + } else { |
|
| 89 | + $errors[sprintf('MODEL_%s_FIELD_%s', static::model_type(), $column_name)] = $err; |
|
| 90 | + } |
|
| 90 | 91 | } |
| 91 | 92 | |
| 92 | 93 | return $errors; |