@@ -271,8 +271,7 @@ |
||
| 271 | 271 | if(is_numeric($key)) |
| 272 | 272 | { |
| 273 | 273 | $rewritten["filter_bind_" . ($key + 1)] = $value; |
| 274 | - } |
|
| 275 | - else |
|
| 274 | + } else |
|
| 276 | 275 | { |
| 277 | 276 | $rewritten[$key] = $value; |
| 278 | 277 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $this->getToken(); |
| 61 | 61 | $expression = $this->parseExpression(); |
| 62 | 62 | if ($this->token !== false) { |
| 63 | - throw new FilterCompilerException("Unexpected '" . $this->token . "' in filter [$filter]"); |
|
| 63 | + throw new FilterCompilerException("Unexpected '".$this->token."' in filter [$filter]"); |
|
| 64 | 64 | } |
| 65 | 65 | $parsed = $this->renderExpression($expression); |
| 66 | 66 | return $parsed; |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | private function renderExpression($expression) |
| 70 | 70 | { |
| 71 | 71 | if (is_array($expression)) { |
| 72 | - $expression = $this->renderExpression($expression['left']) . " {$expression['opr']} " . $this->renderExpression($expression['right']); |
|
| 72 | + $expression = $this->renderExpression($expression['left'])." {$expression['opr']} ".$this->renderExpression($expression['right']); |
|
| 73 | 73 | } |
| 74 | 74 | return $expression; |
| 75 | 75 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | $tokens = [$tokens]; |
| 81 | 81 | } |
| 82 | 82 | if (array_search($this->lookahead, $tokens) === false) { |
| 83 | - throw new FilterCompilerException("Expected " . implode(' or ', $tokens) . " but found " . $this->lookahead); |
|
| 83 | + throw new FilterCompilerException("Expected ".implode(' or ', $tokens)." but found ".$this->lookahead); |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | private function returnPositionTag() |
| 174 | 174 | { |
| 175 | - return ":filter_bind_" . (++$this->numPositions); |
|
| 175 | + return ":filter_bind_".(++$this->numPositions); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | private function parseObracket() |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | 'obracket' => 'parseObracket' |
| 196 | 196 | ]; |
| 197 | 197 | |
| 198 | - if(isset($methods[$this->lookahead])) { |
|
| 198 | + if (isset($methods[$this->lookahead])) { |
|
| 199 | 199 | $method = $methods[$this->lookahead]; |
| 200 | 200 | $return = $this->$method(); |
| 201 | 201 | } |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | if ($this->token === false && strlen($this->filter) > 0) { |
| 257 | - throw new FilterCompilerException("Unexpected character [" . $this->filter[0] . "] begining " . $this->filter . "."); |
|
| 257 | + throw new FilterCompilerException("Unexpected character [".$this->filter[0]."] begining ".$this->filter."."); |
|
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | 260 | |
@@ -267,10 +267,10 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | public function rewriteBoundData($data) { |
| 269 | 269 | $rewritten = []; |
| 270 | - foreach($data as $key => $value) { |
|
| 271 | - if(is_numeric($key)) |
|
| 270 | + foreach ($data as $key => $value) { |
|
| 271 | + if (is_numeric($key)) |
|
| 272 | 272 | { |
| 273 | - $rewritten["filter_bind_" . ($key + 1)] = $value; |
|
| 273 | + $rewritten["filter_bind_".($key + 1)] = $value; |
|
| 274 | 274 | } |
| 275 | 275 | else |
| 276 | 276 | { |
@@ -28,10 +28,10 @@ discard block |
||
| 28 | 28 | 'default' => $details['default'], |
| 29 | 29 | 'name' => $field |
| 30 | 30 | ]; |
| 31 | - if(isset($details['default'])) { |
|
| 31 | + if (isset($details['default'])) { |
|
| 32 | 32 | $this->fields[$field]['default'] = $details['default']; |
| 33 | 33 | } |
| 34 | - if(isset($details['length'])) { |
|
| 34 | + if (isset($details['length'])) { |
|
| 35 | 35 | $this->fields[$field]['length'] = $details['length']; |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $this->appendConstraints($schema['primary_key'], $this->primaryKey, true); |
| 40 | 40 | $this->appendConstraints($schema['unique_keys'], $this->uniqueKeys); |
| 41 | 41 | |
| 42 | - foreach($relationships as $type => $relations) { |
|
| 42 | + foreach ($relationships as $type => $relations) { |
|
| 43 | 43 | $this->createRelationships($type, $relations); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | private function getRelationshipDetails($relationship) |
| 63 | 63 | { |
| 64 | - if(is_string($relationship)) |
|
| 64 | + if (is_string($relationship)) |
|
| 65 | 65 | { |
| 66 | 66 | return [ |
| 67 | 67 | 'model' => $relationship, |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | private function createRelationships($type, $relationships) |
| 83 | 83 | { |
| 84 | - foreach($relationships as $relationship) |
|
| 84 | + foreach ($relationships as $relationship) |
|
| 85 | 85 | { |
| 86 | 86 | $relationship = $this->getRelationshipDetails($relationship); |
| 87 | 87 | $class = "\\ntentan\\nibii\\relationships\\{$type}Relationship"; |
@@ -15,17 +15,17 @@ discard block |
||
| 15 | 15 | $this->model = $model; |
| 16 | 16 | $description = $model->getDescription(); |
| 17 | 17 | |
| 18 | - if($description->getAutoPrimaryKey()) { |
|
| 18 | + if ($description->getAutoPrimaryKey()) { |
|
| 19 | 19 | $pk = $description->getPrimaryKey()[0]; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | $fields = $description->getFields(); |
| 23 | - foreach($fields as $field) { |
|
| 23 | + foreach ($fields as $field) { |
|
| 24 | 24 | $this->getFieldRules($rules, $field, $pk); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | $unique = $description->getUniqueKeys(); |
| 28 | - foreach($unique as $constraints) { |
|
| 28 | + foreach ($unique as $constraints) { |
|
| 29 | 29 | $rules['unique'][] = [$constraints['fields']]; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -39,10 +39,10 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | private function getFieldRules(&$rules, $field, $pk) |
| 41 | 41 | { |
| 42 | - if($field['required'] && $field['name'] != $pk && $field['default'] === null) { |
|
| 42 | + if ($field['required'] && $field['name'] != $pk && $field['default'] === null) { |
|
| 43 | 43 | $rules['required'][] = $field['name']; |
| 44 | 44 | } |
| 45 | - if($field['type'] === 'integer' || $field['type'] === 'double') { |
|
| 45 | + if ($field['type'] === 'integer' || $field['type'] === 'double') { |
|
| 46 | 46 | $rules['numeric'][] = $field['name']; |
| 47 | 47 | } |
| 48 | 48 | } |
@@ -14,9 +14,9 @@ discard block |
||
| 14 | 14 | private $dataOperations; |
| 15 | 15 | |
| 16 | 16 | private $queryOperationMethods = [ |
| 17 | - 'fetch', 'fetchFirst', 'filter', 'query', 'fields', |
|
| 18 | - 'cover', 'limit', 'offset', 'filterBy', 'sortBy', |
|
| 19 | - 'delete', 'count', 'update' |
|
| 17 | + 'fetch', 'fetchFirst', 'filter', 'query', 'fields', |
|
| 18 | + 'cover', 'limit', 'offset', 'filterBy', 'sortBy', |
|
| 19 | + 'delete', 'count', 'update' |
|
| 20 | 20 | ]; |
| 21 | 21 | |
| 22 | 22 | private $dataOperationMethods = [ |
@@ -35,9 +35,9 @@ discard block |
||
| 35 | 35 | { |
| 36 | 36 | if (array_search($name, $this->queryOperationMethods) !== false) { |
| 37 | 37 | return call_user_func_array([$this->queryOperations, "do$name"], $arguments); |
| 38 | - } else if (array_search($name, $this->dataOperationMethods) !== false){ |
|
| 38 | + } else if (array_search($name, $this->dataOperationMethods) !== false) { |
|
| 39 | 39 | return call_user_func_array([$this->dataOperations, "do$name"], $arguments); |
| 40 | - } else if($this->queryOperations->initDynamicMethod($name)) { |
|
| 40 | + } else if ($this->queryOperations->initDynamicMethod($name)) { |
|
| 41 | 41 | return $this->queryOperations->runDynamicMethod($arguments); |
| 42 | 42 | } else { |
| 43 | 43 | throw new NibiiException("Method {$name} not found"); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | } else if ($arg instanceof \ntentan\nibii\QueryParameters) { |
| 80 | 80 | $parameters = $arg; |
| 81 | 81 | } else if (is_array($arg)) { |
| 82 | - foreach($arg as $field => $value) { |
|
| 82 | + foreach ($arg as $field => $value) { |
|
| 83 | 83 | $parameters->addFilter($field, [$value]); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | $fields = []; |
| 115 | 115 | $arguments = func_get_args(); |
| 116 | - foreach($arguments as $argument) { |
|
| 117 | - if(is_array($argument)) { |
|
| 116 | + foreach ($arguments as $argument) { |
|
| 117 | + if (is_array($argument)) { |
|
| 118 | 118 | $fields = array_merge($fields, $argument); |
| 119 | 119 | } else { |
| 120 | - $fields[]=$argument; |
|
| 120 | + $fields[] = $argument; |
|
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | $this->getQueryParameters()->setFields($fields); |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | |
| 48 | 48 | public function getModelInstance() |
| 49 | 49 | { |
| 50 | - if(!$this->setup) { |
|
| 50 | + if (!$this->setup) { |
|
| 51 | 51 | $this->runSetup(); |
| 52 | 52 | $this->setup = true; |
| 53 | 53 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function mapDataTypes($nativeType) |
| 14 | 14 | { |
| 15 | - switch($nativeType) |
|
| 15 | + switch ($nativeType) |
|
| 16 | 16 | { |
| 17 | 17 | case 'character varying': |
| 18 | 18 | return 'string'; |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | public function preSaveCallback($data) |
| 18 | 18 | { |
| 19 | - if(isset($this->model->getDescription()->getFields()['created'])) |
|
| 19 | + if (isset($this->model->getDescription()->getFields()['created'])) |
|
| 20 | 20 | { |
| 21 | 21 | $data['created'] = date('Y-m-d H:i:s'); |
| 22 | 22 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | public function preUpdateCallback($data) |
| 27 | 27 | { |
| 28 | - if(isset($this->model->getDescription()->getFields()['updated'])) |
|
| 28 | + if (isset($this->model->getDescription()->getFields()['updated'])) |
|
| 29 | 29 | { |
| 30 | 30 | $data['updated'] = date('Y-m-d H:i:s'); |
| 31 | 31 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function mapDataTypes($nativeType) |
| 14 | 14 | { |
| 15 | - switch($nativeType) |
|
| 15 | + switch ($nativeType) |
|
| 16 | 16 | { |
| 17 | 17 | case 'character varying': |
| 18 | 18 | return 'string'; |