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
37 changes: 19 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"php": "^7.2.4",
"ext-json": "*",
"composer/xdebug-handler": "^1.4",
"doctrine/annotations": "^1.8",
"doctrine/annotations": "^1.10.2",
"doctrine/inflector": "^1.3",
"jean85/pretty-package-versions": "^1.2",
"jetbrains/phpstorm-stubs": "^2019.3",
Expand All @@ -26,29 +26,30 @@
"phpstan/phpstan-phpunit": "^0.12",
"psr/simple-cache": "^1.0",
"sebastian/diff": "^3.0|^4.0",
"symfony/cache": "^4.4.6|^5.0.6",
"symfony/console": "^4.4.6|^5.0.6",
"symfony/dependency-injection": "^4.4.6|^5.0.6",
"symfony/finder": "^4.4.6|^5.0.6",
"symfony/process": "^4.4.6|^5.0.6",
"symplify/auto-bind-parameter": "^7.3.13",
"symplify/autowire-array-parameter": "^7.3.13",
"symplify/console-color-diff": "^7.3.13",
"symplify/package-builder": "^7.3.13",
"symplify/parameter-name-guard": "^7.3.13",
"symplify/set-config-resolver": "^7.3.13",
"symfony/cache": "^4.4.8|^5.0.6",
"symfony/console": "^4.4.8|^5.0.6",
"symfony/dependency-injection": "^4.4.8|^5.0.6",
"symfony/finder": "^4.4.8|^5.0.6",
"symfony/process": "^4.4.8|^5.0.6",
"symplify/auto-bind-parameter": "^7.3.18",
"symplify/autowire-array-parameter": "^7.3.18",
"symplify/console-color-diff": "^7.3.18",
"symplify/package-builder": "^7.3.18",
"symplify/parameter-name-guard": "^7.3.18",
"symplify/set-config-resolver": "^7.3.18",
"tracy/tracy": "^2.7"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16",
"ocramius/package-versions": "^1.4|^1.5",
"phpunit/phpunit": "^8.4|^9.0",
"phpunit/phpunit": "^8.5|^9.0",
"slam/phpstan-extensions": "^5.0",
"symplify/changelog-linker": "^7.3.13",
"symplify/easy-coding-standard": "^7.3.13",
"symplify/monorepo-builder": "^7.3.13",
"symplify/phpstan-extensions": "^7.3.13",
"thecodingmachine/phpstan-strict-rules": "^0.12"
"symplify/changelog-linker": "^7.3.18",
"symplify/easy-coding-standard": "^7.3.18",
"symplify/monorepo-builder": "^7.3.18",
"symplify/phpstan-extensions": "^7.3.18",
"thecodingmachine/phpstan-strict-rules": "^0.12",
"psr/event-dispatcher": "^1.0"
},
"replace": {
"rector/rector-prefixed": "self.version"
Expand Down
6 changes: 6 additions & 0 deletions config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ services:
PhpParser\NodeVisitor\CloningVisitor:
PhpParser\NodeFinder: null

PhpParser\Parser:
factory: ['@Rector\Core\PhpParser\Parser\ParserFactory', 'create']

PhpParser\Lexer:
factory: ['@Rector\Core\PhpParser\Parser\LexerFactory', 'create']

# value resolver
Symfony\Component\Filesystem\Filesystem: null
Symplify\PackageBuilder\Reflection\PrivatesAccessor: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ final class TagValueToPhpParserNodeMap

// doctrine
ColumnTagValueNode::class => Property::class,
JoinTableTagValueNode
::class => Property::class,
JoinTableTagValueNode::class => Property::class,
EntityTagValueNode::class => Class_::class,
TableTagValueNode::class => Class_::class,
CustomIdGeneratorTagValueNode::class => Property::class,
Expand Down
2 changes: 0 additions & 2 deletions src/HttpKernel/RectorKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use Symplify\AutowireArrayParameter\DependencyInjection\CompilerPass\AutowireArrayParameterCompilerPass;
use Symplify\ConsoleColorDiff\ConsoleColorDiffBundle;
use Symplify\PackageBuilder\Contract\HttpKernel\ExtraConfigAwareKernelInterface;
use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutoReturnFactoryCompilerPass;
use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireInterfacesCompilerPass;
use Symplify\ParameterNameGuard\ParameterNameGuardBundle;

Expand Down Expand Up @@ -86,7 +85,6 @@ protected function build(ContainerBuilder $containerBuilder): void
{
$containerBuilder->addCompilerPass(new RemoveExcludedRectorsCompilerPass());

$containerBuilder->addCompilerPass(new AutoReturnFactoryCompilerPass());
$containerBuilder->addCompilerPass(new AutowireArrayParameterCompilerPass());

// autowire Rectors by default (mainly for 3rd party code)
Expand Down