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

chore: adjusts tests

Browse Source
This commit is contained in:
Nuno Maduro
2021-08-26 21:14:56 +01:00
parent dbf3c0a8cf
commit 2125bf9668
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Expectation.php
View File

@ -6,7 +6,7 @@ namespace Pest;
use BadMethodCallException;
use Closure;
use LogicException;
use InvalidArgumentException;
use Pest\Concerns\Extendable;
use Pest\Concerns\RetrievesValues;
use Pest\Support\Arr;
@ -758,8 +758,7 @@ final class Expectation
/**
* Asserts that executing value throws an exception.
*
* @param string|Closure $exception string: the exception class
* Closure: first parameter = exception class
* @param (Closure(Throwable): mixed)|string $exception
*/
public function toThrow($exception, string $exceptionMessage = null): Expectation
{
@ -770,11 +769,11 @@ final class Expectation
$parameters = (new ReflectionFunction($exception))->getParameters();
if (1 !== count($parameters)) {
throw new LogicException('The "toThrow" closure must have a single parameter type-hinted as the class string');
throw new InvalidArgumentException('The given closure must have a single parameter type-hinted as the class string.');
}
if (!($type = $parameters[0]->getType()) instanceof ReflectionNamedType) {
throw new LogicException('The "toThrow" closure\'s parameter must be type-hinted as the class string');
throw new InvalidArgumentException('The given closure\'s parameter must be type-hinted as the class string.');
}
$exception = $type->getName();
@ -782,14 +781,14 @@ final class Expectation
try {
($this->value)();
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
if (!class_exists($exception)) {
Assert::assertStringContainsString($exception, $e->getMessage());
return $this;
}
if ($exceptionMessage) {
if ($exceptionMessage !== null) {
Assert::assertStringContainsString($exceptionMessage, $e->getMessage());
}