Skip to content

fix: encode search keyword #2903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: encode search keyword #2903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
349746b
fix: encode search keyword
yajra Nov 17, 2022
a833a2c
test: encoded search keyword
yajra Nov 17, 2022
5667af8
refactor: no need to cast as string
yajra Nov 22, 2022
d2ab963
revert: "refactor: no need to cast as string"
yajra Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Utilities/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ public function columnKeyword(int $index): string
protected function prepareKeyword(float|array|int|string $keyword): string
{
if (is_array($keyword)) {
return implode(' ', $keyword);
$keyword = implode(' ', $keyword);
}

return (string) $keyword;
return e((string) $keyword);
}

/**
Expand Down
25 changes: 25 additions & 0 deletions tests/Integration/QueryDataTableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,31 @@ public function it_can_perform_global_search()
]);
}

/** @test */
public function it_can_perform_global_search_with_html_string()
{
User::create([
'name' => e('Record & 21'),
'email' => '[email protected]',
]);

$this->assertEquals('Record & 21', User::find(21)->name);

$crawler = $this->call('GET', '/query/users', [
'columns' => [
['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
],
'search' => ['value' => 'Record & 21'],
]);

$crawler->assertJson([
'draw' => 0,
'recordsTotal' => 21,
'recordsFiltered' => 1,
]);
}

/** @test */
public function it_can_skip_total_records_count_query()
{
Expand Down