Changeset 3872:39861f53bcc0

Timestamp:

09/12/18 14:45:17 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Use ... token for variable argument list rather than func_get_args() whenever is possible

Files:

• admin/help.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (4 diffs)
• inc/core/class.dc.auth.php (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/core/class.dc.media.php (modified) (1 diff)
• inc/core/class.dc.update.php (modified) (1 diff)
• plugins/importExport/inc/flat/class.flat.backup.php (modified) (1 diff)

admin/help.php

@@ -12 +12 @@
 dcPage::check('usage,contentadmin');
 
-$helpPage = function () {
+$helpPage = function (...$args) {
     $ret = array('content' => '', 'title' => '');
 
-    $args = func_get_args();
     if (empty($args)) {
         return $ret;

inc/admin/lib.dc.page.php

@@ -619 +619 @@
     }
 
-    public static function helpBlock()
+    public static function helpBlock(...$params)
     {
         global $core;
@@ -627 +627 @@
         }
 
-        $args = func_get_args();
-        $args = new ArrayObject($args);
+        $args = new ArrayObject($params);
 
         # --BEHAVIOR-- adminPageHelpBlock
@@ -914 +913 @@
     }
 
-    public static function jsConfirmClose()
-    {
-        $args = func_get_args();
+    public static function jsConfirmClose(...$args)
+    {
         if (count($args) > 0) {
             foreach ($args as $k => $v) {
                 $args[$k] = "'" . html::escapeJS($v) . "'";
             }
-            $args = implode(',', $args);
+            $params = implode(',', $args);
         } else {
-            $args = '';
+            $params = '';
         }
 
@@ -929 +927 @@
         self::jsLoad('js/confirm-close.js') .
         '<script type="text/javascript">' . "\n" .
-        "confirmClosePage = new confirmClose(" . $args . "); " .
+        "confirmClosePage = new confirmClose(" . $params . "); " .
         "confirmClose.prototype.prompt = '" . html::escapeJS(__('You have unsaved changes.')) . "'; " .
             "</script>\n";

inc/core/class.dc.auth.php

@@ -375 +375 @@
      * @return mixed
      */
-    public function sudo($f)
+    public function sudo($f, ...$args)
     {
         if (!is_callable($f)) {
             throw new Exception($f . ' function doest not exist');
         }
-
-        $args = func_get_args();
-        array_shift($args);
 
         if ($this->user_admin) {

inc/core/class.dc.core.php

@@ -376 +376 @@
     @return    <b>string</b> Behavior concatened result
      */
-    public function callBehavior($behavior)
+    public function callBehavior($behavior, ...$args)
     {
         if (isset($this->behaviors[$behavior])) {
-            $args = func_get_args();
-            array_shift($args);
-
             $res = '';
 

inc/core/class.dc.media.php

@@ -158 +158 @@
     }
 
-    protected function callFileHandler($type, $event)
+    protected function callFileHandler($type, $event, ...$args)
     {
         if (!empty($this->file_handler[$type][$event])) {
-            $args = func_get_args();
-            array_shift($args);
-            array_shift($args);
-
             foreach ($this->file_handler[$type][$event] as $f) {
                 call_user_func_array($f, $args);

inc/core/class.dc.update.php

@@ -172 +172 @@
     }
 
-    public function setForcedFiles()
-    {
-        $this->forced_files = func_get_args();
+    public function setForcedFiles(...$args)
+    {
+        $this->forced_files = $args;
     }
 

plugins/importExport/inc/flat/class.flat.backup.php

@@ -124 +124 @@
     }
 
-    public function drop()
+    public function drop(...$args)
     {
-        foreach (func_get_args() as $n) {
+        foreach ($args as $n) {
             if (isset($this->__data[$n])) {
                 unset($this->__data[$n]);