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
2 changes: 1 addition & 1 deletion .github/workflows/code_analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
actions:
-
name: 'Active Classes'
run: vendor/bin/class-leak check config bin src rules --skip-type="Rector\PhpSpecToPHPUnit\Rector\Class_\ImplicitLetInitializationRector"
run: vendor/bin/class-leak check config bin src rules

-
name: "Composer Analyser"
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"phpstan/extension-installer": "^1.3",
"tomasvotruba/class-leak": "^2.0",
"tracy/tracy": "^2.10",
"shipmonk/composer-dependency-analyser": "^1.8"
"shipmonk/composer-dependency-analyser": "^1.8",
"symplify/phpstan-extensions": "^12.0"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 3 additions & 5 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,21 @@ parameters:
- rules-tests

reportUnmatchedIgnoredErrors: false

treatPhpDocTypesAsCertain: false
errorFormat: symplify

excludePaths:
- */Fixture/*

ignoreErrors:
# bool property
# bool property changed inside another call, false positive
-
message: '#Negated boolean expression is always true#'
path: src/NodeFactory/AssertMethodCallFactory.php

- '#PHPDoc tag @return contains generic type PhpParser\\Node\\Stmt\\Expression<(.*?)> but class PhpParser\\Node\\Stmt\\Expression is not generic#'

# known value
- '#Cannot call method toString\(\) on PhpParser\\Node\\Identifier\|null#'
- '#Call to an undefined method PhpParser\\Node\\Expr\|PhpParser\\Node\\Identifier\:\:toString\(\)#'

-
identifier: phpstanApi.instanceofType
- identifier: phpstanApi.instanceofType

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

138 changes: 0 additions & 138 deletions rules/Rector/Class_/ImplicitLetInitializationRector.php

This file was deleted.

7 changes: 6 additions & 1 deletion rules/Rector/Class_/PhpSpecClassToPHPUnitClassRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Stmt\Class_;
use Rector\PhpSpecToPHPUnit\Naming\PhpSpecRenaming;
use Rector\PHPUnit\Enum\PHPUnitClassName;
use Rector\Privatization\NodeManipulator\VisibilityManipulator;
use Rector\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
Expand Down Expand Up @@ -38,6 +39,10 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if (! $node->name instanceof Identifier) {
return null;
}

// skip already renamed
/** @var string $className */
$className = $node->name->toString();
Expand All @@ -48,7 +53,7 @@ public function refactor(Node $node): ?Node
// rename class and parent class
$phpunitTestClassName = $this->phpSpecRenaming->createPHPUnitTestClassName($node);
$node->name = new Identifier($phpunitTestClassName);
$node->extends = new FullyQualified('PHPUnit\Framework\TestCase');
$node->extends = new FullyQualified(PHPUnitClassName::TEST_CASE);

$this->visibilityManipulator->makeFinal($node);

Expand Down
5 changes: 3 additions & 2 deletions src/DocFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Rector\PhpSpecToPHPUnit;

use PhpParser\Comment\Doc;
use Rector\PhpSpecToPHPUnit\Enum\PHPUnitClassName;
use Rector\PhpSpecToPHPUnit\ValueObject\ServiceMock;

final class DocFactory
Expand All @@ -14,7 +15,7 @@ public static function createForMockAssign(ServiceMock $serviceMock): Doc
$comment = sprintf(
"/** @var \%s|\%s $%s */",
$serviceMock->getMockClassName(),
'PHPUnit\Framework\MockObject\MockObject',
PHPUnitClassName::MOCK_OBJECT,
$serviceMock->getVariableName() . 'Mock'
);

Expand All @@ -27,7 +28,7 @@ public static function createForMockProperty(ServiceMock $serviceMock): Doc
"/**%s * @var \%s|\%s%s */",
PHP_EOL,
$serviceMock->getMockClassName(),
'PHPUnit\Framework\MockObject\MockObject',
PHPUnitClassName::MOCK_OBJECT,
PHP_EOL
);

Expand Down
10 changes: 10 additions & 0 deletions src/Enum/PHPUnitClassName.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

declare(strict_types=1);

namespace Rector\PhpSpecToPHPUnit\Enum;

final class PHPUnitClassName
{
public const MOCK_OBJECT = 'PHPUnit\Framework\MockObject\MockObject';
}
3 changes: 2 additions & 1 deletion src/NodeFactory/LetMockNodeFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\PhpParser\Node\NodeFactory;
use Rector\PhpSpecToPHPUnit\DocFactory;
use Rector\PhpSpecToPHPUnit\Enum\PHPUnitClassName;
use Rector\PhpSpecToPHPUnit\Exception\ShouldNotHappenException;
use Rector\PhpSpecToPHPUnit\ValueObject\ServiceMock;

Expand Down Expand Up @@ -87,7 +88,7 @@ public function createMockPropertyAssignExpressions(array $params): array

private function crateMockProperty(string $parameterName): Property
{
$objectType = new ObjectType('PHPUnit\Framework\MockObject\MockObject');
$objectType = new ObjectType(PHPUnitClassName::MOCK_OBJECT);
return $this->nodeFactory->createPrivatePropertyFromNameAndType($parameterName, $objectType);
}

Expand Down
Loading