Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion config/sets/phpunit110.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@
declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\PHPUnit\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector;
use Rector\PHPUnit\PHPUnit110\Rector\Class_\NamedArgumentForDataProviderRector;
use Rector\PHPUnit\PHPUnit120\Rector\Class_\AssertIsTypeMethodCallRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(NamedArgumentForDataProviderRector::class);
$rectorConfig->rules([
NamedArgumentForDataProviderRector::class,
// deprecated in PHPUnit 11.5, guarded by composer package constraint
AssertContainsOnlyMethodCallRector::class,
AssertIsTypeMethodCallRector::class,
]);
};
3 changes: 3 additions & 0 deletions config/sets/phpunit120.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\PHPUnit\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector;
use Rector\PHPUnit\PHPUnit120\Rector\Class_\AssertIsTypeMethodCallRector;
use Rector\PHPUnit\PHPUnit120\Rector\Class_\RemoveOverrideFinalConstructTestCaseRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
Expand All @@ -12,6 +13,8 @@

$rectorConfig->rules([
RemoveOverrideFinalConstructTestCaseRector::class,
// deprecated in PHPUnit 11.5, repeated here for a direct 11.4 → 12.0 upgrade
AssertContainsOnlyMethodCallRector::class,
AssertIsTypeMethodCallRector::class,
]);
};
8 changes: 8 additions & 0 deletions config/sets/phpunit130.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@
declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\PHPUnit\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector;
use Rector\PHPUnit\PHPUnit120\Rector\Class_\AssertIsTypeMethodCallRector;
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
use Rector\Renaming\ValueObject\MethodCallRename;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
// deprecated in PHPUnit 11.5, repeated here for a direct upgrade from an older version
AssertContainsOnlyMethodCallRector::class,
AssertIsTypeMethodCallRector::class,
]);

$rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [
// @see https://github.com/sebastianbergmann/phpunit/issues/6560
new MethodCallRename('PHPUnit\Framework\TestCase', 'expectExceptionMessage', 'expectExceptionMessageIsOrContains'),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

declare(strict_types=1);

namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector;

use Iterator;
use PHPUnit\Framework\Attributes\DataProvider;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;

final class AssertContainsOnlyMethodCallRectorTest extends AbstractRectorTestCase
{
#[DataProvider('provideData')]
public function test(string $filePath): void
{
$this->doTestFile($filePath);
}

public static function provideData(): Iterator
{
return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
}

public function provideConfigFilePath(): string
{
return __DIR__ . '/config/configured_rule.php';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?php

namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector\Fixture;

use PHPUnit\Framework\TestCase;

final class Fixture extends TestCase
{
public function testMethod(): void
{
$this->assertContainsOnly('array', [[]]);
$this->assertContainsOnly('bool', [true]);
$this->assertContainsOnly('boolean', [true]);
$this->assertContainsOnly('callable', [fn () => 0]);
$this->assertContainsOnly('double', [1.0]);
$this->assertContainsOnly('float', [1.0]);
$this->assertContainsOnly('int', [1]);
$this->assertContainsOnly('integer', [1]);
$this->assertContainsOnly('iterable', [[]]);
$this->assertContainsOnly('null', [null]);
$this->assertContainsOnly('numeric', [12]);
$this->assertContainsOnly('object', [new \stdClass()]);
$this->assertContainsOnly('real', [1.0]);
$this->assertContainsOnly('resource', [$resource]);
$this->assertContainsOnly('resource (closed)', [$closedResource]);
$this->assertContainsOnly('scalar', ['']);
$this->assertContainsOnly('string', ['']);
}
}

?>
-----
<?php

namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector\Fixture;

use PHPUnit\Framework\TestCase;

final class Fixture extends TestCase
{
public function testMethod(): void
{
$this->assertContainsOnlyArray([[]]);
$this->assertContainsOnlyBool([true]);
$this->assertContainsOnlyBool([true]);
$this->assertContainsOnlyCallable([fn () => 0]);
$this->assertContainsOnlyFloat([1.0]);
$this->assertContainsOnlyFloat([1.0]);
$this->assertContainsOnlyInt([1]);
$this->assertContainsOnlyInt([1]);
$this->assertContainsOnlyIterable([[]]);
$this->assertContainsOnlyNull([null]);
$this->assertContainsOnlyNumeric([12]);
$this->assertContainsOnlyObject([new \stdClass()]);
$this->assertContainsOnlyFloat([1.0]);
$this->assertContainsOnlyResource([$resource]);
$this->assertContainsOnlyClosedResource([$closedResource]);
$this->assertContainsOnlyScalar(['']);
$this->assertContainsOnlyString(['']);
}
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector\Fixture;

use PHPUnit\Framework\TestCase;

final class SkipClassNameType extends TestCase
{
public function testMethod(): void
{
$this->assertContainsOnly(\stdClass::class, [new \stdClass()]);
$this->assertContainsOnly('string', ['a'], false);
$this->assertContainsOnly('string', ['a'], $isNativeType);
$this->assertContainsOnly($type, ['a']);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector\Fixture;

use PHPUnit\Framework\TestCase;

final class StaticFixture extends TestCase
{
public function testMethod(): void
{
self::assertContainsOnly('string', ['a'], null, 'some message');
self::assertContainsOnly('int', [1], true);
}
}

?>
-----
<?php

namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector\Fixture;

use PHPUnit\Framework\TestCase;

final class StaticFixture extends TestCase
{
public function testMethod(): void
{
self::assertContainsOnlyString(['a'], 'some message');
self::assertContainsOnlyInt([1]);
}
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\PHPUnit\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(AssertContainsOnlyMethodCallRector::class);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<?php

declare(strict_types=1);

namespace Rector\PHPUnit\PHPUnit110\Rector\CallLike;

use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\StaticCall;
use Rector\PhpParser\Node\Value\ValueResolver;
use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
use Rector\Rector\AbstractRector;
use Rector\VersionBonding\Contract\ComposerPackageConstraintInterface;
use Rector\VersionBonding\ValueObject\ComposerPackageConstraint;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;

/**
* The assertContainsOnly*() methods were added and assertContainsOnly() deprecated in PHPUnit 11.5
*
* @see https://github.com/sebastianbergmann/phpunit/issues/6055
* @see https://github.com/sebastianbergmann/phpunit/blob/11.5.0/ChangeLog-11.5.md
*
* @see \Rector\PHPUnit\Tests\PHPUnit110\Rector\CallLike\AssertContainsOnlyMethodCallRector\AssertContainsOnlyMethodCallRectorTest
*/
final class AssertContainsOnlyMethodCallRector extends AbstractRector implements ComposerPackageConstraintInterface
{
/**
* @var array<string, string>
*/
private const array TYPE_VALUE_TO_METHOD = [
'array' => 'assertContainsOnlyArray',
'bool' => 'assertContainsOnlyBool',
'boolean' => 'assertContainsOnlyBool',
'callable' => 'assertContainsOnlyCallable',
'double' => 'assertContainsOnlyFloat',
'float' => 'assertContainsOnlyFloat',
'int' => 'assertContainsOnlyInt',
'integer' => 'assertContainsOnlyInt',
'iterable' => 'assertContainsOnlyIterable',
'null' => 'assertContainsOnlyNull',
'numeric' => 'assertContainsOnlyNumeric',
'object' => 'assertContainsOnlyObject',
'real' => 'assertContainsOnlyFloat',
'resource' => 'assertContainsOnlyResource',
'resource (closed)' => 'assertContainsOnlyClosedResource',
'scalar' => 'assertContainsOnlyScalar',
'string' => 'assertContainsOnlyString',
];

public function __construct(
private readonly ValueResolver $valueResolver,
private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
) {
}

public function provideComposerPackageConstraint(): ComposerPackageConstraint
{
return new ComposerPackageConstraint('phpunit/phpunit', '>=11.5');
}

public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition(
'Replaces `Assert::assertContainsOnly()` calls with type-specific `Assert::assertContainsOnly*()` calls',
[
new CodeSample(
<<<'CODE_SAMPLE'
use PHPUnit\Framework\TestCase;

final class SomeClass extends TestCase
{
public function testMethod(): void
{
$this->assertContainsOnly('string', ['a', 'b']);
}
}
CODE_SAMPLE
,
<<<'CODE_SAMPLE'
use PHPUnit\Framework\TestCase;

final class SomeClass extends TestCase
{
public function testMethod(): void
{
$this->assertContainsOnlyString(['a', 'b']);
}
}
CODE_SAMPLE
,
),
],
);
}

/**
* @return array<class-string<Node>>
*/
public function getNodeTypes(): array
{
return [MethodCall::class, StaticCall::class];
}

/**
* @param MethodCall|StaticCall $node
*/
public function refactor(Node $node): Node|null
{
if ($node->isFirstClassCallable()) {
return null;
}

if (! $this->testsNodeAnalyzer->isPHPUnitTestCaseCall($node) || ! $this->isName(
$node->name,
'assertContainsOnly'
)) {
return null;
}

$typeArg = $node->getArg('type', 0);
$haystackArg = $node->getArg('haystack', 1);
if (! $typeArg instanceof Arg || ! $haystackArg instanceof Arg) {
return null;
}

$typeValue = $this->valueResolver->getValue($typeArg);
if (! is_string($typeValue)) {
return null;
}

$newMethodName = self::TYPE_VALUE_TO_METHOD[$typeValue] ?? null;
if ($newMethodName === null) {
return null;
}

// the $isNativeType argument can turn the type into a class name, that has no type-specific method
$isNativeTypeArg = $node->getArg('isNativeType', 2);
if ($isNativeTypeArg instanceof Arg && ! $this->valueResolver->isTrue(
$isNativeTypeArg->value
) && ! $this->valueResolver->isNull($isNativeTypeArg->value)) {
return null;
}

$newArgs = [new Arg($haystackArg->value)];

$messageArg = $node->getArg('message', 3);
if ($messageArg instanceof Arg) {
$newArgs[] = new Arg($messageArg->value);
}

if ($node instanceof MethodCall) {
return new MethodCall($node->var, $newMethodName, $newArgs);
}

return new StaticCall($node->class, $newMethodName, $newArgs);
}
}
Loading
Loading