Skip to content

Commit d22378e

Browse files
committed
Do not pass null into strtoupper
1 parent f1cfc54 commit d22378e

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/Assembler/Segments/ClauseAssembler.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ public function assembleJoinClause(JoinClause $clause)
8484
);
8585
}
8686
return $clause->getAction() . ' '
87-
. $this->assembleSegment($clause->getTable())
88-
. ' ON ' . implode($clause->getGlue(), $segments);
87+
. $this->assembleSegment($clause->getTable())
88+
. ' ON ' . implode($clause->getGlue(), $segments);
8989
}
9090

9191
public function assembleInsertClause(InsertClause $clause)
9292
{
9393
return $this->assembleAbstractTableClause($clause) . ' ('
94-
. implode(', ', $this->assembleSegments($clause->getFields()))
95-
. ')';
94+
. implode(', ', $this->assembleSegments($clause->getFields()))
95+
. ')';
9696
}
9797

9898
public function assembleLimitClause(LimitClause $clause)
@@ -119,13 +119,13 @@ public function assembleSelectClause(SelectClause $clause)
119119
}
120120

121121
return $return . ' '
122-
. implode(', ', $this->assembleSegments($clause->getExpressions()));
122+
. implode(', ', $this->assembleSegments($clause->getExpressions()));
123123
}
124124

125125
public function assembleAbstractTableClause(AbstractTableClause $clause)
126126
{
127127
return $clause->getAction() . ' '
128-
. $this->assembleSegment($clause->getTable());
128+
. $this->assembleSegment($clause->getTable());
129129
}
130130

131131
public function assembleValuesClause(ValuesClause $clause)
@@ -150,7 +150,7 @@ public function assembleOrderByClause(OrderByClause $clause)
150150
{
151151
$orders[] = trim(
152152
$this->assembleSegment($field) . ' '
153-
. strtoupper($clause->getOrder($field, ''))
153+
. strtoupper($clause->getOrder($field, '') ?? '')
154154
);
155155
}
156156
return $clause->getAction() . ' ' . implode(', ', $orders);
@@ -159,7 +159,7 @@ public function assembleOrderByClause(OrderByClause $clause)
159159
public function assembleAbstractFieldClause(AbstractFieldClause $clause)
160160
{
161161
return $clause->getAction() . ' '
162-
. implode(', ', $this->assembleSegments($clause->getFields()));
162+
. implode(', ', $this->assembleSegments($clause->getFields()));
163163
}
164164

165165
public function assemblePredicateClause(AbstractPredicateClause $clause)
@@ -187,10 +187,10 @@ public function assemblePredicateClause(AbstractPredicateClause $clause)
187187
else
188188
{
189189
return $clause->getAction() . ' '
190-
. implode(
191-
$clause->getGlue(),
192-
$this->assembleSegments($clause->getPredicates())
193-
);
190+
. implode(
191+
$clause->getGlue(),
192+
$this->assembleSegments($clause->getPredicates())
193+
);
194194
}
195195
}
196196
}

src/SelectExpression/TrimSelectExpression.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function hasString()
2828

2929
public function setSide($side)
3030
{
31-
$side = strtoupper($side);
31+
$side = strtoupper($side ?? '');
3232
if(in_array($side, ['LEADING', 'TRAILING', 'BOTH']))
3333
{
3434
$this->_side = $side;

0 commit comments

Comments
 (0)