Skip to content

Commit d4fe989

Browse files
committed
Rename method
1 parent f7151ab commit d4fe989

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

system/Database/BaseBuilder.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,8 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
693693
$op = ' =';
694694
}
695695

696-
if ($this->isSubQuery($v)) {
697-
$v = $this->buildSubQuery($v, true);
696+
if ($this->isSubquery($v)) {
697+
$v = $this->buildSubquery($v, true);
698698
} else {
699699
$bind = $this->setBind($k, $v, $escape);
700700
$v = " :{$bind}:";
@@ -844,7 +844,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
844844
return $this; // @codeCoverageIgnore
845845
}
846846

847-
if ($values === null || (! is_array($values) && ! $this->isSubQuery($values))) {
847+
if ($values === null || (! is_array($values) && ! $this->isSubquery($values))) {
848848
if (CI_DEBUG) {
849849
throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
850850
}
@@ -864,8 +864,8 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
864864

865865
$not = ($not) ? ' NOT' : '';
866866

867-
if ($this->isSubQuery($values)) {
868-
$ok = $this->buildSubQuery($values);
867+
if ($this->isSubquery($values)) {
868+
$ok = $this->buildSubquery($values);
869869
} else {
870870
$whereIn = array_values($values);
871871
$ok = $this->setBind($ok, $whereIn, $escape);
@@ -874,7 +874,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
874874
$prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
875875

876876
$whereIn = [
877-
'condition' => $prefix . $key . $not . ($this->isSubQuery($values) ? " IN ({$ok})" : " IN :{$ok}:"),
877+
'condition' => $prefix . $key . $not . ($this->isSubquery($values) ? " IN ({$ok})" : " IN :{$ok}:"),
878878
'escape' => false,
879879
];
880880

@@ -2733,7 +2733,7 @@ protected function cleanClone()
27332733
/**
27342734
* @param mixed $value
27352735
*/
2736-
protected function isSubQuery($value): bool
2736+
protected function isSubquery($value): bool
27372737
{
27382738
return $value instanceof BaseBuilder || $value instanceof Closure;
27392739
}
@@ -2742,15 +2742,15 @@ protected function isSubQuery($value): bool
27422742
* @param BaseBuilder|Closure $builder
27432743
* @param bool $wrapped Wrap the subquery in brackets
27442744
*/
2745-
protected function buildSubQuery($builder, bool $wrapped = false): string
2745+
protected function buildSubquery($builder, bool $wrapped = false): string
27462746
{
27472747
if ($builder instanceof Closure) {
27482748
$instance = (clone $this)->from([], true)->resetQuery();
27492749
$builder = $builder($instance);
27502750
}
27512751

2752-
$subQuery = strtr($builder->getCompiledSelect(), "\n", ' ');
2752+
$subquery = strtr($builder->getCompiledSelect(), "\n", ' ');
27532753

2754-
return $wrapped ? '(' . $subQuery . ')' : $subQuery;
2754+
return $wrapped ? '(' . $subquery . ')' : $subquery;
27552755
}
27562756
}

0 commit comments

Comments
 (0)