mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-25 18:51:40 +02:00
Code Issues Releases Wiki Activity

Fix scope removal of bindings

Browse Source
This commit is contained in:
Toby Zerner
2015-03-28 16:31:26 +10:30
parent ac1122b6aa
commit 0894368063
1 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
framework/core/src/Core/Models/RegisteredTypesScope.php
View File

@@ -6,6 +6,27 @@ use Illuminate\Database\Eloquent\Model;
class RegisteredTypesScope implements ScopeInterface class RegisteredTypesScope implements ScopeInterface
{ {
/**
* The index at which we added a where clause.
*
* @var int
*/
protected $whereIndex;
/**
* The index at which we added where bindings.
*
* @var int
*/
protected $bindingIndex;
/**
* The number of where bindings we added.
*
* @var int
*/
protected $bindingCount;
/** /**
* Apply the scope to a given Eloquent query builder. * Apply the scope to a given Eloquent query builder.
* *
@@ -15,7 +36,14 @@ class RegisteredTypesScope implements ScopeInterface
*/ */
public function apply(Builder $builder, Model $model) public function apply(Builder $builder, Model $model)
{ {
$builder->whereIn('type', array_keys($model::getTypes())); $query = $builder->getQuery();
$this->whereIndex = count($query->wheres);
$this->bindingIndex = count($query->getRawBindings()['where']);
$types = array_keys($model::getTypes());
$this->bindingCount = count($types);
$query->whereIn('type', $types);
} }
/** /**
@@ -29,27 +57,11 @@ class RegisteredTypesScope implements ScopeInterface
{ {
$query = $builder->getQuery(); $query = $builder->getQuery();
foreach ((array) $query->wheres as $key => $where) unset($query->wheres[$this->whereIndex]);
{ $query->wheres = array_values($query->wheres);
if ($this->isTypeConstraint($where))
{
unset($query->wheres[$key]);
$query->wheres = array_values($query->wheres); $whereBindings = $query->getRawBindings()['where'];
} array_splice($whereBindings, $this->bindingIndex, $this->bindingCount);
} $query->setBindings(array_values($whereBindings));
} }
/**
* Determine if the given where clause is a type constraint.
*
* @param array $where
* @param string $column
* @return bool
*/
protected function isTypeConstraint(array $where)
{
return $where['type'] == 'In' && $where['column'] == 'type';
}
} }