From 6fd4f12c5aa732db1d31abbc67071c2a536b27de Mon Sep 17 00:00:00 2001 From: Antonio Pauletich Date: Sun, 18 Nov 2018 11:20:24 +0100 Subject: [PATCH] [5.8] Remove the container makeWith method --- src/Illuminate/Container/Container.php | 12 ------------ .../Database/Concerns/BuildsQueries.php | 4 ++-- tests/Container/ContainerTest.php | 16 ---------------- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php index 927760f42180..649d5fb74b67 100755 --- a/src/Illuminate/Container/Container.php +++ b/src/Illuminate/Container/Container.php @@ -584,18 +584,6 @@ public function factory($abstract) }; } - /** - * An alias function name for make(). - * - * @param string $abstract - * @param array $parameters - * @return mixed - */ - public function makeWith($abstract, array $parameters = []) - { - return $this->make($abstract, $parameters); - } - /** * Resolve the given type from the container. * diff --git a/src/Illuminate/Database/Concerns/BuildsQueries.php b/src/Illuminate/Database/Concerns/BuildsQueries.php index c712bbef4c4e..9cb33c40b1f8 100644 --- a/src/Illuminate/Database/Concerns/BuildsQueries.php +++ b/src/Illuminate/Database/Concerns/BuildsQueries.php @@ -138,7 +138,7 @@ public function unless($value, $callback, $default = null) */ protected function paginator($items, $total, $perPage, $currentPage, $options) { - return Container::getInstance()->makeWith(LengthAwarePaginator::class, compact( + return Container::getInstance()->make(LengthAwarePaginator::class, compact( 'items', 'total', 'perPage', 'currentPage', 'options' )); } @@ -154,7 +154,7 @@ protected function paginator($items, $total, $perPage, $currentPage, $options) */ protected function simplePaginator($items, $perPage, $currentPage, $options) { - return Container::getInstance()->makeWith(Paginator::class, compact( + return Container::getInstance()->make(Paginator::class, compact( 'items', 'perPage', 'currentPage', 'options' )); } diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php index 07ba41ee36ee..c04e942b0aec 100755 --- a/tests/Container/ContainerTest.php +++ b/tests/Container/ContainerTest.php @@ -951,22 +951,6 @@ public function testResolvingCallbacksShouldBeFiredWhenCalledWithAliases() $this->assertEquals('taylor', $instance->name); } - public function testMakeWithMethodIsAnAliasForMakeMethod() - { - $mock = $this->getMockBuilder(Container::class) - ->setMethods(['make']) - ->getMock(); - - $mock->expects($this->once()) - ->method('make') - ->with(ContainerDefaultValueStub::class, ['default' => 'laurence']) - ->will($this->returnValue(new stdClass)); - - $result = $mock->makeWith(ContainerDefaultValueStub::class, ['default' => 'laurence']); - - $this->assertInstanceOf(stdClass::class, $result); - } - public function testResolvingWithArrayOfParameters() { $container = new Container;