@@ -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 | } |
@@ -122,20 +122,20 @@ discard block |
||
122 | 122 | $behaviors = $tableMap->getBehaviors(); |
123 | 123 | foreach ($map::getFieldNames() as $field) { |
124 | 124 | $fDto = self::parseFormField($domain, $tableMap, $field, $behaviors); |
125 | - if(null !== $fDto) { |
|
125 | + if (null !== $fDto) { |
|
126 | 126 | $form->addField($fDto); |
127 | 127 | } |
128 | 128 | } |
129 | 129 | |
130 | - if(array_key_exists('i18n', $behaviors)) { |
|
131 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
132 | - if(null !== $relateI18n) { |
|
130 | + if (array_key_exists('i18n', $behaviors)) { |
|
131 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
132 | + if (null !== $relateI18n) { |
|
133 | 133 | $i18NTableMap = $relateI18n->getLocalTable(); |
134 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
134 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
135 | 135 | $columnName = self::getColumnMapName($columnMap); |
136 | - if(!$form->fieldExists($columnName)) { |
|
136 | + if (!$form->fieldExists($columnName)) { |
|
137 | 137 | $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors()); |
138 | - if(null !== $fDto) { |
|
138 | + if (null !== $fDto) { |
|
139 | 139 | $fDto->pk = false; |
140 | 140 | $fDto->required = true; |
141 | 141 | $form->addField($fDto); |
@@ -158,14 +158,14 @@ discard block |
||
158 | 158 | { |
159 | 159 | $column = null; |
160 | 160 | try { |
161 | - foreach($tableMap->getColumns() as $tableMapColumn) { |
|
161 | + foreach ($tableMap->getColumns() as $tableMapColumn) { |
|
162 | 162 | $columnName = $tableMapColumn->getPhpName(); |
163 | - if(preg_match('/^'.$field.'$/i', $columnName)) { |
|
163 | + if (preg_match('/^'.$field.'$/i', $columnName)) { |
|
164 | 164 | $column = $tableMapColumn; |
165 | 165 | break; |
166 | 166 | } |
167 | 167 | } |
168 | - } catch (\Exception $e) { |
|
168 | + }catch (\Exception $e) { |
|
169 | 169 | Logger::log($e->getMessage(), LOG_DEBUG); |
170 | 170 | } |
171 | 171 | return $column; |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | */ |
177 | 177 | public static function getFieldTypes() { |
178 | 178 | $configType = Config::getParam('api.field.case', TableMap::TYPE_PHPNAME); |
179 | - switch($configType) { |
|
179 | + switch ($configType) { |
|
180 | 180 | default: |
181 | 181 | case 'UpperCamelCase': |
182 | 182 | case TableMap::TYPE_PHPNAME: |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | } elseif ($mappedColumn->isText()) { |
44 | 44 | if ($mappedColumn->getSize() > 100) { |
45 | 45 | $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required); |
46 | - } else { |
|
46 | + }else { |
|
47 | 47 | $fDto = self::generateStringField($field, $required); |
48 | 48 | } |
49 | 49 | } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) { |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | } elseif (in_array($mappedColumn->getType(), [PropelTypes::ENUM, PropelTypes::SET])) { |
60 | 60 | $fDto = self::generateEnumField($field, $required); |
61 | 61 | foreach ($mappedColumn->getValueSet() as $value) { |
62 | - switch(Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) { |
|
62 | + switch (Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) { |
|
63 | 63 | default: |
64 | 64 | case TableMap::TYPE_PHPNAME: |
65 | 65 | $fieldName = $mappedColumn->getPhpName(); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $fDto->pk = true; |
84 | 84 | } |
85 | 85 | } |
86 | - switch(Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) { |
|
86 | + switch (Config::getParam('api.field.case', TableMap::TYPE_PHPNAME)) { |
|
87 | 87 | default: |
88 | 88 | case TableMap::TYPE_PHPNAME: |
89 | 89 | $fDto->name = $mappedColumn->getPhpName(); |
@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | $array['fields'][] = $field->__toArray(); |
43 | 43 | } |
44 | 44 | usort($array['fields'], function($fieldA, $fieldB) { |
45 | - if((bool)$fieldA['required'] !== (bool)$fieldB['required']) { |
|
46 | - if((bool)$fieldA['required']) { |
|
45 | + if ((bool)$fieldA['required'] !== (bool)$fieldB['required']) { |
|
46 | + if ((bool)$fieldA['required']) { |
|
47 | 47 | return -1; |
48 | - } else { |
|
48 | + }else { |
|
49 | 49 | return 1; |
50 | 50 | } |
51 | 51 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } |
57 | 57 | return ($aOrder < $bOrder) ? -1 : 1; |
58 | 58 | }); |
59 | - foreach($this->actions as $action) { |
|
59 | + foreach ($this->actions as $action) { |
|
60 | 60 | $array['actions'][] = $action->__toArray(); |
61 | 61 | } |
62 | 62 | return $array; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $use /= 1024; |
38 | 38 | break; |
39 | 39 | case "MBytes": |
40 | - $use /= (1024 * 1024); |
|
40 | + $use /= (1024*1024); |
|
41 | 41 | break; |
42 | 42 | case "Bytes": |
43 | 43 | default: |
@@ -61,34 +61,34 @@ discard block |
||
61 | 61 | protected function bindWarningAsExceptions() |
62 | 62 | { |
63 | 63 | Inspector::stats('[SystemTrait] Added handlers for errors'); |
64 | - if(Config::getParam('debug')) { |
|
64 | + if (Config::getParam('debug')) { |
|
65 | 65 | Logger::log('Setting error_reporting as E_ALL'); |
66 | 66 | ini_set('error_reporting', E_ALL); |
67 | 67 | ini_set('display_errors', 1); |
68 | 68 | } |
69 | 69 | //Warning & Notice handler |
70 | - set_error_handler(function ($errno, $errstr, $errfile, $errline) { |
|
70 | + set_error_handler(function($errno, $errstr, $errfile, $errline) { |
|
71 | 71 | Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]); |
72 | 72 | return true; |
73 | 73 | }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR); |
74 | 74 | |
75 | - register_shutdown_function(function () { |
|
75 | + register_shutdown_function(function() { |
|
76 | 76 | $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors(); |
77 | - if( $error !== NULL) { |
|
77 | + if ($error !== NULL) { |
|
78 | 78 | $errno = $error["type"]; |
79 | 79 | $errfile = $error["file"]; |
80 | 80 | $errline = $error["line"]; |
81 | 81 | $errstr = $error["message"]; |
82 | 82 | Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]); |
83 | - if(null !== Config::getParam('log.slack.hook')) { |
|
83 | + if (null !== Config::getParam('log.slack.hook')) { |
|
84 | 84 | SlackHelper::getInstance()->trace($errstr, $errfile, $errline, $error); |
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - if(self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) { |
|
88 | + if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) { |
|
89 | 89 | SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [ |
90 | - 'time' => round(self::getTs(), 3) . ' secs', |
|
91 | - 'memory' => round(self::getMem('MBytes'), 3) . ' Mb', |
|
90 | + 'time' => round(self::getTs(), 3).' secs', |
|
91 | + 'memory' => round(self::getMem('MBytes'), 3).' Mb', |
|
92 | 92 | ]); |
93 | 93 | } |
94 | 94 | return false; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | Inspector::stats('[SystemTrait] Initializing stats (mem + ts)'); |
104 | 104 | if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) { |
105 | 105 | $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT']; |
106 | - } else { |
|
106 | + }else { |
|
107 | 107 | $this->ts = PSFS_START_TS; |
108 | 108 | } |
109 | 109 | $this->mem = PSFS_START_MEM; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $locale = Request::header('X-API-LANG', $default); |
29 | 29 | if (empty($locale)) { |
30 | 30 | $locale = Security::getInstance()->getSessionKey(self::PSFS_SESSION_LANGUAGE_KEY); |
31 | - if(empty($locale) && array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) { |
|
31 | + if (empty($locale) && array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) { |
|
32 | 32 | $BrowserLocales = explode(",", str_replace("-", "_", $_SERVER["HTTP_ACCEPT_LANGUAGE"])); // brosers use en-US, Linux uses en_US |
33 | 33 | for ($i = 0, $ct = count($BrowserLocales); $i < $ct; $i++) { |
34 | 34 | list($BrowserLocales[$i]) = explode(";", $BrowserLocales[$i]); //trick for "en;q=0.8" |
@@ -44,8 +44,8 @@ discard block |
||
44 | 44 | // TODO check more en locales |
45 | 45 | if (strtolower($locale) === 'en') { |
46 | 46 | $locale = 'en_GB'; |
47 | - } else { |
|
48 | - $locale = $locale . '_' . strtoupper($locale); |
|
47 | + }else { |
|
48 | + $locale = $locale.'_'.strtoupper($locale); |
|
49 | 49 | } |
50 | 50 | $default_locales = explode(',', Config::getParam('i18n.locales', '')); |
51 | 51 | if (!in_array($locale, array_merge($default_locales, self::$langs))) { |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $translations = array(); |
67 | 67 | if (file_exists($absoluteTranslationFileName)) { |
68 | 68 | @include($absoluteTranslationFileName); |
69 | - } else { |
|
69 | + }else { |
|
70 | 70 | Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE); |
71 | 71 | } |
72 | 72 | |
@@ -81,13 +81,13 @@ discard block |
||
81 | 81 | public static function setLocale($default = null) |
82 | 82 | { |
83 | 83 | $locale = self::extractLocale($default); |
84 | - Inspector::stats('[i18NHelper] Set locale to project [' . $locale . ']'); |
|
84 | + Inspector::stats('[i18NHelper] Set locale to project ['.$locale.']'); |
|
85 | 85 | // Load translations |
86 | - putenv("LC_ALL=" . $locale); |
|
86 | + putenv("LC_ALL=".$locale); |
|
87 | 87 | setlocale(LC_ALL, $locale); |
88 | 88 | // Load the locale path |
89 | - $localePath = BASE_DIR . DIRECTORY_SEPARATOR . 'locale'; |
|
90 | - Logger::log('Set locale dir ' . $localePath); |
|
89 | + $localePath = BASE_DIR.DIRECTORY_SEPARATOR.'locale'; |
|
90 | + Logger::log('Set locale dir '.$localePath); |
|
91 | 91 | GeneratorHelper::createDir($localePath); |
92 | 92 | bindtextdomain('translations', $localePath); |
93 | 93 | textdomain('translations'); |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | */ |
124 | 124 | public static function checkI18Class($namespace) { |
125 | 125 | $isI18n = false; |
126 | - if(preg_match('/I18n$/i', $namespace)) { |
|
126 | + if (preg_match('/I18n$/i', $namespace)) { |
|
127 | 127 | $parentClass = preg_replace('/I18n$/i', '', $namespace); |
128 | - if(Router::exists($parentClass)) { |
|
128 | + if (Router::exists($parentClass)) { |
|
129 | 129 | $isI18n = true; |
130 | 130 | } |
131 | 131 | } |
@@ -151,12 +151,12 @@ discard block |
||
151 | 151 | ['i', 'i', 'i', 'i', 'I', 'I', 'I', 'I'], |
152 | 152 | ['o', 'o', 'o', 'o', 'O', 'O', 'O', 'O'], |
153 | 153 | ['u', 'u', 'u', 'u', 'U', 'U', 'U', 'U'], |
154 | - ['n', 'N', 'c', 'C',], |
|
154 | + ['n', 'N', 'c', 'C', ], |
|
155 | 155 | ]; |
156 | 156 | |
157 | 157 | $text = filter_var($string, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW); |
158 | - for($i = 0, $total = count($from); $i < $total; $i++) { |
|
159 | - $text = str_replace($from[$i],$to[$i], $text); |
|
158 | + for ($i = 0, $total = count($from); $i < $total; $i++) { |
|
159 | + $text = str_replace($from[$i], $to[$i], $text); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | return $text; |
@@ -20,11 +20,11 @@ discard block |
||
20 | 20 | { |
21 | 21 | Inspector::stats('[RouterHelper] Getting class to call for executing the request action'); |
22 | 22 | Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action); |
23 | - $actionClass = class_exists($action['class']) ? $action['class'] : "\\" . $action['class']; |
|
23 | + $actionClass = class_exists($action['class']) ? $action['class'] : "\\".$action['class']; |
|
24 | 24 | $reflectionClass = new \ReflectionClass($actionClass); |
25 | - if($reflectionClass->hasMethod('getInstance')) { |
|
25 | + if ($reflectionClass->hasMethod('getInstance')) { |
|
26 | 26 | $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']); |
27 | - } else { |
|
27 | + }else { |
|
28 | 28 | $class = new $actionClass; |
29 | 29 | } |
30 | 30 | return $class; |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $expr = preg_quote($expr, '/'); |
114 | 114 | $expr = str_replace('###', '(.*)', $expr); |
115 | 115 | $expr2 = preg_replace('/\(\.\*\)$/', '', $expr); |
116 | - $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path); |
|
116 | + $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path); |
|
117 | 117 | return $matched; |
118 | 118 | } |
119 | 119 | |
@@ -124,8 +124,8 @@ discard block |
||
124 | 124 | */ |
125 | 125 | public static function extractDomainInfo(\ReflectionClass $class, $domain) |
126 | 126 | { |
127 | - $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; |
|
128 | - $path = realpath($path) . DIRECTORY_SEPARATOR; |
|
127 | + $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR; |
|
128 | + $path = realpath($path).DIRECTORY_SEPARATOR; |
|
129 | 129 | $templatesPath = 'templates'; |
130 | 130 | $publicPath = 'public'; |
131 | 131 | $modelsPath = 'models'; |
@@ -135,13 +135,13 @@ discard block |
||
135 | 135 | $modelsPath = ucfirst($modelsPath); |
136 | 136 | } |
137 | 137 | if ($class->hasConstant('TPL')) { |
138 | - $templatesPath .= DIRECTORY_SEPARATOR . $class->getConstant('TPL'); |
|
138 | + $templatesPath .= DIRECTORY_SEPARATOR.$class->getConstant('TPL'); |
|
139 | 139 | } |
140 | 140 | return [ |
141 | 141 | 'base' => $path, |
142 | - 'template' => $path . $templatesPath, |
|
143 | - 'model' => $path . $modelsPath, |
|
144 | - 'public' => $path . $publicPath, |
|
142 | + 'template' => $path.$templatesPath, |
|
143 | + 'model' => $path.$modelsPath, |
|
144 | + 'public' => $path.$publicPath, |
|
145 | 145 | ]; |
146 | 146 | } |
147 | 147 | |
@@ -165,12 +165,12 @@ discard block |
||
165 | 165 | foreach ($parameters as $param) { |
166 | 166 | if ($param->isOptional() && !is_array($param->getDefaultValue())) { |
167 | 167 | $params[$param->getName()] = $param->getDefaultValue(); |
168 | - $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex); |
|
169 | - } elseif(!$param->isOptional()) { |
|
168 | + $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex); |
|
169 | + } elseif (!$param->isOptional()) { |
|
170 | 170 | $requirements[] = $param->getName(); |
171 | 171 | } |
172 | 172 | } |
173 | - } else { |
|
173 | + }else { |
|
174 | 174 | $default = $regex; |
175 | 175 | } |
176 | 176 | |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $httpMethod = self::extractReflectionHttpMethod($docComments); |
267 | 267 | $icon = self::extractDocIcon($docComments); |
268 | 268 | $label = self::extractReflectionLabel(str_replace('{__API__}', $api, $docComments)); |
269 | - $route = $httpMethod . "#|#" . $regex; |
|
269 | + $route = $httpMethod."#|#".$regex; |
|
270 | 270 | $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route); |
271 | 271 | $info = [ |
272 | 272 | 'method' => $method->getName(), |