Skip to content

Commit 18c6aa1

Browse files
committed
added checking enabled brackets to *Expression::toBoolean
1 parent 1a7a521 commit 18c6aa1

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

core/Logic/BinaryExpression.class.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public function toMapped(ProtoDAO $dao, JoinCapableQuery $query)
109109

110110
public function toBoolean(Form $form)
111111
{
112+
Assert::isTrue($this->brackets, 'brackets must be enabled');
112113
$left = $form->toFormValue($this->left);
113114
$right = $form->toFormValue($this->right);
114115

core/Logic/PostfixUnaryExpression.class.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public function toMapped(ProtoDAO $dao, JoinCapableQuery $query)
7070

7171
public function toBoolean(Form $form)
7272
{
73+
Assert::isTrue($this->brackets, 'brackets must be enabled');
7374
$subject = $form->toFormValue($this->subject);
7475

7576
switch ($this->logic) {

core/Logic/PrefixUnaryExpression.class.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function toMapped(ProtoDAO $dao, JoinCapableQuery $query)
6767

6868
public function toBoolean(Form $form)
6969
{
70+
Assert::isTrue($this->brackets, 'brackets must be enabled');
7071
$subject = $form->toFormValue($this->subject);
7172

7273
switch ($this->logic) {

doc/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2012-03-26 Alexey S. Denisov
2+
* core/Logic/BinaryExpression.class.php,
3+
core/Logic/PostfixUnaryExpression.class.php,
4+
core/Logic/PrefixUnaryExpression.class.php,
5+
core/OSQL/SQLFunction.class.php: Added option noBrackets for binary/unary expressions
6+
17
2012-04-27 Georgiy T. Kutsurua
28

39
* core/Form/Primitives/PrimitiveString.class.php:

0 commit comments

Comments
 (0)