@@ -17,11 +17,11 @@ discard block |
||
| 17 | 17 | public static function checkApiActions($namespace, $domain, $api) { |
| 18 | 18 | $actions = []; |
| 19 | 19 | $reflector = new \ReflectionClass($namespace); |
| 20 | - if(null !== $reflector) { |
|
| 21 | - foreach($reflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $apiAction) { |
|
| 20 | + if (null !== $reflector) { |
|
| 21 | + foreach ($reflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $apiAction) { |
|
| 22 | 22 | $docComments = $apiAction->getDocComment(); |
| 23 | 23 | $action = self::extractAction($docComments); |
| 24 | - if(null !== $action) { |
|
| 24 | + if (null !== $action) { |
|
| 25 | 25 | list($route, $info) = RouterHelper::extractRouteInfo($apiAction, $api, $domain); |
| 26 | 26 | list($method, $cleanRoute) = RouterHelper::extractHttpRoute($route); |
| 27 | 27 | $formAction = new FormAction(); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | { |
| 45 | 45 | $action = null; |
| 46 | 46 | if (false !== preg_match('/@action\s+([^\s]+)/', $doc, $matches)) { |
| 47 | - if(count($matches) > 1) { |
|
| 47 | + if (count($matches) > 1) { |
|
| 48 | 48 | list(, $action) = $matches; |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -65,21 +65,21 @@ discard block |
||
| 65 | 65 | if (count($pks) == 1) { |
| 66 | 66 | $pks = array_keys($pks); |
| 67 | 67 | return [ |
| 68 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD |
|
| 68 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD |
|
| 69 | 69 | ]; |
| 70 | 70 | } elseif (count($pks) > 1) { |
| 71 | 71 | $apiPks = []; |
| 72 | 72 | $principal = ''; |
| 73 | 73 | $sep = 'CONCAT('; |
| 74 | 74 | foreach ($pks as $pk) { |
| 75 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); |
|
| 76 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); |
|
| 77 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; |
|
| 75 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); |
|
| 76 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); |
|
| 77 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; |
|
| 78 | 78 | } |
| 79 | 79 | $principal .= ')'; |
| 80 | 80 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; |
| 81 | 81 | return $apiPks; |
| 82 | - } else { |
|
| 82 | + }else { |
|
| 83 | 83 | throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta')); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -102,10 +102,10 @@ discard block |
||
| 102 | 102 | $pks = ''; |
| 103 | 103 | $sep = ''; |
| 104 | 104 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
| 105 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
| 105 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
| 106 | 106 | $sep = ', "|", '; |
| 107 | 107 | } |
| 108 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; |
|
| 108 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | } |
| 128 | 128 | if (null !== $column) { |
| 129 | 129 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; |
| 130 | - } else { |
|
| 130 | + }else { |
|
| 131 | 131 | $this->addClassListName($tableMap); |
| 132 | 132 | } |
| 133 | 133 | } |
@@ -146,15 +146,15 @@ discard block |
||
| 146 | 146 | $this->addPkToList(); |
| 147 | 147 | } |
| 148 | 148 | if (!empty($this->extraColumns)) { |
| 149 | - if(Config::getParam('api.extrafields.compat', true)) { |
|
| 149 | + if (Config::getParam('api.extrafields.compat', true)) { |
|
| 150 | 150 | $fields = array_values($this->extraColumns); |
| 151 | - } else { |
|
| 151 | + }else { |
|
| 152 | 152 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
| 153 | 153 | $fields = explode(',', $returnFields ?: ''); |
| 154 | 154 | $fields[] = self::API_MODEL_KEY_FIELD; |
| 155 | 155 | } |
| 156 | 156 | foreach ($this->extraColumns as $expression => $columnName) { |
| 157 | - if(empty($fields) || in_array($columnName, $fields)) { |
|
| 157 | + if (empty($fields) || in_array($columnName, $fields)) { |
|
| 158 | 158 | $query->withColumn($expression, $columnName); |
| 159 | 159 | } |
| 160 | 160 | } |
@@ -186,17 +186,17 @@ discard block |
||
| 186 | 186 | { |
| 187 | 187 | $this->extractApiLang(); |
| 188 | 188 | $model = $this->getModelNamespace(); |
| 189 | - $modelI18n = $model . 'I18n'; |
|
| 189 | + $modelI18n = $model.'I18n'; |
|
| 190 | 190 | if (method_exists($query, 'useI18nQuery')) { |
| 191 | 191 | $query->useI18nQuery($this->lang); |
| 192 | - $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap'; |
|
| 192 | + $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap'; |
|
| 193 | 193 | /** @var TableMap $modelI18nTableMap */ |
| 194 | 194 | $modelI18nTableMap = $modelI18nTableMapClass::getTableMap(); |
| 195 | - foreach($modelI18nTableMap->getColumns() as $columnMap) { |
|
| 196 | - if(!$columnMap->isPrimaryKey()) { |
|
| 197 | - $query->withColumn($modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName(), $columnMap->getPhpName()); |
|
| 198 | - } elseif(!$columnMap->isForeignKey()) { |
|
| 199 | - $query->withColumn('IFNULL(' . $modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName() . ', "'.$this->lang.'")', $columnMap->getPhpName()); |
|
| 195 | + foreach ($modelI18nTableMap->getColumns() as $columnMap) { |
|
| 196 | + if (!$columnMap->isPrimaryKey()) { |
|
| 197 | + $query->withColumn($modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName(), $columnMap->getPhpName()); |
|
| 198 | + } elseif (!$columnMap->isForeignKey()) { |
|
| 199 | + $query->withColumn('IFNULL('.$modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName().', "'.$this->lang.'")', $columnMap->getPhpName()); |
|
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -210,20 +210,20 @@ discard block |
||
| 210 | 210 | $model->fromArray($data); |
| 211 | 211 | $tableMap = $this->getTableMap(); |
| 212 | 212 | try { |
| 213 | - if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) |
|
| 213 | + if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) |
|
| 214 | 214 | { |
| 215 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
| 215 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
| 216 | 216 | $i18NTableMap = $relateI18n->getLocalTable(); |
| 217 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
| 218 | - $method = 'set' . $columnMap->getPhpName(); |
|
| 219 | - if(!($columnMap->isPrimaryKey() && $columnMap->isForeignKey()) |
|
| 217 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
| 218 | + $method = 'set'.$columnMap->getPhpName(); |
|
| 219 | + if (!($columnMap->isPrimaryKey() && $columnMap->isForeignKey()) |
|
| 220 | 220 | &&array_key_exists($columnMap->getPhpName(), $data) |
| 221 | 221 | && method_exists($model, $method)) { |
| 222 | 222 | $model->$method($data[$columnMap->getPhpName()]); |
| 223 | 223 | } |
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | - } catch(\Exception $e) { |
|
| 226 | + }catch (\Exception $e) { |
|
| 227 | 227 | Logger::log($e->getMessage(), LOG_WARNING); |
| 228 | 228 | } |
| 229 | 229 | } |