@@ -37,20 +37,20 @@ discard block |
||
| 37 | 37 | $behaviors = $tableMap->getBehaviors(); |
| 38 | 38 | foreach ($map::getFieldNames() as $field) { |
| 39 | 39 | $fDto = self::parseFormField($domain, $tableMap, $field, $behaviors); |
| 40 | - if(null !== $fDto) { |
|
| 40 | + if (null !== $fDto) { |
|
| 41 | 41 | $form->addField($fDto); |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - if(array_key_exists('i18n', $behaviors)) { |
|
| 46 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
| 47 | - if(null !== $relateI18n) { |
|
| 45 | + if (array_key_exists('i18n', $behaviors)) { |
|
| 46 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
| 47 | + if (null !== $relateI18n) { |
|
| 48 | 48 | $i18NTableMap = $relateI18n->getLocalTable(); |
| 49 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
| 49 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
| 50 | 50 | $columnName = self::getColumnMapName($columnMap); |
| 51 | - if(!$form->fieldExists($columnName)) { |
|
| 51 | + if (!$form->fieldExists($columnName)) { |
|
| 52 | 52 | $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors()); |
| 53 | - if(null !== $fDto) { |
|
| 53 | + if (null !== $fDto) { |
|
| 54 | 54 | $fDto->pk = false; |
| 55 | 55 | $form->addField($fDto); |
| 56 | 56 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $fDto->entity = $relatedModel; |
| 80 | 80 | $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName()); |
| 81 | 81 | $fDto->relatedField = $relatedField->getPhpName(); |
| 82 | - $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel); |
|
| 82 | + $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel); |
|
| 83 | 83 | return $fDto; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -186,14 +186,14 @@ discard block |
||
| 186 | 186 | { |
| 187 | 187 | $column = null; |
| 188 | 188 | try { |
| 189 | - foreach($tableMap->getColumns() as $tableMapColumn) { |
|
| 189 | + foreach ($tableMap->getColumns() as $tableMapColumn) { |
|
| 190 | 190 | $columnName = $tableMapColumn->getPhpName(); |
| 191 | - if(preg_match('/^'.$field.'$/i', $columnName)) { |
|
| 191 | + if (preg_match('/^'.$field.'$/i', $columnName)) { |
|
| 192 | 192 | $column = $tableMapColumn; |
| 193 | 193 | break; |
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | - } catch (\Exception $e) { |
|
| 196 | + }catch (\Exception $e) { |
|
| 197 | 197 | Logger::log($e->getMessage(), LOG_DEBUG); |
| 198 | 198 | } |
| 199 | 199 | return $column; |
@@ -207,18 +207,18 @@ discard block |
||
| 207 | 207 | private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) |
| 208 | 208 | { |
| 209 | 209 | $tableField = $column->getFullyQualifiedName(); |
| 210 | - if(is_array($value)) { |
|
| 210 | + if (is_array($value)) { |
|
| 211 | 211 | $query->add($tableField, $value, Criteria::IN); |
| 212 | 212 | } elseif (preg_match('/^\[/', $value) && preg_match('/\]$/', $value)) { |
| 213 | 213 | $query->add($tableField, explode(',', preg_replace('/(\[|\])/', '', $value)), Criteria::IN); |
| 214 | 214 | } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) { |
| 215 | 215 | $text = preg_replace('/(\'|\")/', '', $value); |
| 216 | 216 | $text = preg_replace('/\ /', '%', $text); |
| 217 | - $query->add($tableField, '%' . $text . '%', Criteria::LIKE); |
|
| 218 | - } else { |
|
| 219 | - if(null !== $column->getValueSet()) { |
|
| 217 | + $query->add($tableField, '%'.$text.'%', Criteria::LIKE); |
|
| 218 | + }else { |
|
| 219 | + if (null !== $column->getValueSet()) { |
|
| 220 | 220 | $valueSet = $column->getValueSet(); |
| 221 | - if(in_array($value, $valueSet)) { |
|
| 221 | + if (in_array($value, $valueSet)) { |
|
| 222 | 222 | $value = array_search($value, $valueSet); |
| 223 | 223 | } |
| 224 | 224 | } |
@@ -238,31 +238,31 @@ discard block |
||
| 238 | 238 | $sep = ''; |
| 239 | 239 | foreach ($tableMap->getColumns() as $column) { |
| 240 | 240 | if ($column->isText()) { |
| 241 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 241 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
| 242 | 242 | $sep = ', " ", '; |
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | - foreach($tableMap->getRelations() as $relation) { |
|
| 246 | - if(preg_match('/I18n$/i', $relation->getName())) { |
|
| 245 | + foreach ($tableMap->getRelations() as $relation) { |
|
| 246 | + if (preg_match('/I18n$/i', $relation->getName())) { |
|
| 247 | 247 | $localeTableMap = $relation->getLocalTable(); |
| 248 | 248 | foreach ($localeTableMap->getColumns() as $column) { |
| 249 | 249 | if ($column->isText()) { |
| 250 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 250 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
| 251 | 251 | $sep = ', " ", '; |
| 252 | 252 | } |
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | foreach ($extraColumns as $extra => $name) { |
| 257 | - if(!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) { |
|
| 258 | - $exp .= $sep . $extra; |
|
| 257 | + if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) { |
|
| 258 | + $exp .= $sep.$extra; |
|
| 259 | 259 | $sep = ', " ", '; |
| 260 | 260 | } |
| 261 | 261 | } |
| 262 | 262 | $exp .= ")"; |
| 263 | 263 | $text = preg_replace('/(\'|\")/', '', $value); |
| 264 | 264 | $text = preg_replace('/\ /', '%', $text); |
| 265 | - $query->where($exp . Criteria::LIKE . '"%' . $text . '%"'); |
|
| 265 | + $query->where($exp.Criteria::LIKE.'"%'.$text.'%"'); |
|
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | /** |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | */ |
| 288 | 288 | public static function extractQuery($modelNameNamespace, ConnectionInterface $con = null) |
| 289 | 289 | { |
| 290 | - $queryReflector = new \ReflectionClass($modelNameNamespace . "Query"); |
|
| 290 | + $queryReflector = new \ReflectionClass($modelNameNamespace."Query"); |
|
| 291 | 291 | /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */ |
| 292 | 292 | $query = $queryReflector->getMethod('create')->invoke($con); |
| 293 | 293 | |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | } elseif ($mappedColumn->isText()) { |
| 317 | 317 | if ($mappedColumn->getSize() > 100) { |
| 318 | 318 | $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required); |
| 319 | - } else { |
|
| 319 | + }else { |
|
| 320 | 320 | $fDto = self::generateStringField($field, $required); |
| 321 | 321 | } |
| 322 | 322 | } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) { |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | $fDto->pk = true; |
| 345 | 345 | } |
| 346 | 346 | } |
| 347 | - switch(Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) { |
|
| 347 | + switch (Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) { |
|
| 348 | 348 | default: |
| 349 | 349 | case TableMap::TYPE_PHPNAME: |
| 350 | 350 | $fDto->name = $mappedColumn->getPhpName(); |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | */ |
| 369 | 369 | public static function extractPrimaryKeyColumnName(TableMap $tableMap) { |
| 370 | 370 | $modelPk = null; |
| 371 | - foreach($tableMap->getPrimaryKeys() as $pk) { |
|
| 371 | + foreach ($tableMap->getPrimaryKeys() as $pk) { |
|
| 372 | 372 | $modelPk = $pk; |
| 373 | 373 | break; |
| 374 | 374 | } |
@@ -377,15 +377,15 @@ discard block |
||
| 377 | 377 | |
| 378 | 378 | private static function mapResult(ActiveRecordInterface $model, array $data = []) { |
| 379 | 379 | $result = []; |
| 380 | - foreach($data as $key => $value) { |
|
| 380 | + foreach ($data as $key => $value) { |
|
| 381 | 381 | try { |
| 382 | 382 | $realValue = $model->getByName($key); |
| 383 | - } catch(\Exception $e) { |
|
| 383 | + }catch (\Exception $e) { |
|
| 384 | 384 | $realValue = $value; |
| 385 | 385 | } |
| 386 | - if(Api::API_MODEL_KEY_FIELD === $key) { |
|
| 386 | + if (Api::API_MODEL_KEY_FIELD === $key) { |
|
| 387 | 387 | $result[$key] = (integer)$realValue; |
| 388 | - } else { |
|
| 388 | + }else { |
|
| 389 | 389 | $result[$key] = $realValue; |
| 390 | 390 | } |
| 391 | 391 | } |
@@ -402,14 +402,14 @@ discard block |
||
| 402 | 402 | $objTableMap = get_class($formatter->getTableMap()); |
| 403 | 403 | /** @var TableMapTrait $objTableMap */ |
| 404 | 404 | $objData = $data; |
| 405 | - foreach($objTableMap::getFieldNames() as $field) { |
|
| 406 | - if(!array_key_exists($field, $objData)) { |
|
| 405 | + foreach ($objTableMap::getFieldNames() as $field) { |
|
| 406 | + if (!array_key_exists($field, $objData)) { |
|
| 407 | 407 | $objData[$field] = null; |
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | $obj = @$formatter->getAllObjectsFromRow($objData); |
| 411 | 411 | $result = self::mapResult($obj, $data); |
| 412 | - if(!preg_match('/' . $modelPk->getPhpName() . '/i', $query[Api::API_FIELDS_RESULT_FIELD])) { |
|
| 412 | + if (!preg_match('/'.$modelPk->getPhpName().'/i', $query[Api::API_FIELDS_RESULT_FIELD])) { |
|
| 413 | 413 | unset($result[$modelPk->getPhpName()]); |
| 414 | 414 | } |
| 415 | 415 | return $result; |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | */ |
| 421 | 421 | public static function getFieldTypes() { |
| 422 | 422 | $configType = Config::getParam('api.field.case'); |
| 423 | - switch($configType) { |
|
| 423 | + switch ($configType) { |
|
| 424 | 424 | default: |
| 425 | 425 | case 'UpperCamelCase': |
| 426 | 426 | case TableMap::TYPE_PHPNAME: |
@@ -446,11 +446,11 @@ discard block |
||
| 446 | 446 | } |
| 447 | 447 | |
| 448 | 448 | public static function getColumnMapName(ColumnMap $field) { |
| 449 | - switch(self::getFieldTypes()) { |
|
| 449 | + switch (self::getFieldTypes()) { |
|
| 450 | 450 | default: |
| 451 | 451 | case 'UpperCamelCase': |
| 452 | 452 | case TableMap::TYPE_PHPNAME: |
| 453 | - $columnName =$field->getPhpName(); |
|
| 453 | + $columnName = $field->getPhpName(); |
|
| 454 | 454 | break; |
| 455 | 455 | case 'camelCase': |
| 456 | 456 | case 'lowerCamelCase': |