Skip to content

Commit c179f09

Browse files
authored
Add source_module to the template. Improve code: fix comments and order use statements alphabetically (#3858)
1 parent a6d97a2 commit c179f09

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed

src/Command/Generate/PluginMigrateSourceCommand.php

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,32 @@
22

33
/**
44
* @file
5-
* Contains \Drupal\Console\Command\Generate\PluginBlockCommand.
5+
* Contains \Drupal\Console\Command\Generate\PluginMigrateSourceCommand.
66
*/
77

88
namespace Drupal\Console\Command\Generate;
99

10-
use Symfony\Component\Console\Input\InputInterface;
11-
use Symfony\Component\Console\Input\InputOption;
12-
use Symfony\Component\Console\Output\OutputInterface;
1310
use Drupal\Console\Core\Command\ContainerAwareCommand;
14-
use Drupal\Console\Generator\PluginMigrateSourceGenerator;
15-
use Drupal\Console\Command\Shared\ModuleTrait;
11+
use Drupal\Console\Command\Shared\ArrayInputTrait;
1612
use Drupal\Console\Command\Shared\ConfirmationTrait;
17-
use Drupal\Console\Extension\Manager;
18-
use Drupal\Console\Utils\Validator;
13+
use Drupal\Console\Command\Shared\ModuleTrait;
1914
use Drupal\Console\Core\Utils\StringConverter;
2015
use Drupal\Console\Core\Utils\ChainQueue;
16+
use Drupal\Console\Extension\Manager;
17+
use Drupal\Console\Generator\PluginMigrateSourceGenerator;
18+
use Drupal\Console\Utils\Validator;
2119
use Drupal\Core\Config\ConfigFactory;
2220
use Drupal\Core\Entity\EntityTypeManagerInterface;
2321
use Drupal\Core\Render\ElementInfoManagerInterface;
22+
use Symfony\Component\Console\Input\InputInterface;
23+
use Symfony\Component\Console\Input\InputOption;
24+
use Symfony\Component\Console\Output\OutputInterface;
2425

2526
class PluginMigrateSourceCommand extends ContainerAwareCommand
2627
{
27-
use ModuleTrait;
28+
use ArrayInputTrait;
2829
use ConfirmationTrait;
30+
use ModuleTrait;
2931

3032
/**
3133
* @var ConfigFactory
@@ -68,7 +70,7 @@ class PluginMigrateSourceCommand extends ContainerAwareCommand
6870
protected $elementInfoManager;
6971

7072
/**
71-
* PluginBlockCommand constructor.
73+
* PluginMigrateSourceCommand constructor.
7274
*
7375
* @param ConfigFactory $configFactory
7476
* @param ChainQueue $chainQueue
@@ -167,6 +169,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
167169
$alias = $input->getOption('alias');
168170
$group_by = $input->getOption('group-by');
169171
$fields = $input->getOption('fields');
172+
$no_interaction = $input->getOption('no-interaction');
173+
// Parse nested data.
174+
if ($no_interaction) {
175+
$fields = $this->explodeInlineArray($fields);
176+
}
170177

171178
$this->generator->generate([
172179
'module' => $module,

templates/module/src/Plugin/migrate/source/source.php.twig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ use Drupal\migrate\Plugin\migrate\source\SqlBase;
1717
* Provides a '{{class_name}}' migrate source.
1818
*
1919
* @MigrateSource(
20-
* id = "{{plugin_id}}"
20+
* id = "{{plugin_id}}",
21+
* source_module = "{{module}}"
2122
* )
2223
*/
2324
class {{class_name}} extends SqlBase {% endblock %}
@@ -26,30 +27,29 @@ class {{class_name}} extends SqlBase {% endblock %}
2627
* {@inheritdoc}
2728
*/
2829
public function query() {
29-
3030
return $this->select('{{table}}', '{{alias}}')
31-
->fields('{{alias}}'){% if group_by %}
31+
->fields('{{alias}}')
32+
{% if group_by %}
3233
->groupBy('{{alias}}.{{group_by}}')
33-
{% endif %};
34+
{% endif %};
3435
}
3536

3637
/**
3738
* {@inheritdoc}
3839
*/
3940
public function fields() {
4041
$fields = [
41-
{% for field in fields %}
42-
'{{field.id}}' => $this->t('{{field.description}}'),
43-
{% endfor %}
44-
];
42+
{% for field in fields %}
43+
'{{field.id}}' => $this->t('{{field.description}}'),
44+
{% endfor %}
45+
];
4546
return $fields;
4647
}
4748

4849
/**
4950
* {@inheritdoc}
5051
*/
5152
public function getIds() {
52-
return [
53-
];
53+
return [];
5454
}
5555
{% endblock %}

0 commit comments

Comments
 (0)