@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $this->expectExceptionMessage('Too few parameters: the query defines 1 parameters but you only bound 0'); |
151 | 151 | |
152 | 152 | $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1') |
153 | - ->getSingleResult(); |
|
153 | + ->getSingleResult(); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | public function testInvalidInputParameterThrowsException() : void |
@@ -158,8 +158,8 @@ discard block |
||
158 | 158 | $this->expectException(QueryException::class); |
159 | 159 | |
160 | 160 | $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?') |
161 | - ->setParameter(1, 'jwage') |
|
162 | - ->getSingleResult(); |
|
161 | + ->setParameter(1, 'jwage') |
|
162 | + ->getSingleResult(); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | public function testSetParameters() : void |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | $parameters->add(new Parameter(2, 'active')); |
170 | 170 | |
171 | 171 | $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2') |
172 | - ->setParameters($parameters) |
|
173 | - ->getResult(); |
|
172 | + ->setParameters($parameters) |
|
173 | + ->getResult(); |
|
174 | 174 | |
175 | 175 | $extractValue = static function (Parameter $parameter) { |
176 | 176 | return $parameter->getValue(); |
@@ -187,8 +187,8 @@ discard block |
||
187 | 187 | $parameters = [1 => 'jwage', 2 => 'active']; |
188 | 188 | |
189 | 189 | $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2') |
190 | - ->setParameters($parameters) |
|
191 | - ->getResult(); |
|
190 | + ->setParameters($parameters) |
|
191 | + ->getResult(); |
|
192 | 192 | |
193 | 193 | self::assertSame( |
194 | 194 | \array_values($parameters), |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | public function testGetSingleResultThrowsExceptionOnNoResult() : void |
333 | 333 | { |
334 | 334 | $this->em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsArticle a') |
335 | - ->getSingleResult(); |
|
335 | + ->getSingleResult(); |
|
336 | 336 | } |
337 | 337 | |
338 | 338 | /** |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | public function testGetSingleScalarResultThrowsExceptionOnNoResult() : void |
342 | 342 | { |
343 | 343 | $this->em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsArticle a') |
344 | - ->getSingleScalarResult(); |
|
344 | + ->getSingleScalarResult(); |
|
345 | 345 | } |
346 | 346 | |
347 | 347 | /** |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | $this->em->clear(); |
373 | 373 | |
374 | 374 | $this->em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsArticle a') |
375 | - ->getSingleScalarResult(); |
|
375 | + ->getSingleScalarResult(); |
|
376 | 376 | } |
377 | 377 | |
378 | 378 | public function testModifiedLimitQuery() : void |
@@ -389,27 +389,27 @@ discard block |
||
389 | 389 | $this->em->clear(); |
390 | 390 | |
391 | 391 | $data = $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u') |
392 | - ->setFirstResult(1) |
|
393 | - ->setMaxResults(2) |
|
394 | - ->getResult(); |
|
392 | + ->setFirstResult(1) |
|
393 | + ->setMaxResults(2) |
|
394 | + ->getResult(); |
|
395 | 395 | |
396 | 396 | self::assertCount(2, $data); |
397 | 397 | self::assertEquals('gblanco1', $data[0]->username); |
398 | 398 | self::assertEquals('gblanco2', $data[1]->username); |
399 | 399 | |
400 | 400 | $data = $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u') |
401 | - ->setFirstResult(3) |
|
402 | - ->setMaxResults(2) |
|
403 | - ->getResult(); |
|
401 | + ->setFirstResult(3) |
|
402 | + ->setMaxResults(2) |
|
403 | + ->getResult(); |
|
404 | 404 | |
405 | 405 | self::assertCount(2, $data); |
406 | 406 | self::assertEquals('gblanco3', $data[0]->username); |
407 | 407 | self::assertEquals('gblanco4', $data[1]->username); |
408 | 408 | |
409 | 409 | $data = $this->em->createQuery('SELECT u FROM ' . CmsUser::class . ' u') |
410 | - ->setFirstResult(3) |
|
411 | - ->setMaxResults(2) |
|
412 | - ->getScalarResult(); |
|
410 | + ->setFirstResult(3) |
|
411 | + ->setMaxResults(2) |
|
412 | + ->getScalarResult(); |
|
413 | 413 | } |
414 | 414 | |
415 | 415 | /** |
@@ -620,9 +620,9 @@ discard block |
||
620 | 620 | { |
621 | 621 | $qb = $this->em->createQueryBuilder(); |
622 | 622 | $qb->select('u') |
623 | - ->from(CmsUser::class, 'u') |
|
624 | - ->innerJoin('u.articles', 'a') |
|
625 | - ->where('(u.id = 0) OR (u.id IS NULL)'); |
|
623 | + ->from(CmsUser::class, 'u') |
|
624 | + ->innerJoin('u.articles', 'a') |
|
625 | + ->where('(u.id = 0) OR (u.id IS NULL)'); |
|
626 | 626 | |
627 | 627 | $query = $qb->getQuery(); |
628 | 628 | $users = $query->execute(); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | public function testAggregateSum() : void |
28 | 28 | { |
29 | 29 | $salarySum = $this->em->createQuery('SELECT SUM(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m') |
30 | - ->getSingleResult(); |
|
30 | + ->getSingleResult(); |
|
31 | 31 | |
32 | 32 | self::assertEquals(1500000, $salarySum['salary']); |
33 | 33 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | public function testAggregateAvg() : void |
36 | 36 | { |
37 | 37 | $salaryAvg = $this->em->createQuery('SELECT AVG(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m') |
38 | - ->getSingleResult(); |
|
38 | + ->getSingleResult(); |
|
39 | 39 | |
40 | 40 | self::assertEquals(375000, \round($salaryAvg['salary'], 0)); |
41 | 41 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | public function testAggregateMin() : void |
44 | 44 | { |
45 | 45 | $salary = $this->em->createQuery('SELECT MIN(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m') |
46 | - ->getSingleResult(); |
|
46 | + ->getSingleResult(); |
|
47 | 47 | |
48 | 48 | self::assertEquals(100000, $salary['salary']); |
49 | 49 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | public function testAggregateMax() : void |
52 | 52 | { |
53 | 53 | $salary = $this->em->createQuery('SELECT MAX(m.salary) AS salary FROM Doctrine\Tests\Models\Company\CompanyManager m') |
54 | - ->getSingleResult(); |
|
54 | + ->getSingleResult(); |
|
55 | 55 | |
56 | 56 | self::assertEquals(800000, $salary['salary']); |
57 | 57 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | public function testAggregateCount() : void |
60 | 60 | { |
61 | 61 | $managerCount = $this->em->createQuery('SELECT COUNT(m.id) AS managers FROM Doctrine\Tests\Models\Company\CompanyManager m') |
62 | - ->getSingleResult(); |
|
62 | + ->getSingleResult(); |
|
63 | 63 | |
64 | 64 | self::assertEquals(4, $managerCount['managers']); |
65 | 65 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | public function testFunctionAbs() : void |
68 | 68 | { |
69 | 69 | $result = $this->em->createQuery('SELECT m, ABS(m.salary * -1) AS abs FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC') |
70 | - ->getResult(); |
|
70 | + ->getResult(); |
|
71 | 71 | |
72 | 72 | self::assertCount(4, $result); |
73 | 73 | self::assertEquals(100000, $result[0]['abs']); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | public function testFunctionConcat() : void |
80 | 80 | { |
81 | 81 | $arg = $this->em->createQuery('SELECT m, CONCAT(m.name, m.department) AS namedep FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC') |
82 | - ->getArrayResult(); |
|
82 | + ->getArrayResult(); |
|
83 | 83 | |
84 | 84 | self::assertCount(4, $arg); |
85 | 85 | self::assertEquals('Roman B.IT', $arg[0]['namedep']); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | public function testFunctionLength() : void |
92 | 92 | { |
93 | 93 | $result = $this->em->createQuery('SELECT m, LENGTH(CONCAT(m.name, m.department)) AS namedeplength FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC') |
94 | - ->getArrayResult(); |
|
94 | + ->getArrayResult(); |
|
95 | 95 | |
96 | 96 | self::assertCount(4, $result); |
97 | 97 | self::assertEquals(10, $result[0]['namedeplength']); |
@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | public function testFunctionLocate() : void |
104 | 104 | { |
105 | 105 | $dql = "SELECT m, LOCATE('e', LOWER(m.name)) AS loc, LOCATE('e', LOWER(m.name), 7) AS loc2 " . |
106 | - 'FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC'; |
|
106 | + 'FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC'; |
|
107 | 107 | |
108 | 108 | $result = $this->em->createQuery($dql) |
109 | - ->getArrayResult(); |
|
109 | + ->getArrayResult(); |
|
110 | 110 | |
111 | 111 | self::assertCount(4, $result); |
112 | 112 | self::assertEquals(0, $result[0]['loc']); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | public function testFunctionLower() : void |
123 | 123 | { |
124 | 124 | $result = $this->em->createQuery('SELECT m, LOWER(m.name) AS lowername FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC') |
125 | - ->getArrayResult(); |
|
125 | + ->getArrayResult(); |
|
126 | 126 | |
127 | 127 | self::assertCount(4, $result); |
128 | 128 | self::assertEquals('roman b.', $result[0]['lowername']); |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | public function testFunctionMod() : void |
135 | 135 | { |
136 | 136 | $result = $this->em->createQuery('SELECT m, MOD(m.salary, 3500) AS amod FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC') |
137 | - ->getArrayResult(); |
|
137 | + ->getArrayResult(); |
|
138 | 138 | |
139 | 139 | self::assertCount(4, $result); |
140 | 140 | self::assertEquals(2000, $result[0]['amod']); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | public function testFunctionSqrt() : void |
147 | 147 | { |
148 | 148 | $result = $this->em->createQuery('SELECT m, SQRT(m.salary) AS sqrtsalary FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC') |
149 | - ->getArrayResult(); |
|
149 | + ->getArrayResult(); |
|
150 | 150 | |
151 | 151 | self::assertCount(4, $result); |
152 | 152 | self::assertEquals(316, \round($result[0]['sqrtsalary'])); |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | public function testFunctionUpper() : void |
159 | 159 | { |
160 | 160 | $result = $this->em->createQuery('SELECT m, UPPER(m.name) AS uppername FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC') |
161 | - ->getArrayResult(); |
|
161 | + ->getArrayResult(); |
|
162 | 162 | |
163 | 163 | self::assertCount(4, $result); |
164 | 164 | self::assertEquals('ROMAN B.', $result[0]['uppername']); |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | 'FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.name'; |
174 | 174 | |
175 | 175 | $result = $this->em->createQuery($dql) |
176 | - ->getArrayResult(); |
|
176 | + ->getArrayResult(); |
|
177 | 177 | |
178 | 178 | self::assertCount(4, $result); |
179 | 179 | self::assertEquals('Ben', $result[0]['str1']); |
@@ -190,8 +190,8 @@ discard block |
||
190 | 190 | public function testFunctionTrim() : void |
191 | 191 | { |
192 | 192 | $dql = "SELECT m, TRIM(TRAILING '.' FROM m.name) AS str1, " . |
193 | - " TRIM(LEADING '.' FROM m.name) AS str2, TRIM(CONCAT(' ', CONCAT(m.name, ' '))) AS str3 " . |
|
194 | - 'FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC'; |
|
193 | + " TRIM(LEADING '.' FROM m.name) AS str2, TRIM(CONCAT(' ', CONCAT(m.name, ' '))) AS str3 " . |
|
194 | + 'FROM Doctrine\Tests\Models\Company\CompanyManager m ORDER BY m.salary ASC'; |
|
195 | 195 | |
196 | 196 | $result = $this->em->createQuery($dql)->getArrayResult(); |
197 | 197 | |
@@ -333,8 +333,8 @@ discard block |
||
333 | 333 | ); |
334 | 334 | |
335 | 335 | $result = $this->em->createQuery($query) |
336 | - ->setMaxResults(1) |
|
337 | - ->getSingleResult(AbstractQuery::HYDRATE_ARRAY); |
|
336 | + ->setMaxResults(1) |
|
337 | + ->getSingleResult(AbstractQuery::HYDRATE_ARRAY); |
|
338 | 338 | |
339 | 339 | self::assertArrayHasKey('now', $result); |
340 | 340 | self::assertArrayHasKey('sub', $result); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | foreach ($props as $name => $prop) { |
61 | 61 | $ident += 4; |
62 | 62 | $str .= \str_repeat(' ', $ident) . '"' . $name . '": ' |
63 | - . $this->dump($prop) . ',' . PHP_EOL; |
|
63 | + . $this->dump($prop) . ',' . PHP_EOL; |
|
64 | 64 | $ident -= 4; |
65 | 65 | } |
66 | 66 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | |
73 | 73 | foreach ($obj as $k => $v) { |
74 | 74 | $str .= PHP_EOL . \str_repeat(' ', $ident) . '"' |
75 | - . $k . '" => ' . $this->dump($v) . ','; |
|
75 | + . $k . '" => ' . $this->dump($v) . ','; |
|
76 | 76 | $some = true; |
77 | 77 | } |
78 | 78 |
@@ -107,8 +107,8 @@ |
||
107 | 107 | public function __toString() |
108 | 108 | { |
109 | 109 | return \strtoupper($this->joinType) . ' JOIN ' . $this->join |
110 | - . ($this->alias ? ' ' . $this->alias : '') |
|
111 | - . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '') |
|
112 | - . ($this->condition ? ' ' . \strtoupper($this->conditionType) . ' ' . $this->condition : ''); |
|
110 | + . ($this->alias ? ' ' . $this->alias : '') |
|
111 | + . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '') |
|
112 | + . ($this->condition ? ' ' . \strtoupper($this->conditionType) . ' ' . $this->condition : ''); |
|
113 | 113 | } |
114 | 114 | } |
@@ -247,7 +247,7 @@ |
||
247 | 247 | |
248 | 248 | // 2) Build insert table records into temporary table |
249 | 249 | $dql = ' SELECT t0.' . \implode(', t0.', $rootClass->getIdentifierFieldNames()) |
250 | - . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner'; |
|
250 | + . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner'; |
|
251 | 251 | $query = $this->em->createQuery($dql)->setParameter('owner', $collection->getOwner()); |
252 | 252 | |
253 | 253 | $statement = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ') ' . $query->getSQL(); |
@@ -303,8 +303,8 @@ discard block |
||
303 | 303 | |
304 | 304 | // FIXME: Order with composite keys might not be correct |
305 | 305 | $sql = 'SELECT ' . $columnName |
306 | - . ' FROM ' . $tableName |
|
307 | - . ' WHERE ' . \implode(' = ? AND ', $identifier) . ' = ?'; |
|
306 | + . ' FROM ' . $tableName |
|
307 | + . ' WHERE ' . \implode(' = ? AND ', $identifier) . ' = ?'; |
|
308 | 308 | |
309 | 309 | $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id); |
310 | 310 | $versionType = $versionProperty->getType(); |
@@ -517,8 +517,8 @@ discard block |
||
517 | 517 | } |
518 | 518 | |
519 | 519 | $sql = 'UPDATE ' . $quotedTableName |
520 | - . ' SET ' . \implode(', ', $set) |
|
521 | - . ' WHERE ' . \implode(' = ? AND ', $where) . ' = ?'; |
|
520 | + . ' SET ' . \implode(', ', $set) |
|
521 | + . ' WHERE ' . \implode(' = ? AND ', $where) . ' = ?'; |
|
522 | 522 | |
523 | 523 | $result = $this->conn->executeUpdate($sql, $params, $types); |
524 | 524 | |
@@ -1637,9 +1637,9 @@ discard block |
||
1637 | 1637 | $lock = $this->getLockTablesSql($lockMode); |
1638 | 1638 | $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' '; |
1639 | 1639 | $sql = 'SELECT 1 ' |
1640 | - . $lock |
|
1641 | - . $where |
|
1642 | - . $lockSql; |
|
1640 | + . $lock |
|
1641 | + . $where |
|
1642 | + . $lockSql; |
|
1643 | 1643 | |
1644 | 1644 | [$params, $types] = $this->expandParameters($criteria); |
1645 | 1645 | |
@@ -2107,8 +2107,8 @@ discard block |
||
2107 | 2107 | $alias = $this->getSQLTableAlias($this->class->getTableName()); |
2108 | 2108 | |
2109 | 2109 | $sql = 'SELECT 1 ' |
2110 | - . $this->getLockTablesSql(null) |
|
2111 | - . ' WHERE ' . $this->getSelectConditionSQL($criteria); |
|
2110 | + . $this->getLockTablesSql(null) |
|
2111 | + . ' WHERE ' . $this->getSelectConditionSQL($criteria); |
|
2112 | 2112 | |
2113 | 2113 | [$params, $types] = $this->expandParameters($criteria); |
2114 | 2114 |
@@ -1353,9 +1353,9 @@ discard block |
||
1353 | 1353 | private function getDQLForDelete() |
1354 | 1354 | { |
1355 | 1355 | return 'DELETE' |
1356 | - . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) |
|
1357 | - . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
1358 | - . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
1356 | + . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) |
|
1357 | + . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
1358 | + . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
1359 | 1359 | } |
1360 | 1360 | |
1361 | 1361 | /** |
@@ -1364,10 +1364,10 @@ discard block |
||
1364 | 1364 | private function getDQLForUpdate() |
1365 | 1365 | { |
1366 | 1366 | return 'UPDATE' |
1367 | - . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) |
|
1368 | - . $this->getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', ']) |
|
1369 | - . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
1370 | - . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
1367 | + . $this->getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) |
|
1368 | + . $this->getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', ']) |
|
1369 | + . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
1370 | + . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
1371 | 1371 | } |
1372 | 1372 | |
1373 | 1373 | /** |
@@ -1376,8 +1376,8 @@ discard block |
||
1376 | 1376 | private function getDQLForSelect() |
1377 | 1377 | { |
1378 | 1378 | $dql = 'SELECT' |
1379 | - . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '') |
|
1380 | - . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']); |
|
1379 | + . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '') |
|
1380 | + . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']); |
|
1381 | 1381 | |
1382 | 1382 | $fromParts = $this->getDQLPart('from'); |
1383 | 1383 | $joinParts = $this->getDQLPart('join'); |
@@ -1401,10 +1401,10 @@ discard block |
||
1401 | 1401 | } |
1402 | 1402 | |
1403 | 1403 | $dql .= \implode(', ', $fromClauses) |
1404 | - . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
1405 | - . $this->getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', ']) |
|
1406 | - . $this->getReducedDQLQueryPart('having', ['pre' => ' HAVING ']) |
|
1407 | - . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
1404 | + . $this->getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
1405 | + . $this->getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', ']) |
|
1406 | + . $this->getReducedDQLQueryPart('having', ['pre' => ' HAVING ']) |
|
1407 | + . $this->getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
1408 | 1408 | |
1409 | 1409 | return $dql; |
1410 | 1410 | } |
@@ -1424,8 +1424,8 @@ discard block |
||
1424 | 1424 | } |
1425 | 1425 | |
1426 | 1426 | return ($options['pre'] ?? '') |
1427 | - . (\is_array($queryPart) ? \implode($options['separator'], $queryPart) : $queryPart) |
|
1428 | - . ($options['post'] ?? ''); |
|
1427 | + . (\is_array($queryPart) ? \implode($options['separator'], $queryPart) : $queryPart) |
|
1428 | + . ($options['post'] ?? ''); |
|
1429 | 1429 | } |
1430 | 1430 | |
1431 | 1431 | /** |