@@ -603,6 +603,9 @@ discard block |
||
| 603 | 603 | $this->con->useDebug($this->debug); |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | + /** |
|
| 607 | + * @return string |
|
| 608 | + */ |
|
| 606 | 609 | private function getApi() |
| 607 | 610 | { |
| 608 | 611 | $model = explode("\\", $this->getModelNamespace()); |
@@ -610,6 +613,9 @@ discard block |
||
| 610 | 613 | return $model[count($model) - 1]; |
| 611 | 614 | } |
| 612 | 615 | |
| 616 | + /** |
|
| 617 | + * @return string |
|
| 618 | + */ |
|
| 613 | 619 | public function getDomain() |
| 614 | 620 | { |
| 615 | 621 | $model = explode("\\", $this->getModelNamespace()); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | } elseif ($mappedColumn->isText()) { |
| 41 | 41 | if ($mappedColumn->getSize() > 100) { |
| 42 | 42 | $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required); |
| 43 | - } else { |
|
| 43 | + }else { |
|
| 44 | 44 | $fDto = self::generateStringField($field, $required); |
| 45 | 45 | } |
| 46 | 46 | } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $fDto->entity = $relatedModel; |
| 84 | 84 | $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName()); |
| 85 | 85 | $fDto->relatedField = $relatedField->getPhpName(); |
| 86 | - $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel); |
|
| 86 | + $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel); |
|
| 87 | 87 | return $fDto; |
| 88 | 88 | } |
| 89 | 89 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | { |
| 191 | 191 | try { |
| 192 | 192 | $column = $tableMap->getColumnByPhpName($field); |
| 193 | - } catch (\Exception $e) { |
|
| 193 | + }catch (\Exception $e) { |
|
| 194 | 194 | Logger::log($e->getMessage(), LOG_ERR); |
| 195 | 195 | $column = null; |
| 196 | 196 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | * @param ModelCriteria $query |
| 203 | 203 | * @param mixed $value |
| 204 | 204 | */ |
| 205 | - private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) |
|
| 205 | + private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null) |
|
| 206 | 206 | { |
| 207 | 207 | $tableField = $column->getPhpName(); |
| 208 | 208 | if (preg_match('/^<=/', $value)) { |
@@ -216,8 +216,8 @@ discard block |
||
| 216 | 216 | } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) { |
| 217 | 217 | $text = preg_replace('/(\'|\")/', '', $value); |
| 218 | 218 | $text = preg_replace('/\ /', '%', $text); |
| 219 | - $query->filterBy($tableField, '%' . $text . '%', Criteria::LIKE); |
|
| 220 | - } else { |
|
| 219 | + $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE); |
|
| 220 | + }else { |
|
| 221 | 221 | $query->filterBy($tableField, $value, Criteria::EQUAL); |
| 222 | 222 | } |
| 223 | 223 | } |
@@ -228,24 +228,24 @@ discard block |
||
| 228 | 228 | * @param array $extraColumns |
| 229 | 229 | * @param mixed $value |
| 230 | 230 | */ |
| 231 | - public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null) |
|
| 231 | + public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null) |
|
| 232 | 232 | { |
| 233 | 233 | $exp = 'CONCAT('; |
| 234 | 234 | $sep = ''; |
| 235 | 235 | foreach ($tableMap->getColumns() as $column) { |
| 236 | 236 | if ($column->isText()) { |
| 237 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 237 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
| 238 | 238 | $sep = ', " ", '; |
| 239 | 239 | } |
| 240 | 240 | } |
| 241 | 241 | foreach ($extraColumns as $extra => $name) { |
| 242 | - $exp .= $sep . $extra; |
|
| 242 | + $exp .= $sep.$extra; |
|
| 243 | 243 | $sep = ', " ", '; |
| 244 | 244 | } |
| 245 | 245 | $exp .= ")"; |
| 246 | 246 | $text = preg_replace('/(\'|\")/', '', $value); |
| 247 | 247 | $text = preg_replace('/\ /', '%', $text); |
| 248 | - $query->where($exp . Criteria::LIKE . '"%' . $text . '%"'); |
|
| 248 | + $query->where($exp.Criteria::LIKE.'"%'.$text.'%"'); |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | * @param string $field |
| 256 | 256 | * @param mixed $value |
| 257 | 257 | */ |
| 258 | - public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null) |
|
| 258 | + public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null) |
|
| 259 | 259 | { |
| 260 | 260 | if ($column = self::checkFieldExists($tableMap, $field)) { |
| 261 | 261 | self::addQueryFilter($column, $query, $value); |
@@ -17,11 +17,11 @@ |
||
| 17 | 17 | public static function checkApiActions($namespace, $domain, $api) { |
| 18 | 18 | $actions = []; |
| 19 | 19 | $reflector = new \ReflectionClass($namespace); |
| 20 | - if(null !== $reflector) { |
|
| 21 | - foreach($reflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $apiAction) { |
|
| 20 | + if (null !== $reflector) { |
|
| 21 | + foreach ($reflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $apiAction) { |
|
| 22 | 22 | $docComments = $apiAction->getDocComment(); |
| 23 | 23 | $action = self::extractAction($docComments); |
| 24 | - if(null !== $action) { |
|
| 24 | + if (null !== $action) { |
|
| 25 | 25 | list($route, $info) = RouterHelper::extractRouteInfo($apiAction, $api, $domain); |
| 26 | 26 | list($method, $cleanRoute) = RouterHelper::extractHttpRoute($route); |
| 27 | 27 | $formAction = new FormAction(); |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | $array['fields'][] = $field->__toArray(); |
| 27 | 27 | } |
| 28 | 28 | $array['actions'] = []; |
| 29 | - foreach($this->actions as $action) { |
|
| 29 | + foreach ($this->actions as $action) { |
|
| 30 | 30 | $array['actions'][] = $action->__toArray(); |
| 31 | 31 | } |
| 32 | 32 | return $array; |