use Closure instead of callback and drop call_user_func

- per @mvorisek

Author: michalbundyra

classes/MockDisablerPHPUnit10.php

@@ -2,6 +2,7 @@
 
 namespace phpmock\phpunit;
 
+use Closure;
 use phpmock\Deactivatable;
 use PHPUnit\Event\Test\Finished;
 use PHPUnit\Event\Test\FinishedSubscriber;
@@ -24,17 +25,17 @@ class MockDisablerPHPUnit10 implements FinishedSubscriber
     private $deactivatable;
 
     /**
-     * @var callable|null The callback to execute after the test.
+     * @var Closure|null The callback to execute after the test.
      */
     private $callback;
 
     /**
      * Sets the function mocks.
      *
      * @param Deactivatable $deactivatable The function mocks.
-     * @param callback|null $callback      The callback to execute after the test.
+     * @param Closure|null $callback       The callback to execute after the test.
      */
-    public function __construct(Deactivatable $deactivatable, ?callable $callback = null)
+    public function __construct(Deactivatable $deactivatable, ?Closure $callback = null)
     {
         $this->deactivatable = $deactivatable;
         $this->callback = $callback;
@@ -47,15 +48,15 @@ public function notify(Finished $event) : void
     {
         $this->deactivatable->disable();
         if ($this->callback !== null) {
-            call_user_func($this->callback, $this);
+            ($this->callback)($this);
         }
     }
 
     public function endTest(): void
     {
         $this->deactivatable->disable();
         if ($this->callback !== null) {
-            call_user_func($this->callback, $this);
+            ($this->callback)($this);
         }
     }
 }

classes/MockDisablerPHPUnit6.php

@@ -2,6 +2,7 @@
 
 namespace phpmock\phpunit;
 
+use Closure;
 use phpmock\Deactivatable;
 use PHPUnit\Framework\BaseTestListener;
 use PHPUnit\Framework\Test;
@@ -24,17 +25,17 @@ class MockDisablerPHPUnit6 extends BaseTestListener
     private $deactivatable;
 
     /**
-     * @var callable|null The callback to execute after the test.
+     * @var Closure|null The callback to execute after the test.
      */
     private $callback;
 
     /**
      * Sets the function mocks.
      *
      * @param Deactivatable $deactivatable The function mocks.
-     * @param callable|null $callback      The callback to execute after the test.
+     * @param Closure|null $callback       The callback to execute after the test.
      */
-    public function __construct(Deactivatable $deactivatable, callable $callback = null)
+    public function __construct(Deactivatable $deactivatable, Closure $callback = null)
     {
         $this->deactivatable = $deactivatable;
         $this->callback = $callback;
@@ -54,7 +55,7 @@ public function endTest(Test $test, $time)
 
         $this->deactivatable->disable();
         if ($this->callback !== null) {
-            call_user_func($this->callback, $this);
+            ($this->callback)($this);
         }
     }
 }

classes/MockDisablerPHPUnit7.php

@@ -2,6 +2,7 @@
 
 namespace phpmock\phpunit;
 
+use Closure;
 use phpmock\Deactivatable;
 use PHPUnit\Framework\BaseTestListener;
 use PHPUnit\Framework\Test;
@@ -24,17 +25,17 @@ class MockDisablerPHPUnit7 extends BaseTestListener
     private $deactivatable;
 
     /**
-     * @var callable|null The callback to execute after the test.
+     * @var Closure|null The callback to execute after the test.
      */
     private $callback;
 
     /**
      * Sets the function mocks.
      *
      * @param Deactivatable $deactivatable The function mocks.
-     * @param callable|null $callback      The callback to execute after the test.
+     * @param Closure|null $callback       The callback to execute after the test.
      */
-    public function __construct(Deactivatable $deactivatable, $callback = null)
+    public function __construct(Deactivatable $deactivatable, Closure $callback = null)
     {
         $this->deactivatable = $deactivatable;
         $this->callback = $callback;
@@ -54,7 +55,7 @@ public function endTest(Test $test, float $time) : void
 
         $this->deactivatable->disable();
         if ($this->callback !== null) {
-            call_user_func($this->callback, $this);
+            ($this->callback)($this);
         }
     }
 }