SADM/pest
1
0
Fork 0
mirror of https://github.com/pestphp/pest.git synced 2026-03-06 07:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(describe): more refactor

Browse Source
This commit is contained in:
Nuno Maduro
2023-05-26 20:01:55 +01:00
parent 68ea2c7d7e
commit 551fa01415
7 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Concerns/Testable.php
View File

@ -142,7 +142,7 @@ trait Testable
}
$this->{$property} = ($this->{$property} instanceof Closure)
? ChainableClosure::fromSameObject($this->{$property}, $hook)
? ChainableClosure::bound($this->{$property}, $hook)
: $hook;
}
@ -190,7 +190,7 @@ trait Testable
$beforeEach = TestSuite::getInstance()->beforeEach->get(self::$__filename)[1];
if ($this->__beforeEach instanceof Closure) {
$beforeEach = ChainableClosure::fromSameObject($this->__beforeEach, $beforeEach);
$beforeEach = ChainableClosure::bound($this->__beforeEach, $beforeEach);
}
$this->__callClosure($beforeEach, func_get_args());
@ -204,7 +204,7 @@ trait Testable
$afterEach = TestSuite::getInstance()->afterEach->get(self::$__filename);
if ($this->__afterEach instanceof Closure) {
$afterEach = ChainableClosure::fromSameObject($this->__afterEach, $afterEach);
$afterEach = ChainableClosure::bound($this->__afterEach, $afterEach);
}
$this->__callClosure($afterEach, func_get_args());

18
src/PendingCalls.php
View File

@ -1,18 +0,0 @@
<?php
declare(strict_types=1);
namespace Pest;
use Pest\PendingCalls\DescribeCall;
/**
* @internal
*/
final class PendingCalls
{
/**
* The current describe call.
*/
public static ?string $describing = null;
}

2
src/PendingCalls/AfterEachCall.php
View File

@ -55,7 +55,7 @@ final class AfterEachCall
$afterEachTestCase = ChainableClosure::when(
fn (): bool => is_null($describing) || $this->__describing === $describing, // @phpstan-ignore-line
ChainableClosure::fromSameObject(fn () => $proxies->chain($this), $this->closure)->bindTo($this, self::class), // @phpstan-ignore-line
ChainableClosure::bound(fn () => $proxies->chain($this), $this->closure)->bindTo($this, self::class), // @phpstan-ignore-line
)->bindTo($this, self::class);
assert($afterEachTestCase instanceof Closure);

4
src/PendingCalls/BeforeEachCall.php
View File

@ -58,7 +58,7 @@ final class BeforeEachCall
$describing = $this->describing;
$testCaseProxies = $this->testCaseProxies;
$beforeEachTestCall = function (TestCall $testCall) use ($describing) : void {
$beforeEachTestCall = function (TestCall $testCall) use ($describing): void {
if ($describing !== $this->describing) {
return;
}
@ -70,7 +70,7 @@ final class BeforeEachCall
$beforeEachTestCase = ChainableClosure::when(
fn (): bool => is_null($describing) || $this->__describing === $describing, // @phpstan-ignore-line
ChainableClosure::fromSameObject(fn () => $testCaseProxies->chain($this), $this->closure)->bindTo($this, self::class), // @phpstan-ignore-line
ChainableClosure::bound(fn () => $testCaseProxies->chain($this), $this->closure)->bindTo($this, self::class), // @phpstan-ignore-line
)->bindTo($this, self::class);
assert($beforeEachTestCase instanceof Closure);

4
src/Repositories/AfterEachRepository.php
View File

@ -28,7 +28,7 @@ final class AfterEachRepository
if (array_key_exists($filename, $this->state)) {
$fromAfterEachTestCase = $this->state[$filename];
$afterEachTestCase = ChainableClosure::fromSameObject($fromAfterEachTestCase, $afterEachTestCase)
$afterEachTestCase = ChainableClosure::bound($fromAfterEachTestCase, $afterEachTestCase)
->bindTo($afterEachCall, $afterEachCall::class);
}
@ -44,7 +44,7 @@ final class AfterEachRepository
{
$afterEach = $this->state[$filename] ?? NullClosure::create();
return ChainableClosure::fromSameObject(function (): void {
return ChainableClosure::bound(function (): void {
if (class_exists(Mockery::class)) {
if ($container = Mockery::getContainer()) {
/* @phpstan-ignore-next-line */

4
src/Repositories/BeforeEachRepository.php
View File

@ -27,8 +27,8 @@ final class BeforeEachRepository
if (array_key_exists($filename, $this->state)) {
[$fromBeforeEachTestCall, $fromBeforeEachTestCase] = $this->state[$filename];
$beforeEachTestCall = ChainableClosure::fromDifferentObjects($fromBeforeEachTestCall, $beforeEachTestCall);
$beforeEachTestCase = ChainableClosure::fromSameObject($fromBeforeEachTestCase, $beforeEachTestCase)->bindTo($beforeEachCall, $beforeEachCall::class);
$beforeEachTestCall = ChainableClosure::unbound($fromBeforeEachTestCall, $beforeEachTestCall);
$beforeEachTestCase = ChainableClosure::bound($fromBeforeEachTestCase, $beforeEachTestCase)->bindTo($beforeEachCall, $beforeEachCall::class);
}
assert($beforeEachTestCall instanceof Closure);

8
src/Support/ChainableClosure.php
View File

@ -29,9 +29,9 @@ final class ChainableClosure
}
/**
* Calls the given `$closure` and chains the `$next` closure.
* Calls the given `$closure` and chains the `$next` closure, "bound" to the same object.
*/
public static function fromSameObject(Closure $closure, Closure $next): Closure
public static function bound(Closure $closure, Closure $next): Closure
{
return function () use ($closure, $next): void {
if (! is_object($this)) { // @phpstan-ignore-line
@ -44,9 +44,9 @@ final class ChainableClosure
}
/**
* Calls the given `$closure` and chains the `$next` closure.
* Calls the given `$closure` and chains the `$next` closure, "unbound" of any object.
*/
public static function fromDifferentObjects(Closure $closure, Closure $next): Closure
public static function unbound(Closure $closure, Closure $next): Closure
{
return function () use ($closure, $next): void {
$closure(...func_get_args());