@@ -295,7 +295,7 @@ |
||
295 | 295 | * |
296 | 296 | * @param array $parameters |
297 | 297 | * @param Connection $dbConnection |
298 | - * @param int|number $indent |
|
298 | + * @param integer $indent |
|
299 | 299 | * @param int $conditionsMode |
300 | 300 | * @return string |
301 | 301 | */ |
@@ -211,6 +211,6 @@ |
||
211 | 211 | * @return bool |
212 | 212 | */ |
213 | 213 | public function isDiscardedOnNull() { |
214 | - return $this->discardedOnNull; |
|
214 | + return $this->discardedOnNull; |
|
215 | 215 | } |
216 | 216 | } |
@@ -96,7 +96,7 @@ |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | if(is_numeric($this->value)) { |
99 | - return (int) $this->value; |
|
99 | + return (int) $this->value; |
|
100 | 100 | } else if ($dbConnection != null) { |
101 | 101 | return $dbConnection->quote($this->value); |
102 | 102 | } else { |
@@ -91,11 +91,11 @@ |
||
91 | 91 | */ |
92 | 92 | public function toSql(array $parameters = array(), Connection $dbConnection = null, $indent = 0, $conditionsMode = self::CONDITION_APPLY) |
93 | 93 | { |
94 | - if($this->value === null) { |
|
94 | + if ($this->value === null) { |
|
95 | 95 | throw new \Exception('A limit parameter must be an integer'); |
96 | 96 | } |
97 | 97 | |
98 | - if(is_numeric($this->value)) { |
|
98 | + if (is_numeric($this->value)) { |
|
99 | 99 | return (int) $this->value; |
100 | 100 | } else if ($dbConnection != null) { |
101 | 101 | return $dbConnection->quote($this->value); |
@@ -58,6 +58,6 @@ |
||
58 | 58 | { |
59 | 59 | $name = parent::toSql($parameters, $dbConnection, $indent, $conditionsMode); |
60 | 60 | $name = str_replace("'", "", $name); |
61 | - return is_numeric($name) ? (int)$name : $name; |
|
61 | + return is_numeric($name) ? (int) $name : $name; |
|
62 | 62 | } |
63 | 63 | } |
@@ -571,7 +571,7 @@ discard block |
||
571 | 571 | $assignment = $this->process_expr_list($this->splitSQLIntoTokens($base_expr)); |
572 | 572 | |
573 | 573 | return array('expr_type' => ExpressionType::EXPRESSION, 'base_expr' => trim($base_expr), |
574 | - 'sub_tree' => $assignment, ); |
|
574 | + 'sub_tree' => $assignment,); |
|
575 | 575 | } |
576 | 576 | |
577 | 577 | private function getVariableType($expression) |
@@ -692,8 +692,8 @@ discard block |
||
692 | 692 | } |
693 | 693 | |
694 | 694 | return [ |
695 | - ['expr_type' => 'limit_const', 'base_expr' => trim($offset), 'sub_tree' => false ], |
|
696 | - ['expr_type' => 'limit_const', 'base_expr' => trim($rowcount), 'sub_tree' => false ] |
|
695 | + ['expr_type' => 'limit_const', 'base_expr' => trim($offset), 'sub_tree' => false], |
|
696 | + ['expr_type' => 'limit_const', 'base_expr' => trim($rowcount), 'sub_tree' => false] |
|
697 | 697 | ]; |
698 | 698 | } |
699 | 699 | |
@@ -846,7 +846,7 @@ discard block |
||
846 | 846 | || $this->isFunction($prev) || $this->isExpression($prev) || $this->isSubQuery($prev) |
847 | 847 | || $this->isColumnReference($prev) || $this->isBracketExpression($prev)) { |
848 | 848 | $alias = array('as' => false, 'name' => trim($last['base_expr']), |
849 | - 'base_expr' => trim($last['base_expr']), ); |
|
849 | + 'base_expr' => trim($last['base_expr']),); |
|
850 | 850 | #remove the last token |
851 | 851 | array_pop($tokens); |
852 | 852 | $base_expr = implode('', $tokens); |
@@ -876,7 +876,7 @@ discard block |
||
876 | 876 | } |
877 | 877 | |
878 | 878 | return array('expr_type' => $type, 'alias' => $alias, 'base_expr' => trim($base_expr), |
879 | - 'sub_tree' => $processed, ); |
|
879 | + 'sub_tree' => $processed,); |
|
880 | 880 | } |
881 | 881 | |
882 | 882 | /** |
@@ -1018,7 +1018,7 @@ discard block |
||
1018 | 1018 | return array('expression' => '', 'token_count' => 0, 'table' => '', 'alias' => false, 'join_type' => '', |
1019 | 1019 | 'next_join_type' => '', 'saved_join_type' => $parseInfo['saved_join_type'], |
1020 | 1020 | 'ref_type' => false, 'ref_expr' => false, 'base_expr' => false, 'sub_tree' => false, |
1021 | - 'subquery' => '', ); |
|
1021 | + 'subquery' => '',); |
|
1022 | 1022 | } |
1023 | 1023 | |
1024 | 1024 | private function processFromExpression(&$parseInfo) |
@@ -1102,7 +1102,7 @@ discard block |
||
1102 | 1102 | } |
1103 | 1103 | |
1104 | 1104 | return array('expr_type' => $parseInfo['type'], 'base_expr' => $parseInfo['expr'], |
1105 | - 'direction' => $parseInfo['dir'], ); |
|
1105 | + 'direction' => $parseInfo['dir'],); |
|
1106 | 1106 | } |
1107 | 1107 | |
1108 | 1108 | private function initParseInfoForOrder() |
@@ -1562,7 +1562,7 @@ discard block |
||
1562 | 1562 | unset($values[$k]); |
1563 | 1563 | } else { |
1564 | 1564 | $values[$k] = array('expr_type' => ExpressionType::RECORD, 'base_expr' => $v, |
1565 | - 'data' => $this->process_record($v), ); |
|
1565 | + 'data' => $this->process_record($v),); |
|
1566 | 1566 | } |
1567 | 1567 | } |
1568 | 1568 |