Skip to content

Allow fetching Resources with zero parameter #463

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

Merged
lindyhopchris merged 3 commits into from
Jan 13, 2020
Merged

Allow fetching Resources with zero parameter #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d03dbd
Update Route.php
dneykov Dec 12, 2019
dd206e9
Merge pull request #1 from dneykov/dneykov-patch-1
dneykov Dec 12, 2019
25aaee7
Update IdentifiableTrait.php
dneykov Dec 12, 2019
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
2 changes: 1 addition & 1 deletion src/Object/IdentifiableTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function getId()
throw new RuntimeException('Id member is not a string.');
}

if (empty($id)) {
if (empty($id) && '0' !== $id) {
throw new RuntimeException('Id member is an empty string.');
}

Expand Down
14 changes: 8 additions & 6 deletions src/Routing/Route.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,21 @@ public function __construct(ResolverInterface $resolver, ?IlluminateRoute $route
public function substituteBindings(StoreInterface $store): void
{
/** Cache the ID values so that we still have access to them. */
$this->resourceId = $this->getResourceId() ?: false;
$this->processId = $this->getProcessId() ?: false;

$tempResourceId = $this->getResourceId();
$tempProcessId = $this->getProcessId();
$this->resourceId = isset($tempResourceId) ? $tempResourceId : false;
$this->processId = isset($tempProcessId) ? $tempProcessId : false;

/** Bind the domain record. */
if ($this->resourceId) {
if (!empty($this->resourceId) || '0' === $this->resourceId) {
$this->route->setParameter(
ResourceRegistrar::PARAM_RESOURCE_ID,
$store->findOrFail($this->getResourceType(), $this->resourceId)
);
}

/** Bind the async process. */
if ($this->processId) {
if (!empty($this->processId) || '0' === $this->processId) {
$this->route->setParameter(
ResourceRegistrar::PARAM_PROCESS_ID,
$store->findOrFail($this->getProcessType(), $this->processId)
Expand Down