@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | foreach ($aliases as $alias => $values) { |
| 67 | 67 | /** @var string $cacheKey */ |
| 68 | - [$cacheKey,] = Query\CacheKeyGenerator::generate( |
|
| 68 | + [$cacheKey, ] = Query\CacheKeyGenerator::generate( |
|
| 69 | 69 | self::CACHE_FIELD, |
| 70 | 70 | $this->currentQueryBuilder->getDQL(), |
| 71 | 71 | ['query' => "[{$expr}][{$alias}]"] |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | foreach ($conditions as $alias => $value) { |
| 97 | 97 | $snakeCaseExprMethod = 'order_by'; |
| 98 | 98 | /** @var string $cacheKey */ |
| 99 | - [$cacheKey,] = Query\CacheKeyGenerator::generate( |
|
| 99 | + [$cacheKey, ] = Query\CacheKeyGenerator::generate( |
|
| 100 | 100 | self::CACHE_FIELD, |
| 101 | 101 | $this->currentQueryBuilder->getDQL(), |
| 102 | 102 | ['query' => "[{$snakeCaseExprMethod}][{$alias}]"] |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | private function createField(string $tableAliasAndColumnName, string $expr): Query\Field |
| 125 | 125 | { |
| 126 | 126 | foreach ($this->getAliasesAndMetadata() as $alias => $metadata) { |
| 127 | - if (0 === strncasecmp($tableAliasAndColumnName, $alias . '_', mb_strlen($alias . '_'))) { |
|
| 128 | - $columnName = mb_substr($tableAliasAndColumnName, mb_strlen($alias . '_')); |
|
| 127 | + if (0 === strncasecmp($tableAliasAndColumnName, $alias.'_', mb_strlen($alias.'_'))) { |
|
| 128 | + $columnName = mb_substr($tableAliasAndColumnName, mb_strlen($alias.'_')); |
|
| 129 | 129 | |
| 130 | 130 | if (\array_key_exists($columnName, $metadata->fieldNames)) { |
| 131 | 131 | return (new Query\Field($expr, $metadata->getName(), $alias)) |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - throw new \InvalidArgumentException($tableAliasAndColumnName . ' not allowed'); |
|
| 137 | + throw new \InvalidArgumentException($tableAliasAndColumnName.' not allowed'); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | private function getAliasesAndMetadata(): array |
| 147 | 147 | { |
| 148 | - [$cacheKey,] = Query\CacheKeyGenerator::generate(self::CACHE_METADATA, $this->currentQueryBuilder->getDQL()); |
|
| 148 | + [$cacheKey, ] = Query\CacheKeyGenerator::generate(self::CACHE_METADATA, $this->currentQueryBuilder->getDQL()); |
|
| 149 | 149 | if (!\is_array($aliasesAndMetadata = $this->cacher->fetch($cacheKey))) { |
| 150 | 150 | $aliasesAndMetadata = []; |
| 151 | 151 | |