@@ -125,7 +125,7 @@ |
||
125 | 125 | * @return $this |
126 | 126 | */ |
127 | 127 | public function from(?string $alias, $table = null) { |
128 | - if($table === null) { |
|
128 | + if ($table === null) { |
|
129 | 129 | [$alias, $table] = [$table, $alias]; |
130 | 130 | $this->addTable($alias, (string) $table); |
131 | 131 | } else { |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | * @return $this |
16 | 16 | */ |
17 | 17 | public function orderBy($expression, string $direction = 'ASC') { |
18 | - if($expression instanceof OrderBySpecification) { |
|
19 | - foreach($expression->getFields() as $field) { |
|
18 | + if ($expression instanceof OrderBySpecification) { |
|
19 | + foreach ($expression->getFields() as $field) { |
|
20 | 20 | $this->addOrder($field[0], $field[1]); |
21 | 21 | } |
22 | 22 | return $this; |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function orderByValues(string $fieldName, array $values) { |
34 | 34 | $expr = []; |
35 | - foreach(array_values($values) as $idx => $value) { |
|
35 | + foreach (array_values($values) as $idx => $value) { |
|
36 | 36 | $expr[] = $this->db()->quoteExpression("WHEN ? THEN ?", [$value, $idx]); |
37 | 37 | } |
38 | 38 | $this->orderBy[] = [sprintf("CASE %s\n\t\t%s\n\tEND", $this->db()->quoteField($fieldName), implode("\n\t\t", $expr)), 'ASC']; |
@@ -44,12 +44,12 @@ discard block |
||
44 | 44 | * @return string |
45 | 45 | */ |
46 | 46 | protected function buildOrder(string $query): string { |
47 | - if(!count($this->orderBy)) { |
|
47 | + if (!count($this->orderBy)) { |
|
48 | 48 | return $query; |
49 | 49 | } |
50 | 50 | $query .= "ORDER BY\n"; |
51 | 51 | $arr = []; |
52 | - foreach($this->orderBy as [$expression, $direction]) { |
|
52 | + foreach ($this->orderBy as [$expression, $direction]) { |
|
53 | 53 | $arr[] = sprintf("\t%s %s", $expression, strtoupper($direction)); |
54 | 54 | } |
55 | 55 | return $query.implode(",\n", $arr)."\n"; |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | */ |
62 | 62 | private function addOrder($expression, string $direction): void { |
63 | 63 | $direction = $this->fixDirection($direction); |
64 | - if(is_array($expression)) { |
|
65 | - if(count($expression) < 1) { |
|
64 | + if (is_array($expression)) { |
|
65 | + if (count($expression) < 1) { |
|
66 | 66 | return; |
67 | 67 | } |
68 | 68 | $expr = (string) $expression[0]; |
@@ -9,10 +9,10 @@ |
||
9 | 9 | * @return string |
10 | 10 | */ |
11 | 11 | public static function quoteField(string $field): string { |
12 | - if(is_numeric($field) || !is_string($field)) { |
|
12 | + if (is_numeric($field) || !is_string($field)) { |
|
13 | 13 | throw new UnexpectedValueException('Field name is invalid'); |
14 | 14 | } |
15 | - if(strpos($field, '`') !== false) { |
|
15 | + if (strpos($field, '`') !== false) { |
|
16 | 16 | return $field; |
17 | 17 | } |
18 | 18 | $parts = explode('.', $field); |
@@ -14,17 +14,17 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public function __construct(array $spec, array $sortFieldsSpec) { |
16 | 16 | $expressions = []; |
17 | - foreach($spec as $specReference => $dbExpr) { |
|
18 | - if(is_int($specReference)) { |
|
17 | + foreach ($spec as $specReference => $dbExpr) { |
|
18 | + if (is_int($specReference)) { |
|
19 | 19 | $specReference = $dbExpr; |
20 | 20 | } |
21 | 21 | $expressions[$specReference] = $dbExpr; |
22 | 22 | } |
23 | - foreach($sortFieldsSpec as $sortFieldSpec) { |
|
24 | - if(array_key_exists(0, $sortFieldSpec)) { |
|
25 | - if(array_key_exists($sortFieldSpec[0], $expressions)) { |
|
23 | + foreach ($sortFieldsSpec as $sortFieldSpec) { |
|
24 | + if (array_key_exists(0, $sortFieldSpec)) { |
|
25 | + if (array_key_exists($sortFieldSpec[0], $expressions)) { |
|
26 | 26 | $direction = 'ASC'; |
27 | - if(array_key_exists(1, $sortFieldSpec) && strtoupper($sortFieldSpec[1]) !== 'ASC') { |
|
27 | + if (array_key_exists(1, $sortFieldSpec) && strtoupper($sortFieldSpec[1]) !== 'ASC') { |
|
28 | 28 | $direction = 'DESC'; |
29 | 29 | } |
30 | 30 | $this->fields[] = [ |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | ]; |
34 | 34 | } |
35 | 35 | } else { // @phpstan-ignore-line |
36 | - foreach($sortFieldSpec as $alias => $direction) { |
|
36 | + foreach ($sortFieldSpec as $alias => $direction) { |
|
37 | 37 | $direction = strtoupper($direction) === 'DESC' ? 'DESC' : 'ASC'; |
38 | - if(array_key_exists($alias, $expressions)) { |
|
38 | + if (array_key_exists($alias, $expressions)) { |
|
39 | 39 | $this->fields[] = [$expressions[$alias], $direction]; |
40 | 40 | } |
41 | 41 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | * @return DBExprFilter |
37 | 37 | */ |
38 | 38 | public function __invoke(string $expression, $keyPath, $validator = null) { |
39 | - if(!RecursiveStructureAccess::recursiveHas($this->map, $keyPath)) { |
|
39 | + if (!RecursiveStructureAccess::recursiveHas($this->map, $keyPath)) { |
|
40 | 40 | throw new RequiredValueNotFoundException(sprintf("Required value %s not found", json_encode($keyPath, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE))); |
41 | 41 | } |
42 | 42 | return new DBExprFilter($expression, $this->map, $keyPath, $validator); |
@@ -41,13 +41,13 @@ |
||
41 | 41 | public function getFields(): array { |
42 | 42 | $fields = []; |
43 | 43 | $max = $this->options['max_sort_instructions'] ?? 16; |
44 | - foreach($this->sortingInstruction as $alias => $direction) { |
|
44 | + foreach ($this->sortingInstruction as $alias => $direction) { |
|
45 | 45 | $direction = strtolower($direction) === 'desc' ? 'DESC' : 'ASC'; |
46 | - if(!array_key_exists($alias, $this->sortSpecification)) { |
|
46 | + if (!array_key_exists($alias, $this->sortSpecification)) { |
|
47 | 47 | throw new DBSortAliasNotFoundException('Sorting: Alias for DB-Expression not found'); |
48 | 48 | } |
49 | 49 | $fields[] = [$this->sortSpecification[$alias], $direction]; |
50 | - if($max < 1) { |
|
50 | + if ($max < 1) { |
|
51 | 51 | throw new DBSortTooManyInstructionsException(); |
52 | 52 | } |
53 | 53 | $max--; |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | if (!$count) { |
29 | 29 | return $default; |
30 | 30 | } |
31 | - foreach($arrayPath as $idxValue) { |
|
31 | + foreach ($arrayPath as $idxValue) { |
|
32 | 32 | $part = $idxValue; |
33 | - if(!array_key_exists($part, $data)) { |
|
33 | + if (!array_key_exists($part, $data)) { |
|
34 | 34 | return $default; |
35 | 35 | } |
36 | 36 | $data = $data[$part]; |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | */ |
46 | 46 | private static function _recursiveHas($structure, array $path): bool { |
47 | 47 | $data = self::ensureArrayIsArray($structure); |
48 | - if($data === null) { |
|
48 | + if ($data === null) { |
|
49 | 49 | return false; |
50 | 50 | } |
51 | - if(!count($path)) { |
|
51 | + if (!count($path)) { |
|
52 | 52 | return false; |
53 | 53 | } |
54 | 54 | $key = array_shift($path); |
55 | - if(count($path)) { |
|
55 | + if (count($path)) { |
|
56 | 56 | return self::_recursiveHas($data[$key] ?? null, $path); |
57 | 57 | } |
58 | 58 | return array_key_exists($key, $data); |
@@ -63,11 +63,11 @@ discard block |
||
63 | 63 | * @return array<int, string> |
64 | 64 | */ |
65 | 65 | private static function getArrayPath($path): array { |
66 | - if(is_array($path)) { |
|
66 | + if (is_array($path)) { |
|
67 | 67 | return $path; |
68 | 68 | } |
69 | 69 | $parts = preg_split('{(?<!\\x5C)(?:\\x5C\\x5C)*\\.}', $path); |
70 | - if($parts === false) { |
|
70 | + if ($parts === false) { |
|
71 | 71 | return [$path]; |
72 | 72 | } |
73 | 73 | return $parts; |
@@ -78,13 +78,13 @@ discard block |
||
78 | 78 | * @return array<mixed, mixed> |
79 | 79 | */ |
80 | 80 | private static function ensureArrayIsArray($array): ?array { |
81 | - if($array instanceof ArrayObject) { |
|
81 | + if ($array instanceof ArrayObject) { |
|
82 | 82 | return $array->getArrayCopy(); |
83 | 83 | } |
84 | - if(is_object($array)) { |
|
84 | + if (is_object($array)) { |
|
85 | 85 | return (array) $array; |
86 | 86 | } |
87 | - if(is_array($array)) { |
|
87 | + if (is_array($array)) { |
|
88 | 88 | return $array; |
89 | 89 | } |
90 | 90 | return null; |
@@ -27,10 +27,10 @@ |
||
27 | 27 | * @return bool |
28 | 28 | */ |
29 | 29 | public function isValid(): bool { |
30 | - if(!RecursiveStructureAccess::recursiveHas($this->data, $this->path)) { |
|
30 | + if (!RecursiveStructureAccess::recursiveHas($this->data, $this->path)) { |
|
31 | 31 | return false; |
32 | 32 | } |
33 | - if($this->validator !== null) { |
|
33 | + if ($this->validator !== null) { |
|
34 | 34 | $value = $this->getValue(); |
35 | 35 | return call_user_func($this->validator, $value); |
36 | 36 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * @return null|int |
13 | 13 | */ |
14 | 14 | protected function getOffset(): ?int { |
15 | - if($this->offset instanceof OptionalValue) { |
|
15 | + if ($this->offset instanceof OptionalValue) { |
|
16 | 16 | return $this->offset->getValue(); |
17 | 17 | } |
18 | 18 | return $this->offset; |
@@ -33,15 +33,15 @@ discard block |
||
33 | 33 | */ |
34 | 34 | protected function buildOffset(string $query): string { |
35 | 35 | $offset = $this->getOffset(); |
36 | - if($this->offset instanceof OptionalValue) { |
|
37 | - if($this->offset->isValid()) { |
|
36 | + if ($this->offset instanceof OptionalValue) { |
|
37 | + if ($this->offset->isValid()) { |
|
38 | 38 | $value = $this->offset->getValue(); |
39 | - if(!preg_match('{\\d+}', $value)) { |
|
39 | + if (!preg_match('{\\d+}', $value)) { |
|
40 | 40 | throw new InvalidValueException('Value for OFFSET has to be a number'); |
41 | 41 | } |
42 | 42 | $query .= "OFFSET\n\t{$this->offset->getValue()}\n"; |
43 | 43 | } |
44 | - } elseif($offset !== null) { |
|
44 | + } elseif ($offset !== null) { |
|
45 | 45 | $query .= "OFFSET\n\t{$this->offset}\n"; |
46 | 46 | } |
47 | 47 | return $query; |