@@ -149,7 +149,7 @@ |
||
149 | 149 | * Returns a set of pending operations (Deferred) and QueryBuilder. |
150 | 150 | * |
151 | 151 | * @param Query $query |
152 | - * @return \Generator|\Closure[]|QueryBuilder |
|
152 | + * @return \Generator |
|
153 | 153 | */ |
154 | 154 | protected function toBuilder(Query $query): \Generator |
155 | 155 | { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function getScalarResult(Query $query) |
41 | 41 | { |
42 | - return $this->exec($query, function (DoctrineQuery $query) { |
|
42 | + return $this->exec($query, function(DoctrineQuery $query) { |
|
43 | 43 | return $query->getSingleScalarResult(); |
44 | 44 | }); |
45 | 45 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | */ |
94 | 94 | private function applicator(QueryBuilder $builder): \Closure |
95 | 95 | { |
96 | - return function ($response) use ($builder) { |
|
96 | + return function($response) use ($builder) { |
|
97 | 97 | // Send the context (the builder) in case the |
98 | 98 | // answer contains an empty value. |
99 | 99 | if ($response === null) { |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | */ |
165 | 165 | public function getResult(Query $query): iterable |
166 | 166 | { |
167 | - return $this->exec($query, function (DoctrineQuery $query) { |
|
167 | + return $this->exec($query, function(DoctrineQuery $query) { |
|
168 | 168 | return $query->getResult(); |
169 | 169 | }); |
170 | 170 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | */ |
176 | 176 | public function getArrayResult(Query $query): array |
177 | 177 | { |
178 | - return $this->exec($query, function (DoctrineQuery $query) { |
|
178 | + return $this->exec($query, function(DoctrineQuery $query) { |
|
179 | 179 | return $query->getArrayResult(); |
180 | 180 | }); |
181 | 181 | } |
@@ -12,7 +12,6 @@ |
||
12 | 12 | use Doctrine\ORM\QueryBuilder; |
13 | 13 | use RDS\Hydrogen\Criteria\CriterionInterface; |
14 | 14 | use RDS\Hydrogen\Criteria\Group; |
15 | -use RDS\Hydrogen\Criteria\Where; |
|
16 | 15 | |
17 | 16 | /** |
18 | 17 | * Class GroupBuilder |
@@ -32,7 +32,7 @@ |
||
32 | 32 | foreach ($inner->getCriteria() as $where) { |
33 | 33 | $expression = parent::getDoctrineExpression($where, $builder->expr(), $where->getField()); |
34 | 34 | |
35 | - yield from $this->extractResult($expression, function ($current) use ($expr, $where, $builder) { |
|
35 | + yield from $this->extractResult($expression, function($current) use ($expr, $where, $builder) { |
|
36 | 36 | if ($where->isAnd()) { |
37 | 37 | $expr->add($current); |
38 | 38 | } else { |
@@ -81,7 +81,7 @@ |
||
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
84 | - * @param mixed $context |
|
84 | + * @param \Doctrine\ORM\QueryBuilder $context |
|
85 | 85 | * @param Query $query |
86 | 86 | * @return \Generator |
87 | 87 | */ |
@@ -85,7 +85,7 @@ |
||
85 | 85 | * @param Query $query |
86 | 86 | * @return \Generator |
87 | 87 | */ |
88 | - protected function forEach($context, Query $query): \Generator |
|
88 | + protected function forEach ($context, Query $query): \Generator |
|
89 | 89 | { |
90 | 90 | foreach ($query->getCriteria() as $criterion) { |
91 | 91 | $builder = $this->getBuilder($criterion); |
@@ -85,7 +85,7 @@ |
||
85 | 85 | * @param Query $query |
86 | 86 | * @return \Generator |
87 | 87 | */ |
88 | - protected function forEach($context, Query $query): \Generator |
|
88 | + protected function foreach($context, Query $query): \Generator |
|
89 | 89 | { |
90 | 90 | foreach ($query->getCriteria() as $criterion) { |
91 | 91 | $builder = $this->getBuilder($criterion); |
@@ -79,7 +79,7 @@ |
||
79 | 79 | /** |
80 | 80 | * Returns a list of selection criteria. |
81 | 81 | * |
82 | - * @return \Generator|CriterionInterface[] |
|
82 | + * @return \Generator |
|
83 | 83 | */ |
84 | 84 | public function getCriteria(): \Generator |
85 | 85 | { |
@@ -20,6 +20,7 @@ discard block |
||
20 | 20 | { |
21 | 21 | /** |
22 | 22 | * @param string ...$fields |
23 | + * @param string[] $fields |
|
23 | 24 | * @return object[]|iterable |
24 | 25 | */ |
25 | 26 | public function get(string ...$fields): iterable |
@@ -149,6 +150,7 @@ discard block |
||
149 | 150 | |
150 | 151 | /** |
151 | 152 | * @param string ...$fields |
153 | + * @param string[] $fields |
|
152 | 154 | * @return Collection |
153 | 155 | */ |
154 | 156 | public function collect(string ...$fields): Collection |
@@ -157,7 +159,7 @@ discard block |
||
157 | 159 | } |
158 | 160 | |
159 | 161 | /** |
160 | - * @param string[] $fields |
|
162 | + * @param string $fields |
|
161 | 163 | * @return object|null |
162 | 164 | * @throws \LogicException |
163 | 165 | */ |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | return Collection::wrap($processor->getArrayResult($this)) |
34 | - ->map(function ($item) use ($fields) { |
|
34 | + ->map(function($item) use ($fields) { |
|
35 | 35 | $result = []; |
36 | 36 | |
37 | 37 | foreach ($fields as $field) { |
@@ -71,22 +71,22 @@ discard block |
||
71 | 71 | |
72 | 72 | switch ($typeOf) { |
73 | 73 | case 'callable': |
74 | - return function (callable $applicator = null) use ($result) { |
|
74 | + return function(callable $applicator = null) use ($result) { |
|
75 | 75 | return ($applicator ?? '\\value')($result); |
76 | 76 | }; |
77 | 77 | |
78 | 78 | case 'object': |
79 | - return (object)$result; |
|
79 | + return (object) $result; |
|
80 | 80 | |
81 | 81 | case 'array': |
82 | 82 | case 'iterable': |
83 | - return (array)$result; |
|
83 | + return (array) $result; |
|
84 | 84 | } |
85 | 85 | |
86 | - $function = $typeOf . 'val'; |
|
86 | + $function = $typeOf.'val'; |
|
87 | 87 | |
88 | - if (! \function_exists($function)) { |
|
89 | - throw new \InvalidArgumentException('Could not cast to type ' . $typeOf); |
|
88 | + if (!\function_exists($function)) { |
|
89 | + throw new \InvalidArgumentException('Could not cast to type '.$typeOf); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | return $function($result); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function count(?string $field = 'id'): int |
101 | 101 | { |
102 | - return $this->select('COUNT(' . $field . ') AS __count') |
|
102 | + return $this->select('COUNT('.$field.') AS __count') |
|
103 | 103 | ->scalar('__count', 'int'); |
104 | 104 | } |
105 | 105 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | */ |
111 | 111 | public function sum(string $field = null): int |
112 | 112 | { |
113 | - return $this->select('SUM(' . $field . ') AS __sum') |
|
113 | + return $this->select('SUM('.$field.') AS __sum') |
|
114 | 114 | ->scalar('__sum', 'int'); |
115 | 115 | } |
116 | 116 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function avg(string $field = null): int |
123 | 123 | { |
124 | - return $this->select('AVG(' . $field . ') AS __avg') |
|
124 | + return $this->select('AVG('.$field.') AS __avg') |
|
125 | 125 | ->scalar('__avg', 'int'); |
126 | 126 | } |
127 | 127 | |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | */ |
133 | 133 | public function max(string $field = null): int |
134 | 134 | { |
135 | - return $this->select('MAX(' . $field . ') AS __max') |
|
135 | + return $this->select('MAX('.$field.') AS __max') |
|
136 | 136 | ->scalar('__max', 'int'); |
137 | 137 | } |
138 | 138 | |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | public function min(string $field = null): int |
145 | 145 | { |
146 | - return $this->select('MIN(' . $field . ') AS __min') |
|
146 | + return $this->select('MIN('.$field.') AS __min') |
|
147 | 147 | ->scalar('__min', 'int'); |
148 | 148 | } |
149 | 149 |
@@ -34,6 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | /** |
36 | 36 | * @param string ...$fields |
37 | + * @param string[] $fields |
|
37 | 38 | * @return Query|$this|self |
38 | 39 | */ |
39 | 40 | public function asc(string ...$fields): self |
@@ -70,6 +71,7 @@ discard block |
||
70 | 71 | |
71 | 72 | /** |
72 | 73 | * @param string ...$fields |
74 | + * @param string[] $fields |
|
73 | 75 | * @return Query|$this|self |
74 | 76 | */ |
75 | 77 | public function desc(string ...$fields): self |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | protected $repository; |
26 | 26 | |
27 | 27 | /** |
28 | - * @param ObjectRepository|Hydrogen $repository |
|
28 | + * @param ObjectRepository $repository |
|
29 | 29 | * @return Query|$this |
30 | 30 | */ |
31 | 31 | public function from(ObjectRepository $repository): self |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
37 | - * @return ObjectRepository|Hydrogen |
|
37 | + * @return ObjectRepository |
|
38 | 38 | * @throws \LogicException |
39 | 39 | */ |
40 | 40 | public function getRepository(): ObjectRepository |
@@ -10,7 +10,6 @@ |
||
10 | 10 | namespace RDS\Hydrogen\Query\WhereProvider; |
11 | 11 | |
12 | 12 | use RDS\Hydrogen\Criteria\Where\Operator; |
13 | -use RDS\Hydrogen\Criteria\Where; |
|
14 | 13 | use RDS\Hydrogen\Query; |
15 | 14 | |
16 | 15 | /** |
@@ -30,7 +30,7 @@ |
||
30 | 30 | { |
31 | 31 | $expression = $this->getDoctrineExpression($where, $builder->expr(), $where->getField()); |
32 | 32 | |
33 | - yield from $this->extractResult($expression, function ($expr) use ($where, $builder) { |
|
33 | + yield from $this->extractResult($expression, function($expr) use ($where, $builder) { |
|
34 | 34 | if ($where->isAnd()) { |
35 | 35 | $builder->andWhere($expr); |
36 | 36 | } else { |