@@ -58,7 +58,7 @@ |
||
58 | 58 | * |
59 | 59 | * @param Connection $dbConnection |
60 | 60 | * @param array $parameters |
61 | - * @param number $indent |
|
61 | + * @param integer $indent |
|
62 | 62 | * @param int $conditionsMode |
63 | 63 | * |
64 | 64 | * @return string |
@@ -635,6 +635,9 @@ discard block |
||
635 | 635 | }); |
636 | 636 | } |
637 | 637 | |
638 | + /** |
|
639 | + * @param \Closure $callback |
|
640 | + */ |
|
638 | 641 | private static function array_map_deep($array, $callback) |
639 | 642 | { |
640 | 643 | $new = array(); |
@@ -661,7 +664,7 @@ discard block |
||
661 | 664 | * @param array $parameters |
662 | 665 | * @param string $delimiter |
663 | 666 | * @param bool|string $wrapInBrackets |
664 | - * @param int|number $indent |
|
667 | + * @param integer $indent |
|
665 | 668 | * @param int $conditionsMode |
666 | 669 | * |
667 | 670 | * @return null|string |
@@ -33,7 +33,6 @@ |
||
33 | 33 | namespace SQLParser\Node; |
34 | 34 | |
35 | 35 | use Mouf\Database\MagicQueryException; |
36 | -use Mouf\Database\MagicQueryParserException; |
|
37 | 36 | use SQLParser\SqlRenderInterface; |
38 | 37 | use Doctrine\DBAL\Connection; |
39 | 38 | use Mouf\MoufManager; |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | array('NOT'), |
512 | 512 | array('&&', 'AND'), |
513 | 513 | array('XOR'), |
514 | - array('||', 'OR'), ); |
|
514 | + array('||', 'OR'),); |
|
515 | 515 | |
516 | 516 | private static $OPERATOR_TO_CLASS = array( |
517 | 517 | '=' => 'SQLParser\Node\Equal', |
@@ -818,7 +818,7 @@ discard block |
||
818 | 818 | */ |
819 | 819 | public static function nodeToInstanceDescriptor($node, MoufManager $moufManager) |
820 | 820 | { |
821 | - return self::array_map_deep($node, function ($item) use ($moufManager) { |
|
821 | + return self::array_map_deep($node, function($item) use ($moufManager) { |
|
822 | 822 | if ($item instanceof NodeInterface) { |
823 | 823 | return $item->toInstanceDescriptor($moufManager); |
824 | 824 | } else { |
@@ -862,7 +862,7 @@ discard block |
||
862 | 862 | { |
863 | 863 | if (is_array($nodes)) { |
864 | 864 | $elems = array(); |
865 | - array_walk_recursive($nodes, function ($item) use (&$elems, $dbConnection, $indent, $parameters, $conditionsMode, $extrapolateParameters) { |
|
865 | + array_walk_recursive($nodes, function($item) use (&$elems, $dbConnection, $indent, $parameters, $conditionsMode, $extrapolateParameters) { |
|
866 | 866 | if ($item instanceof SqlRenderInterface) { |
867 | 867 | $itemSql = $item->toSql($parameters, $dbConnection, $indent, $conditionsMode, $extrapolateParameters); |
868 | 868 | if ($itemSql !== null) { |
@@ -48,7 +48,7 @@ |
||
48 | 48 | if (isset($desc['SELECT'])) { |
49 | 49 | $select = new Select(); |
50 | 50 | |
51 | - $columns = array_map(function ($item) { |
|
51 | + $columns = array_map(function($item) { |
|
52 | 52 | return NodeFactory::toObject($item); |
53 | 53 | }, $desc['SELECT']); |
54 | 54 | $columns = NodeFactory::simplify($columns); |
@@ -58,7 +58,7 @@ |
||
58 | 58 | * |
59 | 59 | * @param Connection $dbConnection |
60 | 60 | * @param array $parameters |
61 | - * @param number $indent |
|
61 | + * @param integer $indent |
|
62 | 62 | * @param int $conditionsMode |
63 | 63 | * |
64 | 64 | * @return string |
@@ -58,7 +58,7 @@ |
||
58 | 58 | * |
59 | 59 | * @param Connection $dbConnection |
60 | 60 | * @param array $parameters |
61 | - * @param number $indent |
|
61 | + * @param integer $indent |
|
62 | 62 | * @param int $conditionsMode |
63 | 63 | * |
64 | 64 | * @return string |
@@ -58,7 +58,7 @@ |
||
58 | 58 | * |
59 | 59 | * @param Connection $dbConnection |
60 | 60 | * @param array $parameters |
61 | - * @param number $indent |
|
61 | + * @param integer $indent |
|
62 | 62 | * @param int $conditionsMode |
63 | 63 | * |
64 | 64 | * @return string |
@@ -316,7 +316,7 @@ |
||
316 | 316 | * |
317 | 317 | * @param array $parameters |
318 | 318 | * @param Connection $dbConnection |
319 | - * @param int|number $indent |
|
319 | + * @param integer $indent |
|
320 | 320 | * @param int $conditionsMode |
321 | 321 | * |
322 | 322 | * @return string |
@@ -316,7 +316,7 @@ |
||
316 | 316 | * |
317 | 317 | * @param array $parameters |
318 | 318 | * @param Connection $dbConnection |
319 | - * @param int|number $indent |
|
319 | + * @param integer $indent |
|
320 | 320 | * @param int $conditionsMode |
321 | 321 | * |
322 | 322 | * @return string |
@@ -85,7 +85,7 @@ |
||
85 | 85 | $sql = $this->getTwigEnvironment()->render($sql, $parameters); |
86 | 86 | } |
87 | 87 | |
88 | - $availableParameterKeys = array_keys(array_filter($parameters, static function($param) { return $param !== null;})); |
|
88 | + $availableParameterKeys = array_keys(array_filter($parameters, static function($param) { return $param !== null; })); |
|
89 | 89 | // We choose md4 because it is fast. |
90 | 90 | $cacheKey = 'request_build_'.hash('md4', $sql.'__'.implode('_/_', $availableParameterKeys)); |
91 | 91 | $newSql = $this->cache->fetch($cacheKey); |
@@ -168,7 +168,6 @@ |
||
168 | 168 | * @param NodeInterface $sqlNode |
169 | 169 | * @param array $parameters |
170 | 170 | * @param bool $extrapolateParameters Whether the parameters should be fed into the returned SQL query |
171 | - |
|
172 | 171 | * @return string |
173 | 172 | */ |
174 | 173 | public function toSql(NodeInterface $sqlNode, array $parameters = array(), bool $extrapolateParameters = true) |