Use argument unpacking.

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Mar 16, 2016 · dcfdb3d · dcfdb3d
1 parent ab9a458
commit dcfdb3d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/src/Providers/CommandServiceProvider.php b/src/Providers/CommandServiceProvider.php
@@ -35,7 +35,7 @@ public function register()
         foreach (array_keys($this->commands) as $command) {
             $method = "register{$command}Command";
 
-            call_user_func_array([$this, $method], []);
+            $this->{$method}();
         }
 
         $this->commands(array_values($this->commands));

diff --git a/src/Support/Manager.php b/src/Support/Manager.php
@@ -44,7 +44,7 @@ protected function createDriver($driverName)
         if (isset($this->customCreators[$driver])) {
             return $this->callCustomCreator($driverName);
         } elseif (method_exists($this, $method)) {
-            return call_user_func([$this, $method], $name);
+            return $this->{$method}($name);
         }
 
         throw new InvalidArgumentException("Driver [$driver] not supported.");
@@ -61,7 +61,7 @@ protected function callCustomCreator($driverName)
     {
         list($driver, $name) = $this->getDriverName($driverName);
 
-        return call_user_func($this->customCreators[$driver], $this->app, $name);
+        return $this->customCreators[$driver]($this->app, $name);
     }
 
     /**

diff --git a/src/Support/Morph.php b/src/Support/Morph.php
@@ -27,7 +27,9 @@ public static function __callStatic($method, $parameters)
             throw new RuntimeException("Unable to call [{$method}].");
         }
 
-        return call_user_func_array(static::$prefix.snake_case($method), $parameters);
+        $callback = static::$prefix.snake_case($method);
+
+        return $callback(...$parameters);
     }
 
     /**

diff --git a/src/Support/Nesty.php b/src/Support/Nesty.php
@@ -189,7 +189,7 @@ protected function pickTraverseFromMatchedExpression($id, $key, $location)
 
         $method = $matching[$key];
 
-        return call_user_func([$this, $method], $id, $location);
+        return $this->{$method}($id, $location);
     }
 
     /**

diff --git a/src/Support/Traits/Macroable.php b/src/Support/Traits/Macroable.php
@@ -35,7 +35,7 @@ public function macro($name, $macro)
     public function __call($method, $parameters)
     {
         if (isset($this->macros[$method])) {
-            return call_user_func_array($this->macros[$method], $parameters);
+            return $this->macros[$method](...$parameters);
         }
 
         throw new \BadMethodCallException("Method {$method} does not exist.");

diff --git a/src/Support/Traits/Validation.php b/src/Support/Traits/Validation.php
@@ -121,7 +121,7 @@ protected function getBindedRules()
     protected function runQueuedOn()
     {
         if (! is_null($method = $this->validationScenarios['on'])) {
-            call_user_func_array([$this, $method], $this->validationScenarios['parameters']);
+            $this->{$method}(...$this->validationScenarios['parameters']);
         }
     }