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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
244 changes: 122 additions & 122 deletions composer.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions config/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
imports:
- { resource: '../packages/**/config/config.yaml' }
- { resource: '../rules/**/config/config.yaml' }
- { resource: 'services.yaml' }
# only in local repository
# ignore errors, because utils are not part of composer package nor rector.phar
Expand Down
4 changes: 3 additions & 1 deletion docs/AllRectorsOverview.md
Original file line number Diff line number Diff line change
Expand Up @@ -4485,7 +4485,9 @@ Add @see annotation test of the class for faster jump to test. Make it FQN, so i
{
}

class SomeServiceTest extends \PHPUnit\Framework\TestCase
use PHPUnit\Framework\TestCase;

class SomeServiceTest extends TestCase
{
}
```
Expand Down
43 changes: 25 additions & 18 deletions ecs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,21 @@ services:
- 'NodeVisitorAbstract'

parameters:
paths:
- "bin"
- "src"
- "packages"
- "rules"
- "tests"
- "utils"

sets:
- 'psr12'
- 'php70'
- 'php71'
- 'symplify'
- 'common'
- 'clean-code'
- "psr12"
- "php70"
- "php71"
- "symplify"
- "common"
- "clean-code"

exclude_files:
- '*tests/**Source/*.php'
Expand All @@ -35,7 +43,6 @@ parameters:
- '*tests/*/Expected/*'
- '*utils/ContributorTools/templates/*'
- 'stubs/*'
- '*/Expected/*'
# exclude
- 'src/Rector/AbstractRector.php'
- 'src/PhpParser/BetterNodeDumper.php'
Expand All @@ -54,7 +61,7 @@ parameters:
Symplify\CodingStandard\Fixer\Order\PrivateMethodOrderByUseFixer: null

PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer:
- 'packages/php-74/src/Rector/Double/RealToFloatTypeCastRector.php'
- 'rules/php-74/src/Rector/Double/RealToFloatTypeCastRector.php'

Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenReferenceSniff: null

Expand All @@ -78,19 +85,19 @@ parameters:
- "packages/node-type-resolver/src/NodeTypeResolver.php"
- "packages/better-php-doc-parser/src/Printer/OriginalSpacingRestorer.php"
# @todo split to multiple rectors
- "packages/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php"
- "rules/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php"

- "packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/ColumnTagValueNode.php"
- "packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/JoinColumnTagValueNode.php"
- "packages/coding-style/src/Rector/ClassMethod/NewlineBeforeNewAssignSetRector.php"
- "rules/coding-style/src/Rector/ClassMethod/NewlineBeforeNewAssignSetRector.php"

# per node logic
- 'utils/DocumentationGenerator/src/Command/DumpNodesCommand.php'
# copied 3rd party logic
- 'packages/php-70/src/EregToPcreTransformer.php'
- 'rules/php-70/src/EregToPcreTransformer.php'
# dev
- 'packages/type-declaration/src/Rector/FunctionLike/*TypeDeclarationRector.php'
- 'packages/php-70/src/Rector/If_/IfToSpaceshipRector.php'
- 'rules/php-70/src/Rector/If_/IfToSpaceshipRector.php'

Symplify\CodingStandard\Sniffs\ControlStructure\SprintfOverContactSniff:
# respects inherited pattern for better comparing
Expand All @@ -111,10 +118,10 @@ parameters:

Symplify\CodingStandard\Sniffs\Debug\CommentedOutCodeSniff.Found:
# notes
- 'packages/php-72/src/Rector/Each/ListEachRector.php'
- 'packages/dead-code/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php'
- 'packages/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php'
- 'packages/cakephp-to-symfony/tests/Rector/Class_/CakePHPModelToDoctrineRepositoryRector/CakePHPModelToDoctrineRepositoryRectorTest.php'
- 'rules/php-72/src/Rector/Each/ListEachRector.php'
- 'rules/dead-code/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php'
- 'rules/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php'
- 'rules/cakephp-to-symfony/tests/Rector/Class_/CakePHPModelToDoctrineRepositoryRector/CakePHPModelToDoctrineRepositoryRectorTest.php'

PhpCsFixer\Fixer\PhpUnit\PhpUnitStrictFixer:
- 'packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfo/PhpDocInfoTest.php'
Expand All @@ -135,7 +142,7 @@ parameters:
- 'packages/polyfill/src/ConditionEvaluator.php'

SlevomatCodingStandard\Sniffs\Namespaces\ReferenceUsedNamesOnlySniff.PartialUse:
- "packages/dead-code/src/Rector/Plus/RemoveDeadZeroAndOneOperationRector.php"
- "packages/php-56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php"
- "rules/dead-code/src/Rector/Plus/RemoveDeadZeroAndOneOperationRector.php"
- "rules/php-56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php"

line_ending: "\n"
3 changes: 2 additions & 1 deletion packages/node-type-resolver/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ services:
Rector\Core\PhpParser\Printer\BetterStandardPrinter: null
Rector\Core\PhpParser\Node\BetterNodeFinder: null

# PHPStan
# PHPStan - this is the cleanest way to include another container
# without injecting full container to Rector Symfony Continaer scope
PHPStan\Reflection\ReflectionProvider:
factory: ['@Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory', 'createReflectionProvider']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@

final class PHPStanStaticTypeMapper
{
/**
* @var string
*/
public const KIND_PARAM = 'param';

/**
* @var string
*/
public const KIND_PROPERTY = 'property';

/**
* @var TypeMapperInterface[]
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ public function mapToPhpParserNode(Type $type, ?string $kind = null): ?Node
return null;
}

/**
* @param ClassStringType $type
*/
public function mapToDocString(Type $type, ?Type $parentType = null): string
{
return $type->describe(VerbosityLevel::typeOnly());
Expand Down
7 changes: 7 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ parameters:
- compiler/src

paths:
- bin
- src
- rules
- packages
- tests
- compiler/src
Expand Down Expand Up @@ -232,3 +234,8 @@ parameters:
- '#Method Rector\\SOLID\\Reflection\\ParentConstantReflectionResolver\:\:(.*?)\(\) should return ReflectionClassConstant\|null but returns ReflectionClassConstant\|false#'
- '#Parameter \#1 \$firstStmt of method Rector\\Core\\Rector\\MethodBody\\NormalToFluentRector\:\:isBothMethodCallMatch\(\) expects PhpParser\\Node\\Stmt\\Expression, PhpParser\\Node\\Stmt given#'
- '#Method Rector\\Core\\Rector\\AbstractRector\:\:wrapToArg\(\) should return array<PhpParser\\Node\\Arg\> but returns array<PhpParser\\Node\\Arg\|PhpParser\\Node\\Expr\>#'
- '#Property PhpParser\\Node\\Stmt\\ClassMethod\:\:\$returnType \(PhpParser\\Node\\Identifier\|PhpParser\\Node\\Name\|PhpParser\\Node\\NullableType\|PhpParser\\Node\\UnionType\|null\) does not accept PhpParser\\Node#'

- '#Parameter \#1 \$possibleSubtype of method Rector\\TypeDeclaration\\PhpParserTypeAnalyzer\:\:isSubtypeOf\(\) expects PhpParser\\Node\\Identifier\|PhpParser\\Node\\Name\|PhpParser\\Node\\NullableType\|PhpParser\\Node\\UnionType, PhpParser\\Node given#'
- '#Parameter \#2 \$inferredReturnNode of method Rector\\TypeDeclaration\\Rector\\FunctionLike\\ReturnTypeDeclarationRector\:\:addReturnType\(\) expects PhpParser\\Node, PhpParser\\Node\\Identifier\|PhpParser\\Node\\Name\|PhpParser\\Node\\NullableType\|PhpParser\\Node\\UnionType\|null given#'
- '#Method Rector\\FileSystemRector\\Rector\\AbstractFileSystemRector\:\:wrapToArg\(\) should return array<PhpParser\\Node\\Arg\> but returns array<PhpParser\\Node\\Arg\|PhpParser\\Node\\Expr\>#'
2 changes: 2 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
</php>
<testsuites>
<testsuite name="main">
<directory>rules/*/tests</directory>
<directory>packages/*/tests</directory>
<directory>tests</directory>
</testsuite>
</testsuites>

<filter>
<whitelist addUncoveredFilesFromWhitelist="false">
<directory suffix=".php">rules/*/src</directory>
<directory suffix=".php">packages/*/src</directory>
<directory>src</directory>
</whitelist>
Expand Down
File renamed without changes.
Loading