@@ -81,20 +81,20 @@ discard block |
||
| 81 | 81 | public function init() |
| 82 | 82 | { |
| 83 | 83 | parent::init(); |
| 84 | - Logger::log(static::class . ' init', LOG_DEBUG); |
|
| 84 | + Logger::log(static::class.' init', LOG_DEBUG); |
|
| 85 | 85 | $this->domain = $this->getDomain(); |
| 86 | 86 | $this->hydrateRequestData(); |
| 87 | 87 | $this->hydrateOrders(); |
| 88 | - if($this instanceof CustomApi === false) { |
|
| 88 | + if ($this instanceof CustomApi === false) { |
|
| 89 | 89 | $this->createConnection($this->getTableMap()); |
| 90 | 90 | } |
| 91 | 91 | $this->checkFieldType(); |
| 92 | 92 | $this->setLoaded(true); |
| 93 | - Logger::log(static::class . ' loaded', LOG_DEBUG); |
|
| 93 | + Logger::log(static::class.' loaded', LOG_DEBUG); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | private function checkActions($method) { |
| 97 | - switch($method) { |
|
| 97 | + switch ($method) { |
|
| 98 | 98 | default: |
| 99 | 99 | case 'modelList': $this->action = self::API_ACTION_LIST; break; |
| 100 | 100 | case 'get': $this->action = self::API_ACTION_GET; break; |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | protected function hydrateOrders() |
| 112 | 112 | { |
| 113 | 113 | if (count($this->query)) { |
| 114 | - Logger::log(static::class . ' gathering query string', LOG_DEBUG); |
|
| 114 | + Logger::log(static::class.' gathering query string', LOG_DEBUG); |
|
| 115 | 115 | foreach ($this->query as $key => $value) { |
| 116 | 116 | if ($key === self::API_ORDER_FIELD && is_array($value)) { |
| 117 | 117 | foreach ($value as $field => $direction) { |
@@ -128,10 +128,10 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | protected function extractPagination() |
| 130 | 130 | { |
| 131 | - Logger::log(static::class . ' extract pagination start', LOG_DEBUG); |
|
| 131 | + Logger::log(static::class.' extract pagination start', LOG_DEBUG); |
|
| 132 | 132 | $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1; |
| 133 | 133 | $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100; |
| 134 | - Logger::log(static::class . ' extract pagination end', LOG_DEBUG); |
|
| 134 | + Logger::log(static::class.' extract pagination end', LOG_DEBUG); |
|
| 135 | 135 | return array($page, (int)$limit); |
| 136 | 136 | } |
| 137 | 137 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | private function addOrders(ModelCriteria &$query) |
| 144 | 144 | { |
| 145 | - Logger::log(static::class . ' extract orders start ', LOG_DEBUG); |
|
| 145 | + Logger::log(static::class.' extract orders start ', LOG_DEBUG); |
|
| 146 | 146 | $orderAdded = FALSE; |
| 147 | 147 | $tableMap = $this->getTableMap(); |
| 148 | 148 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -150,18 +150,18 @@ discard block |
||
| 150 | 150 | $orderAdded = TRUE; |
| 151 | 151 | if ($direction === Order::ASC) { |
| 152 | 152 | $query->addAscendingOrderByColumn($column->getPhpName()); |
| 153 | - } else { |
|
| 153 | + }else { |
|
| 154 | 154 | $query->addDescendingOrderByColumn($column->getPhpName()); |
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | 158 | if (!$orderAdded) { |
| 159 | 159 | $pks = $this->getPkDbName(); |
| 160 | - foreach(array_keys($pks) as $key) { |
|
| 160 | + foreach (array_keys($pks) as $key) { |
|
| 161 | 161 | $query->addAscendingOrderByColumn($key); |
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | - Logger::log(static::class . ' extract orders end', LOG_DEBUG); |
|
| 164 | + Logger::log(static::class.' extract orders end', LOG_DEBUG); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | foreach ($this->query as $field => $value) { |
| 177 | 177 | if (self::API_COMBO_FIELD === $field) { |
| 178 | 178 | ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value); |
| 179 | - } elseif(!preg_match('/^__/', $field)) { |
|
| 179 | + } elseif (!preg_match('/^__/', $field)) { |
|
| 180 | 180 | ApiHelper::addModelField($tableMap, $query, $field, $value); |
| 181 | 181 | } |
| 182 | 182 | } |
@@ -197,10 +197,10 @@ discard block |
||
| 197 | 197 | list($page, $limit) = $this->extractPagination(); |
| 198 | 198 | if ($limit === -1) { |
| 199 | 199 | $this->list = $query->find($this->con); |
| 200 | - } else { |
|
| 200 | + }else { |
|
| 201 | 201 | $this->list = $query->paginate($page, $limit, $this->con); |
| 202 | 202 | } |
| 203 | - } catch (\Exception $e) { |
|
| 203 | + }catch (\Exception $e) { |
|
| 204 | 204 | Logger::log($e->getMessage(), LOG_ERR); |
| 205 | 205 | } |
| 206 | 206 | } |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | $code = 200; |
| 220 | 220 | list($return, $total, $pages) = $this->getList(); |
| 221 | 221 | $message = null; |
| 222 | - if(!$total) { |
|
| 222 | + if (!$total) { |
|
| 223 | 223 | $message = t('No se han encontrado elementos para la búsqueda'); |
| 224 | 224 | } |
| 225 | 225 | |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | $pages = 1; |
| 246 | 246 | $message = null; |
| 247 | 247 | list($code, $return) = $this->getSingleResult($pk); |
| 248 | - if($code !== 200) { |
|
| 248 | + if ($code !== 200) { |
|
| 249 | 249 | $message = t('No se ha encontrado el elemento solicitado'); |
| 250 | 250 | } |
| 251 | 251 | |
@@ -274,13 +274,13 @@ discard block |
||
| 274 | 274 | $status = 200; |
| 275 | 275 | $saved = TRUE; |
| 276 | 276 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 277 | - } else { |
|
| 277 | + }else { |
|
| 278 | 278 | $message = t('No se ha podido guardar el modelo seleccionado'); |
| 279 | 279 | } |
| 280 | - } catch (\Exception $e) { |
|
| 281 | - $message = t('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage(); |
|
| 280 | + }catch (\Exception $e) { |
|
| 281 | + $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage(); |
|
| 282 | 282 | $context = []; |
| 283 | - if(null !== $e->getPrevious()) { |
|
| 283 | + if (null !== $e->getPrevious()) { |
|
| 284 | 284 | $context[] = $e->getPrevious()->getMessage(); |
| 285 | 285 | } |
| 286 | 286 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -316,18 +316,18 @@ discard block |
||
| 316 | 316 | $updated = TRUE; |
| 317 | 317 | $status = 200; |
| 318 | 318 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 319 | - } else { |
|
| 319 | + }else { |
|
| 320 | 320 | $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
| 321 | 321 | } |
| 322 | - } catch (\Exception $e) { |
|
| 322 | + }catch (\Exception $e) { |
|
| 323 | 323 | $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
| 324 | 324 | $context = []; |
| 325 | - if(null !== $e->getPrevious()) { |
|
| 325 | + if (null !== $e->getPrevious()) { |
|
| 326 | 326 | $context[] = $e->getPrevious()->getMessage(); |
| 327 | 327 | } |
| 328 | 328 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
| 329 | 329 | } |
| 330 | - } else { |
|
| 330 | + }else { |
|
| 331 | 331 | $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar'); |
| 332 | 332 | } |
| 333 | 333 | |
@@ -355,15 +355,15 @@ discard block |
||
| 355 | 355 | $this->con->beginTransaction(); |
| 356 | 356 | $this->hydrateModel($pk); |
| 357 | 357 | if (NULL !== $this->model) { |
| 358 | - if(method_exists('clearAllReferences', $this->model)) { |
|
| 358 | + if (method_exists('clearAllReferences', $this->model)) { |
|
| 359 | 359 | $this->model->clearAllReferences(true); |
| 360 | 360 | } |
| 361 | 361 | $this->model->delete($this->con); |
| 362 | 362 | $deleted = TRUE; |
| 363 | 363 | } |
| 364 | - } catch (\Exception $e) { |
|
| 364 | + }catch (\Exception $e) { |
|
| 365 | 365 | $context = []; |
| 366 | - if(null !== $e->getPrevious()) { |
|
| 366 | + if (null !== $e->getPrevious()) { |
|
| 367 | 367 | $context[] = $e->getPrevious()->getMessage(); |
| 368 | 368 | } |
| 369 | 369 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | $this->saveBulk(); |
| 393 | 393 | $saved = true; |
| 394 | 394 | $status = 200; |
| 395 | - } catch(\Exception $e) { |
|
| 395 | + }catch (\Exception $e) { |
|
| 396 | 396 | Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData()); |
| 397 | 397 | $message = t('Bulk insert rolled back'); |
| 398 | 398 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | |
| 415 | 415 | /** @var CustomerTableMap $tableMap */ |
| 416 | 416 | $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap()); |
| 417 | - foreach($this->list->getData() as $data) { |
|
| 417 | + foreach ($this->list->getData() as $data) { |
|
| 418 | 418 | $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data); |
| 419 | 419 | } |
| 420 | 420 | return $return; |
@@ -431,23 +431,23 @@ discard block |
||
| 431 | 431 | try { |
| 432 | 432 | $this->paginate(); |
| 433 | 433 | if (null !== $this->list) { |
| 434 | - if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
| 434 | + if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
| 435 | 435 | $return = $this->extractDataWithFormat(); |
| 436 | - } else { |
|
| 436 | + }else { |
|
| 437 | 437 | $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false); |
| 438 | 438 | } |
| 439 | 439 | $total = 0; |
| 440 | 440 | $pages = 0; |
| 441 | - if($this->list instanceof PropelModelPager) { |
|
| 441 | + if ($this->list instanceof PropelModelPager) { |
|
| 442 | 442 | $total = $this->list->getNbResults(); |
| 443 | 443 | $pages = $this->list->getLastPage(); |
| 444 | - } elseif($this->list instanceof ArrayCollection) { |
|
| 444 | + } elseif ($this->list instanceof ArrayCollection) { |
|
| 445 | 445 | $total = count($return); |
| 446 | 446 | $pages = 1; |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | - } catch (\Exception $e) { |
|
| 450 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
| 449 | + }catch (\Exception $e) { |
|
| 450 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
| 451 | 451 | } |
| 452 | 452 | |
| 453 | 453 | return array($return, $total, $pages); |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | $return = array(); |
| 466 | 466 | if (NULL === $model || !method_exists($model, 'toArray')) { |
| 467 | 467 | $code = 404; |
| 468 | - } else { |
|
| 468 | + }else { |
|
| 469 | 469 | $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 470 | 470 | } |
| 471 | 471 | |
@@ -83,9 +83,9 @@ |
||
| 83 | 83 | 'class' => 'btn-warning md-default', |
| 84 | 84 | 'icon' => 'fa-plus', |
| 85 | 85 | ]; |
| 86 | - if(Config::getParam('admin.version', 'v1') === 'v1') { |
|
| 87 | - $add['onclick'] = 'javascript:addNewField(document.getElementById("' . $this->getName() . '"));'; |
|
| 88 | - } else { |
|
| 86 | + if (Config::getParam('admin.version', 'v1') === 'v1') { |
|
| 87 | + $add['onclick'] = 'javascript:addNewField(document.getElementById("'.$this->getName().'"));'; |
|
| 88 | + }else { |
|
| 89 | 89 | $add['ng-click'] = 'addNewField()'; |
| 90 | 90 | } |
| 91 | 91 | $this->addButton('submit', t('Guardar configuración'), 'submit', array( |
@@ -65,8 +65,8 @@ |
||
| 65 | 65 | $model = $this->getHydratedModel(); |
| 66 | 66 | $model->save(); |
| 67 | 67 | $save = true; |
| 68 | - Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO); |
|
| 69 | - } catch (\Exception $e) { |
|
| 68 | + Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO); |
|
| 69 | + }catch (\Exception $e) { |
|
| 70 | 70 | Logger::log($e->getMessage(), LOG_ERR); |
| 71 | 71 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
| 72 | 72 | } |
@@ -27,8 +27,8 @@ discard block |
||
| 27 | 27 | public function add($name, array $value = []) |
| 28 | 28 | { |
| 29 | 29 | $this->fields[$name] = $value; |
| 30 | - $this->fields[$name]['name'] = $this->getName() . '['.$name.']'; |
|
| 31 | - $this->fields[$name]['id'] = $this->getName() . '_' . $name; |
|
| 30 | + $this->fields[$name]['name'] = $this->getName().'['.$name.']'; |
|
| 31 | + $this->fields[$name]['id'] = $this->getName().'_'.$name; |
|
| 32 | 32 | $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name; |
| 33 | 33 | $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true; |
| 34 | 34 | return $this; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $data = array(); |
| 68 | 68 | if (count($this->fields) > 0) { |
| 69 | 69 | foreach ($this->fields as $key => $field) { |
| 70 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) { |
|
| 70 | + if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) { |
|
| 71 | 71 | $data[$key] = array_key_exists('value', $field) ? $field['value'] : null; |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -115,10 +115,10 @@ discard block |
||
| 115 | 115 | if (array_key_exists($key, $data[$formName])) { |
| 116 | 116 | if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) { |
| 117 | 117 | $field['value'] = null; |
| 118 | - } else { |
|
| 118 | + }else { |
|
| 119 | 119 | $field['value'] = $data[$formName][$key]; |
| 120 | 120 | } |
| 121 | - } else { |
|
| 121 | + }else { |
|
| 122 | 122 | unset($field['value']); |
| 123 | 123 | } |
| 124 | 124 | return array($data, $field); |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | if (null === $value) { |
| 48 | 48 | $isEmpty = true; |
| 49 | 49 | // Empty Array check |
| 50 | - } else if (is_array($value) && 0 === count($value)) { |
|
| 50 | + }else if (is_array($value) && 0 === count($value)) { |
|
| 51 | 51 | $isEmpty = true; |
| 52 | 52 | // Empty string check |
| 53 | - } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 53 | + }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 54 | 54 | $isEmpty = true; |
| 55 | 55 | } |
| 56 | 56 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | && array_key_exists($key, $field) |
| 77 | 77 | && !array_key_exists('error', $field[$key]) |
| 78 | 78 | && !empty($field['value']) |
| 79 | - && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0 |
|
| 79 | + && preg_match('/'.$field['pattern'].'/', $field['value']) === 0 |
|
| 80 | 80 | ) { |
| 81 | 81 | $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", t('El campo %s no tiene un formato válido'))); |
| 82 | 82 | $field['error'] = $this->getError($key); |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | private function hydrateModelField($key, $value) |
| 49 | 49 | { |
| 50 | - $setter = 'set' . ucfirst($key); |
|
| 51 | - $getter = 'get' . ucfirst($key); |
|
| 50 | + $setter = 'set'.ucfirst($key); |
|
| 51 | + $getter = 'get'.ucfirst($key); |
|
| 52 | 52 | if (method_exists($this->model, $setter)) { |
| 53 | 53 | if (method_exists($this->model, $getter)) { |
| 54 | 54 | $tmp = $this->model->$getter(); |
@@ -72,16 +72,16 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | //Extraemos el dato del modelo relacionado si existe el getter |
| 74 | 74 | $method = null; |
| 75 | - if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) { |
|
| 76 | - $classMethod = 'get' . $field['class_data']; |
|
| 75 | + if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) { |
|
| 76 | + $classMethod = 'get'.$field['class_data']; |
|
| 77 | 77 | $class = $val->$classMethod(); |
| 78 | - if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) { |
|
| 79 | - $method = 'get' . $field['class_id']; |
|
| 78 | + if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) { |
|
| 79 | + $method = 'get'.$field['class_id']; |
|
| 80 | 80 | $data[] = $class->$method(); |
| 81 | - } else { |
|
| 81 | + }else { |
|
| 82 | 82 | $data[] = $class->getPrimaryKey(); |
| 83 | 83 | } |
| 84 | - } else { |
|
| 84 | + }else { |
|
| 85 | 85 | $data[] = $val; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | private function extractModelFieldValue($key, $field) |
| 134 | 134 | { |
| 135 | 135 | //Extraemos el valor del campo del modelo |
| 136 | - $method = 'get' . ucfirst($key); |
|
| 136 | + $method = 'get'.ucfirst($key); |
|
| 137 | 137 | $type = (array_key_exists('type', $field)) ? $field['type'] : 'text'; |
| 138 | 138 | //Extraemos los campos del modelo |
| 139 | 139 | if (method_exists($this->model, $method)) { |
@@ -143,16 +143,16 @@ discard block |
||
| 143 | 143 | //Si es una relación múltiple |
| 144 | 144 | if ($value instanceof ObjectCollection) { |
| 145 | 145 | $field = $this->computeModelFieldValue($field, $value, $type); |
| 146 | - } else { //O una relación unitaria |
|
| 146 | + }else { //O una relación unitaria |
|
| 147 | 147 | if (method_exists($value, '__toString')) { |
| 148 | 148 | $field['value'] = $value; |
| 149 | 149 | } elseif ($value instanceof \DateTime) { |
| 150 | 150 | $field['value'] = $value->format('Y-m-d H:i:s'); |
| 151 | - } else { |
|
| 151 | + }else { |
|
| 152 | 152 | $field['value'] = $value->getPrimaryKey(); |
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | - } else { |
|
| 155 | + }else { |
|
| 156 | 156 | $field['value'] = $value; |
| 157 | 157 | } |
| 158 | 158 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | if ('' !== $hashOrig) { |
| 31 | 31 | $this->crfs = sha1($hashOrig); |
| 32 | - $this->add($this->getName() . '_token', array( |
|
| 32 | + $this->add($this->getName().'_token', array( |
|
| 33 | 33 | 'type' => 'hidden', |
| 34 | 34 | 'value' => $this->crfs, |
| 35 | 35 | )); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | public function isValid() |
| 44 | 44 | { |
| 45 | 45 | $valid = true; |
| 46 | - $tokenField = $this->getName() . '_token'; |
|
| 46 | + $tokenField = $this->getName().'_token'; |
|
| 47 | 47 | // Check crfs token |
| 48 | 48 | if (!$this->existsFormToken($tokenField)) { |
| 49 | 49 | $this->errors[$tokenField] = t('Formulario no válido'); |
@@ -22,15 +22,15 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | private static function mapResult(ActiveRecordInterface $model, array $data = []) { |
| 24 | 24 | $result = []; |
| 25 | - foreach($data as $key => $value) { |
|
| 25 | + foreach ($data as $key => $value) { |
|
| 26 | 26 | try { |
| 27 | 27 | $realValue = $model->getByName($key); |
| 28 | - } catch(\Exception $e) { |
|
| 28 | + }catch (\Exception $e) { |
|
| 29 | 29 | $realValue = $value; |
| 30 | 30 | } |
| 31 | - if(Api::API_MODEL_KEY_FIELD === $key) { |
|
| 31 | + if (Api::API_MODEL_KEY_FIELD === $key) { |
|
| 32 | 32 | $result[$key] = (integer)$realValue; |
| 33 | - } else { |
|
| 33 | + }else { |
|
| 34 | 34 | $result[$key] = $realValue; |
| 35 | 35 | } |
| 36 | 36 | } |
@@ -55,14 +55,14 @@ discard block |
||
| 55 | 55 | $objTableMap = get_class($formatter->getTableMap()); |
| 56 | 56 | /** @var TableMapTrait $objTableMap */ |
| 57 | 57 | $objData = $data; |
| 58 | - foreach($objTableMap::getFieldNames() as $field) { |
|
| 59 | - if(!array_key_exists($field, $objData)) { |
|
| 58 | + foreach ($objTableMap::getFieldNames() as $field) { |
|
| 59 | + if (!array_key_exists($field, $objData)) { |
|
| 60 | 60 | $objData[$field] = null; |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | $obj = @$formatter->getAllObjectsFromRow($objData); |
| 64 | 64 | $result = self::mapResult($obj, $data); |
| 65 | - if(!preg_match('/' . $modelPk->getPhpName() . '/i', $query[Api::API_FIELDS_RESULT_FIELD])) { |
|
| 65 | + if (!preg_match('/'.$modelPk->getPhpName().'/i', $query[Api::API_FIELDS_RESULT_FIELD])) { |
|
| 66 | 66 | unset($result[$modelPk->getPhpName()]); |
| 67 | 67 | } |
| 68 | 68 | return $result; |
@@ -73,11 +73,11 @@ discard block |
||
| 73 | 73 | * @return string |
| 74 | 74 | */ |
| 75 | 75 | public static function getColumnMapName(ColumnMap $field) { |
| 76 | - switch(self::getFieldTypes()) { |
|
| 76 | + switch (self::getFieldTypes()) { |
|
| 77 | 77 | default: |
| 78 | 78 | case 'UpperCamelCase': |
| 79 | 79 | case TableMap::TYPE_PHPNAME: |
| 80 | - $columnName =$field->getPhpName(); |
|
| 80 | + $columnName = $field->getPhpName(); |
|
| 81 | 81 | break; |
| 82 | 82 | case 'camelCase': |
| 83 | 83 | case 'lowerCamelCase': |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $fDto->entity = $relatedModel; |
| 32 | 32 | $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName()); |
| 33 | 33 | $fDto->relatedField = $relatedField->getPhpName(); |
| 34 | - $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel); |
|
| 34 | + $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel); |
|
| 35 | 35 | return $fDto; |
| 36 | 36 | } |
| 37 | 37 | |
@@ -43,18 +43,18 @@ discard block |
||
| 43 | 43 | private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) |
| 44 | 44 | { |
| 45 | 45 | $tableField = $column->getFullyQualifiedName(); |
| 46 | - if(is_array($value)) { |
|
| 46 | + if (is_array($value)) { |
|
| 47 | 47 | $query->add($tableField, $value, Criteria::IN); |
| 48 | 48 | } elseif (preg_match('/^\[/', $value) && preg_match('/\]$/', $value)) { |
| 49 | 49 | $query->add($tableField, explode(',', preg_replace('/(\[|\])/', '', $value)), Criteria::IN); |
| 50 | 50 | } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) { |
| 51 | 51 | $text = preg_replace('/(\'|\")/', '', $value); |
| 52 | 52 | $text = preg_replace('/\ /', '%', $text); |
| 53 | - $query->add($tableField, '%' . $text . '%', Criteria::LIKE); |
|
| 54 | - } else { |
|
| 55 | - if(null !== $column->getValueSet()) { |
|
| 53 | + $query->add($tableField, '%'.$text.'%', Criteria::LIKE); |
|
| 54 | + }else { |
|
| 55 | + if (null !== $column->getValueSet()) { |
|
| 56 | 56 | $valueSet = $column->getValueSet(); |
| 57 | - if(in_array($value, $valueSet)) { |
|
| 57 | + if (in_array($value, $valueSet)) { |
|
| 58 | 58 | $value = array_search($value, $valueSet); |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | public static function extractQuery($modelNameNamespace, ConnectionInterface $con = null) |
| 86 | 86 | { |
| 87 | - $queryReflector = new \ReflectionClass($modelNameNamespace . "Query"); |
|
| 87 | + $queryReflector = new \ReflectionClass($modelNameNamespace."Query"); |
|
| 88 | 88 | /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */ |
| 89 | 89 | $query = $queryReflector->getMethod('create')->invoke($con); |
| 90 | 90 | |
@@ -103,31 +103,31 @@ discard block |
||
| 103 | 103 | $sep = ''; |
| 104 | 104 | foreach ($tableMap->getColumns() as $column) { |
| 105 | 105 | if ($column->isText()) { |
| 106 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 106 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
| 107 | 107 | $sep = ', " ", '; |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | - foreach($tableMap->getRelations() as $relation) { |
|
| 111 | - if(preg_match('/I18n$/i', $relation->getName())) { |
|
| 110 | + foreach ($tableMap->getRelations() as $relation) { |
|
| 111 | + if (preg_match('/I18n$/i', $relation->getName())) { |
|
| 112 | 112 | $localeTableMap = $relation->getLocalTable(); |
| 113 | 113 | foreach ($localeTableMap->getColumns() as $column) { |
| 114 | 114 | if ($column->isText()) { |
| 115 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 115 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
| 116 | 116 | $sep = ', " ", '; |
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | } |
| 121 | 121 | foreach (array_keys($extraColumns) as $extra) { |
| 122 | - if(!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) { |
|
| 123 | - $exp .= $sep . $extra; |
|
| 122 | + if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) { |
|
| 123 | + $exp .= $sep.$extra; |
|
| 124 | 124 | $sep = ', " ", '; |
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | $exp .= ")"; |
| 128 | 128 | $text = preg_replace('/(\'|\")/', '', $value); |
| 129 | 129 | $text = preg_replace('/\ /', '%', $text); |
| 130 | - $query->where($exp . Criteria::LIKE . '"%' . $text . '%"'); |
|
| 130 | + $query->where($exp.Criteria::LIKE.'"%'.$text.'%"'); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | */ |
| 137 | 137 | public static function extractPrimaryKeyColumnName(TableMap $tableMap) { |
| 138 | 138 | $modelPk = null; |
| 139 | - foreach($tableMap->getPrimaryKeys() as $pk) { |
|
| 139 | + foreach ($tableMap->getPrimaryKeys() as $pk) { |
|
| 140 | 140 | $modelPk = $pk; |
| 141 | 141 | break; |
| 142 | 142 | } |