@@ -49,7 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | if (Config::getParam('angular.protection', false)) { |
52 | - $data = ")]}',\n" . $data; |
|
52 | + $data = ")]}',\n".$data; |
|
53 | 53 | } |
54 | 54 | $this->setStatus($statusCode); |
55 | 55 | ResponseHelper::setDebugHeaders([]); |
@@ -58,11 +58,11 @@ discard block |
||
58 | 58 | if ($files->hasResults()) { |
59 | 59 | foreach ($files->getIterator() as $file) { |
60 | 60 | if ($namespace !== Router::PSFS_BASE_NAMESPACE && method_exists($file, 'getRelativePathname')) { |
61 | - $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname())); |
|
62 | - } else { |
|
61 | + $filename = '\\'.str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname())); |
|
62 | + }else { |
|
63 | 63 | $filename = str_replace('/', '\\', str_replace($origen, '', $file->getPathname())); |
64 | 64 | } |
65 | - $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace); |
|
65 | + $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | $this->initializeFinder(); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | if (!is_array($this->domains)) { |
116 | 116 | $this->domains = []; |
117 | 117 | } |
118 | - $domain = '@' . $class->getConstant('DOMAIN') . '/'; |
|
118 | + $domain = '@'.$class->getConstant('DOMAIN').'/'; |
|
119 | 119 | if (!array_key_exists($domain, $this->domains)) { |
120 | 120 | $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain); |
121 | 121 | } |
@@ -142,11 +142,11 @@ discard block |
||
142 | 142 | private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath, &$routing = []) |
143 | 143 | { |
144 | 144 | $extModule = $modulePath->getBasename(); |
145 | - $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php'); |
|
145 | + $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php'); |
|
146 | 146 | if (file_exists($moduleAutoloader)) { |
147 | 147 | include_once $moduleAutoloader; |
148 | 148 | if ($hydrateRoute) { |
149 | - $routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $routing); |
|
149 | + $routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $routing); |
|
150 | 150 | } |
151 | 151 | } |
152 | 152 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $modulesToIgnore = explode(',', Config::getParam('hide.modules', '')); |
163 | 163 | try { |
164 | 164 | $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module); |
165 | - $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src'; |
|
165 | + $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src'; |
|
166 | 166 | if (file_exists($externalModulePath)) { |
167 | 167 | $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0); |
168 | 168 | if ($externalModule->hasResults()) { |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | } |
174 | 174 | } |
175 | 175 | } |
176 | - } catch (Exception $e) { |
|
176 | + }catch (Exception $e) { |
|
177 | 177 | Logger::log($e->getMessage(), LOG_WARNING); |
178 | 178 | } |
179 | 179 | } |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | public function add($name, array $value = []) |
31 | 31 | { |
32 | 32 | $this->fields[$name] = $value; |
33 | - $this->fields[$name]['name'] = $this->getName() . '[' . $name . ']'; |
|
34 | - $this->fields[$name]['id'] = $this->getName() . '_' . $name; |
|
33 | + $this->fields[$name]['name'] = $this->getName().'['.$name.']'; |
|
34 | + $this->fields[$name]['id'] = $this->getName().'_'.$name; |
|
35 | 35 | $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name; |
36 | 36 | $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true; |
37 | 37 | return $this; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $data = array(); |
71 | 71 | if (count($this->fields) > 0) { |
72 | 72 | foreach ($this->fields as $key => $field) { |
73 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) { |
|
73 | + if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) { |
|
74 | 74 | $data[$key] = array_key_exists('value', $field) ? $field['value'] : null; |
75 | 75 | } |
76 | 76 | } |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | if (array_key_exists($key, $data[$formName])) { |
118 | 118 | if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) { |
119 | 119 | $field['value'] = null; |
120 | - } else { |
|
120 | + }else { |
|
121 | 121 | $field['value'] = $data[$formName][$key]; |
122 | 122 | } |
123 | - } else { |
|
123 | + }else { |
|
124 | 124 | unset($field['value']); |
125 | 125 | } |
126 | 126 | return array($data, $field); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $use /= 1024; |
40 | 40 | break; |
41 | 41 | case "MBytes": |
42 | - $use /= (1024 * 1024); |
|
42 | + $use /= (1024*1024); |
|
43 | 43 | break; |
44 | 44 | case "Bytes": |
45 | 45 | default: |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | ini_set('display_errors', 1); |
70 | 70 | } |
71 | 71 | //Warning & Notice handler |
72 | - set_error_handler(function ($errno, $errstr, $errfile, $errline) { |
|
72 | + set_error_handler(function($errno, $errstr, $errfile, $errline) { |
|
73 | 73 | Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]); |
74 | 74 | return true; |
75 | 75 | }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR); |
76 | 76 | |
77 | - register_shutdown_function(function () { |
|
77 | + register_shutdown_function(function() { |
|
78 | 78 | $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors(); |
79 | 79 | if ($error !== NULL) { |
80 | 80 | $errno = $error["type"]; |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | |
90 | 90 | if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) { |
91 | 91 | SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [ |
92 | - 'time' => round(self::getTs(), 3) . ' secs', |
|
93 | - 'memory' => round(self::getMem('MBytes'), 3) . ' Mb', |
|
92 | + 'time' => round(self::getTs(), 3).' secs', |
|
93 | + 'memory' => round(self::getMem('MBytes'), 3).' Mb', |
|
94 | 94 | ]); |
95 | 95 | } |
96 | 96 | return false; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | Inspector::stats('[SystemTrait] Initializing stats (mem + ts)'); |
106 | 106 | if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) { |
107 | 107 | $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT']; |
108 | - } else { |
|
108 | + }else { |
|
109 | 109 | $this->ts = PSFS_START_TS; |
110 | 110 | } |
111 | 111 | $this->mem = PSFS_START_MEM; |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | if (array_key_exists('i18n', $behaviors)) { |
133 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
133 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
134 | 134 | if (null !== $relateI18n) { |
135 | 135 | $i18NTableMap = $relateI18n->getLocalTable(); |
136 | 136 | foreach ($i18NTableMap->getColumns() as $columnMap) { |
@@ -173,12 +173,12 @@ discard block |
||
173 | 173 | try { |
174 | 174 | foreach ($tableMap->getColumns() as $tableMapColumn) { |
175 | 175 | $columnName = $tableMapColumn->getPhpName(); |
176 | - if (preg_match('/^' . $field . '$/i', $columnName)) { |
|
176 | + if (preg_match('/^'.$field.'$/i', $columnName)) { |
|
177 | 177 | $column = $tableMapColumn; |
178 | 178 | break; |
179 | 179 | } |
180 | 180 | } |
181 | - } catch (\Exception $e) { |
|
181 | + }catch (\Exception $e) { |
|
182 | 182 | Logger::log($e->getMessage(), LOG_DEBUG); |
183 | 183 | } |
184 | 184 | return $column; |
@@ -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 . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
108 | + $exp .= $sep.'IFNULL('.$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 . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
117 | + $exp .= $sep.'IFNULL('.$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 . $extra; |
|
125 | + $exp .= $sep.$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 | /** |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | foreach ($data as $key => $value) { |
29 | 29 | try { |
30 | 30 | $realValue = $model->getByName($key); |
31 | - } catch (\Exception $e) { |
|
31 | + }catch (\Exception $e) { |
|
32 | 32 | $realValue = $value; |
33 | 33 | } |
34 | 34 | if (Api::API_MODEL_KEY_FIELD === $key) { |
35 | 35 | $result[$key] = (integer)$realValue; |
36 | - } else { |
|
36 | + }else { |
|
37 | 37 | $result[$key] = $realValue; |
38 | 38 | } |
39 | 39 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | $obj = @$formatter->getAllObjectsFromRow($objData); |
68 | 68 | $result = self::mapResult($obj, $data); |
69 | - if (!preg_match('/' . $modelPk->getPhpName() . '/i', $query[Api::API_FIELDS_RESULT_FIELD])) { |
|
69 | + if (!preg_match('/'.$modelPk->getPhpName().'/i', $query[Api::API_FIELDS_RESULT_FIELD])) { |
|
70 | 70 | unset($result[$modelPk->getPhpName()]); |
71 | 71 | } |
72 | 72 | return $result; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | protected function hydrateOrders() |
40 | 40 | { |
41 | 41 | if (count($this->query)) { |
42 | - Logger::log(static::class . ' gathering query string', LOG_DEBUG); |
|
42 | + Logger::log(static::class.' gathering query string', LOG_DEBUG); |
|
43 | 43 | foreach ($this->query as $key => $value) { |
44 | 44 | if ($key === self::API_ORDER_FIELD) { |
45 | 45 | $orders = json_decode($value, true); |
@@ -57,10 +57,10 @@ discard block |
||
57 | 57 | */ |
58 | 58 | protected function extractPagination() |
59 | 59 | { |
60 | - Logger::log(static::class . ' extract pagination start', LOG_DEBUG); |
|
60 | + Logger::log(static::class.' extract pagination start', LOG_DEBUG); |
|
61 | 61 | $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1; |
62 | 62 | $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100; |
63 | - Logger::log(static::class . ' extract pagination end', LOG_DEBUG); |
|
63 | + Logger::log(static::class.' extract pagination end', LOG_DEBUG); |
|
64 | 64 | return array($page, (int)$limit); |
65 | 65 | } |
66 | 66 | |
@@ -69,9 +69,9 @@ discard block |
||
69 | 69 | * @param ModelCriteria $query |
70 | 70 | * @throws \PSFS\base\exception\ApiException |
71 | 71 | */ |
72 | - protected function addOrders(ModelCriteria &$query) |
|
72 | + protected function addOrders(ModelCriteria & $query) |
|
73 | 73 | { |
74 | - Logger::log(static::class . ' extract orders start ', LOG_DEBUG); |
|
74 | + Logger::log(static::class.' extract orders start ', LOG_DEBUG); |
|
75 | 75 | $orderAdded = FALSE; |
76 | 76 | $tableMap = $this->getTableMap(); |
77 | 77 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $orderAdded = TRUE; |
80 | 80 | if ($direction === Order::ASC) { |
81 | 81 | $query->addAscendingOrderByColumn($column->getPhpName()); |
82 | - } else { |
|
82 | + }else { |
|
83 | 83 | $query->addDescendingOrderByColumn($column->getPhpName()); |
84 | 84 | } |
85 | 85 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $query->addAscendingOrderByColumn($key); |
91 | 91 | } |
92 | 92 | } |
93 | - Logger::log(static::class . ' extract orders end', LOG_DEBUG); |
|
93 | + Logger::log(static::class.' extract orders end', LOG_DEBUG); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * |
99 | 99 | * @param ModelCriteria $query |
100 | 100 | */ |
101 | - protected function addFilters(ModelCriteria &$query) |
|
101 | + protected function addFilters(ModelCriteria & $query) |
|
102 | 102 | { |
103 | 103 | if (count($this->query) > 0) { |
104 | 104 | $tableMap = $this->getTableMap(); |
@@ -125,11 +125,11 @@ discard block |
||
125 | 125 | list($page, $limit) = $this->extractPagination(); |
126 | 126 | if ($limit === -1) { |
127 | 127 | $this->list = $query->find($this->con); |
128 | - } else { |
|
128 | + }else { |
|
129 | 129 | $this->list = $query->paginate($page, $limit, $this->con); |
130 | 130 | } |
131 | 131 | $this->checkReturnFields($this->list->getQuery()); |
132 | - } catch (\Exception $e) { |
|
132 | + }catch (\Exception $e) { |
|
133 | 133 | Logger::log($e->getMessage(), LOG_ERR); |
134 | 134 | } |
135 | 135 | } |
@@ -103,8 +103,8 @@ discard block |
||
103 | 103 | $model = $class->newInstance(); |
104 | 104 | $this->hydrateModelFromRequest($model, $item); |
105 | 105 | $this->list[] = $model; |
106 | - } else { |
|
107 | - Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . t('items')); |
|
106 | + }else { |
|
107 | + Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data).t('items')); |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | try { |
122 | 122 | $model->save($con); |
123 | 123 | $con->commit(); |
124 | - } catch (\Exception $e) { |
|
124 | + }catch (\Exception $e) { |
|
125 | 125 | Logger::log($e->getMessage(), LOG_ERR, $model->toArray()); |
126 | 126 | $con->rollBack(); |
127 | 127 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | * |
147 | 147 | * @param ModelCriteria $query |
148 | 148 | */ |
149 | - protected function joinTables(ModelCriteria &$query) |
|
149 | + protected function joinTables(ModelCriteria & $query) |
|
150 | 150 | { |
151 | 151 | //TODO for specific implementations |
152 | 152 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $pks = explode(Api::API_PK_SEPARATOR, urldecode($primaryKey)); |
163 | 163 | if (count($pks) === 1 && !empty($pks[0])) { |
164 | 164 | $query->filterByPrimaryKey($pks[0]); |
165 | - } else { |
|
165 | + }else { |
|
166 | 166 | $item = 0; |
167 | 167 | foreach ($this->getPkDbName() as $phpName) { |
168 | 168 | try { |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | if ($item >= count($pks)) { |
172 | 172 | break; |
173 | 173 | } |
174 | - } catch (\Exception $e) { |
|
174 | + }catch (\Exception $e) { |
|
175 | 175 | Logger::log($e->getMessage(), LOG_DEBUG); |
176 | 176 | } |
177 | 177 | } |
@@ -202,8 +202,8 @@ discard block |
||
202 | 202 | try { |
203 | 203 | $query = $this->prepareQuery(); |
204 | 204 | $this->model = $this->findPk($query, $primaryKey); |
205 | - } catch (\Exception $e) { |
|
206 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
205 | + }catch (\Exception $e) { |
|
206 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | /** |
225 | 225 | * @param ModelCriteria $query |
226 | 226 | */ |
227 | - protected function checkReturnFields(ModelCriteria &$query) |
|
227 | + protected function checkReturnFields(ModelCriteria & $query) |
|
228 | 228 | { |
229 | 229 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
230 | 230 | if (null !== $returnFields) { |