From d4a32b4e1bbc19a87a71da33745ca4f31d41b0d3 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Fri, 14 Feb 2020 11:17:01 +0100 Subject: [PATCH] improve create command --- config/set/dead-code/dead-code.yaml | 2 ++ .../src/Configuration/ConfigurationFactory.php | 6 ++++-- packages/rector-generator/src/TemplateVariablesFactory.php | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/set/dead-code/dead-code.yaml b/config/set/dead-code/dead-code.yaml index 3e7ab49ddc4..20006969cf7 100644 --- a/config/set/dead-code/dead-code.yaml +++ b/config/set/dead-code/dead-code.yaml @@ -31,3 +31,5 @@ services: Rector\DeadCode\Rector\If_\SimplifyIfElseWithSameContentRector: null Rector\DeadCode\Rector\Ternary\TernaryToBooleanOrFalseToBooleanAndRector: null Rector\PHPUnit\Rector\ClassMethod\RemoveEmptyTestMethodRector: null + Rector\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector: null + Rector\dead-code\Rector\TryCatch\RemoveDeadTryCatchRector: null diff --git a/packages/rector-generator/src/Configuration/ConfigurationFactory.php b/packages/rector-generator/src/Configuration/ConfigurationFactory.php index 5ea2528c6fa..96c750cf48f 100644 --- a/packages/rector-generator/src/Configuration/ConfigurationFactory.php +++ b/packages/rector-generator/src/Configuration/ConfigurationFactory.php @@ -57,8 +57,10 @@ final class ConfigurationFactory $rectorRecipe['description'], $this->normalizeCode($rectorRecipe['code_before']), $this->normalizeCode($rectorRecipe['code_after']), - $this->normalizeCode($rectorRecipe['extra_file_content'] ?? ''), - $rectorRecipe['extra_file_name'], + isset($rectorRecipe['extra_file_content']) ? $this->normalizeCode( + $rectorRecipe['extra_file_content'] + ) : null, + $rectorRecipe['extra_file_name'] ?? null, array_filter((array) $rectorRecipe['source']), $this->configResolver->resolveSetConfig($rectorRecipe['set']), $this->detectPhpSnippet($rectorRecipe['code_before']) diff --git a/packages/rector-generator/src/TemplateVariablesFactory.php b/packages/rector-generator/src/TemplateVariablesFactory.php index 5e47ab2ab1d..8b9765d5170 100644 --- a/packages/rector-generator/src/TemplateVariablesFactory.php +++ b/packages/rector-generator/src/TemplateVariablesFactory.php @@ -10,6 +10,7 @@ use PhpParser\Node\Expr\ArrayItem; use PhpParser\Node\Expr\ClassConstFetch; use PhpParser\Node\Name\FullyQualified; use Rector\Core\PhpParser\Printer\BetterStandardPrinter; +use Rector\Core\Util\RectorStrings; use Rector\RectorGenerator\ValueObject\Configuration; final class TemplateVariablesFactory @@ -31,7 +32,7 @@ final class TemplateVariablesFactory { $data = [ '_Package_' => $configuration->getPackage(), - '_package_' => strtolower($configuration->getPackage()), + '_package_' => RectorStrings::camelCaseToDashes($configuration->getPackage()), '_Category_' => $configuration->getCategory(), '_Description_' => $configuration->getDescription(), '_Name_' => $configuration->getName(),