@@ -31,19 +31,19 @@ discard block |
||
| 31 | 31 | $behaviors = $tableMap->getBehaviors(); |
| 32 | 32 | foreach ($map::getFieldNames() as $field) { |
| 33 | 33 | $fDto = self::parseFormField($domain, $tableMap, $field, $behaviors); |
| 34 | - if(null !== $fDto) { |
|
| 34 | + if (null !== $fDto) { |
|
| 35 | 35 | $form->addField($fDto); |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - if(array_key_exists('i18n', $behaviors)) { |
|
| 40 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
| 41 | - if(null !== $relateI18n) { |
|
| 39 | + if (array_key_exists('i18n', $behaviors)) { |
|
| 40 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
| 41 | + if (null !== $relateI18n) { |
|
| 42 | 42 | $i18NTableMap = $relateI18n->getLocalTable(); |
| 43 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
| 44 | - if(!$form->fieldExists($columnMap->getPhpName())) { |
|
| 43 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
| 44 | + if (!$form->fieldExists($columnMap->getPhpName())) { |
|
| 45 | 45 | $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors()); |
| 46 | - if(null !== $fDto) { |
|
| 46 | + if (null !== $fDto) { |
|
| 47 | 47 | $fDto->pk = false; |
| 48 | 48 | $form->addField($fDto); |
| 49 | 49 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $fDto->entity = $relatedModel; |
| 73 | 73 | $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName()); |
| 74 | 74 | $fDto->relatedField = $relatedField->getPhpName(); |
| 75 | - $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel); |
|
| 75 | + $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel); |
|
| 76 | 76 | return $fDto; |
| 77 | 77 | } |
| 78 | 78 | |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | $column = null; |
| 181 | 181 | try { |
| 182 | 182 | $column = $tableMap->getColumnByPhpName($field); |
| 183 | - } catch (\Exception $e) { |
|
| 183 | + }catch (\Exception $e) { |
|
| 184 | 184 | Logger::log($e->getMessage(), LOG_WARNING); |
| 185 | 185 | //foreach($tableMap->getRelations() as $relation) { |
| 186 | 186 | // $column = self::checkFieldExists($relation->getLocalTable(), $field); |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | * @param ModelCriteria $query |
| 195 | 195 | * @param mixed $value |
| 196 | 196 | */ |
| 197 | - private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) |
|
| 197 | + private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null) |
|
| 198 | 198 | { |
| 199 | 199 | $tableField = $column->getFullyQualifiedName(); |
| 200 | 200 | if (preg_match('/^\[/', $value) && preg_match('/\]$/', $value)) { |
@@ -202,11 +202,11 @@ discard block |
||
| 202 | 202 | } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) { |
| 203 | 203 | $text = preg_replace('/(\'|\")/', '', $value); |
| 204 | 204 | $text = preg_replace('/\ /', '%', $text); |
| 205 | - $query->add($tableField, '%' . $text . '%', Criteria::LIKE); |
|
| 206 | - } else { |
|
| 207 | - if(null !== $column->getValueSet()) { |
|
| 205 | + $query->add($tableField, '%'.$text.'%', Criteria::LIKE); |
|
| 206 | + }else { |
|
| 207 | + if (null !== $column->getValueSet()) { |
|
| 208 | 208 | $valueSet = $column->getValueSet(); |
| 209 | - if(in_array($value, $valueSet)) { |
|
| 209 | + if (in_array($value, $valueSet)) { |
|
| 210 | 210 | $value = array_search($value, $valueSet); |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -220,35 +220,35 @@ discard block |
||
| 220 | 220 | * @param array $extraColumns |
| 221 | 221 | * @param mixed $value |
| 222 | 222 | */ |
| 223 | - public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null) |
|
| 223 | + public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null) |
|
| 224 | 224 | { |
| 225 | 225 | $exp = 'CONCAT('; |
| 226 | 226 | $sep = ''; |
| 227 | 227 | foreach ($tableMap->getColumns() as $column) { |
| 228 | 228 | if ($column->isText()) { |
| 229 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 229 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
| 230 | 230 | $sep = ', " ", '; |
| 231 | 231 | } |
| 232 | 232 | } |
| 233 | - foreach($tableMap->getRelations() as $relation) { |
|
| 234 | - if(preg_match('/I18n$/i', $relation->getName())) { |
|
| 233 | + foreach ($tableMap->getRelations() as $relation) { |
|
| 234 | + if (preg_match('/I18n$/i', $relation->getName())) { |
|
| 235 | 235 | $localeTableMap = $relation->getLocalTable(); |
| 236 | 236 | foreach ($localeTableMap->getColumns() as $column) { |
| 237 | 237 | if ($column->isText()) { |
| 238 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 238 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
| 239 | 239 | $sep = ', " ", '; |
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | 244 | foreach ($extraColumns as $extra => $name) { |
| 245 | - $exp .= $sep . $extra; |
|
| 245 | + $exp .= $sep.$extra; |
|
| 246 | 246 | $sep = ', " ", '; |
| 247 | 247 | } |
| 248 | 248 | $exp .= ")"; |
| 249 | 249 | $text = preg_replace('/(\'|\")/', '', $value); |
| 250 | 250 | $text = preg_replace('/\ /', '%', $text); |
| 251 | - $query->where($exp . Criteria::LIKE . '"%' . $text . '%"'); |
|
| 251 | + $query->where($exp.Criteria::LIKE.'"%'.$text.'%"'); |
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | /** |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | * @param string $field |
| 259 | 259 | * @param mixed $value |
| 260 | 260 | */ |
| 261 | - public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null) |
|
| 261 | + public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null) |
|
| 262 | 262 | { |
| 263 | 263 | if ($column = self::checkFieldExists($tableMap, $field)) { |
| 264 | 264 | self::addQueryFilter($column, $query, $value); |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | */ |
| 274 | 274 | public static function extractQuery($modelNameNamespace, ConnectionInterface $con = null) |
| 275 | 275 | { |
| 276 | - $queryReflector = new \ReflectionClass($modelNameNamespace . "Query"); |
|
| 276 | + $queryReflector = new \ReflectionClass($modelNameNamespace."Query"); |
|
| 277 | 277 | /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */ |
| 278 | 278 | $query = $queryReflector->getMethod('create')->invoke($con); |
| 279 | 279 | |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | } elseif ($mappedColumn->isText()) { |
| 303 | 303 | if ($mappedColumn->getSize() > 100) { |
| 304 | 304 | $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required); |
| 305 | - } else { |
|
| 305 | + }else { |
|
| 306 | 306 | $fDto = self::generateStringField($field, $required); |
| 307 | 307 | } |
| 308 | 308 | } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) { |