From 5d9b56d194c4dcfc285b38bfc3e5693544d44431 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Fri, 2 Mar 2018 23:59:35 +0700
Subject: [PATCH] Replaced func_get_args() by ...$params (PHP 5.6+).

---
 src/PHPCensor/Builder.php     |  6 ++++--
 src/PHPCensor/Helper/Lang.php | 24 +++++++++++++-----------
 tests/bootstrap.php           |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/PHPCensor/Builder.php b/src/PHPCensor/Builder.php
index 5cbe6778..896c2e59 100644
--- a/src/PHPCensor/Builder.php
+++ b/src/PHPCensor/Builder.php
@@ -278,11 +278,13 @@ class Builder implements LoggerAwareInterface
     /**
      * Used by this class, and plugins, to execute shell commands.
      *
+     * @param array ...$params
+     *
      * @return boolean
      */
-    public function executeCommand()
+    public function executeCommand(...$params)
     {
-        return $this->commandExecutor->executeCommand(func_get_args());
+        return $this->commandExecutor->executeCommand($params);
     }
 
     /**
diff --git a/src/PHPCensor/Helper/Lang.php b/src/PHPCensor/Helper/Lang.php
index 300ee1b4..5c452942 100644
--- a/src/PHPCensor/Helper/Lang.php
+++ b/src/PHPCensor/Helper/Lang.php
@@ -37,19 +37,19 @@ class Lang
     /**
      * Get a specific string from the language file.
      *
-     * @param $string
-     * @return mixed|string
+     * @param string $string
+     * @param array  ...$params
+     *
+     * @return string
      */
-    public static function get($string)
+    public static function get($string, ...$params)
     {
-        $vars = func_get_args();
-
         if (array_key_exists($string, self::$strings)) {
-            $vars[0] = self::$strings[$string];
-            return call_user_func_array('sprintf', $vars);
+            $params[0] = self::$strings[$string];
+            return call_user_func_array('sprintf', $params);
         } elseif (self::DEFAULT_LANGUAGE !== self::$language && array_key_exists($string, self::$default_strings)) {
-            $vars[0] = self::$default_strings[$string];
-            return call_user_func_array('sprintf', $vars);
+            $params[0] = self::$default_strings[$string];
+            return call_user_func_array('sprintf', $params);
         }
 
         return $string;
@@ -57,10 +57,12 @@ class Lang
 
     /**
      * Output a specific string from the language file.
+     *
+     * @param array ...$params
      */
-    public static function out()
+    public static function out(...$params)
     {
-        print call_user_func_array(['PHPCensor\Helper\Lang', 'get'], func_get_args());
+        print call_user_func_array(['PHPCensor\Helper\Lang', 'get'], $params);
     }
 
     /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 113bf8bf..d07365a4 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -35,7 +35,7 @@ $conf['php-censor']['url']               = 'http://php-censor.local';
 
 $config = new b8\Config($conf);
 
-if (!defined('APP_URL') && !empty($config)) {
+if (!defined('APP_URL')) {
     define('APP_URL', $config->get('php-censor.url', '') . '/');
 }