mirror of
https://github.com/rectorphp/rector.git
synced 2024-05-30 07:50:53 +00:00
Updated Rector to commit bd68c98f0bc5cb8b41a62dd9e7bd94bf82e731a5
bd68c98f0b
Run tests workflow as well on push (#3301)
This commit is contained in:
parent
5d0bd503ff
commit
a0a7aca50e
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInitea52fcaa8a63173bc050ce2e45a49379::getLoader();
|
||||
return ComposerAutoloaderInit1c7eb6da90a8fe61c0643f0a792b7779::getLoader();
|
||||
|
|
2
vendor/composer/autoload_classmap.php
vendored
2
vendor/composer/autoload_classmap.php
vendored
|
@ -2522,6 +2522,7 @@ return array(
|
|||
'Rector\\Symfony\\NodeFactory\\InvokableController\\ActiveClassElementsFilter' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/InvokableController/ActiveClassElementsFilter.php',
|
||||
'Rector\\Symfony\\NodeFactory\\OnLogoutClassMethodFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/OnLogoutClassMethodFactory.php',
|
||||
'Rector\\Symfony\\NodeFactory\\OnSuccessLogoutClassMethodFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/OnSuccessLogoutClassMethodFactory.php',
|
||||
'Rector\\Symfony\\NodeFactory\\RequiredClassMethodFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/RequiredClassMethodFactory.php',
|
||||
'Rector\\Symfony\\NodeFactory\\ThisRenderFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/ThisRenderFactory.php',
|
||||
'Rector\\Symfony\\NodeFinder\\EmptyReturnNodeFinder' => $vendorDir . '/rector/rector-symfony/src/NodeFinder/EmptyReturnNodeFinder.php',
|
||||
'Rector\\Symfony\\NodeRemover\\ConstructorDependencyRemover' => $vendorDir . '/rector/rector-symfony/src/NodeRemover/ConstructorDependencyRemover.php',
|
||||
|
@ -2547,6 +2548,7 @@ return array(
|
|||
'Rector\\Symfony\\Rector\\Class_\\ChangeFileLoaderInExtensionAndKernelRector' => $vendorDir . '/rector/rector-symfony/src/Rector/Class_/ChangeFileLoaderInExtensionAndKernelRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\CommandDescriptionToPropertyRector' => $vendorDir . '/rector/rector-symfony/src/Rector/Class_/CommandDescriptionToPropertyRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\CommandPropertyToAttributeRector' => $vendorDir . '/rector/rector-symfony/src/Rector/Class_/CommandPropertyToAttributeRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\ContainerGetToRequiredDependencyAbstractClassRector' => $vendorDir . '/rector/rector-symfony/src/Rector/Class_/ContainerGetToRequiredDependencyAbstractClassRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\EventListenerToEventSubscriberRector' => $vendorDir . '/rector/rector-symfony/src/Rector/Class_/EventListenerToEventSubscriberRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\FormTypeWithDependencyToOptionsRector' => $vendorDir . '/rector/rector-symfony/src/Rector/Class_/FormTypeWithDependencyToOptionsRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\InvokableControllerRector' => $vendorDir . '/rector/rector-symfony/src/Rector/Class_/InvokableControllerRector.php',
|
||||
|
|
10
vendor/composer/autoload_real.php
vendored
10
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInitea52fcaa8a63173bc050ce2e45a49379
|
||||
class ComposerAutoloaderInit1c7eb6da90a8fe61c0643f0a792b7779
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,17 +22,17 @@ class ComposerAutoloaderInitea52fcaa8a63173bc050ce2e45a49379
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInitea52fcaa8a63173bc050ce2e45a49379', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit1c7eb6da90a8fe61c0643f0a792b7779', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitea52fcaa8a63173bc050ce2e45a49379', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit1c7eb6da90a8fe61c0643f0a792b7779', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit1c7eb6da90a8fe61c0643f0a792b7779::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit1c7eb6da90a8fe61c0643f0a792b7779::$files;
|
||||
$requireFile = static function ($fileIdentifier, $file) {
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
|
10
vendor/composer/autoload_static.php
vendored
10
vendor/composer/autoload_static.php
vendored
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379
|
||||
class ComposerStaticInit1c7eb6da90a8fe61c0643f0a792b7779
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -2767,6 +2767,7 @@ class ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379
|
|||
'Rector\\Symfony\\NodeFactory\\InvokableController\\ActiveClassElementsFilter' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/InvokableController/ActiveClassElementsFilter.php',
|
||||
'Rector\\Symfony\\NodeFactory\\OnLogoutClassMethodFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/OnLogoutClassMethodFactory.php',
|
||||
'Rector\\Symfony\\NodeFactory\\OnSuccessLogoutClassMethodFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/OnSuccessLogoutClassMethodFactory.php',
|
||||
'Rector\\Symfony\\NodeFactory\\RequiredClassMethodFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/RequiredClassMethodFactory.php',
|
||||
'Rector\\Symfony\\NodeFactory\\ThisRenderFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/ThisRenderFactory.php',
|
||||
'Rector\\Symfony\\NodeFinder\\EmptyReturnNodeFinder' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFinder/EmptyReturnNodeFinder.php',
|
||||
'Rector\\Symfony\\NodeRemover\\ConstructorDependencyRemover' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeRemover/ConstructorDependencyRemover.php',
|
||||
|
@ -2792,6 +2793,7 @@ class ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379
|
|||
'Rector\\Symfony\\Rector\\Class_\\ChangeFileLoaderInExtensionAndKernelRector' => __DIR__ . '/..' . '/rector/rector-symfony/src/Rector/Class_/ChangeFileLoaderInExtensionAndKernelRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\CommandDescriptionToPropertyRector' => __DIR__ . '/..' . '/rector/rector-symfony/src/Rector/Class_/CommandDescriptionToPropertyRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\CommandPropertyToAttributeRector' => __DIR__ . '/..' . '/rector/rector-symfony/src/Rector/Class_/CommandPropertyToAttributeRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\ContainerGetToRequiredDependencyAbstractClassRector' => __DIR__ . '/..' . '/rector/rector-symfony/src/Rector/Class_/ContainerGetToRequiredDependencyAbstractClassRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\EventListenerToEventSubscriberRector' => __DIR__ . '/..' . '/rector/rector-symfony/src/Rector/Class_/EventListenerToEventSubscriberRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\FormTypeWithDependencyToOptionsRector' => __DIR__ . '/..' . '/rector/rector-symfony/src/Rector/Class_/FormTypeWithDependencyToOptionsRector.php',
|
||||
'Rector\\Symfony\\Rector\\Class_\\InvokableControllerRector' => __DIR__ . '/..' . '/rector/rector-symfony/src/Rector/Class_/InvokableControllerRector.php',
|
||||
|
@ -3072,9 +3074,9 @@ class ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitea52fcaa8a63173bc050ce2e45a49379::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit1c7eb6da90a8fe61c0643f0a792b7779::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit1c7eb6da90a8fe61c0643f0a792b7779::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit1c7eb6da90a8fe61c0643f0a792b7779::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
8
vendor/composer/installed.json
vendored
8
vendor/composer/installed.json
vendored
|
@ -2126,12 +2126,12 @@
|
|||
"source": {
|
||||
"type": "git",
|
||||
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
|
||||
"reference": "b7bd111c5660e1f8752f949d1cf48d0ad38bccb7"
|
||||
"reference": "fc94862f8cde756f6127d7a63fff34460338f921"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/b7bd111c5660e1f8752f949d1cf48d0ad38bccb7",
|
||||
"reference": "b7bd111c5660e1f8752f949d1cf48d0ad38bccb7",
|
||||
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/fc94862f8cde756f6127d7a63fff34460338f921",
|
||||
"reference": "fc94862f8cde756f6127d7a63fff34460338f921",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -2165,7 +2165,7 @@
|
|||
"tomasvotruba\/type-coverage": "^0.0.9",
|
||||
"tomasvotruba\/unused-public": "^0.0.34"
|
||||
},
|
||||
"time": "2023-01-22T18:43:58+00:00",
|
||||
"time": "2023-01-22T23:04:35+00:00",
|
||||
"default-branch": true,
|
||||
"type": "rector-extension",
|
||||
"extra": {
|
||||
|
|
2
vendor/composer/installed.php
vendored
2
vendor/composer/installed.php
vendored
File diff suppressed because one or more lines are too long
|
@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
|
|||
*/
|
||||
final class GeneratedConfig
|
||||
{
|
||||
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main f0c3c11'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main cda9d4d'), 'rector/rector-php-parser' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-php-parser', 'relative_install_path' => '../../rector-php-parser', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 9ea5f62'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 2cfc0a5'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main b7bd111'));
|
||||
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main f0c3c11'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main cda9d4d'), 'rector/rector-php-parser' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-php-parser', 'relative_install_path' => '../../rector-php-parser', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 9ea5f62'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 2cfc0a5'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main fc94862'));
|
||||
private function __construct()
|
||||
{
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# 74 Rules Overview
|
||||
# 75 Rules Overview
|
||||
|
||||
## ActionSuffixRemoverRector
|
||||
|
||||
|
@ -431,6 +431,37 @@ Turns fetching of dependencies via `$container->get()` in ContainerAware to cons
|
|||
|
||||
<br>
|
||||
|
||||
## ContainerGetToRequiredDependencyAbstractClassRector
|
||||
|
||||
Change `$this->get("some_service");` to `@required` dependency in an abstract class
|
||||
|
||||
- class: [`Rector\Symfony\Rector\Class_\ContainerGetToRequiredDependencyAbstractClassRector`](../src/Rector/Class_/ContainerGetToRequiredDependencyAbstractClassRector.php)
|
||||
|
||||
```diff
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
|
||||
abstract class CustomAbstractController extends AbstractController
|
||||
{
|
||||
+ private SomeService $someService;
|
||||
+
|
||||
+ /**
|
||||
+ * @required
|
||||
+ */
|
||||
+ public function autowire(SomeService $someService)
|
||||
+ {
|
||||
+ $this->someService = $someService;
|
||||
+ }
|
||||
+
|
||||
public function run()
|
||||
{
|
||||
- $this->get('some_service')->apply();
|
||||
+ $this->someService->apply();
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
<br>
|
||||
|
||||
## DefinitionAliasSetPrivateToSetPublicRector
|
||||
|
||||
Migrates from deprecated `Definition/Alias->setPrivate()` to `Definition/Alias->setPublic()`
|
||||
|
@ -1498,6 +1529,8 @@ Symplify form rendering by not calling `->createView()` on `render` function
|
|||
- class: [`Rector\Symfony\Rector\MethodCall\SimplifyFormRenderingRector`](../src/Rector/MethodCall/SimplifyFormRenderingRector.php)
|
||||
|
||||
```diff
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
|
||||
class ReplaceFormCreateViewFunctionCall extends AbstractController
|
||||
{
|
||||
public function form(): Response
|
||||
|
|
52
vendor/rector/rector-symfony/src/NodeFactory/RequiredClassMethodFactory.php
vendored
Normal file
52
vendor/rector/rector-symfony/src/NodeFactory/RequiredClassMethodFactory.php
vendored
Normal file
|
@ -0,0 +1,52 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\Symfony\NodeFactory;
|
||||
|
||||
use RectorPrefix202301\Nette\Utils\Strings;
|
||||
use PhpParser\Builder\Method;
|
||||
use PhpParser\Comment\Doc;
|
||||
use PhpParser\Node\Expr\Assign;
|
||||
use PhpParser\Node\Expr\PropertyFetch;
|
||||
use PhpParser\Node\Expr\Variable;
|
||||
use PhpParser\Node\Name\FullyQualified;
|
||||
use PhpParser\Node\Param;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PhpParser\Node\Stmt\Expression;
|
||||
use RectorPrefix202301\Webmozart\Assert\Assert;
|
||||
final class RequiredClassMethodFactory
|
||||
{
|
||||
/**
|
||||
* @param string[] $classNames
|
||||
*/
|
||||
public function createRequiredAutowireClassMethod(array $classNames) : ClassMethod
|
||||
{
|
||||
Assert::allString($classNames);
|
||||
$method = new Method('autowire');
|
||||
$method->makePublic();
|
||||
foreach ($classNames as $className) {
|
||||
$variableName = $this->resolveVariableNameFromClassName($className);
|
||||
$param = new Param(new Variable($variableName));
|
||||
$param->type = new FullyQualified($className);
|
||||
$method->addParam($param);
|
||||
$assign = $this->createAssign($variableName);
|
||||
$method->addStmt(new Expression($assign));
|
||||
}
|
||||
$autowireClassMethod = $method->getNode();
|
||||
$autowireClassMethod->setDocComment(new Doc('/**' . \PHP_EOL . ' * @required' . \PHP_EOL . ' */'));
|
||||
return $autowireClassMethod;
|
||||
}
|
||||
private function resolveVariableNameFromClassName(string $className) : string
|
||||
{
|
||||
$shortClassName = Strings::after($className, '\\', -1);
|
||||
if (!\is_string($shortClassName)) {
|
||||
$shortClassName = $className;
|
||||
}
|
||||
return \lcfirst($shortClassName);
|
||||
}
|
||||
private function createAssign(string $variableName) : Assign
|
||||
{
|
||||
$thisVariable = new Variable('this');
|
||||
return new Assign(new PropertyFetch($thisVariable, $variableName), new Variable($variableName));
|
||||
}
|
||||
}
|
|
@ -0,0 +1,152 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\Symfony\Rector\Class_;
|
||||
|
||||
use RectorPrefix202301\Nette\Utils\Strings;
|
||||
use PhpParser\Builder\Property;
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr\MethodCall;
|
||||
use PhpParser\Node\Expr\PropertyFetch;
|
||||
use PhpParser\Node\Expr\Variable;
|
||||
use PhpParser\Node\Name\FullyQualified;
|
||||
use PhpParser\Node\Param;
|
||||
use PhpParser\Node\Stmt\Class_;
|
||||
use PHPStan\Type\ObjectType;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
use Rector\Symfony\NodeAnalyzer\ServiceTypeMethodCallResolver;
|
||||
use Rector\Symfony\NodeFactory\RequiredClassMethodFactory;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
/**
|
||||
* @see \Rector\Symfony\Tests\Rector\Class_\ContainerGetToRequiredDependencyAbstractClassRector\ContainerGetToRequiredDependencyAbstractClassRectorTest
|
||||
*/
|
||||
final class ContainerGetToRequiredDependencyAbstractClassRector extends AbstractRector
|
||||
{
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
private $autowiredTypes = [];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Symfony\NodeAnalyzer\ServiceTypeMethodCallResolver
|
||||
*/
|
||||
private $serviceTypeMethodCallResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Symfony\NodeFactory\RequiredClassMethodFactory
|
||||
*/
|
||||
private $requiredClassMethodFactory;
|
||||
public function __construct(ServiceTypeMethodCallResolver $serviceTypeMethodCallResolver, RequiredClassMethodFactory $requiredClassMethodFactory)
|
||||
{
|
||||
$this->serviceTypeMethodCallResolver = $serviceTypeMethodCallResolver;
|
||||
$this->requiredClassMethodFactory = $requiredClassMethodFactory;
|
||||
}
|
||||
public function getRuleDefinition() : RuleDefinition
|
||||
{
|
||||
return new RuleDefinition('Change $this->get("some_service"); to @required dependency in an abstract class', [new CodeSample(<<<'CODE_SAMPLE'
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
|
||||
abstract class CustomAbstractController extends AbstractController
|
||||
{
|
||||
public function run()
|
||||
{
|
||||
$this->get('some_service')->apply();
|
||||
}
|
||||
}
|
||||
CODE_SAMPLE
|
||||
, <<<'CODE_SAMPLE'
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
|
||||
abstract class CustomAbstractController extends AbstractController
|
||||
{
|
||||
private SomeService $someService;
|
||||
|
||||
/**
|
||||
* @required
|
||||
*/
|
||||
public function autowire(SomeService $someService)
|
||||
{
|
||||
$this->someService = $someService;
|
||||
}
|
||||
|
||||
public function run()
|
||||
{
|
||||
$this->someService->apply();
|
||||
}
|
||||
}
|
||||
CODE_SAMPLE
|
||||
)]);
|
||||
}
|
||||
/**
|
||||
* @return array<class-string<Node>>
|
||||
*/
|
||||
public function getNodeTypes() : array
|
||||
{
|
||||
return [Class_::class];
|
||||
}
|
||||
/**
|
||||
* @param Class_ $node
|
||||
*/
|
||||
public function refactor(Node $node) : ?Node
|
||||
{
|
||||
if (!$node->isAbstract()) {
|
||||
return null;
|
||||
}
|
||||
if (!$this->isObjectType($node, new ObjectType('Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController'))) {
|
||||
return null;
|
||||
}
|
||||
$this->autowiredTypes = [];
|
||||
// collect all $this->get("some_service") calls
|
||||
$this->traverseNodesWithCallable($node->stmts, function (Node $node) {
|
||||
if (!$node instanceof MethodCall) {
|
||||
return null;
|
||||
}
|
||||
if (!$this->isThisGetMethodCall($node)) {
|
||||
return null;
|
||||
}
|
||||
$serviceType = $this->serviceTypeMethodCallResolver->resolve($node);
|
||||
if (!$serviceType instanceof ObjectType) {
|
||||
return null;
|
||||
}
|
||||
$this->autowiredTypes[] = $serviceType->getClassName();
|
||||
$variableName = $this->resolveVariableNameFromClassName($serviceType->getClassName());
|
||||
return new PropertyFetch(new Variable('this'), $variableName);
|
||||
});
|
||||
if ($this->autowiredTypes === []) {
|
||||
return null;
|
||||
}
|
||||
$newStmts = [];
|
||||
foreach ($this->autowiredTypes as $autowiredType) {
|
||||
$propertyName = $this->resolveVariableNameFromClassName($autowiredType);
|
||||
$propertyBuilder = new Property($propertyName);
|
||||
$propertyBuilder->makePrivate();
|
||||
$propertyBuilder->setType(new FullyQualified($autowiredType));
|
||||
$newStmts[] = $propertyBuilder->getNode();
|
||||
}
|
||||
$newStmts[] = $this->requiredClassMethodFactory->createRequiredAutowireClassMethod($this->autowiredTypes);
|
||||
$node->stmts = \array_merge($newStmts, $node->stmts);
|
||||
return $node;
|
||||
}
|
||||
private function isThisGetMethodCall(MethodCall $methodCall) : bool
|
||||
{
|
||||
if (!$methodCall->var instanceof Variable) {
|
||||
return \false;
|
||||
}
|
||||
if (!$this->isName($methodCall->var, 'this')) {
|
||||
return \false;
|
||||
}
|
||||
if (!$this->isName($methodCall->name, 'get')) {
|
||||
return \false;
|
||||
}
|
||||
return \count($methodCall->getArgs()) === 1;
|
||||
}
|
||||
private function resolveVariableNameFromClassName(string $className) : string
|
||||
{
|
||||
$shortClassName = Strings::after($className, '\\', -1);
|
||||
if (!\is_string($shortClassName)) {
|
||||
$shortClassName = $className;
|
||||
}
|
||||
return \lcfirst($shortClassName);
|
||||
}
|
||||
}
|
|
@ -20,6 +20,8 @@ final class SimplifyFormRenderingRector extends AbstractRector
|
|||
public function getRuleDefinition() : RuleDefinition
|
||||
{
|
||||
return new RuleDefinition('Symplify form rendering by not calling `->createView()` on `render` function', [new CodeSample(<<<'CODE_SAMPLE'
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
|
||||
class ReplaceFormCreateViewFunctionCall extends AbstractController
|
||||
{
|
||||
public function form(): Response
|
||||
|
@ -31,6 +33,8 @@ class ReplaceFormCreateViewFunctionCall extends AbstractController
|
|||
}
|
||||
CODE_SAMPLE
|
||||
, <<<'CODE_SAMPLE'
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
|
||||
class ReplaceFormCreateViewFunctionCall extends AbstractController
|
||||
{
|
||||
public function form(): Response
|
||||
|
|
Loading…
Reference in New Issue
Block a user