Merge pull request #535 from bobvandevijver/modern-callables

Use modern first class callable syntax

Author: helios-ag

src/ElFinder/ElFinder.php

@@ -46,7 +46,7 @@ public function __construct($opts)
         if (defined('E_DEPRECATED')) {
             $errLevel |= E_DEPRECATED | E_USER_DEPRECATED;
         }
-        set_error_handler('elFinder::phpErrorHandler', $errLevel);
+        set_error_handler(elFinder::phpErrorHandler(...), $errLevel);
 
         // Associative array of files to delete at the end of script: ['temp file path' => true]
         $GLOBALS['elFinderTempFiles'] = [];
@@ -195,7 +195,7 @@ public function __construct($opts)
                 $doRegist = (false !== strpos($cmd, '*'));
 
                 if (!$doRegist) {
-                    $doRegist = ($_reqCmd && in_array($_reqCmd, array_map('elFinder::getCmdOfBind', explode(' ', $cmd))));
+                    $doRegist = ($_reqCmd && in_array($_reqCmd, array_map(elFinder::getCmdOfBind(...), explode(' ', $cmd))));
                 }
 
                 if ($doRegist) {
@@ -215,7 +215,7 @@ public function __construct($opts)
                                 if (0 === strcasecmp($_domain, 'plugin')) {
                                     if ($plugin = $this->getPluginInstance($_name, $opts['plugin'][$_name] ?? []) and
                                         method_exists($plugin, $_method)) {
-                                        $this->bind($cmd, [$plugin, $_method]);
+                                        $this->bind($cmd, $plugin->$_method(...));
                                     }
                                 }
                             } else {

src/Twig/Extension/FMElfinderExtension.php

@@ -28,10 +28,10 @@ public function getFunctions(): array
         $options = ['is_safe' => ['html']];
 
         return [
-            new TwigFunction('elfinder_tinymce_init', [$this, 'tinymce'], $options),
-            new TwigFunction('elfinder_tinymce_init4', [$this, 'tinymce4'], $options),
-            new TwigFunction('elfinder_tinymce_init5', [$this, 'tinymce5'], $options),
-            new TwigFunction('elfinder_summernote_init', [$this, 'summernote'], $options),
+            new TwigFunction('elfinder_tinymce_init', $this->tinymce(...), $options),
+            new TwigFunction('elfinder_tinymce_init4', $this->tinymce4(...), $options),
+            new TwigFunction('elfinder_tinymce_init5', $this->tinymce5(...), $options),
+            new TwigFunction('elfinder_summernote_init', $this->summernote(...), $options),
         ];
     }
 

tests/bootstrap.php

@@ -8,4 +8,4 @@
 
 $loader = require $file;
 
-AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+AnnotationRegistry::registerLoader($loader->loadClass(...));