From d4a8a3ec3726f25065febdbc6dfb38f87d2efe42 Mon Sep 17 00:00:00 2001
From: Fabio Ivona <fabio.ivona@defstudio.it>
Date: Thu, 18 Nov 2021 00:12:39 +0100
Subject: [PATCH] upgrade to phpstan lvl 8

---
 phpstan.neon                            |  2 +-
 src/Datasets.php                        |  9 +++++++-
 src/Factories/TestCaseFactory.php       | 12 +++++++++++
 src/Factories/TestCaseMethodFactory.php |  2 +-
 src/Support/ChainableClosure.php        |  8 +++----
 src/Support/Closure.php                 | 28 +++++++++++++++++++++++++
 6 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 src/Support/Closure.php

diff --git a/phpstan.neon b/phpstan.neon
index 1b341db4..89377d38 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -4,7 +4,7 @@ includes:
     - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
 
 parameters:
-    level: 7
+    level: 8
     paths:
         - src
     parallel:
diff --git a/src/Datasets.php b/src/Datasets.php
index 96aa00dd..c91de5e7 100644
--- a/src/Datasets.php
+++ b/src/Datasets.php
@@ -7,6 +7,7 @@ namespace Pest;
 use Closure;
 use Pest\Exceptions\DatasetAlreadyExist;
 use Pest\Exceptions\DatasetDoesNotExist;
+use Pest\Exceptions\ShouldNotHappen;
 use SebastianBergmann\Exporter\Exporter;
 use function sprintf;
 use Traversable;
@@ -61,7 +62,13 @@ final class Datasets
     {
         $dataset = self::$withs[$filename . '>>>' . $description];
 
-        return self::resolve($description, $dataset);
+        $dataset = self::resolve($description, $dataset);
+
+        if ($dataset === null) {
+            throw ShouldNotHappen::fromMessage('Could not resolve dataset.');
+        }
+
+        return $dataset;
     }
 
     /**
diff --git a/src/Factories/TestCaseFactory.php b/src/Factories/TestCaseFactory.php
index 5b077d08..517a586c 100644
--- a/src/Factories/TestCaseFactory.php
+++ b/src/Factories/TestCaseFactory.php
@@ -142,6 +142,10 @@ final class TestCaseFactory
         }
 
         $methodsCode = implode('', array_map(static function (TestCaseMethodFactory $method): string {
+            if ($method->description === null) {
+                throw ShouldNotHappen::fromMessage('The test description may not be empty.');
+            }
+
             $methodName = Str::evaluable($method->description);
 
             $datasetsCode = '';
@@ -224,6 +228,10 @@ EOF;
         }
 
         if (!$method->receivesArguments()) {
+            if ($method->closure === null) {
+                throw ShouldNotHappen::fromMessage('The test closure may not be empty.');
+            }
+
             $arguments = Reflection::getFunctionArguments($method->closure);
 
             if (count($arguments) > 0) {
@@ -240,6 +248,10 @@ EOF;
     public function getMethod(string $methodName): TestCaseMethodFactory
     {
         foreach ($this->methods as $method) {
+            if ($method->description === null) {
+                throw ShouldNotHappen::fromMessage('The test description may not be empty.');
+            }
+
             if (Str::evaluable($method->description) === $methodName) {
                 return $method;
             }
diff --git a/src/Factories/TestCaseMethodFactory.php b/src/Factories/TestCaseMethodFactory.php
index ffa4cb4b..e2ece273 100644
--- a/src/Factories/TestCaseMethodFactory.php
+++ b/src/Factories/TestCaseMethodFactory.php
@@ -89,7 +89,7 @@ final class TestCaseMethodFactory
             $testCase->chains->chain($this);
             $method->chains->chain($this);
 
-            return call_user_func(Closure::bind($closure, $this, $this::class), ...func_get_args());
+            return \Pest\Support\Closure::safeBind($closure, $this, $this::class)(...func_get_args());
         };
     }
 
diff --git a/src/Support/ChainableClosure.php b/src/Support/ChainableClosure.php
index 8a136682..b3406d86 100644
--- a/src/Support/ChainableClosure.php
+++ b/src/Support/ChainableClosure.php
@@ -22,8 +22,8 @@ final class ChainableClosure
                 throw ShouldNotHappen::fromMessage('$this not bound to chainable closure.');
             }
 
-            call_user_func_array(Closure::bind($closure, $this, $this::class), func_get_args());
-            call_user_func_array(Closure::bind($next, $this, $this::class), func_get_args());
+            \Pest\Support\Closure::safeBind($closure, $this, $this::class)(...func_get_args());
+            \Pest\Support\Closure::safeBind($next, $this, $this::class)(...func_get_args());
         };
     }
 
@@ -33,8 +33,8 @@ final class ChainableClosure
     public static function fromStatic(Closure $closure, Closure $next): Closure
     {
         return static function () use ($closure, $next): void {
-            call_user_func_array(Closure::bind($closure, null, self::class), func_get_args());
-            call_user_func_array(Closure::bind($next, null, self::class), func_get_args());
+            \Pest\Support\Closure::safeBind($closure, null, self::class)(...func_get_args());
+            \Pest\Support\Closure::safeBind($next, null, self::class)(...func_get_args());
         };
     }
 }
diff --git a/src/Support/Closure.php b/src/Support/Closure.php
new file mode 100644
index 00000000..ece77d57
--- /dev/null
+++ b/src/Support/Closure.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Support;
+
+use Pest\Exceptions\ShouldNotHappen;
+
+/**
+ * @internal
+ */
+final class Closure
+{
+    public static function safeBind(\Closure|null $closure, ?object $newThis, object|string|null $newScope = 'static'): \Closure
+    {
+        if ($closure == null) {
+            throw ShouldNotHappen::fromMessage('Could not bind null closure.');
+        }
+
+        $closure = \Closure::bind($closure, $newThis, $newScope);
+
+        if ($closure == false) {
+            throw ShouldNotHappen::fromMessage('Could not bind closure.');
+        }
+
+        return $closure;
+    }
+}