@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $fDto->entity = $relatedModel; |
| 34 | 34 | $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName()); |
| 35 | 35 | $fDto->relatedField = $relatedField->getPhpName(); |
| 36 | - $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel); |
|
| 36 | + $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel); |
|
| 37 | 37 | return $fDto; |
| 38 | 38 | } |
| 39 | 39 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param ModelCriteria $query |
| 43 | 43 | * @param mixed $value |
| 44 | 44 | */ |
| 45 | - private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) |
|
| 45 | + private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null) |
|
| 46 | 46 | { |
| 47 | 47 | $tableField = $column->getFullyQualifiedName(); |
| 48 | 48 | if (is_array($value)) { |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) { |
| 53 | 53 | $text = preg_replace('/(\'|\")/', '', $value); |
| 54 | 54 | $text = preg_replace('/\ /', '%', $text); |
| 55 | - $query->add($tableField, '%' . $text . '%', Criteria::LIKE); |
|
| 56 | - } else { |
|
| 55 | + $query->add($tableField, '%'.$text.'%', Criteria::LIKE); |
|
| 56 | + }else { |
|
| 57 | 57 | if (null !== $column->getValueSet()) { |
| 58 | 58 | $valueSet = $column->getValueSet(); |
| 59 | 59 | if (in_array($value, $valueSet)) { |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * @param string $field |
| 72 | 72 | * @param mixed $value |
| 73 | 73 | */ |
| 74 | - public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null) |
|
| 74 | + public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null) |
|
| 75 | 75 | { |
| 76 | 76 | if ($column = self::checkFieldExists($tableMap, $field)) { |
| 77 | 77 | self::addQueryFilter($column, $query, $value); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public static function extractQuery($modelNameNamespace, ConnectionInterface $con = null) |
| 88 | 88 | { |
| 89 | - $queryReflector = new \ReflectionClass($modelNameNamespace . "Query"); |
|
| 89 | + $queryReflector = new \ReflectionClass($modelNameNamespace."Query"); |
|
| 90 | 90 | /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */ |
| 91 | 91 | $query = $queryReflector->getMethod('create')->invoke($con); |
| 92 | 92 | |
@@ -99,13 +99,13 @@ discard block |
||
| 99 | 99 | * @param array $extraColumns |
| 100 | 100 | * @param mixed $value |
| 101 | 101 | */ |
| 102 | - public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null) |
|
| 102 | + public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null) |
|
| 103 | 103 | { |
| 104 | 104 | $exp = 'CONCAT('; |
| 105 | 105 | $sep = ''; |
| 106 | 106 | foreach ($tableMap->getColumns() as $column) { |
| 107 | 107 | if ($column->isText()) { |
| 108 | - $exp .= $sep . 'COALESCE(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 108 | + $exp .= $sep.'COALESCE('.$column->getFullyQualifiedName().',"")'; |
|
| 109 | 109 | $sep = ', " ", '; |
| 110 | 110 | } |
| 111 | 111 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $localeTableMap = $relation->getLocalTable(); |
| 115 | 115 | foreach ($localeTableMap->getColumns() as $column) { |
| 116 | 116 | if ($column->isText()) { |
| 117 | - $exp .= $sep . 'COALESCE(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 117 | + $exp .= $sep.'COALESCE('.$column->getFullyQualifiedName().',"")'; |
|
| 118 | 118 | $sep = ', " ", '; |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -122,14 +122,14 @@ discard block |
||
| 122 | 122 | } |
| 123 | 123 | foreach (array_keys($extraColumns) as $extra) { |
| 124 | 124 | if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) { |
| 125 | - $exp .= $sep . 'COALESCE(' . $extra . ', "")'; |
|
| 125 | + $exp .= $sep.'COALESCE('.$extra.', "")'; |
|
| 126 | 126 | $sep = ', " ", '; |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | $exp .= ")"; |
| 130 | 130 | $text = preg_replace('/(\'|\")/', '', $value); |
| 131 | 131 | $text = preg_replace('/\ /', '%', $text); |
| 132 | - $query->where($exp . Criteria::LIKE . '"%' . $text . '%"'); |
|
| 132 | + $query->where($exp.Criteria::LIKE.'"%'.$text.'%"'); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |