@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | if (count($pks) === 1) { |
82 | 82 | $pks = array_keys($pks); |
83 | 83 | return [ |
84 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD |
|
84 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD |
|
85 | 85 | ]; |
86 | 86 | } |
87 | 87 | if (count($pks) > 1) { |
@@ -89,9 +89,9 @@ discard block |
||
89 | 89 | $principal = ''; |
90 | 90 | $sep = 'CONCAT('; |
91 | 91 | foreach ($pks as $pk) { |
92 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); |
|
93 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); |
|
94 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; |
|
92 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); |
|
93 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); |
|
94 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; |
|
95 | 95 | } |
96 | 96 | $principal .= ')'; |
97 | 97 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; |
@@ -118,10 +118,10 @@ discard block |
||
118 | 118 | $pks = ''; |
119 | 119 | $sep = ''; |
120 | 120 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
121 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
121 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
122 | 122 | $sep = ', "|", '; |
123 | 123 | } |
124 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; |
|
124 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | } |
144 | 144 | if (null !== $column) { |
145 | 145 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; |
146 | - } else { |
|
146 | + }else { |
|
147 | 147 | $this->addClassListName($tableMap); |
148 | 148 | } |
149 | 149 | } |
@@ -161,15 +161,15 @@ discard block |
||
161 | 161 | $this->addPkToList(); |
162 | 162 | } |
163 | 163 | if (!empty($this->extraColumns)) { |
164 | - if(Config::getParam('api.extrafields.compat', true)) { |
|
164 | + if (Config::getParam('api.extrafields.compat', true)) { |
|
165 | 165 | $fields = array_values($this->extraColumns); |
166 | - } else { |
|
166 | + }else { |
|
167 | 167 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
168 | 168 | $fields = explode(',', $returnFields ?: ''); |
169 | 169 | $fields[] = self::API_MODEL_KEY_FIELD; |
170 | 170 | } |
171 | 171 | foreach ($this->extraColumns as $expression => $columnName) { |
172 | - if(empty($fields) || in_array($columnName, $fields)) { |
|
172 | + if (empty($fields) || in_array($columnName, $fields)) { |
|
173 | 173 | $query->withColumn($expression, $columnName); |
174 | 174 | } |
175 | 175 | } |
@@ -200,18 +200,18 @@ discard block |
||
200 | 200 | { |
201 | 201 | $this->extractApiLang(); |
202 | 202 | $model = $this->getModelNamespace(); |
203 | - $modelI18n = $model . 'I18n'; |
|
203 | + $modelI18n = $model.'I18n'; |
|
204 | 204 | if (method_exists($query, 'useI18nQuery')) { |
205 | 205 | $query->useI18nQuery($this->lang); |
206 | 206 | $modelParts = explode('\\', $modelI18n); |
207 | - $i18nMapClass = str_replace(end($modelParts), 'Map\\' . end($modelParts), $modelI18n) . 'TableMap'; |
|
207 | + $i18nMapClass = str_replace(end($modelParts), 'Map\\'.end($modelParts), $modelI18n).'TableMap'; |
|
208 | 208 | /** @var TableMap $modelI18nTableMap */ |
209 | 209 | $modelI18nTableMap = $i18nMapClass::getTableMap(); |
210 | - foreach($modelI18nTableMap->getColumns() as $columnMap) { |
|
211 | - if(!$columnMap->isPrimaryKey()) { |
|
210 | + foreach ($modelI18nTableMap->getColumns() as $columnMap) { |
|
211 | + if (!$columnMap->isPrimaryKey()) { |
|
212 | 212 | $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap)); |
213 | - } elseif(!$columnMap->isForeignKey()) { |
|
214 | - $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
213 | + } elseif (!$columnMap->isForeignKey()) { |
|
214 | + $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
215 | 215 | } |
216 | 216 | } |
217 | 217 | } |
@@ -225,22 +225,22 @@ discard block |
||
225 | 225 | $model->fromArray($data, ApiHelper::getFieldTypes()); |
226 | 226 | $tableMap = $this->getTableMap(); |
227 | 227 | try { |
228 | - if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) |
|
228 | + if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) |
|
229 | 229 | { |
230 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
230 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
231 | 231 | $i18NTableMap = $relateI18n->getLocalTable(); |
232 | 232 | $model->setLocale($this->lang); |
233 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
234 | - $method = 'set' . $columnMap->getPhpName(); |
|
233 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
234 | + $method = 'set'.$columnMap->getPhpName(); |
|
235 | 235 | $dtoColumnName = ApiHelper::getColumnMapName($columnMap); |
236 | - if(array_key_exists($dtoColumnName, $data) |
|
236 | + if (array_key_exists($dtoColumnName, $data) |
|
237 | 237 | && method_exists($model, $method) |
238 | 238 | && !($columnMap->isPrimaryKey() && $columnMap->isForeignKey())) { |
239 | 239 | $model->$method($data[$dtoColumnName]); |
240 | 240 | } |
241 | 241 | } |
242 | 242 | } |
243 | - } catch(Exception $e) { |
|
243 | + }catch (Exception $e) { |
|
244 | 244 | Logger::log($e->getMessage(), LOG_DEBUG); |
245 | 245 | } |
246 | 246 | } |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | { |
26 | 26 | Inspector::stats('[RouterHelper] Getting class to call for executing the request action', Inspector::SCOPE_DEBUG); |
27 | 27 | Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action); |
28 | - $actionClass = class_exists($action['class']) ? $action['class'] : "\\" . $action['class']; |
|
28 | + $actionClass = class_exists($action['class']) ? $action['class'] : "\\".$action['class']; |
|
29 | 29 | $reflectionClass = new ReflectionClass($actionClass); |
30 | - if($reflectionClass->hasMethod('getInstance')) { |
|
30 | + if ($reflectionClass->hasMethod('getInstance')) { |
|
31 | 31 | $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']); |
32 | - } else { |
|
32 | + }else { |
|
33 | 33 | $class = new $actionClass; |
34 | 34 | } |
35 | 35 | return $class; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $expr = preg_quote($expr, '/'); |
119 | 119 | $expr = str_replace('###', '(.*)', $expr); |
120 | 120 | $expr2 = preg_replace('/\(\.\*\)$/', '', $expr); |
121 | - $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path); |
|
121 | + $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path); |
|
122 | 122 | return $matched; |
123 | 123 | } |
124 | 124 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public static function extractDomainInfo(ReflectionClass $class, $domain) |
131 | 131 | { |
132 | - $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; |
|
132 | + $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR; |
|
133 | 133 | $templatesPath = 'templates'; |
134 | 134 | $publicPath = 'public'; |
135 | 135 | $modelsPath = 'models'; |
@@ -139,13 +139,13 @@ discard block |
||
139 | 139 | $modelsPath = ucfirst($modelsPath); |
140 | 140 | } |
141 | 141 | if ($class->hasConstant('TPL')) { |
142 | - $templatesPath .= DIRECTORY_SEPARATOR . $class->getConstant('TPL'); |
|
142 | + $templatesPath .= DIRECTORY_SEPARATOR.$class->getConstant('TPL'); |
|
143 | 143 | } |
144 | 144 | return [ |
145 | 145 | 'base' => $path, |
146 | - 'template' => $path . $templatesPath, |
|
147 | - 'model' => $path . $modelsPath, |
|
148 | - 'public' => $path . $publicPath, |
|
146 | + 'template' => $path.$templatesPath, |
|
147 | + 'model' => $path.$modelsPath, |
|
148 | + 'public' => $path.$publicPath, |
|
149 | 149 | ]; |
150 | 150 | } |
151 | 151 | |
@@ -166,12 +166,12 @@ discard block |
||
166 | 166 | foreach ($parameters as $param) { |
167 | 167 | if ($param->isOptional() && !is_array($param->getDefaultValue())) { |
168 | 168 | $params[$param->getName()] = $param->getDefaultValue(); |
169 | - $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex); |
|
170 | - } elseif(!$param->isOptional()) { |
|
169 | + $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex); |
|
170 | + } elseif (!$param->isOptional()) { |
|
171 | 171 | $requirements[] = $param->getName(); |
172 | 172 | } |
173 | 173 | } |
174 | - } else { |
|
174 | + }else { |
|
175 | 175 | $default = $regex; |
176 | 176 | } |
177 | 177 | |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | $httpMethod = AnnotationHelper::extractReflectionHttpMethod($docComments); |
201 | 201 | $icon = AnnotationHelper::extractDocIcon($docComments); |
202 | 202 | $label = AnnotationHelper::extractReflectionLabel(str_replace('{__API__}', $api, $docComments)); |
203 | - $route = $httpMethod . "#|#" . $regex; |
|
203 | + $route = $httpMethod."#|#".$regex; |
|
204 | 204 | $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route); |
205 | 205 | $info = [ |
206 | 206 | 'method' => $method->getName(), |
@@ -19,11 +19,11 @@ |
||
19 | 19 | public static function checkApiActions($namespace, $domain, $api) { |
20 | 20 | $actions = []; |
21 | 21 | $reflector = new ReflectionClass($namespace); |
22 | - if(null !== $reflector) { |
|
23 | - foreach($reflector->getMethods(ReflectionMethod::IS_PUBLIC) as $apiAction) { |
|
22 | + if (null !== $reflector) { |
|
23 | + foreach ($reflector->getMethods(ReflectionMethod::IS_PUBLIC) as $apiAction) { |
|
24 | 24 | $docComments = $apiAction->getDocComment(); |
25 | 25 | $action = AnnotationHelper::extractAction($docComments); |
26 | - if(null !== $action) { |
|
26 | + if (null !== $action) { |
|
27 | 27 | list($route, $info) = RouterHelper::extractRouteInfo($apiAction, $api, $domain); |
28 | 28 | list($method, $cleanRoute) = RouterHelper::extractHttpRoute($route); |
29 | 29 | $formAction = new FormAction(); |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | $label = self::getLabel($property->getDocComment()); |
32 | 32 | $values = self::getValues($property->getDocComment()); |
33 | 33 | $isArray = (bool)preg_match('/\[\]$/', $instanceType); |
34 | - if($isArray) { |
|
34 | + if ($isArray) { |
|
35 | 35 | $instanceType = str_replace('[]', '', $instanceType); |
36 | 36 | } |
37 | - if($instanceType === '\\DateTime' || !Router::exists($instanceType)) { |
|
37 | + if ($instanceType === '\\DateTime' || !Router::exists($instanceType)) { |
|
38 | 38 | list($type, $format) = DocumentorHelper::translateSwaggerFormats($instanceType); |
39 | 39 | $variables[$property->getName()] = [ |
40 | 40 | 'type' => $type, |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | 'required' => $isRequired, |
43 | 43 | 'description' => $label, |
44 | 44 | ]; |
45 | - } else { |
|
45 | + }else { |
|
46 | 46 | $instance = new ReflectionClass($instanceType); |
47 | 47 | $variables[$property->getName()] = [ |
48 | 48 | 'is_array' => $isArray, |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | 'properties' => self::extractVariables($instance), |
52 | 52 | ]; |
53 | 53 | } |
54 | - if(!empty($values)){ |
|
54 | + if (!empty($values)) { |
|
55 | 55 | $variables[$property->getName()]['enum'] = $values; |
56 | 56 | } |
57 | 57 | } |
@@ -155,13 +155,13 @@ discard block |
||
155 | 155 | */ |
156 | 156 | public static function constructInjectableInstance($variable, $singleton, $classNameSpace, $calledClass) |
157 | 157 | { |
158 | - Logger::log('Create inyectable instance for ' . $classNameSpace); |
|
158 | + Logger::log('Create inyectable instance for '.$classNameSpace); |
|
159 | 159 | $reflector = new ReflectionClass($calledClass); |
160 | 160 | $property = $reflector->getProperty($variable); |
161 | 161 | $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace; |
162 | 162 | if (true === $singleton && method_exists($varInstanceType, 'getInstance')) { |
163 | 163 | $instance = $varInstanceType::getInstance(); |
164 | - } else { |
|
164 | + }else { |
|
165 | 165 | $instance = new $varInstanceType(); |
166 | 166 | } |
167 | 167 | return $instance; |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | public static function getClassProperties($class) |
176 | 176 | { |
177 | 177 | $properties = []; |
178 | - Logger::log('Extracting annotations properties from class ' . $class); |
|
178 | + Logger::log('Extracting annotations properties from class '.$class); |
|
179 | 179 | $selfReflector = new ReflectionClass($class); |
180 | 180 | if (false !== $selfReflector->getParentClass()) { |
181 | 181 | $properties = self::getClassProperties($selfReflector->getParentClass()->getName()); |
@@ -92,7 +92,7 @@ |
||
92 | 92 | * @return string|null |
93 | 93 | */ |
94 | 94 | public static function extractFromDoc($needle, $comments, $default = null) { |
95 | - preg_match('/@' . $needle . '\ (.*)(\n|\r)/im', $comments, $matches); |
|
95 | + preg_match('/@'.$needle.'\ (.*)(\n|\r)/im', $comments, $matches); |
|
96 | 96 | return (count($matches) > 0) ? $matches[1] : $default; |
97 | 97 | } |
98 | 98 | } |