change call_user_func* with self invoked function

Signed-off-by: Abdul Malik Ikhsan <[email protected]>
laminas · May 9, 2020 · ccd63cb · ccd63cb
1 parent 7e94866
commit ccd63cb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/test/CommonServiceLocatorBehaviorsTrait.php b/test/CommonServiceLocatorBehaviorsTrait.php
@@ -33,7 +33,6 @@
 use function array_fill_keys;
 use function array_keys;
 use function array_merge;
-use function call_user_func_array;
 use function restore_error_handler;
 use function set_error_handler;
 
@@ -812,7 +811,7 @@ public function testConfiguringInstanceRaisesExceptionIfAllowOverrideIsFalse($me
         $container = $this->createContainer(['services' => ['foo' => $this]]);
         $container->setAllowOverride(false);
         $this->expectException(ContainerModificationsNotAllowedException::class);
-        call_user_func_array([$container, $method], $args);
+        $container->$method(...$args);
     }
 
     /**

diff --git a/test/TestAsset/PassthroughDelegatorFactory.php b/test/TestAsset/PassthroughDelegatorFactory.php
@@ -19,6 +19,6 @@ class PassthroughDelegatorFactory implements DelegatorFactoryInterface
      */
     public function __invoke(ContainerInterface $container, $name, callable $callback, array $options = null)
     {
-        return call_user_func($callback);
+        return $callback();
     }
 }
diff --git a/test/TestAsset/V2ValidationPluginManager.php b/test/TestAsset/V2ValidationPluginManager.php
@@ -11,7 +11,6 @@
 use Laminas\ServiceManager\AbstractPluginManager;
 use RuntimeException;
 
-use function call_user_func;
 use function is_callable;
 use function sprintf;
 
@@ -28,6 +27,6 @@ public function validatePlugin($plugin)
             ));
         }
 
-        call_user_func($this->assertion, $plugin);
+        ($this->assertion)($plugin);
     }
 }