@@ -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); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | public function import($assoc_data): self |
| 45 | 45 | { |
| 46 | 46 | if (!is_array($assoc_data)) { |
| 47 | - throw new \Exception(__FUNCTION__ . '(assoc_data) parm is not an array'); |
|
| 47 | + throw new \Exception(__FUNCTION__.'(assoc_data) parm is not an array'); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | // shove it all up in model, god will sort them out |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | if ($table_name === false) { |
| 72 | 72 | $shortName = $reflectionClass->getShortName(); |
| 73 | - $table_name = defined($const_name = 'TABLE_' . strtoupper($shortName)) ? constant($const_name) : strtolower($shortName); |
|
| 73 | + $table_name = defined($const_name = 'TABLE_'.strtoupper($shortName)) ? constant($const_name) : strtolower($shortName); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | return $table_name; |
@@ -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 |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | */ |
| 151 | 151 | public static function tableAlias(): string |
| 152 | 152 | { |
| 153 | - if (defined(get_called_class() . '::TABLE_ALIAS')) { |
|
| 153 | + if (defined(get_called_class().'::TABLE_ALIAS')) { |
|
| 154 | 154 | return get_called_class()::TABLE_ALIAS; |
| 155 | 155 | } |
| 156 | 156 | |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | |
| 160 | 160 | public static function model_type(): string |
| 161 | 161 | { |
| 162 | - if (defined(get_called_class() . '::MODEL_TYPE')) { |
|
| 162 | + if (defined(get_called_class().'::MODEL_TYPE')) { |
|
| 163 | 163 | return get_called_class()::MODEL_TYPE; |
| 164 | 164 | } |
| 165 | 165 | |