Skip to content

feat: multiple appended/prepended items #214

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
gp-lnuff wants to merge 2 commits into
base: 4.x
Choose a base branch
from
Draft

feat: multiple appended/prepended items #214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80deb6b
use Generators to handle multiple appended/prepended items
gp-lnuff May 20, 2026
9b1259b
Merge branch '4.x' into generators
gp-lnuff May 27, 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
50 changes: 38 additions & 12 deletions src/SelectTree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,8 +555,8 @@ public function getTreeUsing(Closure|array $value): static
public function getTree(): Collection
{
return Collection::wrap($this->evaluate($this->getTreeUsing) ?? $this->buildTree())
->when(filled($this->prepend), fn (Collection $tree) => $tree->prepend($this->getPrependedItems()))
->when(filled($this->append), fn (Collection $tree) => $tree->push($this->getAppendedItems()));
->when(filled($this->prepend), fn(Collection $tree) => $tree->unshift(...$this->generatePrependedItems()))
->when(filled($this->append), fn(Collection $tree) => $tree->push(...$this->generateAppendedItems()));
}

public function getResults(): Collection|LazyCollection|array|null
Expand Down Expand Up @@ -608,34 +608,60 @@ public function getMultiple(): bool
);
}

public function getPrependedItems(): ?array
protected function generatePrependedItems(): \Generator
{
$prependedItems = $this->evaluate($this->prepend);

if (is_array($prependedItems) && isset($prependedItems['name'], $prependedItems['value'])) {
$prependedItems['value'] = (string) $prependedItems['value'];
if (is_array($prependedItems)) {
if (isset($prependedItems['name'], $prependedItems['value'])) {
$prependedItems['value'] = (string) $prependedItems['value'];
yield $prependedItems;
} elseif (is_array($prependedItems[0])) {
foreach ($prependedItems as $prependedItem) {
if (isset($prependedItem['name'], $prependedItem['value'])) {
$prependedItem['value'] = (string) $prependedItem['value'];
yield $prependedItem;
}
}
}
} elseif (is_null($prependedItems)) {
// Avoid throwing an exception in case $prepend is explicitly set to null, or a Closure evaluates to null.
} else {
throw new InvalidArgumentException('The provided prepend value must be an array with "name" and "value" keys.');
throw new InvalidArgumentException('The provided prepend value must be an array or an array of arrays with "name" and "value" keys.');
}
}

return $prependedItems;
public function getPrependedItems(): ?array
{
return iterator_to_array($this->generatePrependedItems());
}

public function getAppendedItems(): ?array
protected function generateAppendedItems(): \Generator
{
$appendedItems = $this->evaluate($this->append);

if (is_array($appendedItems) && isset($appendedItems['name'], $appendedItems['value'])) {
$appendedItems['value'] = (string) $appendedItems['value'];
if (is_array($appendedItems)) {
if (isset($appendedItems['name'], $appendedItems['value'])) {
$appendedItems['value'] = (string) $appendedItems['value'];
yield $appendedItems;
} elseif (is_array($appendedItems[0])) {
foreach ($appendedItems as $appendedItem) {
if (isset($appendedItem['name'], $appendedItem['value'])) {
$appendedItem['value'] = (string) $appendedItem['value'];
yield $appendedItem;
}
}
}
} elseif (is_null($appendedItems)) {
// Avoid throwing an exception in case $append is explicitly set to null, or a Closure evaluates to null.
} else {
throw new InvalidArgumentException('The provided append value must be an array with "name" and "value" keys.');
throw new InvalidArgumentException('The provided append value must be an array or an array of arrays with "name" and "value" keys.');
}
}

return $appendedItems;
public function getAppendedItems(): ?array
{
return iterator_to_array($this->generateAppendedItems());
}

public function getShowTags(): bool
Expand Down