Code quality improvements

This commit is contained in:
Nuno Maduro
2022-09-16 11:27:17 +01:00
parent e9564febaf
commit 45011ebd14
42 changed files with 266 additions and 278 deletions

View File

@ -30,7 +30,7 @@ final class TestCaseFactory
*
* @var array<int, class-string>
*/
private static array $annotations = [
private const ANNOTATIONS = [
Annotations\Depends::class,
Annotations\Groups::class,
Annotations\CoversNothing::class,
@ -41,7 +41,7 @@ final class TestCaseFactory
*
* @var array<int, class-string<\Pest\Factories\Attributes\Attribute>>
*/
private static array $attributes = [
private const ATTRIBUTES = [
Attributes\Covers::class,
];
@ -84,10 +84,10 @@ final class TestCaseFactory
$methods = array_values(array_filter(
$this->methods,
fn ($method) => count($methodsUsingOnly) === 0 || in_array($method, $methodsUsingOnly, true)
fn ($method) => $methodsUsingOnly === [] || in_array($method, $methodsUsingOnly, true)
));
if (count($methods) > 0) {
if ($methods !== []) {
$this->evaluate($this->filename, $methods);
}
}
@ -162,8 +162,8 @@ final class TestCaseFactory
$classFQN .= $className;
}
$classAvailableAttributes = array_filter(self::$attributes, fn (string $attribute) => $attribute::ABOVE_CLASS);
$methodAvailableAttributes = array_filter(self::$attributes, fn (string $attribute) => ! $attribute::ABOVE_CLASS);
$classAvailableAttributes = array_filter(self::ATTRIBUTES, fn (string $attribute) => $attribute::ABOVE_CLASS);
$methodAvailableAttributes = array_filter(self::ATTRIBUTES, fn (string $attribute) => ! $attribute::ABOVE_CLASS);
$classAttributes = [];
@ -178,7 +178,7 @@ final class TestCaseFactory
$methodsCode = implode('', array_map(
fn (TestCaseMethodFactory $methodFactory) => $methodFactory->buildForEvaluation(
$classFQN,
self::$annotations,
self::ANNOTATIONS,
$methodAvailableAttributes
),
$methods
@ -232,7 +232,7 @@ final class TestCaseFactory
$arguments = Reflection::getFunctionArguments($method->closure);
if (count($arguments) > 0) {
if ($arguments !== []) {
throw new DatasetMissing($method->filename, $method->description, $arguments);
}
}

View File

@ -62,7 +62,7 @@ final class TestCaseMethodFactory
public ?string $description,
public ?Closure $closure,
) {
$this->closure ??= function () {
$this->closure ??= function (): void {
Assert::getCount() > 0 ?: self::markTestIncomplete(); // @phpstan-ignore-line
};
@ -106,7 +106,7 @@ final class TestCaseMethodFactory
*/
public function receivesArguments(): bool
{
return count($this->datasets) > 0 || count($this->depends) > 0;
return $this->datasets !== [] || $this->depends !== [];
}
/**
@ -140,7 +140,7 @@ final class TestCaseMethodFactory
$attributes = (new $attribute())->__invoke($this, $attributes);
}
if (count($this->datasets) > 0) {
if ($this->datasets !== []) {
$dataProviderName = $methodName.'_dataset';
$annotations[] = "@dataProvider $dataProviderName";
$datasetsCode = $this->buildDatasetForEvaluation($methodName, $dataProviderName);