Add DI to TwigExtension generator

Author: Chi-teck

scripts/run-sut-tests.sh

@@ -193,7 +193,7 @@ if [ $TARGET_TEST = all -o $TARGET_TEST = service ]; then
   $DCG d8:service:param-converter -d $MODULE_DIR -a '{"name":"Zippo","machine_name":"zippo","parameter_type":"example","class":"ExampleParamConverter"}'
   $DCG d8:service:route-subscriber -d $MODULE_DIR -a '{"name":"Zippo","machine_name":"zippo"}'
   $DCG d8:service:theme-negotiator -d $MODULE_DIR -a '{"name":"Zippo","machine_name":"zippo","class":"ZippoThemeNegotiator"}'
-  $DCG d8:service:twig-extension -d $MODULE_DIR -a '{"name":"Zippo","machine_name":"zippo","class":"ZippoTwigExtension","di":"Yes"}'
+  $DCG d8:service:twig-extension -d $MODULE_DIR -a '{"name":"Zippo","machine_name":"zippo","class":"ZippoTwigExtension","di":"No"}'
   $DCG d8:service:path-processor -d $MODULE_DIR -a '{"name":"Zippo","machine_name":"zippo","class":"PathProcessorZippo"}'
   $DCG d8:service:request-policy -d $MODULE_DIR -a '{"name":"Zippo","machine_name":"zippo","class":"Example"}'
   $DCG d8:service:response-policy -d $MODULE_DIR -a '{"name":"Zippo","machine_name":"zippo","class":"ExampleResponsePolicy"}'

src/Command/Drupal_8/Service/TwigExtension.php

@@ -22,15 +22,18 @@ class TwigExtension extends BaseGenerator {
    * {@inheritdoc}
    */
   protected function interact(InputInterface $input, OutputInterface $output) {
-    $questions = Utils::defaultQuestions();
+    $questions = Utils::moduleQuestions();
     $default_class = function ($vars) {
       return Utils::camelize($vars['name']) . 'TwigExtension';
     };
     $questions['class'] = new Question('Class', $default_class);
-    $questions['di'] = new ConfirmationQuestion('Would you like to inject dependencies?', FALSE);
-
     $this->collectVars($input, $output, $questions);
 
+    $di_question = new ConfirmationQuestion('Would you like to inject dependencies?');
+    if ($this->ask($input, $output, $di_question)) {
+      $this->collectServices($input, $output);
+    }
+
     $this->addFile()
       ->path('src/{class}.php')
       ->template('d8/service/twig-extension.twig');

templates/d8/service/twig-extension.services.twig

@@ -1,8 +1,9 @@
+{% import 'lib/di.twig' as di %}
 services:
   {{ machine_name }}.twig_extension:
     class: Drupal\{{ machine_name }}\{{ class }}
-{% if di %}
-    arguments: ['@example']
+{% if services %}
+    arguments: [{{ di.arguments(services) }}]
 {% endif %}
     tags:
       - { name: twig.extension }

templates/d8/service/twig-extension.twig

@@ -1,32 +1,26 @@
+{% import 'lib/di.twig' as di %}
 <?php
 
 namespace Drupal\{{ machine_name }};
 
-{% if di %}
-use Drupal\example\ExampleInterface;
-
+{% if services %}
+{{ di.use(services) }}
 {% endif %}
 /**
  * Twig extension.
  */
 class {{ class }} extends \Twig_Extension {
 
-{% if di %}
-  /**
-   * The example service.
-   *
-   * @var \Drupal\example\ExampleInterface
-   */
-  protected $example;
+{% if services %}
+{{ di.properties(services) }}
 
   /**
-   * Constructs a new {{ class }} instance.
+   * Constructs a new {{ class }} object.
    *
-   * @param \Drupal\example\ExampleInterface $example
-   *   The example service.
+{{ di.annotation(services) }}
    */
-  public function __construct(ExampleInterface $example) {
-    $this->example = $example;
+  public function __construct({{ di.signature(services) }}) {
+{{ di.assignment(services) }}
   }
 
 {% endif %}

tests/dcg/Generator/Drupal_8/Service/TwigExtensionTest.php

@@ -15,7 +15,9 @@ class TwigExtensionTest extends GeneratorBaseTest {
     'Module name [%default_name%]:' => 'Example',
     'Module machine name [example]:' => 'example',
     'Class [ExampleTwigExtension]:' => 'ExampleTwigExtension',
-    'Would you like to inject dependencies? [No]:' => 'Yes',
+    'Would you like to inject dependencies? [Yes]:' => 'Yes',
+    '<1> Type the service name or use arrows up/down. Press enter to continue:' => 'entity_type.manager',
+    '<2> Type the service name or use arrows up/down. Press enter to continue:' => "\n",
   ];
 
   protected $fixtures = [

tests/dcg/Generator/Drupal_8/Service/_twig_extension.php

@@ -2,28 +2,28 @@
 
 namespace Drupal\example;
 
-use Drupal\example\ExampleInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
  * Twig extension.
  */
 class ExampleTwigExtension extends \Twig_Extension {
 
   /**
-   * The example service.
+   * The entity type manager.
    *
-   * @var \Drupal\example\ExampleInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $example;
+  protected $entityTypeManager;
 
   /**
-   * Constructs a new ExampleTwigExtension instance.
+   * Constructs a new ExampleTwigExtension object.
    *
-   * @param \Drupal\example\ExampleInterface $example
-   *   The example service.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
    */
-  public function __construct(ExampleInterface $example) {
-    $this->example = $example;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**

tests/dcg/Generator/Drupal_8/Service/_twig_extension.services.yml

@@ -1,6 +1,4 @@
 services:
   example.twig_extension:
     class: Drupal\example\ExampleTwigExtension
-    arguments: ['@example']
-    tags:
-      - { name: twig.extension }
+    arguments: ['@entity_type.manager']