Skip to content

Commit 150bd1b

Browse files
authored
fix: primitive variadic class make (#43985)
1 parent 0c18029 commit 150bd1b

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

src/Illuminate/Container/Container.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,6 +1006,10 @@ protected function resolvePrimitive(ReflectionParameter $parameter)
10061006
return $parameter->getDefaultValue();
10071007
}
10081008

1009+
if ($parameter->isVariadic()) {
1010+
return [];
1011+
}
1012+
10091013
$this->unresolvablePrimitive($parameter);
10101014
}
10111015

tests/Container/ContainerResolveNonInstantiableTest.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ public function testResolvingNonInstantiableWithVariadicRemovesWiths()
2323
$this->assertCount(0, $parent->child->objects);
2424
$this->assertSame(42, $parent->i);
2525
}
26+
27+
public function testResolveVariadicPrimitive()
28+
{
29+
$container = new Container;
30+
$parent = $container->make(VariadicPrimitive::class);
31+
32+
$this->assertSame($parent->params, []);
33+
}
2634
}
2735

2836
interface TestInterface
@@ -73,3 +81,16 @@ public function __construct(TestInterface ...$objects)
7381
$this->objects = $objects;
7482
}
7583
}
84+
85+
class VariadicPrimitive
86+
{
87+
/**
88+
* @var array
89+
*/
90+
public $params;
91+
92+
public function __construct(...$params)
93+
{
94+
$this->params = $params;
95+
}
96+
}

0 commit comments

Comments
 (0)