@@ -137,6 +137,10 @@ |
||
| 137 | 137 | return $this->createRequest($query); |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | + /** |
|
| 141 | + * @param string $action |
|
| 142 | + * @param string $table |
|
| 143 | + */ |
|
| 140 | 144 | public function createQuery($action, $table, array $options = []) |
| 141 | 145 | { |
| 142 | 146 | $class = $this->db->queryClass; |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | |
| 176 | 176 | return $this->$method($operator, $condition); |
| 177 | 177 | } else { |
| 178 | - throw new InvalidParamException('Found unknown operator in query: ' . $operator); |
|
| 178 | + throw new InvalidParamException('Found unknown operator in query: '.$operator); |
|
| 179 | 179 | } |
| 180 | 180 | } else { |
| 181 | 181 | return $this->buildHashCondition($condition); |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | foreach ($condition as $attribute => $value) { |
| 189 | 189 | if (is_array($value)) { // IN condition |
| 190 | 190 | // $parts[] = [$attribute.'s' => join(',',$value)]; |
| 191 | - $parts[$attribute . 's'] = implode(',', $value); |
|
| 191 | + $parts[$attribute.'s'] = implode(',', $value); |
|
| 192 | 192 | } else { |
| 193 | 193 | $parts[$attribute] = $value; |
| 194 | 194 | } |
@@ -199,12 +199,12 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | protected function buildLikeCondition($operator, $operands) |
| 201 | 201 | { |
| 202 | - return [$operands[0] . '_like' => $operands[1]]; |
|
| 202 | + return [$operands[0].'_like' => $operands[1]]; |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | protected function buildIlikeCondition($operator, $operands) |
| 206 | 206 | { |
| 207 | - return [$operands[0] . '_ilike' => $operands[1]]; |
|
| 207 | + return [$operands[0].'_ilike' => $operands[1]]; |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | protected function buildCompareCondition($operator, $operands) |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | throw new InvalidParamException("Operator '$operator' requires three operands."); |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - return [$operands[0] . '_' . $operator => $operands[1]]; |
|
| 216 | + return [$operands[0].'_'.$operator => $operands[1]]; |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | protected function buildAndCondition($operator, $operands) |
@@ -260,9 +260,9 @@ discard block |
||
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | if ($not) { |
| 263 | - $key = $column . '_ni'; // not in |
|
| 263 | + $key = $column.'_ni'; // not in |
|
| 264 | 264 | } else { |
| 265 | - $key = $column . '_in'; |
|
| 265 | + $key = $column.'_in'; |
|
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | return [$key => $values]; |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | { |
| 285 | 285 | $key = array_shift($operands); |
| 286 | 286 | |
| 287 | - return [$key . '_' . $operator => reset($operands)]; |
|
| 287 | + return [$key.'_'.$operator => reset($operands)]; |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | protected function buildCompositeInCondition($operator, $columns, $values) |
@@ -217,7 +217,7 @@ |
||
| 217 | 217 | */ |
| 218 | 218 | public function batchQuery($defaultScenario, $data = [], array $options = []) |
| 219 | 219 | { |
| 220 | - $batch = isset($options['batch']) ? (bool)$options['batch'] : true; |
|
| 220 | + $batch = isset($options['batch']) ? (bool) $options['batch'] : true; |
|
| 221 | 221 | $options['batch'] = $batch; |
| 222 | 222 | |
| 223 | 223 | if (!$batch) { |
@@ -376,8 +376,8 @@ |
||
| 376 | 376 | * Try to find the model data if the response from the API came without an index by ID |
| 377 | 377 | * |
| 378 | 378 | * @param $data |
| 379 | - * @param $model |
|
| 380 | - * @param $pk |
|
| 379 | + * @param ActiveRecord $model |
|
| 380 | + * @param string $pk |
|
| 381 | 381 | * @return mixed |
| 382 | 382 | */ |
| 383 | 383 | private function findAssociatedModelData($data, $model, $pk) |