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

addresses reviews

Browse Source
This commit is contained in:
Fabio Ivona
2021-10-31 22:08:34 +01:00
parent 3943919709
commit 4a22c5d673
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Concerns/Extendable.php
View File

@ -7,7 +7,6 @@ namespace Pest\Concerns;
use BadMethodCallException; use BadMethodCallException;
use Closure; use Closure;
use Pest\Expectation; use Pest\Expectation;
use PHPStan\Type\CallableType;
/** /**
* @internal * @internal
@ -50,6 +49,9 @@ trait Extendable
/** /**
* Register an interceptor that should replace an existing expectation. * Register an interceptor that should replace an existing expectation.
*
* @param class-string|Closure(mixed $value, mixed ...$arguments): bool $filter
* @param Closure(mixed ...$arguments): void $handler
*/ */
public static function intercept(string $name, string|Closure $filter, Closure $handler): void public static function intercept(string $name, string|Closure $filter, Closure $handler): void
{ {
@ -58,19 +60,17 @@ trait Extendable
} }
self::pipe($name, function ($next, ...$arguments) use ($handler, $filter): void { self::pipe($name, function ($next, ...$arguments) use ($handler, $filter): void {
/** @phpstan-ignore-next-line */ /* @phpstan-ignore-next-line */
if ($filter($this->value, ...$arguments)) { if (!$filter($this->value, ...$arguments)) {
/** @phpstan-ignore-next-line */ $next();
$handler = $handler->bindTo($this, get_class($this));
if($handler instanceof Closure){
$handler(...$arguments);
}
return; return;
} }
$next(); /** @phpstan-ignore-next-line */
$handler = $handler->bindTo($this, $this::class);
$handler(...$arguments);
}); });
} }
@ -97,7 +97,7 @@ trait Extendable
foreach (self::$pipes[$name] as $pipe) { foreach (self::$pipes[$name] as $pipe) {
$pipe = $pipe->bindTo($context, $scope); $pipe = $pipe->bindTo($context, $scope);
if($pipe instanceof Closure){ if ($pipe instanceof Closure) {
$pipes[] = $pipe; $pipes[] = $pipe;
} }
} }

4
src/Support/ExpectationPipeline.php
View File

@ -14,7 +14,7 @@ final class ExpectationPipeline
/** @var array<Closure> */ /** @var array<Closure> */
private array $pipes = []; private array $pipes = [];
/** @var array<int|string, mixed> */ /** @var array<int|string, mixed> */
private array $passable; private array $passable;
public function __construct( public function __construct(
@ -28,7 +28,7 @@ final class ExpectationPipeline
return new self($expectationClosure); return new self($expectationClosure);
} }
public function send(...$passable): ExpectationPipeline public function send(mixed ...$passable): ExpectationPipeline
{ {
$this->passable = $passable; $this->passable = $passable;