Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 35 additions & 1 deletion src/Decorators/ControllerDecorator.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
namespace Lorisleiva\Actions\Decorators;

use Illuminate\Container\Container;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Routing\Route;
use Illuminate\Routing\RouteDependencyResolverTrait;
use Illuminate\Support\Str;
use Lorisleiva\Actions\ActionRequest;
use Lorisleiva\Actions\Concerns\DecorateActions;
use Lorisleiva\Actions\Concerns\WithAttributes;
use ReflectionMethod;

class ControllerDecorator
{
Expand Down Expand Up @@ -155,12 +157,44 @@ protected function resolveFromRouteAndCall($method)
{
$this->container = Container::getInstance();

$this->container->instance(Route::class, $this->route);

$parameters = $this->route->parametersWithoutNulls();
$parameters = $this->resolveRouteModelBindings($parameters, $method);

$arguments = $this->resolveClassMethodDependencies(
$this->route->parametersWithoutNulls(),
$parameters,
$this->action,
$method
);

return $this->action->{$method}(...array_values($arguments));
}

protected function resolveRouteModelBindings(array $parameters, string $method): array
{
foreach ($parameters as $key => $value) {
if (is_object($value)) {
continue;
}

$reflection = new ReflectionMethod($this->action, $method);
$reflectionParameters = $reflection->getParameters();

foreach ($reflectionParameters as $reflectionParameter) {
if ($reflectionParameter->getName() === $key) {
$type = $reflectionParameter->getType();
if ($type && !$type->isBuiltin() && class_exists($type->getName())) {
$modelClass = $type->getName();
if (is_subclass_of($modelClass, Model::class)) {
$parameters[$key] = $modelClass::findOrFail($value);
break;
}
}
}
}
}

return $parameters;
}
}
42 changes: 42 additions & 0 deletions tests/AsActionWithRoutesAndImplicitBindingsTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

namespace Lorisleiva\Actions\Tests;

use Illuminate\Routing\Router;
use Lorisleiva\Actions\Concerns\AsAction;
use Lorisleiva\Actions\Facades\Actions;
use Lorisleiva\Actions\Tests\Stubs\User;

class AsActionWithRoutesAndImplicitBindingsTest
{
use AsAction;

public static function routes(Router $router): void
{
$router->get('/from-action/users/{user}', static::class);
}

public function handle(User $user): User
{
return $user;
}
}

it('supports implicit route model binding when using AsAction and route is defined in routes() method', function () {
Actions::registerRoutesForAction(AsActionWithRoutesAndImplicitBindingsTest::class);

loadMigrations();
createUser([
'id' => 42,
'name' => 'John Doe',
]);

$response = $this->getJson('/from-action/users/42');

$response->assertOk();
$response->assertJson([
'id' => 42,
'name' => 'John Doe',
]);
});

42 changes: 42 additions & 0 deletions tests/AsControllerWithRoutesAndImplicitBindingsTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

namespace Lorisleiva\Actions\Tests;

use Illuminate\Routing\Router;
use Lorisleiva\Actions\Concerns\AsController;
use Lorisleiva\Actions\Facades\Actions;
use Lorisleiva\Actions\Tests\Stubs\User;

class AsControllerWithRoutesAndImplicitBindingsTest
{
use AsController;

public static function routes(Router $router): void
{
$router->get('/from-action/users/{user}', static::class);
}

public function handle(User $user): User
{
return $user;
}
}

it('supports implicit route model binding when route is defined in routes() method', function () {
Actions::registerRoutesForAction(AsControllerWithRoutesAndImplicitBindingsTest::class);

loadMigrations();
createUser([
'id' => 42,
'name' => 'John Doe',
]);

$response = $this->getJson('/from-action/users/42');

$response->assertOk();
$response->assertJson([
'id' => 42,
'name' => 'John Doe',
]);
});