8000 Merge pull request #1 from lucasmichot/fix-5925 · laravel/framework@137c0db · GitHub
[go: up one dir, main page]

Skip to content

Commit 137c0db

Browse files
committed
Merge pull request #1 from lucasmichot/fix-5925
Fix PR alignment
2 parents 97c1880 + 120fe49 commit 137c0db

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/Illuminate/Container/Container.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -523,25 +523,28 @@ public function call($callback, array $parameters = array(), $defaultMethod = nu
523523
return $this->callClass($callback, $parameters, $defaultMethod);
524524
}
525525

526-
$dependencies = $this->getMethodDependencies($callback,$parameters);
526+
$dependencies = $this->getMethodDependencies($callback, $parameters);
527527

528528
return call_user_func_array($callback, $dependencies);
529529
}
530530

531531
/**
532-
* Get all dependencies for a given method
532+
* Get all dependencies for a given method.
533+
*
533534
* @param \Closure|array $callback
534535
* @param array $parameters
535536
* @return array
536537
*/
537-
protected function getMethodDependencies($callback,$parameters = array()) {
538+
protected function getMethodDependencies($callback, $parameters = [])
539+
{
538540
$dependencies = [];
541+
539542
foreach ($this->getCallReflector($callback)->getParameters() as $key => $parameter)
540543
{
541544
$dependencies[] = $this->getDependencyForCallParameter($parameter, $parameters);
542545
}
543546

544-
return array_merge($dependencies,$parameters);
547+
return array_merge($dependencies, $parameters);
545548
}
546549

547550
/**
@@ -612,7 +615,7 @@ protected function callClass($target, array $parameters = array(), $defaultMetho
612615
// received in this method into this listener class instance's methods.
613616
$callable = array($this->make($segments[0]), $method);
614617

615-
$dependencies = $this->getMethodDependencies($callable,$parameters);
618+
$dependencies = $this->getMethodDependencies($callable, $parameters);
616619

617620
return call_user_func_array($callable, $dependencies);
618621
}

tests/Container/ContainerTest.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,13 +380,13 @@ public function testCallWithAtSignBasedClassReferences()
380380

381381
$container = new Container;
382382
$result = $container->call('ContainerTestCallStub@inject');
383-
$this->assertInstanceOf('ContainerConcreteStub',$result[0]);
384-
$this->assertEquals('taylor',$result[1]);
383+
$this->assertInstanceOf('ContainerConcreteStub', $result[0]);
384+
$this->assertEquals('taylor', $result[1]);
385385

386386
$container = new Container;
387-
$result = $container->call('ContainerTestCallStub@inject',['default'=>'foo']);
388-
$this->assertInstanceOf('ContainerConcreteStub',$result[0]);
389-
$this->assertEquals('foo',$result[1]);
387+
$result = $container->call('ContainerTestCallStub@inject', ['default' => 'foo']);
388+
$this->assertInstanceOf('ContainerConcreteStub', $result[0]);
389+
$this->assertEquals('foo', $result[1]);
390390

391391
$container = new Container;
392392
$result = $container->call('ContainerTestCallStub', ['foo', 'bar'], 'work');
@@ -510,7 +510,9 @@ class ContainerTestCallStub {
510510
public function work() {
511511
return func_get_args();
512512
}
513-
public function inject(ContainerConcreteStub $stub,$default = 'taylor') {
513+
514+
public function inject(ContainerConcreteStub $stub, $default = 'taylor')
515+
{
514516
return func_get_args();
515517
}
516518
}

0 commit comments

Comments
 (0)
0