phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-07 09:10:03 +01:00
Code Activity

Fix potential resolve() helper function conflict (#218)

Browse Source
This commit is contained in:
Caleb Porzio
2016-12-08 17:14:32 -05:00
committed by Taylor Otwell
parent e965fac863
commit bb19f85748
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/includes/facades.php
View File

@@ -1,5 +1,7 @@
<?php <?php
use Illuminate\Container\Container;
class Facade class Facade
{ {
/** /**
@@ -21,7 +23,9 @@ public static function containerKey()
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {
return call_user_func_array([resolve(static::containerKey()), $method], $parameters); $resolvedInstance = Container::getInstance()->make(static::containerKey());
return call_user_func_array([$resolvedInstance, $method], $parameters);
} }
} }

20
cli/includes/helpers.php
View File

@@ -46,15 +46,17 @@ function output($output)
(new Symfony\Component\Console\Output\ConsoleOutput)->writeln($output); (new Symfony\Component\Console\Output\ConsoleOutput)->writeln($output);
} }
/** if (! function_exists('resolve')) {
* Resolve the given class from the container. /**
* * Resolve the given class from the container.
* @param string $class *
* @return mixed * @param string $class
*/ * @return mixed
function resolve($class) */
{ function resolve($class)
return Container::getInstance()->make($class); {
return Container::getInstance()->make($class);
}
} }
/** /**