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
39 changes: 19 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"doctrine/inflector": "^2.0",
"jean85/pretty-package-versions": "^1.5.1",
"nette/robot-loader": "^3.2",
"nette/utils": "^3.1",
"nette/utils": "^3.2",
"nikic/php-parser": "^4.10.3",
"phpstan/phpdoc-parser": "^0.4.9",
"phpstan/phpstan": "^0.12.59",
"phpstan/phpstan": "^0.12.60",
"phpstan/phpstan-phpunit": "^0.12.16",
"psr/simple-cache": "^1.0",
"sebastian/diff": "^4.0",
Expand All @@ -30,15 +30,15 @@
"symfony/dependency-injection": "^4.4.8|^5.1",
"symfony/finder": "^4.4.8|^5.1",
"symfony/http-kernel": "^4.4.8|^5.1",
"symplify/autowire-array-parameter": "^9.0.5",
"symplify/skipper": "^9.0.5",
"symplify/package-builder": "^9.0.5",
"symplify/simple-php-doc-parser": "^9.0.5",
"symplify/smart-file-system": "^9.0.5",
"symplify/rule-doc-generator": "^9.0.5",
"symplify/set-config-resolver": "^9.0.5",
"symplify/console-color-diff": "^9.0.5",
"symplify/symfony-php-config": "^9.0.5",
"symplify/autowire-array-parameter": "^9.0.6",
"symplify/skipper": "^9.0.6",
"symplify/package-builder": "^9.0.6",
"symplify/simple-php-doc-parser": "^9.0.6",
"symplify/smart-file-system": "^9.0.6",
"symplify/rule-doc-generator": "^9.0.6",
"symplify/set-config-resolver": "^9.0.6",
"symplify/console-color-diff": "^9.0.6",
"symplify/symfony-php-config": "^9.0.6",
"webmozart/assert": "^1.9"
},
"require-dev": {
Expand All @@ -48,14 +48,14 @@
"nette/forms": "^3.0",
"ocramius/package-versions": "^1.9",
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpunit/phpunit": "^8.5|^9.2",
"psr/event-dispatcher": "^1.0",
"symplify/changelog-linker": "^9.0.5",
"symplify/easy-coding-standard": "^9.0.5",
"symplify/coding-standard": "^9.0.5",
"symplify/easy-testing": "^9.0.5",
"symplify/phpstan-extensions": "^9.0.5",
"symplify/phpstan-rules": "dev-master",
"phpunit/phpunit": "^9.5",
"sebastian/diff": "^4.0.4",
"symplify/changelog-linker": "^9.0.6",
"symplify/easy-coding-standard": "^9.0.6",
"symplify/coding-standard": "^9.0.6",
"symplify/easy-testing": "^9.0.6",
"symplify/phpstan-extensions": "^9.0.6",
"symplify/phpstan-rules": "^9.0.6",
"tracy/tracy": "^2.7"
},
"replace": {
Expand Down Expand Up @@ -143,7 +143,6 @@
"Rector\\RectorGenerator\\": "packages/rector-generator/src",
"Rector\\RemovingStatic\\": "rules/removing-static/src",
"Rector\\Renaming\\": "rules/renaming/src",
"Rector\\Reporting\\": "packages/reporting/src",
"Rector\\Restoration\\": "rules/restoration/src",
"Rector\\SOLID\\": "rules/solid/src",
"Rector\\Sensio\\": "rules/sensio/src",
Expand Down
4 changes: 0 additions & 4 deletions config/services.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@
use Rector\Core\Bootstrap\NoRectorsLoadedReporter;
use Rector\Core\Configuration\RectorClassesProvider;
use Rector\Core\Console\ConsoleApplication;
use Rector\Core\EventDispatcher\AutowiredEventDispatcher;
use Rector\Core\PhpParser\Parser\NikicPhpParserFactory;
use Rector\Core\PhpParser\Parser\PhpParserLexerFactory;
use Symfony\Component\Console\Application as SymfonyApplication;
use Symfony\Component\Console\Descriptor\TextDescriptor;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Filesystem\Filesystem;
use Symplify\PackageBuilder\Console\Command\CommandNaming;
use Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory;
Expand Down Expand Up @@ -92,8 +90,6 @@

$services->set(StringFormatConverter::class);

$services->alias(EventDispatcherInterface::class, AutowiredEventDispatcher::class);

$services->set(SymfonyStyleFactory::class);
$services->set(SymfonyStyle::class)
->factory([ref(SymfonyStyleFactory::class), 'create']);
Expand Down
2 changes: 2 additions & 0 deletions config/set/coding-style.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector;
use Rector\CodingStyle\Rector\Include_\FollowRequireByDirRector;
use Rector\CodingStyle\Rector\Plus\UseIncrementAssignRector;
use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector;
use Rector\CodingStyle\Rector\String_\SplitStringClassConstantToClassConstFetchRector;
use Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector;
use Rector\CodingStyle\Rector\Switch_\BinarySwitchToIfElseRector;
Expand Down Expand Up @@ -69,4 +70,5 @@
$services->set(CamelCaseFunctionNamingToUnderscoreRector::class);
$services->set(SplitGroupedUseImportsRector::class);
$services->set(RemoveDoubleUnderscoreInMethodNameRector::class);
$services->set(PostIncDecToPreIncDecRector::class);
};
14 changes: 8 additions & 6 deletions ecs.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
declare(strict_types=1);

use PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\MethodDeclarationSniff;
use PhpCsFixer\Fixer\Basic\Psr4Fixer;
use PhpCsFixer\Fixer\Import\GlobalNamespaceImportFixer;
use PhpCsFixer\Fixer\Operator\UnaryOperatorSpacesFixer;
use PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocAnnotationRemoveFixer;
Expand Down Expand Up @@ -79,6 +80,13 @@
UnusedVariableSniff::class,
GlobalNamespaceImportFixer::class,
MethodDeclarationSniff::class . '.Underscore',
UnaryOperatorSpacesFixer::class,
// breaks on-purpose annotated variables
ReturnAssignmentFixer::class,
// buggy with specific markdown snippet file in docs/rules_overview.md
ArrayListItemNewlineFixer::class,
BlankLineAfterOpeningTagFixer::class,
Psr4Fixer::class,

PhpdocTypesFixer::class => [__DIR__ . '/rules/php74/src/Rector/Double/RealToFloatTypeCastRector.php'],
CommentedOutCodeSniff::class . '.Found' => [
Expand All @@ -91,12 +99,6 @@
__DIR__ . '/tests/PhpParser/Node/NodeFactoryTest.php',
'*TypeResolverTest.php',
],
UnaryOperatorSpacesFixer::class,
// breaks on-purpose annotated variables
ReturnAssignmentFixer::class,
// buggy with specific markdown snippet file in docs/rules_overview.md
ArrayListItemNewlineFixer::class,
BlankLineAfterOpeningTagFixer::class,

StrictComparisonFixer::class => [__DIR__ . '/rules/polyfill/src/ConditionEvaluator.php'],

Expand Down
17 changes: 0 additions & 17 deletions packages/reporting/config/config.php

This file was deleted.

36 changes: 0 additions & 36 deletions packages/reporting/src/DataCollector/ReportCollector.php

This file was deleted.

This file was deleted.

This file was deleted.

58 changes: 0 additions & 58 deletions packages/reporting/src/ValueObject/Report.php

This file was deleted.

2 changes: 0 additions & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,6 @@ parameters:
- packages/better-php-doc-parser/src/PhpDocNode/PrintTagValueNodeTrait.php # 13
- packages/changes-reporting/src/Rector/AbstractRector/NotifyingRemovingNodeTrait.php # 17
- packages/post-rector/src/Rector/AbstractRector/NodeCommandersTrait.php # 31
- packages/reporting/src/Rector/AbstractRector/NodeReportCollectorTrait.php # 14
- rules/doctrine/src/AbstractRector/DoctrineTrait.php # 13
- src/Rector/AbstractRector/*

Expand Down Expand Up @@ -718,6 +717,5 @@ parameters:
- '#Method (.*?) should return DOMElement but returns DOMElement\|false#'
- '#Method (.*?) should return DOMElement\|null but returns DOMElement\|false#'


# bug in simplify
- '#Parameter 1 should use PhpParser\\Node\\Expr\\MethodCall type as already checked#'
Loading