Skip to content

refactor: make Filter service stateless #30

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

refactor: make Filter service stateless #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2713d8
refactor: make Filter service stateless by removing instance-level fo…
Copilot May 12, 2026
5433a71
refactor: fix null safety in getForm() with explicit early return
Copilot May 12, 2026
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
35 changes: 22 additions & 13 deletions src/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@

final class Filter
{
/** @var array<int|string, FormInterface> */
private array $forms = [];

public function __construct(
private readonly FormFactoryInterface $formFactory,
private readonly RequestStack $requestStack,
Expand All @@ -31,12 +28,16 @@ public function __construct(
public function filter(string $name): array
{
$filter = [];
$fname = $name.$this->getSession()->getId();
/** @var array<string, mixed>|null $values */
$values = $this->getSession()->get('filter.'.$name);
if (null !== $values) {
if ($this->forms[$fname]->isSubmitted() || $this->forms[$fname]->submit($values)->isValid()) {
$filter = \array_filter($values, static fn ($value): bool => '' !== $value);
/** @var array{type: string, options: array<string, mixed>}|null $meta */
$meta = $this->getSession()->get('filter_meta.'.$name);
if (null !== $meta) {
$form = $this->formFactory->create($meta['type'], null, $meta['options']);
if ($this->getRequest()->query->has('submit-filter') || $form->submit($values)->isValid()) {
$filter = \array_filter($values, static fn ($value): bool => '' !== $value);
}
}
}
if ([] !== ($sort = $this->getSort($name))) {
Expand Down Expand Up @@ -76,8 +77,7 @@ public function getFormView(string $name, ?string $type = null): FormView
*/
public function saveFilter(string $type, string $name, array $defaults = [], array $options = []): bool
{
$fname = $name.$this->getSession()->getId();
$this->forms[$fname] = $this->formFactory->create($type, null, $options);
$this->getSession()->set('filter_meta.'.$name, ['type' => $type, 'options' => $options]);
if ($this->getRequest()->query->has('reset-filter')) {
$this->getSession()->set('filter.'.$name, null);

Expand All @@ -91,9 +91,10 @@ public function saveFilter(string $type, string $name, array $defaults = [], arr
if (!$this->getRequest()->query->has('submit-filter')) {
return false;
}
$this->forms[$fname]->handleRequest($this->getRequest());
if ($this->forms[$fname]->isSubmitted() && $this->forms[$fname]->isValid()) {
$this->getSession()->set('filter.'.$name, $this->getRequest()->query->all()[$this->forms[$fname]->getName()]);
$form = $this->formFactory->create($type, null, $options);
$form->handleRequest($this->getRequest());
if ($form->isSubmitted() && $form->isValid()) {
$this->getSession()->set('filter.'.$name, $this->getRequest()->query->all()[$form->getName()]);

return true;
}
Expand All @@ -114,9 +115,17 @@ public function sort(string $name, string $field, string $direction = 'ASC'): vo
*/
private function getForm(string $name, ?string $type = null): FormInterface
{
$name .= $this->getSession()->getId();
/** @var array{type: string, options: array<string, mixed>}|null $meta */
$meta = $this->getSession()->get('filter_meta.'.$name);
if (null === $meta) {
return $this->formFactory->create($type ?? FormType::class);
}
$form = $this->formFactory->create($type ?? $meta['type'], null, $meta['options']);
if ($this->getRequest()->query->has('submit-filter')) {
$form->handleRequest($this->getRequest());
}

return $this->forms[$name] ?? $this->formFactory->create($type ?? FormType::class);
return $form;
}

private function getRequest(): Request
Expand Down