@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | if (count($pks) === 1) { |
81 | 81 | $pks = array_keys($pks); |
82 | 82 | return [ |
83 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD |
|
83 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD |
|
84 | 84 | ]; |
85 | 85 | } |
86 | 86 | if (count($pks) > 1) { |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | $principal = ''; |
89 | 89 | $sep = 'CONCAT('; |
90 | 90 | foreach ($pks as $pk) { |
91 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); |
|
92 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); |
|
93 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; |
|
91 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); |
|
92 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); |
|
93 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; |
|
94 | 94 | } |
95 | 95 | $principal .= ')'; |
96 | 96 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | $pks = ''; |
118 | 118 | $sep = ''; |
119 | 119 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
120 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
120 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
121 | 121 | $sep = ', "|", '; |
122 | 122 | } |
123 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; |
|
123 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | if (null !== $column) { |
144 | 144 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; |
145 | - } else { |
|
145 | + }else { |
|
146 | 146 | $this->addClassListName($tableMap); |
147 | 147 | } |
148 | 148 | } |
@@ -161,15 +161,15 @@ discard block |
||
161 | 161 | $this->addPkToList(); |
162 | 162 | } |
163 | 163 | if (!empty($this->extraColumns)) { |
164 | - if(Config::getParam('api.extrafields.compat', true)) { |
|
164 | + if (Config::getParam('api.extrafields.compat', true)) { |
|
165 | 165 | $fields = array_values($this->extraColumns); |
166 | - } else { |
|
166 | + }else { |
|
167 | 167 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
168 | 168 | $fields = explode(',', $returnFields ?: ''); |
169 | 169 | $fields[] = self::API_MODEL_KEY_FIELD; |
170 | 170 | } |
171 | 171 | foreach ($this->extraColumns as $expression => $columnName) { |
172 | - if(empty($fields) || in_array($columnName, $fields)) { |
|
172 | + if (empty($fields) || in_array($columnName, $fields)) { |
|
173 | 173 | $query->withColumn($expression, $columnName); |
174 | 174 | } |
175 | 175 | } |
@@ -201,17 +201,17 @@ discard block |
||
201 | 201 | { |
202 | 202 | $this->extractApiLang(); |
203 | 203 | $model = $this->getModelNamespace(); |
204 | - $modelI18n = $model . 'I18n'; |
|
204 | + $modelI18n = $model.'I18n'; |
|
205 | 205 | if (method_exists($query, 'useI18nQuery')) { |
206 | 206 | $query->useI18nQuery($this->lang); |
207 | - $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap'; |
|
207 | + $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap'; |
|
208 | 208 | /** @var TableMap $modelI18nTableMap */ |
209 | 209 | $modelI18nTableMap = $modelI18nTableMapClass::getTableMap(); |
210 | - foreach($modelI18nTableMap->getColumns() as $columnMap) { |
|
211 | - if(!$columnMap->isPrimaryKey()) { |
|
210 | + foreach ($modelI18nTableMap->getColumns() as $columnMap) { |
|
211 | + if (!$columnMap->isPrimaryKey()) { |
|
212 | 212 | $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap)); |
213 | - } elseif(!$columnMap->isForeignKey()) { |
|
214 | - $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
213 | + } elseif (!$columnMap->isForeignKey()) { |
|
214 | + $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
215 | 215 | } |
216 | 216 | } |
217 | 217 | } |
@@ -225,22 +225,22 @@ discard block |
||
225 | 225 | $model->fromArray($data, ApiHelper::getFieldTypes()); |
226 | 226 | $tableMap = $this->getTableMap(); |
227 | 227 | try { |
228 | - if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) |
|
228 | + if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) |
|
229 | 229 | { |
230 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
230 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
231 | 231 | $i18NTableMap = $relateI18n->getLocalTable(); |
232 | 232 | $model->setLocale($this->lang); |
233 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
234 | - $method = 'set' . $columnMap->getPhpName(); |
|
233 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
234 | + $method = 'set'.$columnMap->getPhpName(); |
|
235 | 235 | $dtoColumnName = ApiHelper::getColumnMapName($columnMap); |
236 | - if(array_key_exists($dtoColumnName, $data) |
|
236 | + if (array_key_exists($dtoColumnName, $data) |
|
237 | 237 | && method_exists($model, $method) |
238 | 238 | && !($columnMap->isPrimaryKey() && $columnMap->isForeignKey())) { |
239 | 239 | $model->$method($data[$dtoColumnName]); |
240 | 240 | } |
241 | 241 | } |
242 | 242 | } |
243 | - } catch(\Exception $e) { |
|
243 | + }catch (\Exception $e) { |
|
244 | 244 | Logger::log($e->getMessage(), LOG_DEBUG); |
245 | 245 | } |
246 | 246 | } |