Skip to content
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

Merge array and with parameters #367

Merged
merged 3 commits into from
Oct 9, 2024
Merged

Merge array and with parameters #367

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
0d006fb
Merge existing parameters with `with` parameters
mateusjunges Oct 9, 2024
ce9b139
Add test
mateusjunges Oct 9, 2024
ce54dd6
Add test case for multiple chained with calls
mateusjunges Oct 9, 2024
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
28 changes: 22 additions & 6 deletions src/Formatters/ArrayParametersOverViewWith.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,32 @@ public function enterNode(Node $node): Node|int|null
return null;
}

$existingArrayItems = [];

// Check if `view` has a second argument and extract array items
if (isset($node->getArgs()[1])) {
$secondArg = $node->getArgs()[1]->value;
if ($secondArg instanceof Array_) {
$existingArrayItems = $secondArg->items;
}
}

// Merge existing array items with `with` parameters
$mergedItems = array_merge(
$existingArrayItems,
array_map(function ($viewWith) {
return new ArrayItem(
$viewWith[1]->value,
$viewWith[0]->value,
);
}, array_reverse($this->viewWith))
);

return new FuncCall(
new Name('view'),
[
$node->getArgs()[0],
new Arg(new Array_(array_map(function ($viewWith) {
return new ArrayItem(
$viewWith[1]->value,
$viewWith[0]->value,
);
}, array_reverse($this->viewWith)), [
new Arg(new Array_($mergedItems, [
'kind' => Array_::KIND_SHORT,
])),
]
Expand Down
72 changes: 72 additions & 0 deletions tests/Formatting/Formatters/ArrayParametersOverViewWithTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,76 @@ function edit()

$this->assertSame($expected, $formatted);
}

/** @test */
public function it_merges_parameters_passed_using_with_and_array_parameters(): void
{
$file = <<<'file'
<?php

namespace App;

class Controller
{
function index()
{
return view('test.index', ['id' => 1234])->with('first', 'yes');
}
}
file;

$expected = <<<'file'
<?php

namespace App;

class Controller
{
function index()
{
return view('test.index', ['id' => 1234, 'first' => 'yes']);
}
}
file;

$formatted = (new TFormat)->format(new ArrayParametersOverViewWith($file));

$this->assertSame($expected, $formatted);
}

/** @test */
public function it_merges_array_parameters_with_multiple_with_calls(): void
{
$file = <<<'file'
<?php

namespace App;

class Controller
{
function index()
{
return view('test.index', ['id' => 1234])->with('first', 'yes')->with('second', 'yes');
}
}
file;

$expected = <<<'file'
<?php

namespace App;

class Controller
{
function index()
{
return view('test.index', ['id' => 1234, 'first' => 'yes', 'second' => 'yes']);
}
}
file;

$formatted = (new TFormat)->format(new ArrayParametersOverViewWith($file));

$this->assertSame($expected, $formatted);
}
}
Loading