@@ -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'); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | protected static function calculateStats(array $stats, $timestamp, $mem = 0, $files = 0) { |
40 | 40 | return [ |
41 | 41 | 'ts' => round($stats['ts'] - $timestamp, 4), |
42 | - 'mem' => round(($stats['mem'] - $mem) / 1024 / 1024, 4), |
|
42 | + 'mem' => round(($stats['mem'] - $mem)/1024/1024, 4), |
|
43 | 43 | 'files' => $stats['files'] - $files, |
44 | 44 | 'name' => $stats['name'], |
45 | 45 | ]; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $timestamp = defined('PSFS_START_TS') ? PSFS_START_TS : 0; |
54 | 54 | $mem = defined('PSFS_START_MEM') ? PSFS_START_MEM : 0; |
55 | 55 | $files = 0; |
56 | - foreach(self::$profiling as &$value) { |
|
56 | + foreach (self::$profiling as &$value) { |
|
57 | 57 | $value = self::calculateStats($value, $timestamp, $mem, $files); |
58 | 58 | } |
59 | 59 | self::$profiling[] = self::calculateStats(self::collect('Profiling collect ends'), $timestamp, $mem, $files); |
@@ -19,10 +19,10 @@ discard block |
||
19 | 19 | $objects = scandir($dir); |
20 | 20 | foreach ($objects as $object) { |
21 | 21 | if ($object != "." && $object != "..") { |
22 | - if (filetype($dir . "/" . $object) == "dir") { |
|
23 | - self::deleteDir($dir . "/" . $object); |
|
24 | - } else { |
|
25 | - unlink($dir . "/" . $object); |
|
22 | + if (filetype($dir."/".$object) == "dir") { |
|
23 | + self::deleteDir($dir."/".$object); |
|
24 | + }else { |
|
25 | + unlink($dir."/".$object); |
|
26 | 26 | } |
27 | 27 | } |
28 | 28 | } |
@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | { |
39 | 39 | $rootDirs = array("css", "js", "media", "font"); |
40 | 40 | foreach ($rootDirs as $dir) { |
41 | - if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) { |
|
41 | + if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) { |
|
42 | 42 | try { |
43 | - self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir); |
|
44 | - } catch (\Exception $e) { |
|
43 | + self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir); |
|
44 | + }catch (\Exception $e) { |
|
45 | 45 | Logger::log($e->getMessage()); |
46 | 46 | } |
47 | 47 | } |
@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | { |
58 | 58 | try { |
59 | 59 | if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) { |
60 | - throw new \Exception(t('Can\'t create directory ') . $dir); |
|
60 | + throw new \Exception(t('Can\'t create directory ').$dir); |
|
61 | 61 | } |
62 | - } catch (\Exception $e) { |
|
62 | + }catch (\Exception $e) { |
|
63 | 63 | Logger::log($e->getMessage(), LOG_WARNING); |
64 | 64 | if (!file_exists(dirname($dir))) { |
65 | - throw new GeneratorException($e->getMessage() . $dir); |
|
65 | + throw new GeneratorException($e->getMessage().$dir); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public static function getTemplatePath() |
75 | 75 | { |
76 | - $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR; |
|
76 | + $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR; |
|
77 | 77 | return realpath($path); |
78 | 78 | } |
79 | 79 | |
@@ -92,15 +92,15 @@ discard block |
||
92 | 92 | * @throws \ReflectionException |
93 | 93 | */ |
94 | 94 | public static function checkCustomNamespaceApi($namespace) { |
95 | - if(!empty($namespace)) { |
|
96 | - if(class_exists($namespace)) { |
|
95 | + if (!empty($namespace)) { |
|
96 | + if (class_exists($namespace)) { |
|
97 | 97 | $reflector = new \ReflectionClass($namespace); |
98 | - if(!$reflector->isSubclassOf(\PSFS\base\types\Api::class)) { |
|
98 | + if (!$reflector->isSubclassOf(\PSFS\base\types\Api::class)) { |
|
99 | 99 | throw new GeneratorException(t('La clase definida debe extender de PSFS\\\base\\\types\\\Api'), 501); |
100 | - } elseif(!$reflector->isAbstract()) { |
|
100 | + } elseif (!$reflector->isAbstract()) { |
|
101 | 101 | throw new GeneratorException(t('La clase definida debe ser abstracta'), 501); |
102 | 102 | } |
103 | - } else { |
|
103 | + }else { |
|
104 | 104 | throw new GeneratorException(t('La clase definida para extender la API no existe'), 501); |
105 | 105 | } |
106 | 106 | } |
@@ -111,13 +111,13 @@ discard block |
||
111 | 111 | * @return array |
112 | 112 | */ |
113 | 113 | public static function getDomainPaths($domain) { |
114 | - $domains = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json'), true); |
|
114 | + $domains = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json'), true); |
|
115 | 115 | $paths = []; |
116 | - if(null !== $domains) { |
|
116 | + if (null !== $domains) { |
|
117 | 117 | $keyDomains = array_keys($domains); |
118 | - foreach($keyDomains as $keyDomain) { |
|
118 | + foreach ($keyDomains as $keyDomain) { |
|
119 | 119 | $key = strtoupper(str_replace(['@', '/'], '', $keyDomain)); |
120 | - if(strtoupper($domain) === $key) { |
|
120 | + if (strtoupper($domain) === $key) { |
|
121 | 121 | $paths = $domains[$keyDomain]; |
122 | 122 | break; |
123 | 123 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | if (count($pks) === 1) { |
81 | 81 | $pks = array_keys($pks); |
82 | 82 | return [ |
83 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD |
|
83 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD |
|
84 | 84 | ]; |
85 | 85 | } |
86 | 86 | if (count($pks) > 1) { |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | $principal = ''; |
89 | 89 | $sep = 'CONCAT('; |
90 | 90 | foreach ($pks as $pk) { |
91 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); |
|
92 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); |
|
93 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; |
|
91 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); |
|
92 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); |
|
93 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; |
|
94 | 94 | } |
95 | 95 | $principal .= ')'; |
96 | 96 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | $pks = ''; |
118 | 118 | $sep = ''; |
119 | 119 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
120 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
120 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
121 | 121 | $sep = ', "|", '; |
122 | 122 | } |
123 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; |
|
123 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | if (null !== $column) { |
144 | 144 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; |
145 | - } else { |
|
145 | + }else { |
|
146 | 146 | $this->addClassListName($tableMap); |
147 | 147 | } |
148 | 148 | } |
@@ -160,15 +160,15 @@ discard block |
||
160 | 160 | $this->addPkToList(); |
161 | 161 | } |
162 | 162 | if (!empty($this->extraColumns)) { |
163 | - if(Config::getParam('api.extrafields.compat', true)) { |
|
163 | + if (Config::getParam('api.extrafields.compat', true)) { |
|
164 | 164 | $fields = array_values($this->extraColumns); |
165 | - } else { |
|
165 | + }else { |
|
166 | 166 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
167 | 167 | $fields = explode(',', $returnFields ?: ''); |
168 | 168 | $fields[] = self::API_MODEL_KEY_FIELD; |
169 | 169 | } |
170 | 170 | foreach ($this->extraColumns as $expression => $columnName) { |
171 | - if(empty($fields) || in_array($columnName, $fields)) { |
|
171 | + if (empty($fields) || in_array($columnName, $fields)) { |
|
172 | 172 | $query->withColumn($expression, $columnName); |
173 | 173 | } |
174 | 174 | } |
@@ -199,17 +199,17 @@ discard block |
||
199 | 199 | { |
200 | 200 | $this->extractApiLang(); |
201 | 201 | $model = $this->getModelNamespace(); |
202 | - $modelI18n = $model . 'I18n'; |
|
202 | + $modelI18n = $model.'I18n'; |
|
203 | 203 | if (method_exists($query, 'useI18nQuery')) { |
204 | 204 | $query->useI18nQuery($this->lang); |
205 | - $i18nMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap'; |
|
205 | + $i18nMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap'; |
|
206 | 206 | /** @var TableMap $modelI18nTableMap */ |
207 | 207 | $modelI18nTableMap = $i18nMapClass::getTableMap(); |
208 | - foreach($modelI18nTableMap->getColumns() as $columnMap) { |
|
209 | - if(!$columnMap->isPrimaryKey()) { |
|
208 | + foreach ($modelI18nTableMap->getColumns() as $columnMap) { |
|
209 | + if (!$columnMap->isPrimaryKey()) { |
|
210 | 210 | $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap)); |
211 | - } elseif(!$columnMap->isForeignKey()) { |
|
212 | - $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
211 | + } elseif (!$columnMap->isForeignKey()) { |
|
212 | + $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
213 | 213 | } |
214 | 214 | } |
215 | 215 | } |
@@ -223,22 +223,22 @@ discard block |
||
223 | 223 | $model->fromArray($data, ApiHelper::getFieldTypes()); |
224 | 224 | $tableMap = $this->getTableMap(); |
225 | 225 | try { |
226 | - if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) |
|
226 | + if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) |
|
227 | 227 | { |
228 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
228 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
229 | 229 | $i18NTableMap = $relateI18n->getLocalTable(); |
230 | 230 | $model->setLocale($this->lang); |
231 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
232 | - $method = 'set' . $columnMap->getPhpName(); |
|
231 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
232 | + $method = 'set'.$columnMap->getPhpName(); |
|
233 | 233 | $dtoColumnName = ApiHelper::getColumnMapName($columnMap); |
234 | - if(array_key_exists($dtoColumnName, $data) |
|
234 | + if (array_key_exists($dtoColumnName, $data) |
|
235 | 235 | && method_exists($model, $method) |
236 | 236 | && !($columnMap->isPrimaryKey() && $columnMap->isForeignKey())) { |
237 | 237 | $model->$method($data[$dtoColumnName]); |
238 | 238 | } |
239 | 239 | } |
240 | 240 | } |
241 | - } catch(\Exception $e) { |
|
241 | + }catch (\Exception $e) { |
|
242 | 242 | Logger::log($e->getMessage(), LOG_DEBUG); |
243 | 243 | } |
244 | 244 | } |
@@ -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 | } |